<command> [command args...] +# @DESCRIPTION: +# Make a GDM/KDM Session file. The title is the file to execute to start the +# Window Manager. The command is the name of the Window Manager. +# +# You can set the name of the file via the ${wm} variable. +make_session_desktop() { + [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1 + [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1 + + local title=$1 + local command=$2 + local desktop=${T}/${wm:-${PN}}.desktop + shift 2 + + cat <<-EOF > "${desktop}" + [Desktop Entry] + Name=${title} + Comment=This session logs you into ${title} + Exec=${command} $* + TryExec=${command} + Type=XSession + EOF + + ( + # wrap the env here so that the 'insinto' call + # doesn't corrupt the env of the caller + insinto /usr/share/xsessions + doins "${desktop}" + ) +} + +# @FUNCTION: domenu +# @USAGE: <menus> +# @DESCRIPTION: +# Install the list of .desktop menu files into the appropriate directory +# (/usr/share/applications). +domenu() { + ( + # wrap the env here so that the 'insinto' call + # doesn't corrupt the env of the caller + local i j ret=0 + insinto /usr/share/applications + for i in "$@" ; do + if [[ -f ${i} ]] ; then + doins "${i}" + ((ret+=$?)) + elif [[ -d ${i} ]] ; then + for j in "${i}"/*.desktop ; do + doins "${j}" + ((ret+=$?)) + done + else + ((++ret)) + fi + done + exit ${ret} + ) +} + +# @FUNCTION: newmenu +# @USAGE: <menu> <newname> +# @DESCRIPTION: +# Like all other new* functions, install the specified menu as newname. +newmenu() { + ( + # wrap the env here so that the 'insinto' call + # doesn't corrupt the env of the caller + insinto /usr/share/applications + newins "$@" + ) +} + +# @FUNCTION: _iconins +# @INTERNAL +# @DESCRIPTION: +# function for use in doicon and newicon +_iconins() { + ( + # wrap the env here so that the 'insinto' call + # doesn't corrupt the env of the caller + local funcname=$1; shift + local size dir + local context=apps + local theme=hicolor + + while [[ $# -gt 0 ]] ; do + case $1 in + -s|--size) + if [[ ${2%%x*}x${2%%x*} == "$2" ]] ; then + size=${2%%x*} + else + size=${2} + fi + case ${size} in + 16|22|24|32|36|48|64|72|96|128|192|256|512) + size=${size}x${size};; + scalable) + ;; + *) + eerror "${size} is an unsupported icon size!" + exit 1;; + esac + shift 2;; + -t|--theme) + theme=${2} + shift 2;; + -c|--context) + context=${2} + shift 2;; + *) + if [[ -z ${size} ]] ; then + insinto /usr/share/pixmaps + else + insinto /usr/share/icons/${theme}/${size}/${context} + fi + + if [[ ${funcname} == doicon ]] ; then + if [[ -f $1 ]] ; then + doins "${1}" + elif [[ -d $1 ]] ; then + shopt -s nullglob + doins "${1}"/*.{png,svg} + shopt -u nullglob + else + eerror "${1} is not a valid file/directory!" + exit 1 + fi + else + break + fi + shift 1;; + esac + done + if [[ ${funcname} == newicon ]] ; then + newins "$@" + fi + ) || die +} + +# @FUNCTION: doicon +# @USAGE: [options] <icons> +# @DESCRIPTION: +# Install icon into the icon directory /usr/share/icons or into +# /usr/share/pixmaps if "--size" is not set. +# This is useful in conjunction with creating desktop/menu files. +# +# @CODE +# options: +# -s, --size +# !!! must specify to install into /usr/share/icons/... !!! +# size of the icon, like 48 or 48x48 +# supported icon sizes are: +# 16 22 24 32 36 48 64 72 96 128 192 256 512 scalable +# -c, --context +# defaults to "apps" +# -t, --theme +# defaults to "hicolor" +# +# icons: list of icons +# +# example 1: doicon foobar.png fuqbar.svg suckbar.png +# results in: insinto /usr/share/pixmaps +# doins foobar.png fuqbar.svg suckbar.png +# +# example 2: doicon -s 48 foobar.png fuqbar.png blobbar.png +# results in: insinto /usr/share/icons/hicolor/48x48/apps +# doins foobar.png fuqbar.png blobbar.png +# @CODE +doicon() { + _iconins ${FUNCNAME} "$@" +} + +# @FUNCTION: newicon +# @USAGE: [options] <icon> <newname> +# @DESCRIPTION: +# Like doicon, install the specified icon as newname. +# +# @CODE +# example 1: newicon foobar.png NEWNAME.png +# results in: insinto /usr/share/pixmaps +# newins foobar.png NEWNAME.png +# +# example 2: newicon -s 48 foobar.png NEWNAME.png +# results in: insinto /usr/share/icons/hicolor/48x48/apps +# newins foobar.png NEWNAME.png +# @CODE +newicon() { + _iconins ${FUNCNAME} "$@" +} + +fi diff -uNr a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass --- a/eclass/distutils-r1.eclass false +++ b/eclass/distutils-r1.eclass af8a4201d913bbd81d8c66a6eff076c5f0af6fb55d6147f1f388aaafdb9609253f8ed4ad5bd776ba24870c1fbce9396e5c6d77d6a66a41a379b5ac2e1988791d @@ -0,0 +1,884 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: distutils-r1.eclass +# @MAINTAINER: +# Python team <python@gentoo.org> +# @AUTHOR: +# Author: Michał Górny <mgorny@gentoo.org> +# Based on the work of: Krzysztof Pawlik <nelchael@gentoo.org> +# @BLURB: A simple eclass to build Python packages using distutils. +# @DESCRIPTION: +# A simple eclass providing functions to build Python packages using +# the distutils build system. It exports phase functions for all +# the src_* phases. Each of the phases runs two pseudo-phases: +# python_..._all() (e.g. python_prepare_all()) once in ${S}, then +# python_...() (e.g. python_prepare()) for each implementation +# (see: python_foreach_impl() in python-r1). +# +# In distutils-r1_src_prepare(), the 'all' function is run before +# per-implementation ones (because it creates the implementations), +# per-implementation functions are run in a random order. +# +# In remaining phase functions, the per-implementation functions are run +# before the 'all' one, and they are ordered from the least to the most +# preferred implementation (so that 'better' files overwrite 'worse' +# ones). +# +# If the ebuild doesn't specify a particular pseudo-phase function, +# the default one will be used (distutils-r1_...). Defaults are provided +# for all per-implementation pseudo-phases, python_prepare_all() +# and python_install_all(); whenever writing your own pseudo-phase +# functions, you should consider calling the defaults (and especially +# distutils-r1_python_prepare_all). +# +# Please note that distutils-r1 sets RDEPEND and DEPEND unconditionally +# for you. +# +# Also, please note that distutils-r1 will always inherit python-r1 +# as well. Thus, all the variables defined and documented there are +# relevant to the packages using distutils-r1. +# +# For more information, please see the wiki: +# https://wiki.gentoo.org/wiki/Project:Python/distutils-r1 + +case "${EAPI:-0}" in + 0|1|2|3|4) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 5|6|7) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +# @ECLASS-VARIABLE: DISTUTILS_OPTIONAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set to a non-null value, distutils part in the ebuild will +# be considered optional. No dependencies will be added and no phase +# functions will be exported. +# +# If you enable DISTUTILS_OPTIONAL, you have to set proper dependencies +# for your package (using ${PYTHON_DEPS}) and to either call +# distutils-r1 default phase functions or call the build system +# manually. + +# @ECLASS-VARIABLE: DISTUTILS_SINGLE_IMPL +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set to a non-null value, the ebuild will support setting a single +# Python implementation only. It will effectively replace the python-r1 +# eclass inherit with python-single-r1. +# +# Note that inheriting python-single-r1 will cause pkg_setup() +# to be exported. It must be run in order for the eclass functions +# to function properly. + +if [[ ! ${_DISTUTILS_R1} ]]; then + +[[ ${EAPI} == [45] ]] && inherit eutils +[[ ${EAPI} == [56] ]] && inherit xdg-utils +inherit toolchain-funcs + +if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + inherit multiprocessing python-r1 +else + inherit python-single-r1 +fi + +fi + +if [[ ! ${DISTUTILS_OPTIONAL} ]]; then + EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install +fi + +if [[ ! ${_DISTUTILS_R1} ]]; then + +if [[ ! ${DISTUTILS_OPTIONAL} ]]; then + RDEPEND=${PYTHON_DEPS} + if [[ ${EAPI} != [56] ]]; then + BDEPEND=${PYTHON_DEPS} + else + DEPEND=${PYTHON_DEPS} + fi + REQUIRED_USE=${PYTHON_REQUIRED_USE} +fi + +# @ECLASS-VARIABLE: PATCHES +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array containing patches to be applied to the sources before +# copying them. +# +# If unset, no custom patches will be applied. +# +# Please note, however, that at some point the eclass may apply +# additional distutils patches/quirks independently of this variable. +# +# Example: +# @CODE +# PATCHES=( "${FILESDIR}"/${P}-make-gentoo-happy.patch ) +# @CODE + +# @ECLASS-VARIABLE: DOCS +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array containing documents installed using dodoc. The files listed +# there must exist in the directory from which +# distutils-r1_python_install_all() is run (${S} by default). +# +# If unset, the function will instead look up files matching default +# filename pattern list (from the Package Manager Specification), +# and install those found. +# +# Example: +# @CODE +# DOCS=( NEWS README ) +# @CODE + +# @ECLASS-VARIABLE: HTML_DOCS +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array containing documents installed using dohtml. The files +# and directories listed there must exist in the directory from which +# distutils-r1_python_install_all() is run (${S} by default). +# +# If unset, no HTML docs will be installed. +# +# Example: +# @CODE +# HTML_DOCS=( doc/html/. ) +# @CODE + +# @ECLASS-VARIABLE: EXAMPLES +# @DEFAULT_UNSET +# @DESCRIPTION: +# OBSOLETE: this variable is deprecated and banned in EAPI 6 +# +# An array containing examples installed into 'examples' doc +# subdirectory. The files and directories listed there must exist +# in the directory from which distutils-r1_python_install_all() is run +# (${S} by default). +# +# The 'examples' subdirectory will be marked not to be compressed +# automatically. +# +# If unset, no examples will be installed. +# +# Example: +# @CODE +# EXAMPLES=( examples/. demos/. ) +# @CODE + +# @ECLASS-VARIABLE: DISTUTILS_IN_SOURCE_BUILD +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set to a non-null value, in-source builds will be enabled. +# If unset, the default is to use in-source builds when python_prepare() +# is declared, and out-of-source builds otherwise. +# +# If in-source builds are used, the eclass will create a copy of package +# sources for each Python implementation in python_prepare_all(), +# and work on that copy afterwards. +# +# If out-of-source builds are used, the eclass will instead work +# on the sources directly, prepending setup.py arguments with +# 'build --build-base ${BUILD_DIR}' to enforce keeping & using built +# files in the specific root. + +# @ECLASS-VARIABLE: DISTUTILS_ALL_SUBPHASE_IMPLS +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of patterns specifying which implementations can be used +# for *_all() sub-phase functions. If undefined, defaults to '*' +# (allowing any implementation). If multiple values are specified, +# implementations matching any of the patterns will be accepted. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# If the restriction needs to apply conditionally to a USE flag, +# the variable should be set conditionally as well (e.g. in an early +# phase function or other convenient location). +# +# Please remember to add a matching || block to REQUIRED_USE, +# to ensure that at least one implementation matching the patterns will +# be enabled. +# +# Example: +# @CODE +# REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" +# +# pkg_setup() { +# use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +# } +# @CODE + +# @ECLASS-VARIABLE: mydistutilsargs +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array containing options to be passed to setup.py. +# +# Example: +# @CODE +# python_configure_all() { +# mydistutilsargs=( --enable-my-hidden-option ) +# } +# @CODE + +# @FUNCTION: esetup.py +# @USAGE: [<args>...] +# @DESCRIPTION: +# Run setup.py using currently selected Python interpreter +# (if ${EPYTHON} is set; fallback 'python' otherwise). +# +# setup.py will be passed the following, in order: +# 1. ${mydistutilsargs[@]} +# 2. additional arguments passed to the esetup.py function. +# +# Please note that setup.py will respect defaults (unless overridden +# via command-line options) from setup.cfg that is created +# in distutils-r1_python_compile and in distutils-r1_python_install. +# +# This command dies on failure. +esetup.py() { + debug-print-function ${FUNCNAME} "${@}" + + local die_args=() + [[ ${EAPI} != [45] ]] && die_args+=( -n ) + + [[ ${BUILD_DIR} ]] && _distutils-r1_create_setup_cfg + + set -- "${EPYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}" + + echo "${@}" >&2 + "${@}" || die "${die_args[@]}" + local ret=${?} + + if [[ ${BUILD_DIR} ]]; then + rm "${HOME}"/.pydistutils.cfg || die "${die_args[@]}" + fi + + return ${ret} +} + +# @FUNCTION: distutils_install_for_testing +# @USAGE: [<args>...] +# @DESCRIPTION: +# Install the package into a temporary location for running tests. +# Update PYTHONPATH appropriately and set TEST_DIR to the test +# installation root. The Python packages will be installed in 'lib' +# subdir, and scripts in 'scripts' subdir (like in BUILD_DIR). +# +# Please note that this function should be only used if package uses +# namespaces (and therefore proper install needs to be done to enforce +# PYTHONPATH) or tests rely on the results of install command. +# For most of the packages, tests built in BUILD_DIR are good enough. +distutils_install_for_testing() { + debug-print-function ${FUNCNAME} "${@}" + + # A few notes: + # 1) because of namespaces, we can't use 'install --root', + # 2) 'install --home' is terribly broken on pypy, so we need + # to override --install-lib and --install-scripts, + # 3) non-root 'install' complains about PYTHONPATH and missing dirs, + # so we need to set it properly and mkdir them, + # 4) it runs a bunch of commands which write random files to cwd, + # in order to avoid that, we add the necessary path overrides + # in _distutils-r1_create_setup_cfg. + + TEST_DIR=${BUILD_DIR}/test + local bindir=${TEST_DIR}/scripts + local libdir=${TEST_DIR}/lib + PYTHONPATH=${libdir}:${PYTHONPATH} + + local add_args=( + install + --home="${TEST_DIR}" + --install-lib="${libdir}" + --install-scripts="${bindir}" + ) + + mkdir -p "${libdir}" || die + esetup.py "${add_args[@]}" "${@}" +} + +# @FUNCTION: _distutils-r1_disable_ez_setup +# @INTERNAL +# @DESCRIPTION: +# Stub out ez_setup.py and distribute_setup.py to prevent packages +# from trying to download a local copy of setuptools. +_distutils-r1_disable_ez_setup() { + local stub="def use_setuptools(*args, **kwargs): pass" + if [[ -f ez_setup.py ]]; then + echo "${stub}" > ez_setup.py || die + fi + if [[ -f distribute_setup.py ]]; then + echo "${stub}" > distribute_setup.py || die + fi +} + +# @FUNCTION: distutils-r1_python_prepare_all +# @DESCRIPTION: +# The default python_prepare_all(). It applies the patches from PATCHES +# array, then user patches and finally calls python_copy_sources to +# create copies of resulting sources for each Python implementation. +# +# At some point in the future, it may also apply eclass-specific +# distutils patches and/or quirks. +distutils-r1_python_prepare_all() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ ! ${DISTUTILS_OPTIONAL} ]]; then + if [[ ${EAPI} != [45] ]]; then + default + else + [[ ${PATCHES} ]] && epatch "${PATCHES[@]}" + epatch_user + fi + fi + + # by default, use in-source build if python_prepare() is used + if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then + if declare -f python_prepare >/dev/null; then + DISTUTILS_IN_SOURCE_BUILD=1 + fi + fi + + _distutils-r1_disable_ez_setup + + if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]] + then + # create source copies for each implementation + python_copy_sources + fi + + _DISTUTILS_DEFAULT_CALLED=1 +} + +# @FUNCTION: distutils-r1_python_prepare +# @DESCRIPTION: +# The default python_prepare(). A no-op. +distutils-r1_python_prepare() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)" +} + +# @FUNCTION: distutils-r1_python_configure +# @DESCRIPTION: +# The default python_configure(). A no-op. +distutils-r1_python_configure() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)" +} + +# @FUNCTION: _distutils-r1_create_setup_cfg +# @INTERNAL +# @DESCRIPTION: +# Create implementation-specific configuration file for distutils, +# setting proper build-dir (and install-dir) paths. +_distutils-r1_create_setup_cfg() { + cat > "${HOME}"/.pydistutils.cfg <<-_EOF_ || die + [build] + build-base = ${BUILD_DIR} + + # using a single directory for them helps us export + # ${PYTHONPATH} and ebuilds find the sources independently + # of whether the package installs extensions or not + # + # note: due to some packages (wxpython) relying on separate + # platlib & purelib dirs, we do not set --build-lib (which + # can not be overridden with --build-*lib) + build-platlib = %(build-base)s/lib + build-purelib = %(build-base)s/lib + + # make the ebuild writer lives easier + build-scripts = %(build-base)s/scripts + + # this is needed by distutils_install_for_testing since + # setuptools like to create .egg files for install --home. + [bdist_egg] + dist-dir = ${BUILD_DIR}/dist + _EOF_ + + # we can't refer to ${D} before src_install() + if [[ ${EBUILD_PHASE} == install ]]; then + cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die + + # installation paths -- allow calling extra install targets + # without the default 'install' + [install] + compile = True + optimize = 2 + root = ${D%/} + _EOF_ + + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die + install-scripts = $(python_get_scriptdir) + _EOF_ + fi + fi +} + +# @FUNCTION: _distutils-r1_copy_egg_info +# @INTERNAL +# @DESCRIPTION: +# Copy egg-info files to the ${BUILD_DIR} (that's going to become +# egg-base in esetup.py). This way, we respect whatever's in upstream +# egg-info. +_distutils-r1_copy_egg_info() { + mkdir -p "${BUILD_DIR}" || die + # stupid freebsd can't do 'cp -t ${BUILD_DIR} {} +' + find -name '*.egg-info' -type d -exec cp -R -p {} "${BUILD_DIR}"/ ';' || die +} + +# @FUNCTION: distutils-r1_python_compile +# @USAGE: [additional-args...] +# @DESCRIPTION: +# The default python_compile(). Runs 'esetup.py build'. Any parameters +# passed to this function will be appended to setup.py invocation, +# i.e. passed as options to the 'build' command. +# +# This phase also sets up initial setup.cfg with build directories +# and copies upstream egg-info files if supplied. +distutils-r1_python_compile() { + debug-print-function ${FUNCNAME} "${@}" + + _distutils-r1_copy_egg_info + + esetup.py build "${@}" +} + +# @FUNCTION: _distutils-r1_wrap_scripts +# @USAGE: <path> <bindir> +# @INTERNAL +# @DESCRIPTION: +# Moves and wraps all installed scripts/executables as necessary. +_distutils-r1_wrap_scripts() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${#} -eq 2 ]] || die "usage: ${FUNCNAME} <path> <bindir>" + local path=${1} + local bindir=${2} + + local PYTHON_SCRIPTDIR + python_export PYTHON_SCRIPTDIR + + local f python_files=() non_python_files=() + + if [[ -d ${path}${PYTHON_SCRIPTDIR} ]]; then + for f in "${path}${PYTHON_SCRIPTDIR}"/*; do + [[ -d ${f} ]] && die "Unexpected directory: ${f}" + debug-print "${FUNCNAME}: found executable at ${f#${path}/}" + + local shebang + read -r shebang < "${f}" + if [[ ${shebang} == '#!'*${EPYTHON}* ]]; then + debug-print "${FUNCNAME}: matching shebang: ${shebang}" + python_files+=( "${f}" ) + else + debug-print "${FUNCNAME}: non-matching shebang: ${shebang}" + non_python_files+=( "${f}" ) + fi + + mkdir -p "${path}${bindir}" || die + done + + for f in "${python_files[@]}"; do + local basename=${f##*/} + + debug-print "${FUNCNAME}: installing wrapper at ${bindir}/${basename}" + _python_ln_rel "${path}${EPREFIX}"/usr/lib/python-exec/python-exec2 \ + "${path}${bindir}/${basename}" || die + done + + for f in "${non_python_files[@]}"; do + local basename=${f##*/} + + debug-print "${FUNCNAME}: moving ${f#${path}/} to ${bindir}/${basename}" + mv "${f}" "${path}${bindir}/${basename}" || die + done + fi +} + +# @FUNCTION: distutils-r1_python_install +# @USAGE: [additional-args...] +# @DESCRIPTION: +# The default python_install(). Runs 'esetup.py install', doing +# intermediate root install and handling script wrapping afterwards. +# Any parameters passed to this function will be appended +# to the setup.py invocation (i.e. as options to the 'install' command). +# +# This phase updates the setup.cfg file with install directories. +distutils-r1_python_install() { + debug-print-function ${FUNCNAME} "${@}" + + local args=( "${@}" ) + + # enable compilation for the install phase. + local -x PYTHONDONTWRITEBYTECODE= + + # python likes to compile any module it sees, which triggers sandbox + # failures if some packages haven't compiled their modules yet. + addpredict "${EPREFIX}/usr/$(get_libdir)/${EPYTHON}" + addpredict /usr/lib/portage/pym + addpredict /usr/local # bug 498232 + + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + # user may override --install-scripts + # note: this is poor but distutils argv parsing is dumb + local mydistutilsargs=( "${mydistutilsargs[@]}" ) + local scriptdir=${EPREFIX}/usr/bin + + # construct a list of mydistutilsargs[0] args[0] args[1]... + local arg arg_vars + [[ ${mydistutilsargs[@]} ]] && eval arg_vars+=( + 'mydistutilsargs['{0..$(( ${#mydistutilsargs[@]} - 1 ))}']' + ) + [[ ${args[@]} ]] && eval arg_vars+=( + 'args['{0..$(( ${#args[@]} - 1 ))}']' + ) + + set -- "${arg_vars[@]}" + while [[ ${@} ]]; do + local arg_var=${1} + shift + local a=${!arg_var} + + case "${a}" in + --install-scripts=*) + scriptdir=${a#--install-scripts=} + unset "${arg_var}" + ;; + --install-scripts) + scriptdir=${!1} + unset "${arg_var}" "${1}" + shift + ;; + esac + done + fi + + local root=${D%/}/_${EPYTHON} + [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/} + + esetup.py install --root="${root}" "${args[@]}" + + local forbidden_package_names=( examples test tests ) + local p + for p in "${forbidden_package_names[@]}"; do + if [[ -d ${root}$(python_get_sitedir)/${p} ]]; then + die "Package installs '${p}' package which is forbidden and likely a bug in the build system." + fi + done + if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then + local cmd=die + [[ ${EAPI} == [45] ]] && cmd=eqawarn + "${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546." + fi + + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + _distutils-r1_wrap_scripts "${root}" "${scriptdir}" + multibuild_merge_root "${root}" "${D%/}" + fi +} + +# @FUNCTION: distutils-r1_python_install_all +# @DESCRIPTION: +# The default python_install_all(). It installs the documentation. +distutils-r1_python_install_all() { + debug-print-function ${FUNCNAME} "${@}" + + einstalldocs + + if declare -p EXAMPLES &>/dev/null; then + [[ ${EAPI} != [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}" + + ( + docinto examples + dodoc -r "${EXAMPLES[@]}" + ) + docompress -x "/usr/share/doc/${PF}/examples" + fi + + _DISTUTILS_DEFAULT_CALLED=1 +} + +# @FUNCTION: distutils-r1_run_phase +# @USAGE: [<argv>...] +# @INTERNAL +# @DESCRIPTION: +# Run the given command. +# +# If out-of-source builds are used, the phase function is run in source +# directory, with BUILD_DIR pointing at the build directory +# and PYTHONPATH having an entry for the module build directory. +# +# If in-source builds are used, the command is executed in the directory +# holding the per-implementation copy of sources. BUILD_DIR points +# to the 'build' subdirectory. +distutils-r1_run_phase() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + cd "${BUILD_DIR}" || die + fi + local BUILD_DIR=${BUILD_DIR}/build + fi + local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}" + + # Bug 559644 + # using PYTHONPATH when the ${BUILD_DIR}/lib is not created yet might lead to + # problems in setup.py scripts that try to import modules/packages from that path + # during the build process (Python at startup evaluates PYTHONPATH, if the dir is + # not valid then associates a NullImporter object to ${BUILD_DIR}/lib storing it + # in the sys.path_importer_cache) + mkdir -p "${BUILD_DIR}/lib" || die + + # Set up build environment, bug #513664. + local -x AR=${AR} CC=${CC} CPP=${CPP} CXX=${CXX} + tc-export AR CC CPP CXX + + # How to build Python modules in different worlds... + local ldopts + case "${CHOST}" in + # provided by haubi, 2014-07-08 + *-aix*) ldopts='-shared -Wl,-berok';; # good enough + # provided by grobian, 2014-06-22, bug #513664 c7 + *-darwin*) ldopts='-bundle -undefined dynamic_lookup';; + *) ldopts='-shared';; + esac + + local -x LDSHARED="${CC} ${ldopts}" LDCXXSHARED="${CXX} ${ldopts}" + + "${@}" + + cd "${_DISTUTILS_INITIAL_CWD}" || die +} + +# @FUNCTION: _distutils-r1_run_common_phase +# @USAGE: [<argv>...] +# @INTERNAL +# @DESCRIPTION: +# Run the given command, restoring the state for a most preferred Python +# implementation matching DISTUTILS_ALL_SUBPHASE_IMPLS. +# +# If in-source build is used, the command will be run in the copy +# of sources made for the selected Python interpreter. +_distutils-r1_run_common_phase() { + local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR} + + if [[ ${DISTUTILS_SINGLE_IMPL} ]]; then + # reuse the dedicated code branch + _distutils-r1_run_foreach_impl "${@}" + else + local -x EPYTHON PYTHON + local -x PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH} + python_setup "${DISTUTILS_ALL_SUBPHASE_IMPLS[@]}" + + local MULTIBUILD_VARIANTS=( "${EPYTHON/./_}" ) + # store for restoring after distutils-r1_run_phase. + local _DISTUTILS_INITIAL_CWD=${PWD} + multibuild_foreach_variant \ + distutils-r1_run_phase "${@}" + fi +} + +# @FUNCTION: _distutils-r1_run_foreach_impl +# @INTERNAL +# @DESCRIPTION: +# Run the given phase for each implementation if multiple implementations +# are enabled, once otherwise. +_distutils-r1_run_foreach_impl() { + debug-print-function ${FUNCNAME} "${@}" + + # store for restoring after distutils-r1_run_phase. + local _DISTUTILS_INITIAL_CWD=${PWD} + set -- distutils-r1_run_phase "${@}" + + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + python_foreach_impl "${@}" + else + if [[ ! ${EPYTHON} ]]; then + die "EPYTHON unset, python-single-r1_pkg_setup not called?!" + fi + local BUILD_DIR=${BUILD_DIR:-${S}} + BUILD_DIR=${BUILD_DIR%%/}_${EPYTHON} + + "${@}" + fi +} + +distutils-r1_src_prepare() { + debug-print-function ${FUNCNAME} "${@}" + + local _DISTUTILS_DEFAULT_CALLED + + # common preparations + if declare -f python_prepare_all >/dev/null; then + python_prepare_all + else + distutils-r1_python_prepare_all + fi + + if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then + local cmd=die + [[ ${EAPI} == [45] ]] && cmd=eqawarn + + "${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all" + fi + + if declare -f python_prepare >/dev/null; then + _distutils-r1_run_foreach_impl python_prepare + fi +} + +distutils-r1_src_configure() { + python_export_utf8_locale + [[ ${EAPI} == [56] ]] && xdg_environment_reset # Bug 577704 + + if declare -f python_configure >/dev/null; then + _distutils-r1_run_foreach_impl python_configure + fi + + if declare -f python_configure_all >/dev/null; then + _distutils-r1_run_common_phase python_configure_all + fi +} + +distutils-r1_src_compile() { + debug-print-function ${FUNCNAME} "${@}" + + if declare -f python_compile >/dev/null; then + _distutils-r1_run_foreach_impl python_compile + else + _distutils-r1_run_foreach_impl distutils-r1_python_compile + fi + + if declare -f python_compile_all >/dev/null; then + _distutils-r1_run_common_phase python_compile_all + fi +} + +# @FUNCTION: _distutils-r1_clean_egg_info +# @INTERNAL +# @DESCRIPTION: +# Clean up potential stray egg-info files left by setuptools test phase. +# Those files ended up being unversioned, and caused issues: +# https://bugs.gentoo.org/534058 +_distutils-r1_clean_egg_info() { + rm -rf "${BUILD_DIR}"/lib/*.egg-info || die +} + +distutils-r1_src_test() { + debug-print-function ${FUNCNAME} "${@}" + + if declare -f python_test >/dev/null; then + _distutils-r1_run_foreach_impl python_test + _distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info + fi + + if declare -f python_test_all >/dev/null; then + _distutils-r1_run_common_phase python_test_all + fi +} + +# @FUNCTION: _distutils-r1_check_namespace_pth +# @INTERNAL +# @DESCRIPTION: +# Check if any *-nspkg.pth files were installed (by setuptools) +# and warn about the policy non-conformance if they were. +_distutils-r1_check_namespace_pth() { + local f pth=() + + while IFS= read -r -d '' f; do + pth+=( "${f}" ) + done < <(find "${ED%/}" -name '*-nspkg.pth' -print0) + + if [[ ${pth[@]} ]]; then + ewarn "The following *-nspkg.pth files were found installed:" + ewarn + for f in "${pth[@]}"; do + ewarn " ${f#${ED%/}}" + done + ewarn + ewarn "The presence of those files may break namespaces in Python 3.5+. Please" + ewarn "read our documentation on reliable handling of namespaces and update" + ewarn "the ebuild accordingly:" + ewarn + ewarn " https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages" + fi +} + +distutils-r1_src_install() { + debug-print-function ${FUNCNAME} "${@}" + + if declare -f python_install >/dev/null; then + _distutils-r1_run_foreach_impl python_install + else + _distutils-r1_run_foreach_impl distutils-r1_python_install + fi + + local _DISTUTILS_DEFAULT_CALLED + + if declare -f python_install_all >/dev/null; then + _distutils-r1_run_common_phase python_install_all + else + _distutils-r1_run_common_phase distutils-r1_python_install_all + fi + + if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then + local cmd=die + [[ ${EAPI} == [45] ]] && cmd=eqawarn + + "${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all" + fi + + _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 diff -uNr a/eclass/dotnet.eclass b/eclass/dotnet.eclass --- a/eclass/dotnet.eclass false +++ b/eclass/dotnet.eclass a58b78f5f7227ae0ba3caa9563c0b9ba5dceee81d1118705bbcf12c2a3bc18b059de54af26bb091dac248985781a585eb9fdb3839e841ced1966b2709215c057 @@ -0,0 +1,142 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: dotnet.eclass +# @MAINTAINER: cynede@gentoo.org +# @BLURB: common settings and functions for mono and dotnet related packages +# @DESCRIPTION: +# The dotnet eclass contains common environment settings that are useful for +# dotnet packages. Currently, it provides no functions, just exports +# MONO_SHARED_DIR and sets LC_ALL in order to prevent errors during compilation +# of dotnet packages. + +case ${EAPI:-0} in + 0) die "this eclass doesn't support EAPI 0" ;; + 1|2|3) ;; + *) ;; #if [[ ${USE_DOTNET} ]]; then REQUIRED_USE="|| (${USE_DOTNET})"; fi;; +esac + +inherit eutils versionator mono-env + +# @ECLASS-VARIABLE: USE_DOTNET +# @DESCRIPTION: +# Use flags added to IUSE + +DEPEND+=" dev-lang/mono" + +# SET default use flags according on DOTNET_TARGETS +for x in ${USE_DOTNET}; do + case ${x} in + net45) if [[ ${DOTNET_TARGETS} == *net45* ]]; then IUSE+=" +net45"; else IUSE+=" net45"; fi;; + net40) if [[ ${DOTNET_TARGETS} == *net40* ]]; then IUSE+=" +net40"; else IUSE+=" net40"; fi;; + net35) if [[ ${DOTNET_TARGETS} == *net35* ]]; then IUSE+=" +net35"; else IUSE+=" net35"; fi;; + net20) if [[ ${DOTNET_TARGETS} == *net20* ]]; then IUSE+=" +net20"; else IUSE+=" net20"; fi;; + esac +done + +# @FUNCTION: dotnet_pkg_setup +# @DESCRIPTION: +# This function set FRAMEWORK. +dotnet_pkg_setup() { + for x in ${USE_DOTNET} ; do + case ${x} in + net45) if use net45; then F="4.5"; fi;; + net40) if use net40; then F="4.0"; fi;; + net35) if use net35; then F="3.5"; fi;; + net20) if use net20; then F="2.0"; fi;; + esac + if [[ -z ${FRAMEWORK} ]]; then + if [[ ${F} ]]; then + FRAMEWORK="${F}"; + fi + else + version_is_at_least "${F}" "${FRAMEWORK}" || FRAMEWORK="${F}" + fi + done + if [[ -z ${FRAMEWORK} ]]; then + FRAMEWORK="4.0" + fi + einfo " -- USING .NET ${FRAMEWORK} FRAMEWORK -- " +} + +# >=mono-0.92 versions using mcs -pkg:foo-sharp require shared memory, so we set the +# shared dir to ${T} so that ${T}/.wapi can be used during the install process. +export MONO_SHARED_DIR="${T}" + +# Building mono, nant and many other dotnet packages is known to fail if LC_ALL +# variable is not set to C. To prevent this all mono related packages will be +# build with LC_ALL=C (see bugs #146424, #149817) +export LC_ALL=C + +# Monodevelop-using applications need this to be set or they will try to create config +# files in the user's ~ dir. + +export XDG_CONFIG_HOME="${T}" + +# Fix bug 83020: +# "Access Violations Arise When Emerging Mono-Related Packages with MONO_AOT_CACHE" + +unset MONO_AOT_CACHE + +# @FUNCTION: exbuild +# @DESCRIPTION: +# Run xbuild with Release configuration and configurated FRAMEWORK. +exbuild() { + elog "xbuild ""$@"" /p:Configuration=Release /tv:4.0 /p:TargetFrameworkVersion=v""${FRAMEWORK}"" || die" + xbuild "$@" /p:Configuration=Release /tv:4.0 /p:TargetFrameworkVersion=v"${FRAMEWORK}" || die +} + +# @FUNCTION: egacinstall +# @DESCRIPTION: +# Install package to GAC. +egacinstall() { + use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}" + gacutil -i "${1}" \ + -root "${ED}"/usr/$(get_libdir) \ + -gacdir /usr/$(get_libdir) \ + -package ${2:-${GACPN:-${PN}}} \ + || die "installing ${1} into the Global Assembly Cache failed" +} + +# @FUNCTION: dotnet_multilib_comply +# @DESCRIPTION: +# multilib comply +dotnet_multilib_comply() { + use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}" + local dir finddirs=() mv_command=${mv_command:-mv} + if [[ -d "${ED}/usr/lib" && "$(get_libdir)" != "lib" ]] + then + if ! [[ -d "${ED}"/usr/"$(get_libdir)" ]] + then + mkdir "${ED}"/usr/"$(get_libdir)" || die "Couldn't mkdir ${ED}/usr/$(get_libdir)" + fi + ${mv_command} "${ED}"/usr/lib/* "${ED}"/usr/"$(get_libdir)"/ || die "Moving files into correct libdir failed" + rm -rf "${ED}"/usr/lib + for dir in "${ED}"/usr/"$(get_libdir)"/pkgconfig "${ED}"/usr/share/pkgconfig + do + + if [[ -d "${dir}" && "$(find "${dir}" -name '*.pc')" != "" ]] + then + pushd "${dir}" &> /dev/null + sed -i -r -e 's:/(lib)([^a-zA-Z0-9]|$):/'"$(get_libdir)"'\2:g' \ + *.pc \ + || die "Sedding some sense into pkgconfig files failed." + popd "${dir}" &> /dev/null + fi + done + if [[ -d "${ED}/usr/bin" ]] + then + for exe in "${ED}/usr/bin"/* + do + if [[ "$(file "${exe}")" == *"shell script text"* ]] + then + sed -r -i -e ":/lib(/|$): s:/lib(/|$):/$(get_libdir)\1:" \ + "${exe}" || die "Sedding some sense into ${exe} failed" + fi + done + fi + + fi +} + +EXPORT_FUNCTIONS pkg_setup diff -uNr a/eclass/eapi7-ver.eclass b/eclass/eapi7-ver.eclass --- a/eclass/eapi7-ver.eclass false +++ b/eclass/eapi7-ver.eclass b4cbcfed874a19a7559bdc2a4bfabe22fad3eed5643fb15f4c4c14bc54ee6f419c28196c372e485438e55c8841d35acff76df7c701c8aaf2361f0dd63df2f4da @@ -0,0 +1,309 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: eapi7-ver.eclass +# @MAINTAINER: +# PMS team <pms@gentoo.org> +# @AUTHOR: +# Ulrich Müller <ulm@gentoo.org> +# Michał Górny <mgorny@gentoo.org> +# @BLURB: Testing implementation of EAPI 7 version manipulators +# @DESCRIPTION: +# A stand-alone implementation of the version manipulation functions +# aimed for EAPI 7. Intended to be used for wider testing of +# the proposed functions and to allow ebuilds to switch to the new +# model early, with minimal change needed for actual EAPI 7. +# +# https://bugs.gentoo.org/482170 +# +# @ROFF .SS +# Version strings +# +# The functions support arbitrary version strings consisting of version +# components interspersed with (possibly empty) version separators. +# +# A version component can either consist purely of digits ([0-9]+) +# or purely of uppercase and lowercase letters ([A-Za-z]+). A version +# separator is either a string of any other characters ([^A-Za-z0-9]+), +# or it occurs at the transition between a sequence of letters +# and a sequence of digits, or vice versa. In the latter case, +# the version separator is an empty string. +# +# The version is processed left-to-right, and each successive component +# is assigned numbers starting with 1. The components are either split +# on version separators or on boundaries between digits and letters +# (in which case the separator between the components is empty). +# Version separators are assigned numbers starting with 1 for +# the separator between 1st and 2nd components. As a special case, +# if the version string starts with a separator, it is assigned index 0. +# +# Examples: +# +# @CODE +# 1.2b-alpha4 -> 1 . 2 '' b - alpha '' 4 +# c s c s c s c s c +# 1 1 2 2 3 3 4 4 5 +# +# .11. -> . 11 . +# s c s +# 0 1 1 +# @CODE +# +# @ROFF .SS +# Ranges +# +# A range can be specified as 'm' for m-th version component, 'm-' +# for all components starting with m-th or 'm-n' for components starting +# at m-th and ending at n-th (inclusive). If the range spans outside +# the version string, it is truncated silently. + +case ${EAPI:-0} in + 0|1|2|3|4|5|6) ;; + 7) die "${ECLASS}: EAPI=${EAPI} includes all functions from this eclass" ;; + *) die "${ECLASS}: EAPI=${EAPI} unknown" ;; +esac + +# @FUNCTION: _ver_parse_range +# @USAGE: <range> <max> +# @INTERNAL +# @DESCRIPTION: +# Parse the range string <range>, setting 'start' and 'end' variables +# to the appropriate bounds. <max> specifies the appropriate upper +# bound for the range; the user-specified value is truncated to this. +_ver_parse_range() { + local range=${1} + local max=${2} + + [[ ${range} == [0-9]* ]] \ + || die "${FUNCNAME}: range must start with a number" + start=${range%-*} + [[ ${range} == *-* ]] && end=${range#*-} || end=${start} + if [[ ${end} ]]; then + [[ ${start} -le ${end} ]] \ + || die "${FUNCNAME}: end of range must be >= start" + [[ ${end} -le ${max} ]] || end=${max} + else + end=${max} + fi +} + +# @FUNCTION: _ver_split +# @USAGE: <version> +# @INTERNAL +# @DESCRIPTION: +# Split the version string <version> into separator-component array. +# Sets 'comp' to an array of the form: ( s_0 c_1 s_1 c_2 s_2 c_3... ) +# where s_i are separators and c_i are components. +_ver_split() { + local v=${1} LC_ALL=C + + comp=() + + # get separators and components + local s c + while [[ ${v} ]]; do + # cut the separator + s=${v%%[a-zA-Z0-9]*} + v=${v:${#s}} + # cut the next component; it can be either digits or letters + [[ ${v} == [0-9]* ]] && c=${v%%[^0-9]*} || c=${v%%[^a-zA-Z]*} + v=${v:${#c}} + + comp+=( "${s}" "${c}" ) + done +} + +# @FUNCTION: ver_cut +# @USAGE: <range> [<version>] +# @DESCRIPTION: +# Print the substring of the version string containing components +# defined by the <range> and the version separators between them. +# Processes <version> if specified, ${PV} otherwise. +# +# For the syntax of versions and ranges, please see the eclass +# description. +ver_cut() { + local range=${1} + local v=${2:-${PV}} + local start end + local -a comp + + _ver_split "${v}" + local max=$((${#comp[@]}/2)) + _ver_parse_range "${range}" "${max}" + + if [[ ${start} -gt 0 ]]; then + start=$(( start*2 - 1 )) + fi + # Work around a bug in bash-3.2, where "${comp[*]:start:end*2-start}" + # inserts stray 0x7f characters for empty array elements + printf "%s" "${comp[@]:start:end*2-start}" $'\n' +} + +# @FUNCTION: ver_rs +# @USAGE: <range> <repl> [<range> <repl>...] [<version>] +# @DESCRIPTION: +# Print the version string after substituting the specified version +# separators at <range> with <repl> (string). Multiple '<range> <repl>' +# pairs can be specified. Processes <version> if specified, +# ${PV} otherwise. +# +# For the syntax of versions and ranges, please see the eclass +# description. +ver_rs() { + local v + (( ${#} & 1 )) && v=${@: -1} || v=${PV} + local start end i + local -a comp + + _ver_split "${v}" + local max=$((${#comp[@]}/2 - 1)) + + while [[ ${#} -ge 2 ]]; do + _ver_parse_range "${1}" "${max}" + for (( i = start*2; i <= end*2; i+=2 )); do + [[ ${i} -eq 0 && -z ${comp[i]} ]] && continue + comp[i]=${2} + done + shift 2 + done + + local IFS= + echo "${comp[*]}" +} + +# @FUNCTION: _ver_compare_int +# @USAGE: <a> <b> +# @RETURN: 0 if <a> -eq <b>, 1 if <a> -lt <b>, 3 if <a> -gt <b> +# @INTERNAL +# @DESCRIPTION: +# Compare two non-negative integers <a> and <b>, of arbitrary length. +# If <a> is equal to, less than, or greater than <b>, return 0, 1, or 3 +# as exit status, respectively. +_ver_compare_int() { + local a=$1 b=$2 d=$(( ${#1}-${#2} )) + + # Zero-pad to equal length if necessary. + if [[ ${d} -gt 0 ]]; then + printf -v b "%0${d}d%s" 0 "${b}" + elif [[ ${d} -lt 0 ]]; then + printf -v a "%0$(( -d ))d%s" 0 "${a}" + fi + + [[ ${a} > ${b} ]] && return 3 + [[ ${a} == "${b}" ]] +} + +# @FUNCTION: _ver_compare +# @USAGE: <va> <vb> +# @RETURN: 1 if <va> < <vb>, 2 if <va> = <vb>, 3 if <va> > <vb> +# @INTERNAL +# @DESCRIPTION: +# Compare two versions <va> and <vb>. If <va> is less than, equal to, +# or greater than <vb>, return 1, 2, or 3 as exit status, respectively. +_ver_compare() { + local va=${1} vb=${2} a an al as ar b bn bl bs br re LC_ALL=C + + re="^([0-9]+(\.[0-9]+)*)([a-z]?)((_(alpha|beta|pre|rc|p)[0-9]*)*)(-r[0-9]+)?$" + + [[ ${va} =~ ${re} ]] || die "${FUNCNAME}: invalid version: ${va}" + an=${BASH_REMATCH[1]} + al=${BASH_REMATCH[3]} + as=${BASH_REMATCH[4]} + ar=${BASH_REMATCH[7]} + + [[ ${vb} =~ ${re} ]] || die "${FUNCNAME}: invalid version: ${vb}" + bn=${BASH_REMATCH[1]} + bl=${BASH_REMATCH[3]} + bs=${BASH_REMATCH[4]} + br=${BASH_REMATCH[7]} + + # Compare numeric components (PMS algorithm 3.2) + # First component + _ver_compare_int "${an%%.*}" "${bn%%.*}" || return + + while [[ ${an} == *.* && ${bn} == *.* ]]; do + # Other components (PMS algorithm 3.3) + an=${an#*.} + bn=${bn#*.} + a=${an%%.*} + b=${bn%%.*} + if [[ ${a} == 0* || ${b} == 0* ]]; then + # Remove any trailing zeros + [[ ${a} =~ 0+$ ]] && a=${a%"${BASH_REMATCH[0]}"} + [[ ${b} =~ 0+$ ]] && b=${b%"${BASH_REMATCH[0]}"} + [[ ${a} > ${b} ]] && return 3 + [[ ${a} < ${b} ]] && return 1 + else + _ver_compare_int "${a}" "${b}" || return + fi + done + [[ ${an} == *.* ]] && return 3 + [[ ${bn} == *.* ]] && return 1 + + # Compare letter components (PMS algorithm 3.4) + [[ ${al} > ${bl} ]] && return 3 + [[ ${al} < ${bl} ]] && return 1 + + # Compare suffixes (PMS algorithm 3.5) + as=${as#_}${as:+_} + bs=${bs#_}${bs:+_} + while [[ -n ${as} && -n ${bs} ]]; do + # Compare each suffix (PMS algorithm 3.6) + a=${as%%_*} + b=${bs%%_*} + if [[ ${a%%[0-9]*} == "${b%%[0-9]*}" ]]; then + _ver_compare_int "${a##*[a-z]}" "${b##*[a-z]}" || return + else + # Check for p first + [[ ${a%%[0-9]*} == p ]] && return 3 + [[ ${b%%[0-9]*} == p ]] && return 1 + # Hack: Use that alpha < beta < pre < rc alphabetically + [[ ${a} > ${b} ]] && return 3 || return 1 + fi + as=${as#*_} + bs=${bs#*_} + done + if [[ -n ${as} ]]; then + [[ ${as} == p[_0-9]* ]] && return 3 || return 1 + elif [[ -n ${bs} ]]; then + [[ ${bs} == p[_0-9]* ]] && return 1 || return 3 + fi + + # Compare revision components (PMS algorithm 3.7) + _ver_compare_int "${ar#-r}" "${br#-r}" || return + + return 2 +} + +# @FUNCTION: ver_test +# @USAGE: [<v1>] <op> <v2> +# @DESCRIPTION: +# Check if the relation <v1> <op> <v2> is true. If <v1> is not specified, +# default to ${PVR}. <op> can be -gt, -ge, -eq, -ne, -le, -lt. +# Both versions must conform to the PMS version syntax (with optional +# revision parts), and the comparison is performed according to +# the algorithm specified in the PMS. +ver_test() { + local va op vb + + if [[ $# -eq 3 ]]; then + va=${1} + shift + else + va=${PVR} + fi + + [[ $# -eq 2 ]] || die "${FUNCNAME}: bad number of arguments" + + op=${1} + vb=${2} + + case ${op} in + -eq|-ne|-lt|-le|-gt|-ge) ;; + *) die "${FUNCNAME}: invalid operator: ${op}" ;; + esac + + _ver_compare "${va}" "${vb}" + test $? "${op}" 2 +} diff -uNr a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass --- a/eclass/elisp-common.eclass false +++ b/eclass/elisp-common.eclass 36c05c19f7c07f508e0eb99b19c3deb16f7cc24d5c72a29e9f38341cacfc7181e16b0cf72b495d31e9dee88ebf9fb8036b0ff43ffae7486b239e86f97e2c7503 @@ -0,0 +1,414 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: elisp-common.eclass +# @MAINTAINER: +# Gentoo GNU Emacs project <gnu-emacs@gentoo.org> +# @AUTHOR: +# Matthew Kennedy <mkennedy@gentoo.org> +# Jeremy Maitin-Shepard <jbms@attbi.com> +# Mamoru Komachi <usata@gentoo.org> +# Christian Faulhammer <fauli@gentoo.org> +# Ulrich Müller <ulm@gentoo.org> +# @BLURB: Emacs-related installation utilities +# @DESCRIPTION: +# +# Usually you want to use this eclass for (optional) GNU Emacs support +# of your package. This is NOT for XEmacs! +# +# Many of the steps here are sometimes done by the build system of your +# package (especially compilation), so this is mainly for standalone +# elisp files you gathered from somewhere else. +# +# When relying on the emacs USE flag, you need to add +# +# @CODE +# emacs? ( virtual/emacs ) +# @CODE +# +# to your DEPEND/RDEPEND line and use the functions provided here to +# bring the files to the correct locations. +# +# If your package requires a minimum Emacs version, e.g. Emacs 24, then +# the dependency should be on >=virtual/emacs-24 instead. Because the +# user can select the Emacs executable with eselect, you should also +# make sure that the active Emacs version is sufficient. This can be +# tested with function elisp-need-emacs(), which would typically be +# called from pkg_setup(), as in the following example: +# +# @CODE +# elisp-need-emacs 24 || die "Emacs version too low" +# @CODE +# +# Please note that such tests should be limited to packages that are +# known to fail with lower Emacs versions; the standard case is to +# depend on virtual/emacs without version. +# +# @ROFF .SS +# src_compile() usage: +# +# An elisp file is compiled by the elisp-compile() function defined +# here and simply takes the source files as arguments. The case of +# interdependent elisp files is also supported, since the current +# directory is added to the load-path which makes sure that all files +# are loadable. +# +# @CODE +# elisp-compile *.el +# @CODE +# +# Function elisp-make-autoload-file() can be used to generate a file +# with autoload definitions for the lisp functions. It takes the output +# file name (default: "${PN}-autoloads.el") and a list of directories +# (default: working directory) as its arguments. Use of this function +# requires that the elisp source files contain magic ";;;###autoload" +# comments. See the Emacs Lisp Reference Manual (node "Autoload") for +# a detailed explanation. +# +# @ROFF .SS +# src_install() usage: +# +# The resulting compiled files (.elc) should be put in a subdirectory of +# /usr/share/emacs/site-lisp/ which is named after the first argument +# of elisp-install(). The following parameters are the files to be put +# in that directory. Usually the subdirectory should be ${PN}, you can +# choose something else, but remember to tell elisp-site-file-install() +# (see below) the change, as it defaults to ${PN}. +# +# @CODE +# elisp-install ${PN} *.el *.elc +# @CODE +# +# To let the Emacs support be activated by Emacs on startup, you need +# to provide a site file (shipped in ${FILESDIR}) which contains the +# startup code (have a look in the documentation of your software). +# Normally this would look like this: +# +# @CODE +# (add-to-list 'load-path "@SITELISP@") +# (add-to-list 'auto-mode-alist '("\\.csv\\'" . csv-mode)) +# (autoload 'csv-mode "csv-mode" "Major mode for csv files." t) +# @CODE +# +# If your Emacs support files are installed in a subdirectory of +# /usr/share/emacs/site-lisp/ (which is strongly recommended), you need +# to extend Emacs' load-path as shown in the first non-comment line. +# The elisp-site-file-install() function of this eclass will replace +# "@SITELISP@" and "@SITEETC@" by the actual paths. +# +# The next line tells Emacs to load the mode opening a file ending +# with ".csv" and load functions depending on the context and needed +# features. Be careful though. Commands as "load-library" or "require" +# bloat the editor as they are loaded on every startup. When having +# many Emacs support files, users may be annoyed by the start-up time. +# Also avoid keybindings as they might interfere with the user's +# settings. Give a hint in pkg_postinst(), which should be enough. +# The guiding principle is that emerging your package should not by +# itself cause a change of standard Emacs behaviour. +# +# The naming scheme for this site-init file matches the shell pattern +# "[1-8][0-9]*-gentoo*.el", where the two digits at the beginning define +# the loading order (numbers below 10 or above 89 are reserved for +# internal use). So if your initialisation depends on another Emacs +# package, your site file's number must be higher! If there are no such +# interdependencies then the number should be 50. Otherwise, numbers +# divisible by 10 are preferred. +# +# Best practice is to define a SITEFILE variable in the global scope of +# your ebuild (e.g., right after S or RDEPEND): +# +# @CODE +# SITEFILE="50${PN}-gentoo.el" +# @CODE +# +# Which is then installed by +# +# @CODE +# elisp-site-file-install "${FILESDIR}/${SITEFILE}" +# @CODE +# +# in src_install(). Any characters after the "-gentoo" part and before +# the extension will be stripped from the destination file's name. +# For example, a file "50${PN}-gentoo-${PV}.el" will be installed as +# "50${PN}-gentoo.el". If your subdirectory is not named ${PN}, give +# the differing name as second argument. +# +# @ROFF .SS +# pkg_postinst() / pkg_postrm() usage: +# +# After that you need to recreate the start-up file of Emacs after +# emerging and unmerging by using +# +# @CODE +# pkg_postinst() { +# elisp-site-regen +# } +# +# pkg_postrm() { +# elisp-site-regen +# } +# @CODE +# +# When having optional Emacs support, you should prepend "use emacs &&" +# to above calls of elisp-site-regen(). +# Don't use "has_version virtual/emacs"! When unmerging the state of +# the emacs USE flag is taken from the package database and not from the +# environment, so it is no problem when you unset USE=emacs between +# merge and unmerge of a package. + +# @ECLASS-VARIABLE: SITELISP +# @DESCRIPTION: +# Directory where packages install Emacs Lisp files. +SITELISP=/usr/share/emacs/site-lisp + +# @ECLASS-VARIABLE: SITEETC +# @DESCRIPTION: +# Directory where packages install miscellaneous (not Lisp) files. +SITEETC=/usr/share/emacs/etc + +# @ECLASS-VARIABLE: EMACS +# @DESCRIPTION: +# Path of Emacs executable. +EMACS=${EPREFIX}/usr/bin/emacs + +# @ECLASS-VARIABLE: EMACSFLAGS +# @DESCRIPTION: +# Flags for executing Emacs in batch mode. +# These work for Emacs versions 18-24, so don't change them. +EMACSFLAGS="-batch -q --no-site-file" + +# @ECLASS-VARIABLE: BYTECOMPFLAGS +# @DESCRIPTION: +# Emacs flags used for byte-compilation in elisp-compile(). +BYTECOMPFLAGS="-L ." + +# @FUNCTION: elisp-emacs-version +# @RETURN: exit status of Emacs +# @DESCRIPTION: +# Output version of currently active Emacs. + +elisp-emacs-version() { + local version ret + # The following will work for at least versions 18-24. + echo "(princ emacs-version)" >"${T}"/emacs-version.el + version=$( + # EMACS could be a microemacs variant that ignores the -batch + # option and would therefore hang, waiting for user interaction. + # Redirecting stdin and unsetting TERM and DISPLAY will cause + # most of them to exit with an error. + unset TERM DISPLAY + ${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el </dev/null + ) + ret=$? + rm -f "${T}"/emacs-version.el + if [[ ${ret} -ne 0 ]]; then + eerror "elisp-emacs-version: Failed to run ${EMACS}" + return ${ret} + fi + if [[ -z ${version} ]]; then + eerror "elisp-emacs-version: Could not determine Emacs version" + return 1 + fi + echo "${version}" +} + +# @FUNCTION: elisp-need-emacs +# @USAGE: <version> +# @RETURN: 0 if true, 1 if false, 2 if trouble +# @DESCRIPTION: +# Test if the eselected Emacs version is at least the major version +# of GNU Emacs specified as argument. + +elisp-need-emacs() { + local need_emacs=$1 have_emacs + have_emacs=$(elisp-emacs-version) || return 2 + einfo "Emacs version: ${have_emacs}" + if [[ ${have_emacs} =~ XEmacs|Lucid ]]; then + eerror "This package needs GNU Emacs." + return 1 + fi + if ! [[ ${have_emacs%%.*} -ge ${need_emacs%%.*} ]]; then + eerror "This package needs at least Emacs ${need_emacs%%.*}." + eerror "Use \"eselect emacs\" to select the active version." + return 1 + fi + return 0 +} + +# @FUNCTION: elisp-compile +# @USAGE: <list of elisp files> +# @DESCRIPTION: +# Byte-compile Emacs Lisp files. +# +# This function uses GNU Emacs to byte-compile all ".el" specified by +# its arguments. The resulting byte-code (".elc") files are placed in +# the same directory as their corresponding source file. +# +# The current directory is added to the load-path. This will ensure +# that interdependent Emacs Lisp files are visible between themselves, +# in case they require or load one another. + +elisp-compile() { + ebegin "Compiling GNU Emacs Elisp files" + ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@" + eend $? "elisp-compile: batch-byte-compile failed" || die +} + +# @FUNCTION: elisp-make-autoload-file +# @USAGE: [output file] [list of directories] +# @DESCRIPTION: +# Generate a file with autoload definitions for the lisp functions. + +elisp-make-autoload-file() { + local f="${1:-${PN}-autoloads.el}" null="" page=$'\f' + shift + ebegin "Generating autoload file for GNU Emacs" + + cat >"${f}" <<-EOF + ;;; ${f##*/} --- autoloads for ${PN} + + ;;; Commentary: + ;; Automatically generated by elisp-common.eclass + ;; DO NOT EDIT THIS FILE + + ;;; Code: + ${page} + ;; Local ${null}Variables: + ;; version-control: never + ;; no-byte-compile: t + ;; no-update-autoloads: t + ;; End: + + ;;; ${f##*/} ends here + EOF + + ${EMACS} ${EMACSFLAGS} \ + --eval "(setq make-backup-files nil)" \ + --eval "(setq generated-autoload-file (expand-file-name \"${f}\"))" \ + -f batch-update-autoloads "${@-.}" + + eend $? "elisp-make-autoload-file: batch-update-autoloads failed" || die +} + +# @FUNCTION: elisp-install +# @USAGE: <subdirectory> <list of files> +# @DESCRIPTION: +# Install files in SITELISP directory. + +elisp-install() { + local subdir="$1" + shift + ebegin "Installing Elisp files for GNU Emacs support" + ( # subshell to avoid pollution of calling environment + insinto "${SITELISP}/${subdir}" + doins "$@" + ) + eend $? "elisp-install: doins failed" || die +} + +# @FUNCTION: elisp-site-file-install +# @USAGE: <site-init file> [subdirectory] +# @DESCRIPTION: +# Install Emacs site-init file in SITELISP directory. Automatically +# inserts a standard comment header with the name of the package (unless +# it is already present). Tokens @SITELISP@ and @SITEETC@ are replaced +# by the path to the package's subdirectory in SITELISP and SITEETC, +# respectively. + +elisp-site-file-install() { + local sf="${1##*/}" my_pn="${2:-${PN}}" ret + local header=";;; ${PN} site-lisp configuration" + + [[ ${sf} == [0-9][0-9]*-gentoo*.el ]] \ + || ewarn "elisp-site-file-install: bad name of site-init file" + [[ ${sf%-gentoo*.el} != "${sf}" ]] && sf="${sf%-gentoo*.el}-gentoo.el" + sf="${T}/${sf}" + ebegin "Installing site initialisation file for GNU Emacs" + [[ $1 = "${sf}" ]] || cp "$1" "${sf}" + sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \ + -e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \ + -e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g;\$q" "${sf}" + ( # subshell to avoid pollution of calling environment + insinto "${SITELISP}/site-gentoo.d" + doins "${sf}" + ) + ret=$? + rm -f "${sf}" + eend ${ret} "elisp-site-file-install: doins failed" || die +} + +# @FUNCTION: elisp-site-regen +# @DESCRIPTION: +# Regenerate the site-gentoo.el file, based on packages' site +# initialisation files in the /usr/share/emacs/site-lisp/site-gentoo.d/ +# directory. + +elisp-site-regen() { + local sitelisp=${ROOT%/}${EPREFIX}${SITELISP} + local sf i ret=0 null="" page=$'\f' + local -a sflist + + if [[ ${EBUILD_PHASE} = *rm && ! -e ${sitelisp}/site-gentoo.el ]]; then + ewarn "Refusing to create site-gentoo.el in ${EBUILD_PHASE} phase." + return 0 + fi + + [[ -d ${sitelisp} ]] \ + || die "elisp-site-regen: Directory ${sitelisp} does not exist" + + [[ -d ${T} ]] \ + || die "elisp-site-regen: Temporary directory ${T} does not exist" + + ebegin "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})" + + for sf in "${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el; do + [[ -r ${sf} ]] && sflist+=("${sf}") + done + + cat <<-EOF >"${T}"/site-gentoo.el || ret=$? + ;;; site-gentoo.el --- site initialisation for Gentoo-installed packages + + ;;; Commentary: + ;; Automatically generated by elisp-common.eclass + ;; DO NOT EDIT THIS FILE + + ;;; Code: + EOF + # Use sed instead of cat here, since files may miss a trailing newline. + sed '$q' "${sflist[@]}" </dev/null >>"${T}"/site-gentoo.el || ret=$? + cat <<-EOF >>"${T}"/site-gentoo.el || ret=$? + + ${page} + (provide 'site-gentoo) + + ;; Local ${null}Variables: + ;; no-byte-compile: t + ;; buffer-read-only: t + ;; End: + + ;;; site-gentoo.el ends here + EOF + + if [[ ${ret} -ne 0 ]]; then + eend ${ret} "elisp-site-regen: Writing site-gentoo.el failed." + die + elif cmp -s "${sitelisp}"/site-gentoo.el "${T}"/site-gentoo.el; then + # This prevents outputting unnecessary text when there + # was actually no change. + # A case is a remerge where we have doubled output. + rm -f "${T}"/site-gentoo.el + eend + einfo "... no changes." + else + mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el + eend $? "elisp-site-regen: Replacing site-gentoo.el failed" || die + case ${#sflist[@]} in + 0) [[ ${PN} = emacs-common-gentoo ]] \ + || ewarn "... Huh? No site initialisation files found." ;; + 1) einfo "... ${#sflist[@]} site initialisation file included." ;; + *) einfo "... ${#sflist[@]} site initialisation files included." ;; + esac + fi + + return 0 +} diff -uNr a/eclass/elisp.eclass b/eclass/elisp.eclass --- a/eclass/elisp.eclass false +++ b/eclass/elisp.eclass 4b0f27c8fb871a159469643bcc8ba5fc1565a8c0584784a56c713a6a7c4359bdd957d26e0d6d063756587b751a93640896146aef17ec6fa52aa4122f1ab842a4 @@ -0,0 +1,218 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: elisp.eclass +# @MAINTAINER: +# Gentoo GNU Emacs project <gnu-emacs@gentoo.org> +# @AUTHOR: +# Matthew Kennedy <mkennedy@gentoo.org> +# Jeremy Maitin-Shepard <jbms@attbi.com> +# Christian Faulhammer <fauli@gentoo.org> +# Ulrich Müller <ulm@gentoo.org> +# @BLURB: Eclass for Emacs Lisp packages +# @DESCRIPTION: +# +# This eclass is designed to install elisp files of Emacs related +# packages into the site-lisp directory. The majority of elisp packages +# will only need to define the standard ebuild variables (like SRC_URI) +# and optionally SITEFILE for successful installation. +# +# Emacs support for other than pure elisp packages is handled by +# elisp-common.eclass where you won't have a dependency on Emacs itself. +# All elisp-* functions are documented there. +# +# If the package's source is a single (in whatever way) compressed elisp +# file with the file name ${P}.el, then this eclass will move ${P}.el to +# ${PN}.el in src_unpack(). + +# @ECLASS-VARIABLE: NEED_EMACS +# @DEFAULT_UNSET +# @DESCRIPTION: +# If you need anything different from Emacs 23, use the NEED_EMACS +# variable before inheriting elisp.eclass. Set it to the major version +# your package uses and the dependency will be adjusted. + +# @ECLASS-VARIABLE: ELISP_PATCHES +# @DEFAULT_UNSET +# @DESCRIPTION: +# Space separated list of patches to apply after unpacking the sources. +# Patch files are searched for in the current working dir, WORKDIR, and +# FILESDIR. + +# @ECLASS-VARIABLE: ELISP_REMOVE +# @DEFAULT_UNSET +# @DESCRIPTION: +# Space separated list of files to remove after unpacking the sources. + +# @ECLASS-VARIABLE: SITEFILE +# @DEFAULT_UNSET +# @DESCRIPTION: +# Name of package's site-init file. The filename must match the shell +# pattern "[1-8][0-9]*-gentoo.el"; numbers below 10 and above 89 are +# reserved for internal use. "50${PN}-gentoo.el" is a reasonable choice +# in most cases. + +# @ECLASS-VARIABLE: ELISP_TEXINFO +# @DEFAULT_UNSET +# @DESCRIPTION: +# Space separated list of Texinfo sources. Respective GNU Info files +# will be generated in src_compile() and installed in src_install(). + +# @ECLASS-VARIABLE: DOCS +# @DEFAULT_UNSET +# @DESCRIPTION: +# DOCS="blah.txt ChangeLog" is automatically used to install the given +# files by dodoc in src_install(). + +inherit elisp-common + +case ${EAPI:-0} in + 0|1) + inherit epatch + EXPORT_FUNCTIONS src_{unpack,compile,install} \ + pkg_{setup,postinst,postrm} ;; + 2|3|4|5) + inherit epatch + EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ + pkg_{setup,postinst,postrm} ;; + 6|7) + EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ + pkg_{setup,postinst,postrm} ;; + *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; +esac + +DEPEND=">=virtual/emacs-${NEED_EMACS:-23}" +RDEPEND="${DEPEND}" + +# @FUNCTION: elisp_pkg_setup +# @DESCRIPTION: +# Test if the eselected Emacs version is sufficient to fulfil the major +# version requirement of the NEED_EMACS variable. + +elisp_pkg_setup() { + elisp-need-emacs "${NEED_EMACS:-23}" + case $? in + 0) ;; + 1) die "Emacs version too low" ;; + *) die "Could not determine Emacs version" ;; + esac +} + +# @FUNCTION: elisp_src_unpack +# @DESCRIPTION: +# Unpack the sources; also handle the case of a single *.el file in +# WORKDIR for packages distributed that way. For EAPIs without +# src_prepare, call elisp_src_prepare. + +elisp_src_unpack() { + [[ -n ${A} ]] && unpack ${A} + if [[ -f ${P}.el ]]; then + # the "simple elisp" case with a single *.el file in WORKDIR + mv ${P}.el ${PN}.el || die + [[ -d ${S} ]] || S=${WORKDIR} + fi + + case ${EAPI:-0} in + 0|1) [[ -d ${S} ]] && cd "${S}" + elisp_src_prepare ;; + esac +} + +# @FUNCTION: elisp_src_prepare +# @DESCRIPTION: +# Apply any patches listed in ELISP_PATCHES. Patch files are searched +# for in the current working dir, WORKDIR, and FILESDIR. + +elisp_src_prepare() { + local patch file + for patch in ${ELISP_PATCHES}; do + if [[ -f ${patch} ]]; then + file="${patch}" + elif [[ -f ${WORKDIR}/${patch} ]]; then + file="${WORKDIR}/${patch}" + elif [[ -f ${FILESDIR}/${patch} ]]; then + file="${FILESDIR}/${patch}" + else + die "Cannot find ${patch}" + fi + case ${EAPI:-0} in + 0|1|2|3|4|5) epatch "${file}" ;; + *) eapply "${file}" ;; + esac + done + + # apply any user patches + case ${EAPI:-0} in + 0|1|2|3|4|5) epatch_user ;; + *) eapply_user ;; + esac + + if [[ -n ${ELISP_REMOVE} ]]; then + rm ${ELISP_REMOVE} || die + fi +} + +# @FUNCTION: elisp_src_configure +# @DESCRIPTION: +# Do nothing, because Emacs packages seldomly bring a full build system. + +elisp_src_configure() { :; } + +# @FUNCTION: elisp_src_compile +# @DESCRIPTION: +# Call elisp-compile to byte-compile all Emacs Lisp (*.el) files. +# If ELISP_TEXINFO lists any Texinfo sources, call makeinfo to generate +# GNU Info files from them. + +elisp_src_compile() { + elisp-compile *.el + if [[ -n ${ELISP_TEXINFO} ]]; then + makeinfo ${ELISP_TEXINFO} || die + fi +} + +# @FUNCTION: elisp_src_install +# @DESCRIPTION: +# Call elisp-install to install all Emacs Lisp (*.el and *.elc) files. +# If the SITEFILE variable specifies a site-init file, install it with +# elisp-site-file-install. Also install any GNU Info files listed in +# ELISP_TEXINFO and documentation listed in the DOCS variable. + +elisp_src_install() { + elisp-install ${PN} *.el *.elc + if [[ -n ${SITEFILE} ]]; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + if [[ -n ${ELISP_TEXINFO} ]]; then + set -- ${ELISP_TEXINFO} + set -- ${@##*/} + doinfo ${@/%.*/.info*} || die + fi + if [[ -n ${DOCS} ]]; then + dodoc ${DOCS} || die + fi + if declare -f readme.gentoo_create_doc >/dev/null; then + readme.gentoo_create_doc + fi +} + +# @FUNCTION: elisp_pkg_postinst +# @DESCRIPTION: +# Call elisp-site-regen, in order to collect the site initialisation for +# all installed Emacs Lisp packages in the site-gentoo.el file. + +elisp_pkg_postinst() { + elisp-site-regen + if declare -f readme.gentoo_print_elog >/dev/null; then + readme.gentoo_print_elog + fi +} + +# @FUNCTION: elisp_pkg_postrm +# @DESCRIPTION: +# Call elisp-site-regen, in order to collect the site initialisation for +# all installed Emacs Lisp packages in the site-gentoo.el file. + +elisp_pkg_postrm() { + elisp-site-regen +} diff -uNr a/eclass/emboss-r2.eclass b/eclass/emboss-r2.eclass --- a/eclass/emboss-r2.eclass false +++ b/eclass/emboss-r2.eclass 8ab8c9a9eceb6027521fbeea4f790f09e7037153563f0da79a46250ed34fd72f9046ca5ffe704d0ad6fb97da503a44e7504a0d1a88c2837ccee0253174e07e72 @@ -0,0 +1,163 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: emboss-r2.eclass +# @MAINTAINER: +# sci-biology@gentoo.org +# jlec@gentoo.org +# ted.tanberry@gmail.com +# @AUTHOR: +# Original author: Author Olivier Fisette <ofisette@gmail.com> +# Next gen author: Justin Lecher <jlec@gentoo.org> +# Next gen author: Ted Tanberry <ted.tanberry@gmail.com> +# @BLURB: Use this to easy install EMBOSS and EMBASSY programs (EMBOSS add-ons). +# @DESCRIPTION: +# The inheriting ebuild must set at least EAPI=6 and provide EBO_DESCRIPTION before the inherit line. +# KEYWORDS should be set. Additionally "(R|P)DEPEND"encies and other standard +# ebuild variables can be extended (FOO+=" bar"). +# +# Example: +# +# EAPI=6 +# +# EBO_DESCRIPTION="applications from the CBS group" +# +# inherit emboss-r2 + +# @ECLASS-VARIABLE: EBO_DESCRIPTION +# @DEFAULT_UNSET +# @DESCRIPTION: +# Should be set. Completes the generic description of the embassy module as follows: +# +# EMBOSS integrated version of ${EBO_DESCRIPTION}, e.g. +# +# "EMBOSS integrated version of applications from the CBS group" +# +# Defaults to the upstream name of the module. + +if [[ ! ${_EMBOSS_R2} ]]; then + +case ${EAPI:-0} in + 6) ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +inherit autotools flag-o-matic + +EXPORT_FUNCTIONS src_prepare src_configure src_install + +HOMEPAGE="http://emboss.sourceforge.net/" +LICENSE="LGPL-2 GPL-2" + +SLOT="0" +IUSE="mysql pdf png postgres static-libs X" + +RDEPEND=" + dev-libs/expat + dev-libs/libpcre:3 + sci-libs/plplot:= + sys-libs/zlib + mysql? ( virtual/mysql ) + pdf? ( media-libs/libharu:= ) + png? ( media-libs/gd:2=[png] ) + postgres? ( dev-db/postgresql:= ) + X? ( x11-libs/libXt )" + +if [[ ${PN} == embassy-* ]]; then + EMBASSY_PACKAGE=yes + # The EMBASSY package name, retrieved from the inheriting ebuild's name + EN=${PN:8} + # The full name and version of the EMBASSY package (excluding the Gentoo + # revision number) + EF="${EN^^}-${PV}" + + [[ ${EBO_DESCRIPTION} ]] || die "EBO_DESCRIPTION was not set before inheriting emboss-r2.eclass" + + DESCRIPTION="EMBOSS integrated version of ${EBO_DESCRIPTION}" + SRC_URI="ftp://emboss.open-bio.org/pub/EMBOSS/${EF}.tar.gz -> embassy-${EN}-${PV}.tar.gz" + RDEPEND+=" >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,static-libs=,X=]" + + S="${WORKDIR}/${EF}" +fi + +DEPEND="${RDEPEND}" + +# @ECLASS-VARIABLE: EBO_EAUTORECONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set, run eautoreconf from autotools.eclass after applying patches +# in emboss-r2_src_prepare. + +# @FUNCTION: emboss-r2_src_prepare +# @DESCRIPTION: +# Does the following things +# +# 1. Renames configure.in to configure.ac, if possible +# 2. Calls default_src_prepare (i.e. +# applies Gentoo and user patches in EAPI>=6) +# 3. If EBO_EAUTORECONF is set, run eautoreconf +# + +emboss-r2_src_prepare() { + if [[ -e configure.in ]]; then + mv configure.{in,ac} || die + fi + + default + [[ ${EBO_EAUTORECONF} ]] && eautoreconf +} + +# @FUNCTION: emboss-r2_src_configure +# @DESCRIPTION: +# runs econf with following options. +# +# --enable-shared +# $(use_enable static-libs static) +# $(use_with X x) +# $(use_with png pngdriver) +# $(use_with pdf hpdf) +# $(use_with mysql mysql) +# $(use_with postgres postgresql) +# --enable-large +# --without-java +# --enable-systemlibs +# +# can be appended to like econf, e.g. +# emboss-r2_src_configure --disable-shared + +emboss-r2_src_configure() { + local myconf=( + --enable-shared + $(use_enable static-libs static) + $(use_with X x) + $(use_with png pngdriver "${EPREFIX}/usr") + $(use_with pdf hpdf "${EPREFIX}/usr") + $(use_with mysql mysql "${EPREFIX}/usr/bin/mysql_config") + $(use_with postgres postgresql "${EPREFIX}/usr/bin/pg_config") + --enable-large + --without-java + --enable-systemlibs + ) + + [[ ${EMBASSY_PACKAGE} == yes ]] && \ + append-cppflags "-I${EPREFIX}/usr/include/emboss" + + econf "${myconf[@]}" "$@" +} + +# @FUNCTION: emboss-r2_src_install +# @DESCRIPTION: +# Installs the package into the staging area and removes +# extraneous .la files, if USE="-static-libs" + +emboss-r2_src_install() { + default + + # delete .la files + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi +} + +_EMBOSS_R2=1 +fi diff -uNr a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass --- a/eclass/enlightenment.eclass false +++ b/eclass/enlightenment.eclass c00d09785111413b301b0102a8b934da6ddc825bd6fa58cb2c566d92b165b008d20855b980e96086000b2a8856d3f45add31e799a1b333c0ee8b3c90af8580a2 @@ -0,0 +1,179 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: enlightenment.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @BLURB: simplify enlightenment package management + +if [[ -z ${_ENLIGHTENMENT_ECLASS} ]]; then +_ENLIGHTENMENT_ECLASS=1 + +inherit epatch epunt-cxx libtool + +# @ECLASS-VARIABLE: E_PYTHON +# @DEFAULT_UNSET +# @DESCRIPTION: +# if defined, the package is based on Python/distutils + +# @ECLASS-VARIABLE: E_CYTHON +# @DEFAULT_UNSET +# @DESCRIPTION: +# if defined, the package is Cython bindings (implies E_PYTHON) + +# @ECLASS-VARIABLE: E_ECONF +# @DESCRIPTION: +# Array of flags to pass to econf (obsoletes MY_ECONF) +E_ECONF=() + +# E_STATE's: +# release [default] +# SRC_URI $P.tar.gz +# S $WORKDIR/$P +# +# snap $PV has .200##### datestamp or .### counter +# SRC_URI $P.tar.bz2 +# S $WORKDIR/$P +# +# live $PV has a 9999 marker +# KEYWORDS "" +# SRC_URI git/etc... up +# S $WORKDIR/$E_S_APPEND +# +# Overrides: +# KEYWORDS EKEY_STATE +# SRC_URI EURI_STATE +# S EURI_STATE + +E_LIVE_SERVER_DEFAULT_GIT="https://git.enlightenment.org" + +E_STATE="release" +if [[ ${PV} == *9999* ]] ; then + if [[ ${EGIT_URI_APPEND} ]] ; then + E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}} + EGIT_URI_APPEND=${EGIT_URI_APPEND:-${PN}} + EGIT_PROJECT="enlightenment/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}" + EGIT_REPO_URI=${EGIT_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}}/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git + E_S_APPEND=${EGIT_URI_APPEND} + E_LIVE_SOURCE="git" + inherit git-2 + fi + E_STATE="live" + WANT_AUTOTOOLS="yes" + +elif [[ -n ${E_SNAP_DATE} ]] ; then + E_STATE="snap" +else + E_STATE="release" +fi + +# Parse requested python state +: ${E_PYTHON:=${E_CYTHON}} +if [[ -n ${E_PYTHON} ]] ; then + PYTHON_DEPEND="2" + + inherit python +fi + +if [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then + WANT_AUTOCONF=${E_WANT_AUTOCONF:-latest} + WANT_AUTOMAKE=${E_WANT_AUTOMAKE:-latest} + inherit autotools +fi + +ENLIGHTENMENT_EXPF="src_unpack src_compile src_install" +case "${EAPI:-0}" in +2|3|4|5) ENLIGHTENMENT_EXPF+=" src_prepare src_configure" ;; +*) ;; +esac +EXPORT_FUNCTIONS ${ENLIGHTENMENT_EXPF} + +DESCRIPTION="An Enlightenment Foundation production" +HOMEPAGE="https://www.enlightenment.org" +if [[ -z ${SRC_URI} ]] ; then + case ${EURI_STATE:-${E_STATE}} in + release) SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz";; + snap) SRC_URI="http://download.enlightenment.org/snapshots/${E_SNAP_DATE}/${P}.tar.bz2";; + live) SRC_URI="";; + esac +fi + +LICENSE="BSD" +SLOT="0" +IUSE="nls doc" + +DEPEND="doc? ( app-doc/doxygen ) + ${E_PYTHON:+>=dev-python/setuptools-0.6_rc9} + ${E_CYTHON:+>=dev-python/cython-0.12.1}" +RDEPEND="nls? ( sys-devel/gettext )" + +case ${EURI_STATE:-${E_STATE}} in + release) S=${WORKDIR}/${P};; + snap) S=${WORKDIR}/${P};; + live) S=${WORKDIR}/${E_S_APPEND};; +esac + +enlightenment_src_unpack() { + if [[ ${E_STATE} == "live" ]] ; then + case ${E_LIVE_SOURCE} in + git) git-2_src_unpack;; + *) die "eek!";; + esac + else + unpack ${A} + fi + if ! has src_prepare ${ENLIGHTENMENT_EXPF} ; then + cd "${S}" || die + enlightenment_src_prepare + fi +} + +enlightenment_src_prepare() { + epatch_user + [[ -s gendoc ]] && chmod a+rx gendoc + if [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then + [[ -d po ]] && eautopoint -f + # autotools require README, when README.in is around, but README + # is created later in configure step + [[ -f README.in ]] && touch README + eautoreconf + fi + epunt_cxx + elibtoolize +} + +enlightenment_src_configure() { + # gstreamer sucks, work around it doing stupid stuff + export GST_REGISTRY="${S}/registry.xml" + has static-libs ${IUSE} && E_ECONF+=( $(use_enable static-libs static) ) + + econf ${MY_ECONF} "${E_ECONF[@]}" +} + +enlightenment_src_compile() { + has src_configure ${ENLIGHTENMENT_EXPF} || enlightenment_src_configure + + V=1 emake || die + + if use doc ; then + if [[ -x ./gendoc ]] ; then + ./gendoc || die + elif emake -j1 -n doc >&/dev/null ; then + V=1 emake doc || die + fi + fi +} + +enlightenment_src_install() { + V=1 emake install DESTDIR="${D}" || die + find "${D}" '(' -name CVS -o -name -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null + for d in AUTHORS ChangeLog NEWS README TODO ${EDOCS}; do + [[ -f ${d} ]] && dodoc ${d} + done + use doc && [[ -d doc ]] && dohtml -r doc/* + if has static-libs ${IUSE} ; then + use static-libs || find "${D}" -name '*.la' -exec rm -f {} + + fi +} + +fi diff -uNr a/eclass/epatch.eclass b/eclass/epatch.eclass --- a/eclass/epatch.eclass false +++ b/eclass/epatch.eclass 929da1944a79627f2af580826e6930390ef3e5cd793f3a023bb7e03de52bc96bcd680a3e4647d1e58a6b4295ec0d6721a0deb0a15b5c6bdfe52877de6990eb80 @@ -0,0 +1,467 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: epatch.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: easy patch application functions +# @DESCRIPTION: +# An eclass providing epatch and epatch_user functions to easily apply +# patches to ebuilds. Mostly superseded by eapply* in EAPI 6. + +if [[ -z ${_EPATCH_ECLASS} ]]; then + +case ${EAPI:-0} in + 0|1|2|3|4|5|6) + ;; + *) + die "${ECLASS}: banned in EAPI=${EAPI}; use eapply* instead";; +esac + +inherit estack + +# @VARIABLE: EPATCH_SOURCE +# @DESCRIPTION: +# Default directory to search for patches. +EPATCH_SOURCE="${WORKDIR}/patch" +# @VARIABLE: EPATCH_SUFFIX +# @DESCRIPTION: +# Default extension for patches (do not prefix the period yourself). +EPATCH_SUFFIX="patch.bz2" +# @VARIABLE: EPATCH_OPTS +# @DESCRIPTION: +# Options to pass to patch. Meant for ebuild/package-specific tweaking +# such as forcing the patch level (-p#) or fuzz (-F#) factor. Note that +# for single patch tweaking, you can also pass flags directly to epatch. +EPATCH_OPTS="" +# @VARIABLE: EPATCH_COMMON_OPTS +# @DESCRIPTION: +# Common options to pass to `patch`. You probably should never need to +# change these. If you do, please discuss it with base-system first to +# be sure. +# @CODE +# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571 +# --no-backup-if-mismatch - do not leave .orig files behind +# -E - automatically remove empty files +# @CODE +EPATCH_COMMON_OPTS="-g0 -E --no-backup-if-mismatch" +# @VARIABLE: EPATCH_EXCLUDE +# @DESCRIPTION: +# List of patches not to apply. Note this is only file names, +# and not the full path. Globs accepted. +EPATCH_EXCLUDE="" +# @VARIABLE: EPATCH_SINGLE_MSG +# @DESCRIPTION: +# Change the printed message for a single patch. +EPATCH_SINGLE_MSG="" +# @VARIABLE: EPATCH_MULTI_MSG +# @DESCRIPTION: +# Change the printed message for multiple patches. +EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." +# @VARIABLE: EPATCH_FORCE +# @DESCRIPTION: +# Only require patches to match EPATCH_SUFFIX rather than the extended +# arch naming style. +EPATCH_FORCE="no" +# @VARIABLE: EPATCH_USER_EXCLUDE +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of patches not to apply. Note this is only file names, +# and not the full path. Globs accepted. + +# @FUNCTION: epatch +# @USAGE: [options] [patches] [dirs of patches] +# @DESCRIPTION: +# epatch is designed to greatly simplify the application of patches. It can +# process patch files directly, or directories of patches. The patches may be +# compressed (bzip/gzip/etc...) or plain text. You generally need not specify +# the -p option as epatch will automatically attempt -p0 to -p4 until things +# apply successfully. +# +# If you do not specify any patches/dirs, then epatch will default to the +# directory specified by EPATCH_SOURCE. +# +# Any options specified that start with a dash will be passed down to patch +# for this specific invocation. As soon as an arg w/out a dash is found, then +# arg processing stops. +# +# When processing directories, epatch will apply all patches that match: +# @CODE +# if ${EPATCH_FORCE} != "yes" +# ??_${ARCH}_foo.${EPATCH_SUFFIX} +# else +# *.${EPATCH_SUFFIX} +# @CODE +# The leading ?? are typically numbers used to force consistent patch ordering. +# The arch field is used to apply patches only for the host architecture with +# the special value of "all" means apply for everyone. Note that using values +# other than "all" is highly discouraged -- you should apply patches all the +# time and let architecture details be detected at configure/compile time. +# +# If EPATCH_SUFFIX is empty, then no period before it is implied when searching +# for patches to apply. +# +# Refer to the other EPATCH_xxx variables for more customization of behavior. +epatch() { + _epatch_draw_line() { + # create a line of same length as input string + [[ -z $1 ]] && set "$(printf "%65s" '')" + echo "${1//?/=}" + } + + unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 + + # First process options. We localize the EPATCH_OPTS setting + # from above so that we can pass it on in the loop below with + # any additional values the user has specified. + local EPATCH_OPTS=( ${EPATCH_OPTS[*]} ) + while [[ $# -gt 0 ]] ; do + case $1 in + -*) EPATCH_OPTS+=( "$1" ) ;; + *) break ;; + esac + shift + done + + # Let the rest of the code process one user arg at a time -- + # each arg may expand into multiple patches, and each arg may + # need to start off with the default global EPATCH_xxx values + if [[ $# -gt 1 ]] ; then + local m + for m in "$@" ; do + epatch "${m}" + done + return 0 + fi + + local SINGLE_PATCH="no" + # no args means process ${EPATCH_SOURCE} + [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}" + + if [[ -f $1 ]] ; then + SINGLE_PATCH="yes" + set -- "$1" + # Use the suffix from the single patch (localize it); the code + # below will find the suffix for us + local EPATCH_SUFFIX=$1 + + elif [[ -d $1 ]] ; then + # We have to force sorting to C so that the wildcard expansion is consistent #471666. + evar_push_set LC_COLLATE C + # Some people like to make dirs of patches w/out suffixes (vim). + set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"} + evar_pop + + elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then + # Re-use EPATCH_SOURCE as a search dir + epatch "${EPATCH_SOURCE}/$1" + return $? + + else + # sanity check ... if it isn't a dir or file, wtf man ? + [[ $# -ne 0 ]] && EPATCH_SOURCE=$1 + echo + eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" + eerror + eerror " ${EPATCH_SOURCE}" + eerror " ( ${EPATCH_SOURCE##*/} )" + echo + die "Cannot find \$EPATCH_SOURCE!" + fi + + # Now that we know we're actually going to apply something, merge + # all of the patch options back in to a single variable for below. + EPATCH_OPTS="${EPATCH_COMMON_OPTS} ${EPATCH_OPTS[*]}" + + local PIPE_CMD + case ${EPATCH_SUFFIX##*\.} in + xz) PIPE_CMD="xz -dc" ;; + lzma) PIPE_CMD="lzma -dc" ;; + bz2) PIPE_CMD="bzip2 -dc" ;; + gz|Z|z) PIPE_CMD="gzip -dc" ;; + ZIP|zip) PIPE_CMD="unzip -p" ;; + *) ;; + esac + + [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}" + + local x + for x in "$@" ; do + # If the patch dir given contains subdirs, or our EPATCH_SUFFIX + # didn't match anything, ignore continue on + [[ ! -f ${x} ]] && continue + + local patchname=${x##*/} + + # Apply single patches, or forced sets of patches, or + # patches with ARCH dependant names. + # ???_arch_foo.patch + # Else, skip this input altogether + local a=${patchname#*_} # strip the ???_ + a=${a%%_*} # strip the _foo.patch + if ! [[ ${SINGLE_PATCH} == "yes" || \ + ${EPATCH_FORCE} == "yes" || \ + ${a} == all || \ + ${a} == ${ARCH} ]] + then + continue + fi + + # Let people filter things dynamically + if [[ -n ${EPATCH_EXCLUDE}${EPATCH_USER_EXCLUDE} ]] ; then + # let people use globs in the exclude + eshopts_push -o noglob + + local ex + for ex in ${EPATCH_EXCLUDE} ; do + if [[ ${patchname} == ${ex} ]] ; then + einfo " Skipping ${patchname} due to EPATCH_EXCLUDE ..." + eshopts_pop + continue 2 + fi + done + + for ex in ${EPATCH_USER_EXCLUDE} ; do + if [[ ${patchname} == ${ex} ]] ; then + einfo " Skipping ${patchname} due to EPATCH_USER_EXCLUDE ..." + eshopts_pop + continue 2 + fi + done + + eshopts_pop + fi + + if [[ ${SINGLE_PATCH} == "yes" ]] ; then + if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then + einfo "${EPATCH_SINGLE_MSG}" + else + einfo "Applying ${patchname} ..." + fi + else + einfo " ${patchname} ..." + fi + + # Handle aliased patch command #404447 #461568 + local patch="patch" + eval $(alias patch 2>/dev/null | sed 's:^alias ::') + + # most of the time, there will only be one run per unique name, + # but if there are more, make sure we get unique log filenames + local STDERR_TARGET="${T}/${patchname}.out" + if [[ -e ${STDERR_TARGET} ]] ; then + STDERR_TARGET="${T}/${patchname}-$$.out" + fi + + printf "***** %s *****\nPWD: %s\nPATCH TOOL: %s -> %s\nVERSION INFO:\n%s\n\n" \ + "${patchname}" \ + "${PWD}" \ + "${patch}" \ + "$(type -P "${patch}")" \ + "$(${patch} --version)" \ + > "${STDERR_TARGET}" + + # Decompress the patch if need be + local count=0 + local PATCH_TARGET + if [[ -n ${PIPE_CMD} ]] ; then + PATCH_TARGET="${T}/$$.patch" + echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}" + + if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then + echo + eerror "Could not extract patch!" + #die "Could not extract patch!" + count=5 + break + fi + else + PATCH_TARGET=${x} + fi + + # Check for absolute paths in patches. If sandbox is disabled, + # people could (accidently) patch files in the root filesystem. + # Or trigger other unpleasantries #237667. So disallow -p0 on + # such patches. + local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }') + if [[ -n ${abs_paths} ]] ; then + count=1 + printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}" + fi + # Similar reason, but with relative paths. + local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}") + if [[ -n ${rel_paths} ]] ; then + echo + eerror "Rejected Patch: ${patchname} !" + eerror " ( ${PATCH_TARGET} )" + eerror + eerror "Your patch uses relative paths '../':" + eerror "${rel_paths}" + echo + die "you need to fix the relative paths in patch" + fi + + # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/ + local patch_cmd + while [[ ${count} -lt 5 ]] ; do + patch_cmd="${patch} -p${count} ${EPATCH_OPTS}" + + # Generate some useful debug info ... + ( + _epatch_draw_line "***** ${patchname} *****" + echo + echo "PATCH COMMAND: ${patch_cmd} --dry-run -f < '${PATCH_TARGET}'" + echo + _epatch_draw_line "***** ${patchname} *****" + ${patch_cmd} --dry-run -f < "${PATCH_TARGET}" 2>&1 + ret=$? + echo + echo "patch program exited with status ${ret}" + exit ${ret} + ) >> "${STDERR_TARGET}" + + if [ $? -eq 0 ] ; then + ( + _epatch_draw_line "***** ${patchname} *****" + echo + echo "ACTUALLY APPLYING ${patchname} ..." + echo "PATCH COMMAND: ${patch_cmd} < '${PATCH_TARGET}'" + echo + _epatch_draw_line "***** ${patchname} *****" + ${patch_cmd} < "${PATCH_TARGET}" 2>&1 + ret=$? + echo + echo "patch program exited with status ${ret}" + exit ${ret} + ) >> "${STDERR_TARGET}" + + if [ $? -ne 0 ] ; then + echo + eerror "A dry-run of patch command succeeded, but actually" + eerror "applying the patch failed!" + #die "Real world sux compared to the dreamworld!" + count=5 + fi + break + fi + + : $(( count++ )) + done + + (( EPATCH_N_APPLIED_PATCHES++ )) + + # if we had to decompress the patch, delete the temp one + if [[ -n ${PIPE_CMD} ]] ; then + rm -f "${PATCH_TARGET}" + fi + + if [[ ${count} -ge 5 ]] ; then + echo + eerror "Failed Patch: ${patchname} !" + eerror " ( ${PATCH_TARGET} )" + eerror + eerror "Include in your bugreport the contents of:" + eerror + eerror " ${STDERR_TARGET}" + echo + die "Failed Patch: ${patchname}!" + fi + + # if everything worked, delete the full debug patch log + rm -f "${STDERR_TARGET}" + + # then log away the exact stuff for people to review later + cat <<-EOF >> "${T}/epatch.log" + PATCH: ${x} + CMD: ${patch_cmd} + PWD: ${PWD} + + EOF + eend 0 + done + + [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching" + : # everything worked +} + +case ${EAPI:-0} in +0|1|2|3|4|5) + +# @VARIABLE: EPATCH_USER_SOURCE +# @DESCRIPTION: +# Location for user patches, see the epatch_user function. +# Should be set by the user. Don't set this in ebuilds. +: ${EPATCH_USER_SOURCE:=${PORTAGE_CONFIGROOT%/}/etc/portage/patches} + +# @FUNCTION: epatch_user +# @USAGE: +# @DESCRIPTION: +# Applies user-provided patches to the source tree. The patches are +# taken from /etc/portage/patches/<CATEGORY>/<P-PR|P|PN>[:SLOT]/, where the first +# of these three directories to exist will be the one to use, ignoring +# any more general directories which might exist as well. They must end +# in ".patch" to be applied. +# +# User patches are intended for quick testing of patches without ebuild +# modifications, as well as for permanent customizations a user might +# desire. Obviously, there can be no official support for arbitrarily +# patched ebuilds. So whenever a build log in a bug report mentions that +# user patches were applied, the user should be asked to reproduce the +# problem without these. +# +# Not all ebuilds do call this function, so placing patches in the +# stated directory might or might not work, depending on the package and +# the eclasses it inherits and uses. It is safe to call the function +# repeatedly, so it is always possible to add a call at the ebuild +# level. The first call is the time when the patches will be +# applied. +# +# Ideally, this function should be called after gentoo-specific patches +# have been applied, so that their code can be modified as well, but +# before calls to e.g. eautoreconf, as the user patches might affect +# autotool input files as well. +epatch_user() { + [[ $# -ne 0 ]] && die "epatch_user takes no options" + + # Allow multiple calls to this function; ignore all but the first + local applied="${T}/epatch_user.log" + [[ -e ${applied} ]] && return 2 + + # don't clobber any EPATCH vars that the parent might want + local EPATCH_SOURCE check + for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT%/*}}; do + EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CTARGET}/${check} + [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check} + [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check} + if [[ -d ${EPATCH_SOURCE} ]] ; then + local old_n_applied_patches=${EPATCH_N_APPLIED_PATCHES:-0} + EPATCH_SOURCE=${EPATCH_SOURCE} \ + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ + epatch + echo "${EPATCH_SOURCE}" > "${applied}" + if [[ ${old_n_applied_patches} -lt ${EPATCH_N_APPLIED_PATCHES} ]]; then + has epatch_user_death_notice ${EBUILD_DEATH_HOOKS} || \ + EBUILD_DEATH_HOOKS+=" epatch_user_death_notice" + fi + return 0 + fi + done + echo "none" > "${applied}" + return 1 +} + +# @FUNCTION: epatch_user_death_notice +# @INTERNAL +# @DESCRIPTION: +# Include an explicit notice in the die message itself that user patches were +# applied to this build. +epatch_user_death_notice() { + ewarn "!!! User patches were applied to this build!" +} + +esac + +_EPATCH_ECLASS=1 +fi #_EPATCH_ECLASS diff -uNr a/eclass/epunt-cxx.eclass b/eclass/epunt-cxx.eclass --- a/eclass/epunt-cxx.eclass false +++ b/eclass/epunt-cxx.eclass 15277c44469402a4001b2b0d819217e2e342e80894680fb28e85881aef7db03f2e7d5884eda8d7623b0ff5094c223098e6da88e5a3519bb7a335a770b111b30f @@ -0,0 +1,47 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: epunt-cxx.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: A function to punt C++ compiler checks from autoconf +# @DESCRIPTION: +# Support for punting C++ compiler checks from autoconf (based +# on ELT-patches). + +if [[ -z ${_EPUNT_CXX_ECLASS} ]]; then + +# eutils for eqawarn +inherit eutils + +DEPEND=">=app-portage/elt-patches-20170317" + +# @FUNCTION: epunt_cxx +# @USAGE: [dir to scan] +# @DESCRIPTION: +# Many configure scripts wrongly bail when a C++ compiler could not be +# detected. If dir is not specified, then it defaults to ${S}. +# +# https://bugs.gentoo.org/73450 +epunt_cxx() { + local dir=$1 + [[ -z ${dir} ]] && dir=${S} + ebegin "Removing useless C++ checks" + local f p any_found + while IFS= read -r -d '' f; do + for p in "${EPREFIX}/usr/share/elt-patches"/nocxx/*.patch ; do + if patch --no-backup-if-mismatch -p1 "${f}" "${p}" >/dev/null ; then + any_found=1 + break + fi + done + done < <(find "${dir}" -name configure -print0) + + if [[ -z ${any_found} ]]; then + eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)." + fi + eend 0 +} + +_EPUNT_CXX_ECLASS=1 +fi #_EPUNT_CXX_ECLASS diff -uNr a/eclass/estack.eclass b/eclass/estack.eclass --- a/eclass/estack.eclass false +++ b/eclass/estack.eclass 19a26e1e40283305bbe5375ea978e8a54b95bd63e9fdde280694fa2b1d60e822acd2c73f1f6ccb35c3f22c26bb565486f7f212806d33fcbe62397ef02b941465 @@ -0,0 +1,212 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: estack.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: stack-like value storage support +# @DESCRIPTION: +# Support for storing values on stack-like variables. + +if [[ -z ${_ESTACK_ECLASS} ]]; then + +# @FUNCTION: estack_push +# @USAGE: <stack> [items to push] +# @DESCRIPTION: +# Push any number of items onto the specified stack. Pick a name that +# is a valid variable (i.e. stick to alphanumerics), and push as many +# items as you like onto the stack at once. +# +# The following code snippet will echo 5, then 4, then 3, then ... +# @CODE +# estack_push mystack 1 2 3 4 5 +# while estack_pop mystack i ; do +# echo "${i}" +# done +# @CODE +estack_push() { + [[ $# -eq 0 ]] && die "estack_push: incorrect # of arguments" + local stack_name="_ESTACK_$1_" ; shift + eval ${stack_name}+=$ \"\$@\" $ +} + +# @FUNCTION: estack_pop +# @USAGE: <stack> [variable] +# @DESCRIPTION: +# Pop a single item off the specified stack. If a variable is specified, +# the popped item is stored there. If no more items are available, return +# 1, else return 0. See estack_push for more info. +estack_pop() { + [[ $# -eq 0 || $# -gt 2 ]] && die "estack_pop: incorrect # of arguments" + + # We use the fugly _estack_xxx var names to avoid collision with + # passing back the return value. If we used "local i" and the + # caller ran `estack_pop ... i`, we'd end up setting the local + # copy of "i" rather than the caller's copy. The _estack_xxx + # garbage is preferable to using $1/$2 everywhere as that is a + # bit harder to read. + local _estack_name="_ESTACK_$1_" ; shift + local _estack_retvar=$1 ; shift + eval local _estack_i=\${#${_estack_name}\[@\]} + # Don't warn -- let the caller interpret this as a failure + # or as normal behavior (akin to `shift`) + [[ $(( --_estack_i )) -eq -1 ]] && return 1 + + if [[ -n ${_estack_retvar} ]] ; then + eval ${_estack_retvar}=\"\${${_estack_name}\[${_estack_i}\]}\" + fi + eval unset \"${_estack_name}\[${_estack_i}\]\" +} + +# @FUNCTION: evar_push +# @USAGE: <variable to save> [more vars to save] +# @DESCRIPTION: +# This let's you temporarily modify a variable and then restore it (including +# set vs unset semantics). Arrays are not supported at this time. +# +# This is meant for variables where using `local` does not work (such as +# exported variables, or only temporarily changing things in a func). +# +# For example: +# @CODE +# evar_push LC_ALL +# export LC_ALL=C +# ... do some stuff that needs LC_ALL=C set ... +# evar_pop +# +# # You can also save/restore more than one var at a time +# evar_push BUTTERFLY IN THE SKY +# ... do stuff with the vars ... +# evar_pop # This restores just one var, SKY +# ... do more stuff ... +# evar_pop 3 # This pops the remaining 3 vars +# @CODE +evar_push() { + local var val + for var ; do + [[ ${!var+set} == "set" ]] \ + && val=${!var} \ + || val="unset_76fc3c462065bb4ca959f939e6793f94" + estack_push evar "${var}" "${val}" + done +} + +# @FUNCTION: evar_push_set +# @USAGE: <variable to save> [new value to store] +# @DESCRIPTION: +# This is a handy shortcut to save and temporarily set a variable. If a value +# is not specified, the var will be unset. +evar_push_set() { + local var=$1 + evar_push ${var} + case $# in + 1) unset ${var} ;; + 2) printf -v "${var}" '%s' "$2" ;; + *) die "${FUNCNAME}: incorrect # of args: $*" ;; + esac +} + +# @FUNCTION: evar_pop +# @USAGE: [number of vars to restore] +# @DESCRIPTION: +# Restore the variables to the state saved with the corresponding +# evar_push call. See that function for more details. +evar_pop() { + local cnt=${1:-bad} + case $# in + 0) cnt=1 ;; + 1) isdigit "${cnt}" || die "${FUNCNAME}: first arg must be a number: $*" ;; + *) die "${FUNCNAME}: only accepts one arg: $*" ;; + esac + + local var val + while (( cnt-- )) ; do + estack_pop evar val || die "${FUNCNAME}: unbalanced push" + estack_pop evar var || die "${FUNCNAME}: unbalanced push" + [[ ${val} == "unset_76fc3c462065bb4ca959f939e6793f94" ]] \ + && unset ${var} \ + || printf -v "${var}" '%s' "${val}" + done +} + +# @FUNCTION: eshopts_push +# @USAGE: [options to `set` or `shopt`] +# @DESCRIPTION: +# Often times code will want to enable a shell option to change code behavior. +# Since changing shell options can easily break other pieces of code (which +# assume the default state), eshopts_push is used to (1) push the current shell +# options onto a stack and (2) pass the specified arguments to set. +# +# If the first argument is '-s' or '-u', we assume you want to call `shopt` +# rather than `set` as there are some options only available via that. +# +# A common example is to disable shell globbing so that special meaning/care +# may be used with variables/arguments to custom functions. That would be: +# @CODE +# eshopts_push -o noglob +# for x in ${foo} ; do +# if ...some check... ; then +# eshopts_pop +# return 0 +# fi +# done +# eshopts_pop +# @CODE +eshopts_push() { + if [[ $1 == -[su] ]] ; then + estack_push eshopts "$(shopt -p)" + [[ $# -eq 0 ]] && return 0 + shopt "$@" || die "${FUNCNAME}: bad options to shopt: $*" + else + estack_push eshopts "$(shopt -p -o)" + [[ $# -eq 0 ]] && return 0 + set "$@" || die "${FUNCNAME}: bad options to set: $*" + fi +} + +# @FUNCTION: eshopts_pop +# @USAGE: +# @DESCRIPTION: +# Restore the shell options to the state saved with the corresponding +# eshopts_push call. See that function for more details. +eshopts_pop() { + local s + estack_pop eshopts s || die "${FUNCNAME}: unbalanced push" + eval "${s}" || die "${FUNCNAME}: sanity: invalid shopt options: ${s}" +} + +# @FUNCTION: eumask_push +# @USAGE: <new umask> +# @DESCRIPTION: +# Set the umask to the new value specified while saving the previous +# value onto a stack. Useful for temporarily changing the umask. +eumask_push() { + estack_push eumask "$(umask)" + umask "$@" || die "${FUNCNAME}: bad options to umask: $*" +} + +# @FUNCTION: eumask_pop +# @USAGE: +# @DESCRIPTION: +# Restore the previous umask state. +eumask_pop() { + [[ $# -eq 0 ]] || die "${FUNCNAME}: we take no options" + local s + estack_pop eumask s || die "${FUNCNAME}: unbalanced push" + umask ${s} || die "${FUNCNAME}: sanity: could not restore umask: ${s}" +} + +# @FUNCTION: isdigit +# @USAGE: <number> [more numbers] +# @DESCRIPTION: +# Return true if all arguments are numbers. +isdigit() { + local d + for d ; do + [[ ${d:-bad} == *[!0-9]* ]] && return 1 + done + return 0 +} + +_ESTACK_ECLASS=1 +fi #_ESTACK_ECLASS diff -uNr a/eclass/eutils.eclass b/eclass/eutils.eclass --- a/eclass/eutils.eclass false +++ b/eclass/eutils.eclass ef73e853854f0c3b4b077e010ba276e9bc1854a013d2bebaaf7bde6bdbd8e65272b98fda022e4f6043d394cfaa6bc90f5dd4fa5d7ec1ee02356815fbdb3af56b @@ -0,0 +1,417 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: eutils.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: many extra (but common) functions that are used in ebuilds +# @DESCRIPTION: +# The eutils eclass contains a suite of functions that complement +# the ones that ebuild.sh already contain. The idea is that the functions +# are not required in all ebuilds but enough utilize them to have a common +# home rather than having multiple ebuilds implementing the same thing. +# +# Due to the nature of this eclass, some functions may have maintainers +# different from the overall eclass! + +if [[ -z ${_EUTILS_ECLASS} ]]; then +_EUTILS_ECLASS=1 + +# implicitly inherited (now split) eclasses +case ${EAPI:-0} in +0|1|2|3|4|5|6) + inherit desktop epatch estack ltprune multilib preserve-libs \ + toolchain-funcs vcs-clean + ;; +esac + +# @FUNCTION: eqawarn +# @USAGE: [message] +# @DESCRIPTION: +# Proxy to ewarn for package managers that don't provide eqawarn and use the PM +# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev +# profile. +if ! declare -F eqawarn >/dev/null ; then + eqawarn() { + has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@" + : + } +fi + +# @FUNCTION: emktemp +# @USAGE: [temp dir] +# @DESCRIPTION: +# Cheap replacement for when debianutils (and thus mktemp) +# does not exist on the users system. +emktemp() { + local exe="touch" + [[ $1 == -d ]] && exe="mkdir" && shift + local topdir=$1 + + if [[ -z ${topdir} ]] ; then + [[ -z ${T} ]] \ + && topdir="/tmp" \ + || topdir=${T} + fi + + if ! type -P mktemp > /dev/null ; then + # system lacks `mktemp` so we have to fake it + local tmp=/ + while [[ -e ${tmp} ]] ; do + tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} + done + ${exe} "${tmp}" || ${exe} -p "${tmp}" + echo "${tmp}" + else + # the args here will give slightly wierd names on BSD, + # but should produce a usable file on all userlands + if [[ ${exe} == "touch" ]] ; then + TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX + else + TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX + fi + fi +} + +# @FUNCTION: edos2unix +# @USAGE: <file> [more files ...] +# @DESCRIPTION: +# A handy replacement for dos2unix, recode, fixdos, etc... This allows you +# to remove all of these text utilities from DEPEND variables because this +# is a script based solution. Just give it a list of files to convert and +# they will all be changed from the DOS CRLF format to the UNIX LF format. +edos2unix() { + [[ $# -eq 0 ]] && return 0 + sed -i 's/\r$//' -- "$@" || die +} + +# @FUNCTION: strip-linguas +# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>] +# @DESCRIPTION: +# Make sure that LINGUAS only contains languages that +# a package can support. The first form allows you to +# specify a list of LINGUAS. The -i builds a list of po +# files found in all the directories and uses the +# intersection of the lists. The -u builds a list of po +# files found in all the directories and uses the union +# of the lists. +strip-linguas() { + local ls newls nols + if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then + local op=$1; shift + ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift + local d f + for d in "$@" ; do + if [[ ${op} == "-u" ]] ; then + newls=${ls} + else + newls="" + fi + for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do + if [[ ${op} == "-i" ]] ; then + has ${f} ${ls} && newls="${newls} ${f}" + else + has ${f} ${ls} || newls="${newls} ${f}" + fi + done + ls=${newls} + done + else + ls="$@" + fi + + nols="" + newls="" + for f in ${LINGUAS} ; do + if has ${f} ${ls} ; then + newls="${newls} ${f}" + else + nols="${nols} ${f}" + fi + done + [[ -n ${nols} ]] \ + && einfo "Sorry, but ${PN} does not support the LINGUAS:" ${nols} + export LINGUAS=${newls:1} +} + +# @FUNCTION: make_wrapper +# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath] +# @DESCRIPTION: +# Create a shell wrapper script named wrapper in installpath +# (defaults to the bindir) to execute target (default of wrapper) by +# first optionally setting LD_LIBRARY_PATH to the colon-delimited +# libpaths followed by optionally changing directory to chdir. +make_wrapper() { + local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 + local tmpwrapper=$(emktemp) + has "${EAPI:-0}" 0 1 2 && local EPREFIX="" + + ( + echo '#!/bin/sh' + [[ -n ${chdir} ]] && printf 'cd "%s"\n' "${EPREFIX}${chdir}" + if [[ -n ${libdir} ]] ; then + local var + if [[ ${CHOST} == *-darwin* ]] ; then + var=DYLD_LIBRARY_PATH + else + var=LD_LIBRARY_PATH + fi + cat <<-EOF + if [ "\${${var}+set}" = "set" ] ; then + export ${var}="\${${var}}:${EPREFIX}${libdir}" + else + export ${var}="${EPREFIX}${libdir}" + fi + EOF + fi + # We don't want to quote ${bin} so that people can pass complex + # things as ${bin} ... "./someprog --args" + printf 'exec %s "$@"\n' "${bin/#\//${EPREFIX}/}" + ) > "${tmpwrapper}" + chmod go+rx "${tmpwrapper}" + + if [[ -n ${path} ]] ; then + ( + exeinto "${path}" + newexe "${tmpwrapper}" "${wrapper}" + ) || die + else + newbin "${tmpwrapper}" "${wrapper}" || die + fi +} + +# @FUNCTION: path_exists +# @USAGE: [-a|-o] <paths> +# @DESCRIPTION: +# Check if the specified paths exist. Works for all types of paths +# (files/dirs/etc...). The -a and -o flags control the requirements +# of the paths. They correspond to "and" and "or" logic. So the -a +# flag means all the paths must exist while the -o flag means at least +# one of the paths must exist. The default behavior is "and". If no +# paths are specified, then the return value is "false". +path_exists() { + local opt=$1 + [[ ${opt} == -[ao] ]] && shift || opt="-a" + + # no paths -> return false + # same behavior as: [[ -e "" ]] + [[ $# -eq 0 ]] && return 1 + + local p r=0 + for p in "$@" ; do + [[ -e ${p} ]] + : $(( r += $? )) + done + + case ${opt} in + -a) return $(( r != 0 )) ;; + -o) return $(( r == $# )) ;; + esac +} + +# @FUNCTION: use_if_iuse +# @USAGE: <flag> +# @DESCRIPTION: +# Return true if the given flag is in USE and IUSE. +# +# Note that this function should not be used in the global scope. +use_if_iuse() { + in_iuse $1 || return 1 + use $1 +} + +# @FUNCTION: optfeature +# @USAGE: <short description> <package atom to match> [other atoms] +# @DESCRIPTION: +# Print out a message suggesting an optional package (or packages) +# not currently installed which provides the described functionality. +# +# The following snippet would suggest app-misc/foo for optional foo support, +# app-misc/bar or app-misc/baz[bar] for optional bar support +# and either both app-misc/a and app-misc/b or app-misc/c for alphabet support. +# @CODE +# optfeature "foo support" app-misc/foo +# optfeature "bar support" app-misc/bar app-misc/baz[bar] +# optfeature "alphabet support" "app-misc/a app-misc/b" app-misc/c +# @CODE +optfeature() { + debug-print-function ${FUNCNAME} "$@" + local i j msg + local desc=$1 + local flag=0 + shift + for i; do + for j in ${i}; do + if has_version "${j}"; then + flag=1 + else + flag=0 + break + fi + done + if [[ ${flag} -eq 1 ]]; then + break + fi + done + if [[ ${flag} -eq 0 ]]; then + for i; do + msg=" " + for j in ${i}; do + msg+=" ${j} and" + done + msg="${msg:0: -4} for ${desc}" + elog "${msg}" + done + fi +} + +case ${EAPI:-0} in +0|1|2) + +# @FUNCTION: epause +# @USAGE: [seconds] +# @DESCRIPTION: +# Sleep for the specified number of seconds (default of 5 seconds). Useful when +# printing a message the user should probably be reading and often used in +# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set, +# don't wait at all. Defined in EAPIs 0 1 and 2. +epause() { + [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} +} + +# @FUNCTION: ebeep +# @USAGE: [number of beeps] +# @DESCRIPTION: +# Issue the specified number of beeps (default of 5 beeps). Useful when +# printing a message the user should probably be reading and often used in +# conjunction with the epause function. If the EBEEP_IGNORE env var is set, +# don't beep at all. Defined in EAPIs 0 1 and 2. +ebeep() { + local n + if [[ -z ${EBEEP_IGNORE} ]] ; then + for ((n=1 ; n <= ${1:-5} ; n++)) ; do + echo -ne "\a" + sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null + echo -ne "\a" + sleep 1 + done + fi +} + +;; +*) + +ebeep() { + ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at https://bugs.gentoo.org" +} + +epause() { + ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at https://bugs.gentoo.org" +} + +;; +esac + +case ${EAPI:-0} in +0|1|2|3|4) + +# @FUNCTION: usex +# @USAGE: <USE flag> [true output] [false output] [true suffix] [false suffix] +# @DESCRIPTION: +# Proxy to declare usex for package managers or EAPIs that do not provide it +# and use the package manager implementation when available (i.e. EAPI >= 5). +# If USE flag is set, echo [true output][true suffix] (defaults to "yes"), +# otherwise echo [false output][false suffix] (defaults to "no"). +usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963 + +;; +esac + +case ${EAPI:-0} in +0|1|2|3|4|5) + +# @FUNCTION: einstalldocs +# @DESCRIPTION: +# Install documentation using DOCS and HTML_DOCS, in EAPIs that do not +# provide this function. When available (i.e., in EAPI 6 or later), +# the package manager implementation should be used instead. +# +# If DOCS is declared and non-empty, all files listed in it are +# installed. The files must exist, otherwise the function will fail. +# In EAPI 4 and 5, DOCS may specify directories as well; in earlier +# EAPIs using directories is unsupported. +# +# If DOCS is not declared, the files matching patterns given +# in the default EAPI implementation of src_install will be installed. +# If this is undesired, DOCS can be set to empty value to prevent any +# documentation from being installed. +# +# If HTML_DOCS is declared and non-empty, all files and/or directories +# listed in it are installed as HTML docs (using dohtml). +# +# Both DOCS and HTML_DOCS can either be an array or a whitespace- +# separated list. Whenever directories are allowed, '<directory>/.' may +# be specified in order to install all files within the directory +# without creating a sub-directory in docdir. +# +# Passing additional options to dodoc and dohtml is not supported. +# If you needed such a thing, you need to call those helpers explicitly. +einstalldocs() { + debug-print-function ${FUNCNAME} "${@}" + + local dodoc_opts=-r + has ${EAPI} 0 1 2 3 && dodoc_opts= + + if ! declare -p DOCS &>/dev/null ; then + local d + for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \ + THANKS BUGS FAQ CREDITS CHANGELOG ; do + if [[ -s ${d} ]] ; then + dodoc "${d}" || die + fi + done + elif [[ $(declare -p DOCS) == "declare -a"* ]] ; then + if [[ ${DOCS[@]} ]] ; then + dodoc ${dodoc_opts} "${DOCS[@]}" || die + fi + else + if [[ ${DOCS} ]] ; then + dodoc ${dodoc_opts} ${DOCS} || die + fi + fi + + if [[ $(declare -p HTML_DOCS 2>/dev/null) == "declare -a"* ]] ; then + if [[ ${HTML_DOCS[@]} ]] ; then + dohtml -r "${HTML_DOCS[@]}" || die + fi + else + if [[ ${HTML_DOCS} ]] ; then + dohtml -r ${HTML_DOCS} || die + fi + fi + + return 0 +} + +# @FUNCTION: in_iuse +# @USAGE: <flag> +# @DESCRIPTION: +# Determines whether the given flag is in IUSE. Strips IUSE default +# prefixes as necessary. In EAPIs where it is available (i.e., EAPI 6 +# or later), the package manager implementation should be used instead. +# +# Note that this function must not be used in the global scope. +in_iuse() { + debug-print-function ${FUNCNAME} "${@}" + [[ ${#} -eq 1 ]] || die "Invalid args to ${FUNCNAME}()" + + local flag=${1} + local liuse=( ${IUSE} ) + + has "${flag}" "${liuse[@]#[+-]}" +} + +;; +esac + +fi diff -uNr a/eclass/fcaps.eclass b/eclass/fcaps.eclass --- a/eclass/fcaps.eclass false +++ b/eclass/fcaps.eclass e410508424abad5da95e522d6e5eb989080830f6a47ceb9e960ca94e54f5e5e04c40dec45cc4c183f0f3323ad4364467d90dba4b56cc5ad816fc46f2923a1f10 @@ -0,0 +1,219 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: fcaps.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: function to set POSIX file-based capabilities +# @DESCRIPTION: +# This eclass provides a function to set file-based capabilities on binaries. +# This is not the same as USE=caps which controls runtime capability changes, +# often via packages like libcap. +# +# Due to probable capability-loss on moving or copying, this happens in +# pkg_postinst phase (at least for now). +# +# @EXAMPLE: +# You can manually set the caps on ping and ping6 by doing: +# @CODE +# pkg_postinst() { +# fcaps cap_net_raw bin/ping bin/ping6 +# } +# @CODE +# +# Or set it via the global ebuild var FILECAPS: +# @CODE +# FILECAPS=( +# cap_net_raw bin/ping bin/ping6 +# ) +# @CODE + +if [[ -z ${_FCAPS_ECLASS} ]]; then +_FCAPS_ECLASS=1 + +IUSE="+filecaps" + +# We can't use libcap-ng atm due to #471414. +DEPEND="filecaps? ( sys-libs/libcap )" + +# @ECLASS-VARIABLE: FILECAPS +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of fcap arguments to use to automatically execute fcaps. See that +# function for more details. +# +# All args are consumed until the '--' marker is found. So if you have: +# @CODE +# FILECAPS=( moo cow -- fat cat -- chubby penguin ) +# @CODE +# +# This will end up executing: +# @CODE +# fcaps moo cow +# fcaps fat cat +# fcaps chubby penguin +# @CODE +# +# Note: If you override pkg_postinst, you must call fcaps_pkg_postinst yourself. + +# @FUNCTION: fcaps +# @USAGE: [-o <owner>] [-g <group>] [-m <mode>] [-M <caps mode>] <capabilities> <file[s]> +# @DESCRIPTION: +# Sets the specified capabilities on the specified files. +# +# The caps option takes the form as expected by the cap_from_text(3) man page. +# If no action is specified, then "=ep" will be used as a default. +# +# If the file is a relative path (e.g. bin/foo rather than /bin/foo), then the +# appropriate path var ($D/$ROOT/etc...) will be prefixed based on the current +# ebuild phase. +# +# The caps mode (default 711) is used to set the permission on the file if +# capabilities were properly set on the file. +# +# If the system is unable to set capabilities, it will use the specified user, +# group, and mode (presumably to make the binary set*id). The defaults there +# are root:0 and 4711. Otherwise, the ownership and permissions will be +# unchanged. +fcaps() { + debug-print-function ${FUNCNAME} "$@" + + # Process the user options first. + local owner='root' + local group='0' + local mode='4711' + local caps_mode='711' + + while [[ $# -gt 0 ]] ; do + case $1 in + -o) owner=$2; shift;; + -g) group=$2; shift;; + -m) mode=$2; shift;; + -M) caps_mode=$2; shift;; + *) break;; + esac + shift + done + + [[ $# -lt 2 ]] && die "${FUNCNAME}: wrong arg count" + + local caps=$1 + [[ ${caps} == *[-=+]* ]] || caps+="=ep" + shift + + local root + case ${EBUILD_PHASE} in + compile|install|preinst) + root=${ED:-${D}} + ;; + postinst) + root=${EROOT:-${ROOT}} + ;; + esac + root=${root%/} + + # Process every file! + local file + for file ; do + [[ ${file} != /* ]] && file="${root}/${file}" + + if use filecaps ; then + # Try to set capabilities. Ignore errors when the + # fs doesn't support it, but abort on all others. + debug-print "${FUNCNAME}: setting caps '${caps}' on '${file}'" + + # If everything goes well, we don't want the file to be readable + # by people. + chmod ${caps_mode} "${file}" || die + + # Set/verify funcs for sys-libs/libcap. + _libcap() { setcap "${caps}" "${file}" ; } + _libcap_verify() { setcap -v "${caps}" "${file}" >/dev/null ; } + + # Set/verify funcs for sys-libs/libcap-ng. + # Note: filecap only supports =ep mode. + # It also expects a different form: + # setcap cap_foo,cap_bar + # filecap foo bar + _libcap_ng() { + local caps=",${caps%=ep}" + filecap "${file}" "${caps//,cap_}" + } + _libcap_ng_verify() { + # libcap-ng has a crappy interface + local rcaps icaps caps=",${caps%=ep}" + rcaps=$(filecap "${file}" | \ + sed -nr \ + -e "s:^.{${#file}} +::" \ + -e 's:, +:\n:g' \ + -e 2p | \ + LC_ALL=C sort) + [[ ${PIPESTATUS[0]} -eq 0 ]] || return 1 + icaps=$(echo "${caps//,cap_}" | LC_ALL=C sort) + [[ ${rcaps} == ${icaps} ]] + } + + local out cmd notfound=0 + for cmd in _libcap _libcap_ng ; do + if ! out=$(LC_ALL=C ${cmd} 2>&1) ; then + case ${out} in + *"command not found"*) + : $(( ++notfound )) + continue + ;; + # ENOTSUP and EOPNOTSUPP might be the same value which means + # strerror() on them is unstable -- we can get both. #559608 + *"Not supported"*|\ + *"Operation not supported"*) + local fstype=$(stat -f -c %T "${file}") + ewarn "Could not set caps on '${file}' due to missing filesystem support:" + ewarn "* enable XATTR support for '${fstype}' in your kernel (if configurable)" + ewarn "* mount the fs with the user_xattr option (if not the default)" + ewarn "* enable the relevant FS_SECURITY option (if configurable)" + break + ;; + *) + eerror "Setting caps '${caps}' on file '${file}' failed:" + eerror "${out}" + die "could not set caps" + ;; + esac + else + # Sanity check that everything took. + ${cmd}_verify || die "Checking caps '${caps}' on '${file}' failed" + + # Everything worked. Move on to the next file. + continue 2 + fi + done + if [[ ${notfound} -eq 2 ]] && [[ -z ${_FCAPS_WARNED} ]] ; then + _FCAPS_WARNED="true" + ewarn "Could not find cap utils; make sure libcap or libcap-ng is available." + fi + fi + + # If we're still here, setcaps failed. + debug-print "${FUNCNAME}: setting owner/mode on '${file}'" + chown "${owner}:${group}" "${file}" || die + chmod ${mode} "${file}" || die + done +} + +# @FUNCTION: fcaps_pkg_postinst +# @DESCRIPTION: +# Process the FILECAPS array. +fcaps_pkg_postinst() { + local arg args=() + for arg in "${FILECAPS[@]}" "--" ; do + if [[ ${arg} == "--" ]] ; then + fcaps "${args[@]}" + args=() + else + args+=( "${arg}" ) + fi + done +} + +EXPORT_FUNCTIONS pkg_postinst + +fi diff -uNr a/eclass/fdo-mime.eclass b/eclass/fdo-mime.eclass --- a/eclass/fdo-mime.eclass false +++ b/eclass/fdo-mime.eclass ff826604d8f2ad079d9d7a46f0ade7b358268c0e5af8f940c9ad608a98e46c15449647ee216c6f1862565cc5b449972af0bde1cd70b9794468021be2df805378 @@ -0,0 +1,39 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: fdo-mime.eclass +# @MAINTAINER: +# freedesktop-bugs@gentoo.org +# @AUTHOR: +# Original author: foser <foser@gentoo.org> +# @BLURB: Utility eclass to update the desktop mime info as laid out in the freedesktop specs & implementations +# @DESCRIPTION: +# This eclass is DEPRECATED. Please use xdg-utils or xdg instead. + +# @FUNCTION: fdo-mime_desktop_database_update +# @DESCRIPTION: +# Updates the desktop database. +# Generates a list of mimetypes linked to applications that can handle them +fdo-mime_desktop_database_update() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" + if [ -x "${EPREFIX}/usr/bin/update-desktop-database" ] + then + einfo "Updating desktop mime database ..." + "${EPREFIX}/usr/bin/update-desktop-database" -q "${EROOT}usr/share/applications" + fi +} + +# @FUNCTION: fdo-mime_mime_database_update +# @DESCRIPTION: +# Update the mime database. +# Creates a general list of mime types from several sources +fdo-mime_mime_database_update() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" + if [ -x "${EPREFIX}/usr/bin/update-mime-database" ] + then + einfo "Updating shared mime info database ..." + "${EPREFIX}/usr/bin/update-mime-database" "${EROOT}usr/share/mime" + fi +} diff -uNr a/eclass/findlib.eclass b/eclass/findlib.eclass --- a/eclass/findlib.eclass false +++ b/eclass/findlib.eclass d83c5c15271035e9d0b53f3942291086707764980f485ae36bee4da47624ea3cf13d9608fd1040b8a6b83b0b4fbe08db117200fdc1f705fb86c7c13d5cd949b6 @@ -0,0 +1,58 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: findlib.eclass +# @MAINTAINER: +# ml@gentoo.org +# @AUTHOR: +# Original author: Matthieu Sozeau <mattam@gentoo.org> (retired) +# @BLURB: ocamlfind (a.k.a. findlib) eclass +# @DESCRIPTION: +# ocamlfind (a.k.a. findlib) eclass + + + +# From this findlib version there is proper stublibs support. +DEPEND=">=dev-ml/findlib-1.0.4-r1" +[[ ${FINDLIB_USE} ]] && DEPEND="${FINDLIB_USE}? ( ${DEPEND} )" + +check_ocamlfind() { + if [ ! -x "${EPREFIX}"/usr/bin/ocamlfind ] + then + eerror "In findlib.eclass: could not find the ocamlfind executable" + eerror "Please report this bug on gentoo's bugzilla, assigning to ml@gentoo.org" + die "ocamlfind executabled not found" + fi +} + +# @FUNCTION: findlib_src_preinst +# @DESCRIPTION: +# Prepare the image for a findlib installation. +# We use the stublibs style, so no ld.conf needs to be +# updated when a package installs C shared libraries. +findlib_src_preinst() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}" + check_ocamlfind + + # destdir is the ocaml sitelib + local destdir=`ocamlfind printconf destdir` + + # strip off prefix + destdir=${destdir#${EPREFIX}} + + dodir ${destdir} || die "dodir failed" + export OCAMLFIND_DESTDIR=${ED}${destdir} + + # stublibs style + dodir ${destdir}/stublibs || die "dodir failed" + export OCAMLFIND_LDCONF=ignore +} + +# @FUNCTION: findlib_src_install +# @DESCRIPTION: +# Install with a properly setup findlib +findlib_src_install() { + findlib_src_preinst + make DESTDIR="${D}" "$@" install || die "make failed" +} diff -uNr a/eclass/fixheadtails.eclass b/eclass/fixheadtails.eclass --- a/eclass/fixheadtails.eclass false +++ b/eclass/fixheadtails.eclass 6685f313029681d9455b06982ecf7a2960091c0524b688ef2a8eb8849c45aaed3d89454338e23011cd33ff3123f944d89432fcb40dd4a8c787e522d51de130e2 @@ -0,0 +1,43 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: fixheadtails.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @AUTHOR: +# Original author John Mylchreest <johnm@gentoo.org> +# @BLURB: functions to replace obsolete head/tail with POSIX compliant ones + +DEPEND=">=sys-apps/sed-4" + +_do_sed_fix() { + einfo " - fixed $1" + sed -i \ + -e 's/head \+-$[0-9]$/head -n \1/g' \ + -e 's/tail \+$[-+][0-9]\+$c/tail -c \1/g' \ + -e 's/tail \+$[-+][0-9]$/tail -n \1/g' ${1} || \ + die "sed ${1} failed" +} + +# @FUNCTION: ht_fix_file +# @USAGE: <files> +# @DESCRIPTION: +# Fix all the specified files. +ht_fix_file() { + local i + einfo "Replacing obsolete head/tail with POSIX compliant ones" + for i in "$@" ; do + _do_sed_fix "$i" + done +} + +# @FUNCTION: ht_fix_all +# @DESCRIPTION: +# Find and fix all files in the current directory as needed. +ht_fix_all() { + local MATCHES + MATCHES=$(grep -l -s -i -R -e "head -[ 0-9]" -e "tail [+-][ 0-9]" * | sort -u) + [[ -n ${MATCHES} ]] \ + && ht_fix_file ${MATCHES} \ + || einfo "No need for ht_fix_all anymore !" +} diff -uNr a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass --- a/eclass/flag-o-matic.eclass false +++ b/eclass/flag-o-matic.eclass 9e7a6c68530ed761db1461e58ce64e7c8001cba75775ec6e5738b94fc7587796ae688688fc4929926c68ed29a92d154f98261185ba62778006546bf63ca771be @@ -0,0 +1,691 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: flag-o-matic.eclass +# @MAINTAINER: +# toolchain@gentoo.org +# @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. + +if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then +_FLAG_O_MATIC_ECLASS=1 + +inherit eutils toolchain-funcs multilib + +# 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 +} + +# {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 + -fbounds-check -fbounds-checking -fno-strict-overflow + -fno-PIE -fno-pie -nopie -no-pie -fno-unit-at-a-time + -g '-g[0-9]' -ggdb '-ggdb[0-9]' '-gdwarf-*' gstabs -gstabs+ -gz + -fno-ident -fpermissive -frecord-gcc-switches + '-fdiagnostics*' '-fplugin*' + '-W*' -w + + # CPPFLAGS and LDFLAGS + '-[DUILR]*' '-Wl,*' + ) + + # allow a bunch of flags that negate features / control ABI + ALLOWED_FLAGS+=( + '-fno-stack-protector*' '-fabi-version=*' + -fno-strict-aliasing -fno-bounds-check -fno-bounds-checking -fstrict-overflow + -fno-omit-frame-pointer '-fno-builtin*' + ) + ALLOWED_FLAGS+=( + -mregparm -mno-app-regs -mapp-regs -mno-mmx -mno-sse + -mno-sse2 -mno-sse3 -mno-ssse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 + -mno-avx -mno-aes -mno-pclmul -mno-sse4a -mno-3dnow -mno-popcnt + -mno-abm -mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 -mplt + -msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu + -mieee -mieee-with-inexact -mschedule -mfloat-gprs -mspe -mno-spe + -mtls-direct-seg-refs -mno-tls-direct-seg-refs -mflat -mno-flat + -mno-faster-structs -mfaster-structs -m32 -m64 -mx32 -mabi + -mlittle-endian -mbig-endian -EL -EB -fPIC -mlive-g0 -mcmodel + -mstack-bias -mno-stack-bias -msecure-plt '-m*-toc' -mfloat-abi + -mfix-r10000 -mno-fix-r10000 -mthumb -marm + + # gcc 4.5 + -mno-fma4 -mno-movbe -mno-xop -mno-lwp + # gcc 4.6 + -mno-fsgsbase -mno-rdrnd -mno-f16c -mno-bmi -mno-tbm + # gcc 4.7 + -mno-avx2 -mno-bmi2 -mno-fma -mno-lzcnt + # gcc 4.8 + -mno-fxsr -mno-hle -mno-rtm -mno-xsave -mno-xsaveopt + # gcc 4.9 + -mno-avx512cd -mno-avx512er -mno-avx512f -mno-avx512pf -mno-sha + ) +} + +# inverted filters for hardened compiler. This is trying to unpick +# the hardened compiler defaults. +_filter-hardened() { + local f + for f in "$@" ; do + case "${f}" in + # Ideally we should only concern ourselves with PIE flags, + # not -fPIC or -fpic, but too many places filter -fPIC without + # thinking about -fPIE. + -fPIC|-fpic|-fPIE|-fpie|-Wl,pie|-pie) + gcc-specs-pie || continue + if ! is-flagq -nopie && ! is-flagq -no-pie ; then + # Support older Gentoo form first (-nopie) before falling + # back to the official gcc-6+ form (-no-pie). + if test-flags -nopie >/dev/null ; then + append-flags -nopie + else + append-flags -no-pie + fi + fi + ;; + -fstack-protector) + gcc-specs-ssp || continue + is-flagq -fno-stack-protector || append-flags $(test-flags -fno-stack-protector);; + -fstack-protector-all) + gcc-specs-ssp-to-all || continue + is-flagq -fno-stack-protector-all || append-flags $(test-flags -fno-stack-protector-all);; + -fno-strict-overflow) + gcc-specs-nostrict || continue + is-flagq -fstrict-overflow || append-flags $(test-flags -fstrict-overflow);; + esac + done +} + +# Remove occurrences of strings from variable given in $1 +# Strings removed are matched as globs, so for example +# '-O*' would remove -O1, -O2 etc. +_filter-var() { + local f x var=$1 new=() + shift + + for f in ${!var} ; do + for x in "$@" ; do + # Note this should work with globs like -O* + [[ ${f} == ${x} ]] && continue 2 + done + new+=( "${f}" ) + done + export ${var}="${new[*]}" +} + +# @FUNCTION: filter-flags +# @USAGE: <flags> +# @DESCRIPTION: +# Remove particular <flags> from {C,CPP,CXX,CCAS,F,FC,LD}FLAGS. Accepts shell globs. +filter-flags() { + _filter-hardened "$@" + local v + for v in $(all-flag-vars) ; do + _filter-var ${v} "$@" + done + return 0 +} + +# @FUNCTION: filter-lfs-flags +# @DESCRIPTION: +# Remove flags that enable Large File Support. +filter-lfs-flags() { + [[ $# -ne 0 ]] && die "filter-lfs-flags takes no arguments" + # http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html + # _LARGEFILE_SOURCE: enable support for new LFS funcs (ftello/etc...) + # _LARGEFILE64_SOURCE: enable support for 64bit variants (off64_t/fseeko64/etc...) + # _FILE_OFFSET_BITS: default to 64bit variants (off_t is defined as off64_t) + filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +} + +# @FUNCTION: filter-ldflags +# @USAGE: <flags> +# @DESCRIPTION: +# Remove particular <flags> from LDFLAGS. Accepts shell globs. +filter-ldflags() { + _filter-var LDFLAGS "$@" + return 0 +} + +# @FUNCTION: append-cppflags +# @USAGE: <flags> +# @DESCRIPTION: +# Add extra <flags> to the current CPPFLAGS. +append-cppflags() { + [[ $# -eq 0 ]] && return 0 + export CPPFLAGS+=" $*" + return 0 +} + +# @FUNCTION: append-cflags +# @USAGE: <flags> +# @DESCRIPTION: +# Add extra <flags> to the current CFLAGS. If a flag might not be supported +# with different compilers (or versions), then use test-flags-CC like so: +# @CODE +# append-cflags $(test-flags-CC -funky-flag) +# @CODE +append-cflags() { + [[ $# -eq 0 ]] && return 0 + # Do not do automatic flag testing ourselves. #417047 + export CFLAGS+=" $*" + return 0 +} + +# @FUNCTION: append-cxxflags +# @USAGE: <flags> +# @DESCRIPTION: +# Add extra <flags> to the current CXXFLAGS. If a flag might not be supported +# with different compilers (or versions), then use test-flags-CXX like so: +# @CODE +# append-cxxflags $(test-flags-CXX -funky-flag) +# @CODE +append-cxxflags() { + [[ $# -eq 0 ]] && return 0 + # Do not do automatic flag testing ourselves. #417047 + export CXXFLAGS+=" $*" + return 0 +} + +# @FUNCTION: append-fflags +# @USAGE: <flags> +# @DESCRIPTION: +# Add extra <flags> to the current {F,FC}FLAGS. If a flag might not be supported +# with different compilers (or versions), then use test-flags-F77 like so: +# @CODE +# append-fflags $(test-flags-F77 -funky-flag) +# @CODE +append-fflags() { + [[ $# -eq 0 ]] && return 0 + # Do not do automatic flag testing ourselves. #417047 + export FFLAGS+=" $*" + export FCFLAGS+=" $*" + return 0 +} + +# @FUNCTION: append-lfs-flags +# @DESCRIPTION: +# Add flags that enable Large File Support. +append-lfs-flags() { + [[ $# -ne 0 ]] && die "append-lfs-flags takes no arguments" + # see comments in filter-lfs-flags func for meaning of these + append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +} + +# @FUNCTION: append-ldflags +# @USAGE: <flags> +# @DESCRIPTION: +# Add extra <flags> to the current LDFLAGS. +append-ldflags() { + [[ $# -eq 0 ]] && return 0 + local flag + for flag in "$@"; do + [[ ${flag} == -l* ]] && \ + eqawarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS" + done + + export LDFLAGS="${LDFLAGS} $*" + return 0 +} + +# @FUNCTION: append-flags +# @USAGE: <flags> +# @DESCRIPTION: +# Add extra <flags> to your current {C,CXX,F,FC}FLAGS. +append-flags() { + [[ $# -eq 0 ]] && return 0 + case " $* " in + *' '-[DIU]*) eqawarn 'please use append-cppflags for preprocessor flags' ;; + *' '-L*|\ + *' '-Wl,*) eqawarn 'please use append-ldflags for linker flags' ;; + esac + append-cflags "$@" + append-cxxflags "$@" + append-fflags "$@" + return 0 +} + +# @FUNCTION: replace-flags +# @USAGE: <old> <new> +# @DESCRIPTION: +# Replace the <old> flag with <new>. Accepts shell globs for <old>. +replace-flags() { + [[ $# != 2 ]] && die "Usage: replace-flags <old flag> <new flag>" + + local f var new + for var in $(all-flag-vars) ; do + # Looping over the flags instead of using a global + # substitution ensures that we're working with flag atoms. + # Otherwise globs like -O* have the potential to wipe out the + # list of flags. + new=() + for f in ${!var} ; do + # Note this should work with globs like -O* + [[ ${f} == ${1} ]] && f=${2} + new+=( "${f}" ) + done + export ${var}="${new[*]}" + done + + return 0 +} + +# @FUNCTION: replace-cpu-flags +# @USAGE: <old> <new> +# @DESCRIPTION: +# Replace cpu flags (like -march/-mcpu/-mtune) that select the <old> cpu +# with flags that select the <new> cpu. Accepts shell globs for <old>. +replace-cpu-flags() { + local newcpu="$#" ; newcpu="${!newcpu}" + while [ $# -gt 1 ] ; do + # quote to make sure that no globbing is done (particularly on + # ${oldcpu}) prior to calling replace-flags + replace-flags "-march=${1}" "-march=${newcpu}" + replace-flags "-mcpu=${1}" "-mcpu=${newcpu}" + replace-flags "-mtune=${1}" "-mtune=${newcpu}" + shift + done + return 0 +} + +_is_flagq() { + local x var="$1[*]" + for x in ${!var} ; do + [[ ${x} == $2 ]] && return 0 + done + return 1 +} + +# @FUNCTION: is-flagq +# @USAGE: <flag> +# @DESCRIPTION: +# Returns shell true if <flag> is in {C,CXX,F,FC}FLAGS, else returns shell false. Accepts shell globs. +is-flagq() { + [[ -n $2 ]] && die "Usage: is-flag <flag>" + + local var + for var in $(all-flag-vars) ; do + _is_flagq ${var} "$1" && return 0 + done + return 1 +} + +# @FUNCTION: is-flag +# @USAGE: <flag> +# @DESCRIPTION: +# Echo's "true" if flag is set in {C,CXX,F,FC}FLAGS. Accepts shell globs. +is-flag() { + is-flagq "$@" && echo true +} + +# @FUNCTION: is-ldflagq +# @USAGE: <flag> +# @DESCRIPTION: +# Returns shell true if <flag> is in LDFLAGS, else returns shell false. Accepts shell globs. +is-ldflagq() { + [[ -n $2 ]] && die "Usage: is-ldflag <flag>" + _is_flagq LDFLAGS $1 +} + +# @FUNCTION: is-ldflag +# @USAGE: <flag> +# @DESCRIPTION: +# Echo's "true" if flag is set in LDFLAGS. Accepts shell globs. +is-ldflag() { + is-ldflagq "$@" && echo true +} + +# @FUNCTION: filter-mfpmath +# @USAGE: <math types> +# @DESCRIPTION: +# Remove specified math types from the fpmath flag. For example, if the user +# has -mfpmath=sse,386, running `filter-mfpmath sse` will leave the user with +# -mfpmath=386. +filter-mfpmath() { + local orig_mfpmath new_math prune_math + + # save the original -mfpmath flag + orig_mfpmath=$(get-flag -mfpmath) + # get the value of the current -mfpmath flag + new_math=$(get-flag mfpmath) + # convert "both" to something we can filter + new_math=${new_math/both/387,sse} + new_math=" ${new_math//[,+]/ } " + # figure out which math values are to be removed + prune_math="" + for prune_math in "$@" ; do + new_math=${new_math/ ${prune_math} / } + done + new_math=$(echo ${new_math}) + new_math=${new_math// /,} + + if [[ -z ${new_math} ]] ; then + # if we're removing all user specified math values are + # slated for removal, then we just filter the flag + filter-flags ${orig_mfpmath} + else + # if we only want to filter some of the user specified + # math values, then we replace the current flag + replace-flags ${orig_mfpmath} -mfpmath=${new_math} + fi + return 0 +} + +# @FUNCTION: strip-flags +# @DESCRIPTION: +# Strip *FLAGS of everything except known good/safe flags. This runs over all +# flags returned by all_flag_vars(). +strip-flags() { + local x y var + + local ALLOWED_FLAGS + setup-allowed-flags + + set -f # disable pathname expansion + + for var in $(all-flag-vars) ; do + local new=() + + for x in ${!var} ; do + local flag=${x%%=*} + for y in "${ALLOWED_FLAGS[@]}" ; do + if [[ -z ${flag%%${y}} ]] ; then + new+=( "${x}" ) + break + fi + done + done + + # In case we filtered out all optimization flags fallback to -O2 + if _is_flagq ${var} "-O*" && ! _is_flagq new "-O*" ; then + new+=( -O2 ) + fi + + if [[ ${!var} != "${new[*]}" ]] ; then + einfo "strip-flags: ${var}: changed '${!var}' to '${new[*]}'" + fi + export ${var}="${new[*]}" + done + + set +f # re-enable pathname expansion + + return 0 +} + +test-flag-PROG() { + local comp=$1 + local lang=$2 + shift 2 + + [[ -z ${comp} || -z $1 ]] && return 1 + + local cmdline=( + $(tc-get${comp}) + # Clang will warn about unknown gcc flags but exit 0. + # Need -Werror to force it to exit non-zero. + -Werror + # Use -c so we can test the assembler as well. + -c -o /dev/null + ) + if "${cmdline[@]}" -x${lang} - </dev/null &>/dev/null ; then + cmdline+=( "$@" -x${lang} - ) + else + # XXX: what's the purpose of this? does it even work with + # any compiler? + cmdline+=( "$@" -c -o /dev/null /dev/null ) + fi + + if ! "${cmdline[@]}" </dev/null &>/dev/null; then + # -Werror makes clang bail out on unused arguments as well; + # try to add -Qunused-arguments to work-around that + # other compilers don't support it but then, it's failure like + # any other + cmdline+=( -Qunused-arguments ) + "${cmdline[@]}" </dev/null &>/dev/null + fi +} + +# @FUNCTION: test-flag-CC +# @USAGE: <flag> +# @DESCRIPTION: +# Returns shell true if <flag> is supported by the C compiler, else returns shell false. +test-flag-CC() { test-flag-PROG "CC" c "$@"; } + +# @FUNCTION: test-flag-CXX +# @USAGE: <flag> +# @DESCRIPTION: +# Returns shell true if <flag> is supported by the C++ compiler, else returns shell false. +test-flag-CXX() { test-flag-PROG "CXX" c++ "$@"; } + +# @FUNCTION: test-flag-F77 +# @USAGE: <flag> +# @DESCRIPTION: +# Returns shell true if <flag> is supported by the Fortran 77 compiler, else returns shell false. +test-flag-F77() { test-flag-PROG "F77" f77 "$@"; } + +# @FUNCTION: test-flag-FC +# @USAGE: <flag> +# @DESCRIPTION: +# Returns shell true if <flag> is supported by the Fortran 90 compiler, else returns shell false. +test-flag-FC() { test-flag-PROG "FC" f95 "$@"; } + +test-flags-PROG() { + local comp=$1 + local flags=() + local x + + shift + + [[ -z ${comp} ]] && return 1 + + while (( $# )); do + case "$1" in + --param) + if test-flag-${comp} "$1" "$2"; then + flags+=( "$1" "$2" ) + fi + shift 2 + ;; + *) + if test-flag-${comp} "$1"; then + flags+=( "$1" ) + fi + shift 1 + ;; + esac + done + + echo "${flags[*]}" + + # Just bail if we dont have any flags + [[ ${#flags[@]} -gt 0 ]] +} + +# @FUNCTION: test-flags-CC +# @USAGE: <flags> +# @DESCRIPTION: +# Returns shell true if <flags> are supported by the C compiler, else returns shell false. +test-flags-CC() { test-flags-PROG "CC" "$@"; } + +# @FUNCTION: test-flags-CXX +# @USAGE: <flags> +# @DESCRIPTION: +# Returns shell true if <flags> are supported by the C++ compiler, else returns shell false. +test-flags-CXX() { test-flags-PROG "CXX" "$@"; } + +# @FUNCTION: test-flags-F77 +# @USAGE: <flags> +# @DESCRIPTION: +# Returns shell true if <flags> are supported by the Fortran 77 compiler, else returns shell false. +test-flags-F77() { test-flags-PROG "F77" "$@"; } + +# @FUNCTION: test-flags-FC +# @USAGE: <flags> +# @DESCRIPTION: +# Returns shell true if <flags> are supported by the Fortran 90 compiler, else returns shell false. +test-flags-FC() { test-flags-PROG "FC" "$@"; } + +# @FUNCTION: test-flags +# @USAGE: <flags> +# @DESCRIPTION: +# Short-hand that should hopefully work for both C and C++ compiler, but +# its really only present due to the append-flags() abomination. +test-flags() { test-flags-CC "$@"; } + +# @FUNCTION: test_version_info +# @USAGE: <version> +# @DESCRIPTION: +# Returns shell true if the current C compiler version matches <version>, else returns shell false. +# Accepts shell globs. +test_version_info() { + if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then + return 0 + else + return 1 + fi +} + +# @FUNCTION: strip-unsupported-flags +# @DESCRIPTION: +# Strip {C,CXX,F,FC}FLAGS of any flags not supported by the active toolchain. +strip-unsupported-flags() { + export CFLAGS=$(test-flags-CC ${CFLAGS}) + export CXXFLAGS=$(test-flags-CXX ${CXXFLAGS}) + export FFLAGS=$(test-flags-F77 ${FFLAGS}) + export FCFLAGS=$(test-flags-FC ${FCFLAGS}) + # note: this does not verify the linker flags but it is enough + # to strip invalid C flags which are much more likely, #621274 + export LDFLAGS=$(test-flags-CC ${LDFLAGS}) +} + +# @FUNCTION: get-flag +# @USAGE: <flag> +# @DESCRIPTION: +# Find and echo the value for a particular flag. Accepts shell globs. +get-flag() { + local f var findflag="$1" + + # this code looks a little flaky but seems to work for + # everything we want ... + # for example, if CFLAGS="-march=i686": + # `get-flag -march` == "-march=i686" + # `get-flag march` == "i686" + for var in $(all-flag-vars) ; do + for f in ${!var} ; do + if [ "${f/${findflag}}" != "${f}" ] ; then + printf "%s\n" "${f/-${findflag}=}" + return 0 + fi + done + done + return 1 +} + +has_m64() { + die "${FUNCNAME}: don't use this anymore" +} + +has_m32() { + die "${FUNCNAME}: don't use this anymore" +} + +# @FUNCTION: replace-sparc64-flags +# @DESCRIPTION: +# Sets mcpu to v8 and uses the original value as mtune if none specified. +replace-sparc64-flags() { + local SPARC64_CPUS="ultrasparc3 ultrasparc v9" + + if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then + for x in ${SPARC64_CPUS}; do + CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}" + done + else + for x in ${SPARC64_CPUS}; do + CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" + done + fi + + if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then + for x in ${SPARC64_CPUS}; do + CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}" + done + else + for x in ${SPARC64_CPUS}; do + CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}" + done + fi + + export CFLAGS CXXFLAGS +} + +# @FUNCTION: append-libs +# @USAGE: <libs> +# @DESCRIPTION: +# Add extra <libs> to the current LIBS. All arguments should be prefixed with +# either -l or -L. For compatibility, if arguments are not prefixed as +# options, they are given a -l prefix automatically. +append-libs() { + [[ $# -eq 0 ]] && return 0 + local flag + for flag in "$@"; do + if [[ -z "${flag// }" ]]; then + eqawarn "Appending an empty argument to LIBS is invalid! Skipping." + continue + fi + case $flag in + -[lL]*) + export LIBS="${LIBS} ${flag}" + ;; + -*) + eqawarn "Appending non-library to LIBS (${flag}); Other linker flags should be passed via LDFLAGS" + export LIBS="${LIBS} ${flag}" + ;; + *) + export LIBS="${LIBS} -l${flag}" + esac + done + + return 0 +} + +# @FUNCTION: raw-ldflags +# @USAGE: [flags] +# @DESCRIPTION: +# Turn C style ldflags (-Wl,-foo) into straight ldflags - the results +# are suitable for passing directly to 'ld'; note LDFLAGS is usually passed +# to gcc where it needs the '-Wl,'. +# +# If no flags are specified, then default to ${LDFLAGS}. +raw-ldflags() { + local x input="$@" + [[ -z ${input} ]] && input=${LDFLAGS} + set -- + for x in ${input} ; do + case ${x} in + -Wl,*) + x=${x#-Wl,} + set -- "$@" ${x//,/ } + ;; + *) # Assume it's a compiler driver flag, so throw it away #441808 + ;; + esac + done + echo "$@" +} + +# @FUNCTION: no-as-needed +# @RETURN: Flag to disable asneeded behavior for use with append-ldflags. +no-as-needed() { + case $($(tc-getLD) -v 2>&1 </dev/null) in + *GNU*) # GNU ld + echo "-Wl,--no-as-needed" ;; + esac +} + +fi diff -uNr a/eclass/font-ebdftopcf.eclass b/eclass/font-ebdftopcf.eclass --- a/eclass/font-ebdftopcf.eclass false +++ b/eclass/font-ebdftopcf.eclass c78d62139a9890298175f707d08eb32e528a7690ca0de034f1a03e736f62eced59ebcc6fb521effe3c2c7ae56e31b71216ff0c3bcdd8bfdea4c87e25ca1cd717 @@ -0,0 +1,45 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Author: Robin H. Johnson <robbat2@gentoo.org> + +# font-ebdftopcf.eclass +# Eclass to make PCF font generator from BDF uniform and optimal +# The manpage for this eclass is in media-gfx/ebdftopcf. + +# inherit this eclass after font.eclass + +# if USE="-X", this eclass is basically a no-op, since bdftopcf requires Xorg. +IUSE="X" + +# Variable declarations +DEPEND="X? ( media-gfx/ebdftopcf )" +RDEPEND="" + +# +# Public functions +# +ebdftopcf() { + local bdffiles + bdffiles="$@" + [ -z "$bdffiles" ] && die "No BDF files specified." + emake -f "${EPREFIX}"/usr/share/ebdftopcf/Makefile.ebdftopcf \ + BDFFILES="${bdffiles}" \ + BDFTOPCF_PARAMS="${BDFTOPCF_PARAMS}" \ + || die "Failed to build PCF files" +} + +# +# Public inheritable functions +# +font-ebdftopcf_src_compile() { + use X && FONT_SUFFIX="pcf.gz" + use X || FONT_SUFFIX="bdf" + + if use X; then + [ -z "${BDFFILES}" ] && BDFFILES="$(find . -name '*.bdf')" + ebdftopcf ${BDFFILES} + fi +} + +EXPORT_FUNCTIONS src_compile diff -uNr a/eclass/font.eclass b/eclass/font.eclass --- a/eclass/font.eclass false +++ b/eclass/font.eclass babeeafd6eebbb767738df9901cd9c8605fe4a2a6c15449429c9c36058222ae8a10d80adaca5ae960ecc35a1172f9b692674b3f8478fa2af98b8c5c4b60b8117 @@ -0,0 +1,249 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: font.eclass +# @MAINTAINER: +# fonts@gentoo.org +# @BLURB: Eclass to make font installation uniform + +inherit eutils + +EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm + +# @ECLASS-VARIABLE: FONT_SUFFIX +# @DEFAULT_UNSET +# @REQUIRED +# @DESCRIPTION: +# Space delimited list of font suffixes to install. +FONT_SUFFIX=${FONT_SUFFIX:-} + +# @ECLASS-VARIABLE: FONT_S +# @REQUIRED +# @DESCRIPTION: +# Space delimited list of directories containing the fonts. +FONT_S=${FONT_S:-${S}} + +# @ECLASS-VARIABLE: FONT_PN +# @DESCRIPTION: +# Font name (ie. last part of FONTDIR). +FONT_PN=${FONT_PN:-${PN}} + +# @ECLASS-VARIABLE: FONTDIR +# @DESCRIPTION: +# Full path to installation directory. +FONTDIR=${FONTDIR:-/usr/share/fonts/${FONT_PN}} + +# @ECLASS-VARIABLE: FONT_CONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array containing fontconfig conf files to install. +FONT_CONF=( "" ) + +# @ECLASS-VARIABLE: DOCS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Space delimited list of docs to install. +# We always install these: +# COPYRIGHT README{,.txt} NEWS AUTHORS BUGS ChangeLog FONTLOG.txt +DOCS=${DOCS:-} + +IUSE="X" + +DEPEND="X? ( + x11-apps/mkfontdir + media-fonts/encodings + )" +RDEPEND="" + +# @FUNCTION: font_xfont_config +# @DESCRIPTION: +# Generate Xorg font files (mkfontscale/mkfontdir). +font_xfont_config() { + local dir_name + if has X ${IUSE//+} && use X ; then + dir_name="${1:-${FONT_PN}}" + ebegin "Creating fonts.scale & fonts.dir in ${dir_name##*/}" + rm -f "${ED}${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir} + mkfontscale "${ED}${FONTDIR}/${1//${S}/}" + mkfontdir \ + -e ${EPREFIX}/usr/share/fonts/encodings \ + -e ${EPREFIX}/usr/share/fonts/encodings/large \ + "${ED}${FONTDIR}/${1//${S}/}" + eend $? + if [[ -e fonts.alias ]] ; then + doins fonts.alias + fi + fi +} + +# @FUNCTION: font_fontconfig +# @DESCRIPTION: +# Install fontconfig conf files given in FONT_CONF. +font_fontconfig() { + local conffile + if [[ -n ${FONT_CONF[@]} ]]; then + insinto /etc/fonts/conf.avail/ + for conffile in "${FONT_CONF[@]}"; do + [[ -e ${conffile} ]] && doins ${conffile} + done + fi +} + +# @FUNCTION: font_cleanup_dirs +# @DESCRIPTION: +# Remove font directories containing only generated files. +font_cleanup_dirs() { + local genfiles="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale" + # fonts.alias isn't generated but it's a special case (see below). + local d f g generated candidate otherfile + + ebegin "Cleaning up font directories" + find -L "${EROOT}"usr/share/fonts/ -type d -print0 | while read -d $'\0' d; do + candidate=false + otherfile=false + for f in "${d}"/*; do + generated=false + # make sure this is a file and not a subdir + [[ -e ${f} || -L ${f} ]] || continue + for g in ${genfiles}; do + if [[ ${f##*/} == ${g} ]]; then + # this is a generated file + generated=true + break + fi + done + # if the file is a generated file then we know this is a font dir (as + # opposed to something like encodings or util) and a candidate for + # removal. if it's not generated then it's an "otherfile". + ${generated} && candidate=true || otherfile=true + # if the directory is both a candidate for removal and contains at + # least one "otherfile" then don't remove it. + [[ ${candidate} == ${otherfile} ]] && break + done + # if in the end we only have generated files, purge the directory. + if [[ ${candidate} == true && ${otherfile} == false ]]; then + # we don't want to remove fonts.alias files that were installed by + # media-fonts/font-alias. any other fonts.alias files will have + # already been unmerged with their packages. + for g in ${genfiles}; do + [[ ${g} != fonts.alias && ( -e ${d}/${g} || -L ${d}/${g} ) ]] \ + && rm "${d}"/${g} + done + # if there's nothing left remove the directory + find "${d}" -maxdepth 0 -type d -empty -exec rmdir '{}' \; + fi + done + eend 0 +} + +# @FUNCTION: font_pkg_setup +# @DESCRIPTION: +# The font pkg_setup function. +# Collision protection and Prefix compat for eapi < 3. +font_pkg_setup() { + # Prefix compat + case ${EAPI:-0} in + 0|1|2) + if ! use prefix; then + EPREFIX= + ED=${D} + EROOT=${ROOT} + [[ ${EROOT} = */ ]] || EROOT+="/" + fi + ;; + esac + + # make sure we get no collisions + # setup is not the nicest place, but preinst doesn't cut it + [[ -e "${EROOT}/${FONTDIR}/fonts.cache-1" ]] && rm -f "${EROOT}/${FONTDIR}/fonts.cache-1" +} + +# @FUNCTION: font_src_install +# @DESCRIPTION: +# The font src_install function. +font_src_install() { + local dir suffix commondoc + + set -- ${FONT_S:-${S}} + if [[ $# -gt 1 ]]; then + # if we have multiple FONT_S elements then we want to recreate the dir + # structure + for dir in ${FONT_S}; do + pushd "${dir}" > /dev/null + insinto "${FONTDIR}/${dir//${S}/}" + for suffix in ${FONT_SUFFIX}; do + doins *.${suffix} + done + font_xfont_config "${dir}" + popd > /dev/null + done + else + pushd "${FONT_S}" > /dev/null + insinto "${FONTDIR}" + for suffix in ${FONT_SUFFIX}; do + doins *.${suffix} + done + font_xfont_config + popd > /dev/null + fi + + font_fontconfig + + [[ -n ${DOCS} ]] && { dodoc ${DOCS} || die "docs installation failed" ; } + + # install common docs + for commondoc in COPYRIGHT README{,.txt} NEWS AUTHORS BUGS ChangeLog FONTLOG.txt; do + [[ -s ${commondoc} ]] && dodoc ${commondoc} + done +} + +# @FUNCTION: font_pkg_postinst +# @DESCRIPTION: +# The font pkg_postinst function. +font_pkg_postinst() { + # unreadable font files = fontconfig segfaults + find "${EROOT}"usr/share/fonts/ -type f '!' -perm 0644 -print0 \ + | xargs -0 chmod -v 0644 2>/dev/null + + if [[ -n ${FONT_CONF[@]} ]]; then + local conffile + echo + elog "The following fontconfig configuration files have been installed:" + elog + for conffile in "${FONT_CONF[@]}"; do + if [[ -e ${EROOT}etc/fonts/conf.avail/$(basename ${conffile}) ]]; then + elog " $(basename ${conffile})" + fi + done + elog + elog "Use \`eselect fontconfig\` to enable/disable them." + echo + fi + + if has_version media-libs/fontconfig && [[ ${ROOT} == / ]]; then + ebegin "Updating global fontcache" + fc-cache -fs + eend $? + else + einfo "Skipping fontcache update (media-libs/fontconfig is not installed or ROOT != /)" + fi +} + +# @FUNCTION: font_pkg_postrm +# @DESCRIPTION: +# The font pkg_postrm function. +font_pkg_postrm() { + font_cleanup_dirs + + # unreadable font files = fontconfig segfaults + find "${EROOT}"usr/share/fonts/ -type f '!' -perm 0644 -print0 \ + | xargs -0 chmod -v 0644 2>/dev/null + + if has_version media-libs/fontconfig && [[ ${ROOT} == / ]]; then + ebegin "Updating global fontcache" + fc-cache -fs + eend $? + else + einfo "Skipping fontcache update (media-libs/fontconfig is not installed or ROOT != /)" + fi +} diff -uNr a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass --- a/eclass/fortran-2.eclass false +++ b/eclass/fortran-2.eclass cc132c665804700999b367ef9c8fddaf0e691a15cebc1d73d772696f8a7f42f838bb2918cb6040036bb6fe0a4f7205e1f1845a9fb5b410fd12bc2184fd1301df @@ -0,0 +1,284 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: fortran-2.eclass +# @MAINTAINER: +# jlec@gentoo.org +# sci@gentoo.org +# @AUTHOR: +# Author Justin Lecher <jlec@gentoo.org> +# Test functions provided by Sebastien Fabbro and Kacper Kowalik +# @BLURB: Simplify fortran compiler management +# @DESCRIPTION: +# If you need a fortran compiler, then you should be inheriting this eclass. +# In case you only need optional support, please export FORTRAN_NEEDED before +# inheriting the eclass. +# +# The eclass tests for working fortran compilers +# and exports the variables FC and F77. +# Optionally, it checks for extended capabilities based on +# the variable options selected in the ebuild +# The only phase function exported is fortran-2_pkg_setup. +# @EXAMPLE: +# FORTRAN_NEEDED="lapack fortran" +# +# inherit fortran-2 +# +# FORTRAN_NEED_OPENMP=1 + +inherit eutils toolchain-funcs + +case ${EAPI:-0} in + 4|5|6) EXPORT_FUNCTIONS pkg_setup ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +if [[ ! ${_FORTRAN_2_CLASS} ]]; then + +# @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP +# @DESCRIPTION: +# Set to "1" in order to automatically have the eclass abort if the fortran +# compiler lacks openmp support. +: ${FORTRAN_NEED_OPENMP:=0} + +# @ECLASS-VARIABLE: FORTRAN_STANDARD +# @DESCRIPTION: +# Set this, if a special dialect needs to be supported. +# Generally not needed as default is sufficient. +# +# Valid settings are any combination of: 77 90 95 2003 +: ${FORTRAN_STANDARD:=77} + +# @ECLASS-VARIABLE: FORTRAN_NEEDED +# @DESCRIPTION: +# If your package has an optional fortran support, set this variable +# to the space separated list of USE triggering the fortran +# dependency. +# +# e.g. FORTRAN_NEEDED=lapack would result in +# +# DEPEND="lapack? ( virtual/fortran )" +# +# If unset, we always depend on virtual/fortran. +: ${FORTRAN_NEEDED:=always} + +for _f_use in ${FORTRAN_NEEDED}; do + case ${_f_use} in + always) + DEPEND+=" virtual/fortran" + RDEPEND+=" virtual/fortran" + break + ;; + no) + break + ;; + test) + DEPEND+=" ${_f_use}? ( virtual/fortran )" + ;; + *) + DEPEND+=" ${_f_use}? ( virtual/fortran )" + RDEPEND+=" ${_f_use}? ( virtual/fortran )" + ;; + esac +done +unset _f_use + +# @FUNCTION: fortran_int64_abi_fflags +# @DESCRIPTION: +# Return the Fortran compiler flag to enable 64 bit integers for +# array indices +# @CODE +fortran_int64_abi_fflags() { + debug-print-function ${FUNCNAME} "${@}" + + _FC=$(tc-getFC) + if [[ ${_FC} == *gfortran* ]]; then + echo "-fdefault-integer-8" + elif [[ ${_FC} == ifort ]]; then + echo "-integer-size 64" + else + die "Compiler flag for 64bit interger for ${_FC} unknown" + fi +} + +# @FUNCTION: _fortran_write_testsuite +# @INTERNAL +# @DESCRIPTION: +# writes fortran test code +_fortran_write_testsuite() { + debug-print-function ${FUNCNAME} "${@}" + + local filebase=${T}/test-fortran + + # f77 code + cat <<- EOF > "${filebase}.f" + end + EOF + + # f90/95 code + cat <<- EOF > "${filebase}.f90" + end + EOF + + # f2003 code + cat <<- EOF > "${filebase}.f03" + procedure(), pointer :: p + end + EOF +} + +# @FUNCTION: _fortran_compile_test +# @USAGE: <compiler> [dialect] +# @INTERNAL +# @DESCRIPTION: +# Takes fortran compiler as first argument and dialect as second. +# Checks whether the passed fortran compiler speaks the fortran dialect +_fortran_compile_test() { + debug-print-function ${FUNCNAME} "${@}" + + local filebase=${T}/test-fortran + local fcomp=${1} + local fdia=${2} + local fcode=${filebase}.f${fdia} + local ret + + [[ $# -lt 1 ]] && \ + die "_fortran_compile_test() needs at least one argument" + + [[ -f ${fcode} ]] || _fortran_write_testsuite + + ${fcomp} "${fcode}" -o "${fcode}.x" \ + >> "${T}"/_fortran_compile_test.log 2>&1 + ret=$? + + rm -f "${fcode}.x" + return ${ret} +} + +# @FUNCTION: _fortran-has-openmp +# @RETURN: return code of the compiler +# @INTERNAL +# @DESCRIPTION: +# See if the fortran supports OpenMP. +_fortran-has-openmp() { + debug-print-function ${FUNCNAME} "${@}" + + local flag + local filebase=${T}/test-fc-openmp + local fcode=${filebase}.f + local ret + local _fc=$(tc-getFC) + + cat <<- EOF > "${fcode}" + call omp_get_num_threads + end + EOF + + for flag in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do + ${_fc} ${flag} "${fcode}" -o "${fcode}.x" \ + &>> "${T}"/_fortran_compile_test.log + ret=$? + (( ${ret} )) || break + done + + rm -f "${fcode}.x" + return ${ret} +} + +# @FUNCTION: _fortran_die_msg +# @INTERNAL +# @DESCRIPTION: +# Detailed description how to handle fortran support +_fortran_die_msg() { + debug-print-function ${FUNCNAME} "${@}" + + echo + eerror "Please install currently selected gcc version with USE=fortran." + eerror "If you intend to use a different compiler then gfortran, please" + eerror "set FC variable accordingly and take care that the necessary" + eerror "fortran dialects are supported." + echo + die "Currently no working fortran compiler is available (see ${T}/_fortran_compile_test.log for information)" +} + +# @FUNCTION: _fortran_test_function +# @INTERNAL +# @DESCRIPTION: +# Internal test function for working fortran compiler. +# It is called in fortran-2_pkg_setup. +_fortran_test_function() { + debug-print-function ${FUNCNAME} "${@}" + + local dialect + + : ${F77:=$(tc-getFC)} + + : ${FORTRAN_STANDARD:=77} + for dialect in ${FORTRAN_STANDARD}; do + case ${dialect} in + 77) _fortran_compile_test $(tc-getF77) || \ + _fortran_die_msg ;; + 90|95) _fortran_compile_test $(tc-getFC) 90 || \ + _fortran_die_msg ;; + 2003) _fortran_compile_test $(tc-getFC) 03 || \ + _fortran_die_msg ;; + 2008) die "Future" ;; + *) die "${dialect} is not a Fortran dialect." ;; + esac + done + + tc-export F77 FC + einfo "Using following Fortran compiler:" + einfo " F77: ${F77}" + einfo " FC: ${FC}" + + if [[ ${FORTRAN_NEED_OPENMP} == 1 ]]; then + if _fortran-has-openmp; then + einfo "${FC} has OPENMP support" + else + die "Please install current gcc with USE=openmp or set the FC variable to a compiler that supports OpenMP" + fi + fi +} + +# @FUNCTION: _fortran-2_pkg_setup +# @INTERNAL +# @DESCRIPTION: +# _The_ fortran-2_pkg_setup() code +_fortran-2_pkg_setup() { + for _f_use in ${FORTRAN_NEEDED}; do + case ${_f_use} in + always) + _fortran_test_function && break + ;; + no) + einfo "Forcing fortran support off" + break + ;; + *) + if use ${_f_use}; then + _fortran_test_function && break + else + unset FC + unset F77 + fi + ;; + esac + done +} + + +# @FUNCTION: fortran-2_pkg_setup +# @DESCRIPTION: +# Setup functionality, +# checks for a valid fortran compiler and optionally for its openmp support. +fortran-2_pkg_setup() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ ${MERGE_TYPE} != binary ]]; then + _fortran-2_pkg_setup + fi +} + +_FORTRAN_2_ECLASS=1 +fi diff -uNr a/eclass/fox.eclass b/eclass/fox.eclass --- a/eclass/fox.eclass false +++ b/eclass/fox.eclass db10c37d409cd04c4194ef2b80b57464fb30e9649e6ea4d9db836daf7b5b195cd6df9d821aa6f0ec4509ce18b0bf1bfcf4ed300387eef7e814c564685a242922 @@ -0,0 +1,229 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: fox.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @BLURB: Functionality required the FOX Toolkit and it's applications +# @DESCRIPTION: +# This eclass allows building SLOT-able FOX Toolkit installations +# (x11-libs/fox: headers, libs, and docs), which are by design +# parallel-installable, while installing only one version of the utils +# (dev-util/reswrap) and apps (app-editors/adie, sci-calculators/calculator, +# x11-misc/pathfinder, and x11-misc/shutterbug). +# +# Version numbering follows the kernel-style odd-even minor version +# designation. Even-number minor versions are API stable, which patch +# releases aimed mostly at the library; apps generally won't need to be +# bumped for a patch release. +# +# Odd-number versions are development branches with their own SLOT and +# are API unstable; changes are made to the apps, and likely need to be +# bumped together with the library. +# +# Here are sample [R]DEPENDs for the fox apps +# 1.6: 'x11-libs/fox:1.6' +# 1.7: '~x11-libs/fox-${PV}' +# +# EAPI phase trickery borrowed from enlightenment.eclass + +inherit autotools versionator + + +FOX_EXPF="src_unpack src_compile src_install pkg_postinst" +case "${EAPI:-0}" in + 2|3|4|5) FOX_EXPF+=" src_prepare src_configure" ;; + *) ;; +esac +EXPORT_FUNCTIONS ${FOX_EXPF} + +# @ECLASS-VARIABLE: FOX_PV +# @DESCRIPTION: +# The version of the FOX Toolkit provided or required by the package +: ${FOX_PV:=${PV}} + +# @ECLASS-VARIABLE: FOXVER +# @INTERNAL +# @DESCRIPTION: +# The major.minor version of FOX_PV, usually acts as $SLOT and is used in +# building the applications +FOXVER=$(get_version_component_range 1-2 ${FOX_PV}) + +# @ECLASS-VARIABLE: FOX_APPS +# @INTERNAL +# @DESCRIPTION: +# The applications originally packaged in the FOX Toolkit +FOX_APPS="adie calculator pathfinder shutterbug" + +# @ECLASS-VARIABLE: FOXCONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this to add additional configuration options during src_configure + +DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively" +HOMEPAGE="http://www.fox-toolkit.org/" +SRC_URI="ftp://ftp.fox-toolkit.org/pub/fox-${FOX_PV}.tar.gz" + +IUSE="debug doc profile" + +if [[ ${PN} != fox ]] ; then + FOX_COMPONENT="${FOX_COMPONENT:-${PN}}" +fi + +if [[ -z ${FOX_COMPONENT} ]] ; then + DOXYGEN_DEP="doc? ( app-doc/doxygen )" +fi + +if [[ ${PN} != reswrap ]] ; then + RESWRAP_DEP="dev-util/reswrap" +fi + +DEPEND="${DOXYGEN_DEP} + ${RESWRAP_DEP} + >=sys-apps/sed-4" + +S="${WORKDIR}/fox-${FOX_PV}" + +fox_src_unpack() { + unpack ${A} + cd "${S}" + + has src_prepare ${FOX_EXPF} || fox_src_prepare +} + +fox_src_prepare() { + # fox changed from configure.in to configure.am in 1.6.38 + local confFile="configure.ac" + [[ -r "configure.in" ]] && confFile="configure.in" + + # Respect system CXXFLAGS + sed -i -e 's:CXXFLAGS=""::' $confFile || die "sed ${confFile} error" + + # don't strip binaries + sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' $confFile || die "sed ${confFile} error" + + # don't build apps from top-level (i.e. x11-libs/fox) + # utils == reswrap + local d + for d in ${FOX_APPS} utils windows ; do + sed -i -e "s:${d}::" Makefile.am || die "sed Makefile.am error" + done + + # use the installed reswrap for everything else + for d in ${FOX_APPS} chart controlpanel tests ; do + [[ -d ${d} ]] && + (sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \ + ${d}/Makefile.am || die "sed ${d}/Makefile.am error") + done + + # use the installed headers and library for apps + for d in ${FOX_APPS} ; do + sed -i \ + -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox-${FOXVER}:" \ + -e 's:$(top_builddir)/src/libFOX:-lFOX:' \ + -e 's:$(top_builddir)/lib/libFOX:-lFOX:' \ + -e 's:\.la::' \ + ${d}/Makefile.am || die "sed ${d}/Makefile.am error" + done + + eautoreconf +} + +fox_src_configure() { + use debug && FOXCONF+=" --enable-debug" \ + || FOXCONF+=" --enable-release" + + econf ${FOXCONF} \ + $(use_with profile profiling) +} + + +fox_src_compile() { + has src_configure ${FOX_EXPF} || fox_src_configure + + cd "${S}/${FOX_COMPONENT}" + emake || die "compile error" + + # build class reference docs (FOXVER >= 1.2) + if use doc && [[ -z ${FOX_COMPONENT} ]] ; then + emake -C "${S}"/doc docs || die "doxygen error" + fi +} + +fox_src_install() { + cd "${S}/${FOX_COMPONENT}" + + emake install \ + DESTDIR="${D}" \ + htmldir=/usr/share/doc/${PF}/html \ + artdir=/usr/share/doc/${PF}/html/art \ + screenshotsdir=/usr/share/doc/${PF}/html/screenshots \ + || die "install error" + + # create desktop menu items for apps + case ${FOX_COMPONENT} in + adie) + newicon big_gif.gif adie.gif + make_desktop_entry adie "Adie Text Editor" adie.gif + ;; + calculator) + newicon bigcalc.gif foxcalc.gif + make_desktop_entry calculator "FOX Calculator" foxcalc.gif + ;; + pathfinder) + newicon iconpath.gif pathfinder.gif + make_desktop_entry PathFinder "PathFinder" pathfinder.gif "FileManager" + ;; + shutterbug) + doicon shutterbug.gif + make_desktop_entry shutterbug "ShutterBug" shutterbug.gif "Graphics" + ;; + esac + + for doc in ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING ; do + [ -f $doc ] && dodoc $doc + done + + # remove documentation if USE=-doc + use doc || rm -fr "${D}/usr/share/doc/${PF}/html" + + # install class reference docs if USE=doc + if use doc && [[ -z ${FOX_COMPONENT} ]] ; then + dohtml -r "${S}/doc/ref" + fi + + # slot fox-config + if [[ -f ${D}/usr/bin/fox-config ]] ; then + mv "${D}/usr/bin/fox-config" "${D}/usr/bin/fox-${FOXVER}-config" \ + || die "failed to install fox-config" + fi +} + +fox_pkg_postinst() { + if [ -z "${FOX_COMPONENT}" ] ; then + echo + einfo "Multiple versions of the FOX Toolkit library may now be installed" + einfo "in parallel SLOTs on the same system." + einfo + einfo "The reswrap utility and the applications included in the FOX Toolkit" + einfo "(adie, calculator, pathfinder, shutterbug) are now available as" + einfo "separate ebuilds." + echo + + if version_is_at_least "1.7.25"; then + einfo "Fox versions after 1.7.25 ships a pkg-config file called fox17.pc" + einfo "instead of the previous fox-config tool." + einfo "You now get all info via pkg-config:" + einfo + einfo "pkg-config fox17 --libs (etc.)" + else + einfo "The fox-config script has been installed as fox-${FOXVER}-config." + einfo "The fox-wrapper package is used to direct calls to fox-config" + einfo "to the correct versioned script, based on the WANT_FOX variable." + einfo "For example:" + einfo + einfo " WANT_FOX=\"${FOXVER}\" fox-config <options>" + fi + einfo + fi +} diff -uNr a/eclass/freebsd.eclass b/eclass/freebsd.eclass --- a/eclass/freebsd.eclass false +++ b/eclass/freebsd.eclass 05d7564e13967dfbee02e3c6075f4d049fa830281695db471cba57be3c1bd644933f210c115b650de98d4c6a00447c782e4481a20f1b5343d885200dab0f60f6 @@ -0,0 +1,333 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @AUTHOR: +# Diego Pettenò <flameeyes@gentoo.org> + +inherit versionator eutils flag-o-matic bsdmk + +# Drop patch level from ${PV} +MY_PV=${PV/_p*} +PLEVEL=${PV##*_p} + +LICENSE="BSD" +HOMEPAGE="http://www.freebsd.org/" + +# Define global package names +LIB="freebsd-lib-${PV}" +BIN="freebsd-bin-${PV}" +CONTRIB="freebsd-contrib-${PV}" +SHARE="freebsd-share-${PV}" +UBIN="freebsd-ubin-${PV}" +USBIN="freebsd-usbin-${PV}" +CRYPTO="freebsd-crypto-${PV}" +LIBEXEC="freebsd-libexec-${PV}" +SBIN="freebsd-sbin-${PV}" +GNU="freebsd-gnu-${PV}" +ETC="freebsd-etc-${PV}" +SYS="freebsd-sys-${PV}" +INCLUDE="freebsd-include-${PV}" +RESCUE="freebsd-rescue-${PV}" +CDDL="freebsd-cddl-${PV}" +SECURE="freebsd-secure-${PV}" + +# Release version (5.3, 5.4, 6.0, etc) +RV="$(get_version_component_range 1-2 ${MY_PV})" + +# SVN ebuild support. +# 9.1.0.9999 --> release/9.1.0 +# 9.1.9999 --> releng/9.1 +# 9.9999 --> stable/9 +# 9999 --> head +# +# svn revision can be specified by patch level: +# freebsd-lib-9.9999_p247000 --> set svn -r 247000 + +if [[ ${MY_PV} == *9999* ]]; then + inherit subversion + + # Set SVN revision using patch level. + [[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}" + + case ${MY_PV%.9999} in + *.*.*) BRANCH="release";; + *.*) BRANCH="releng" ;; + 9999) BRANCH="head" ;; + *) BRANCH="stable" ;; + esac + + if [[ ${BRANCH} == head ]] ; then + SVN_SUB_URI="${BRANCH}" + else + SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}" + fi + + ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}" + ESVN_PROJECT="freebsd-${BRANCH}" +fi + +# Use the original source code. +if [[ ${MY_PV} != *9999* ]] && version_is_at_least 10.0 ${RV} ; then + DL_PV=${MY_PV/_rc/-RC} + DL_PV=${DL_PV/_beta/-BETA} + DL_PV=${DL_PV/_alpha/-ALPHA} + 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" +fi + +IUSE="profile" + +#unalias -a +alias install-info='/usr/bin/bsdinstall-info' + +EXPORT_FUNCTIONS src_compile src_install src_unpack + +# doperiodic <kind> <file> ... +doperiodic() { + local kind=$1 + shift + + ( # dont want to pollute calling env + insinto /etc/periodic/${kind} + insopts -m 0755 + doins "$@" + ) +} + +freebsd_get_bmake() { + local bmake + bmake=$(get_bmake) + if version_is_at_least 11.0 ${RV} ; then + if [[ ${CBUILD} == *-freebsd* ]] ; then + bmake="${bmake} -m /usr/share/mk/system" + else + bmake="${bmake} -m /usr/share/mk/freebsd/system" + fi + else + [[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m /usr/share/mk/freebsd" + fi + + echo "${bmake}" +} + +# Generates SRC_URI or DISTDIR for the upstream patch. +freebsd_upstream_patches() { + local opt=$1 + [[ ${#UPSTREAM_PATCHES[@]} -eq 0 ]] && return 1 + for x in "${UPSTREAM_PATCHES[@]}" + do + local out=${PN}-${x/\//-} + out=${out/:/} + if [[ ${opt} == -s ]] ; then + echo "${DISTDIR}/${out}" + else + echo "https://security.freebsd.org/patches/${x} -> ${out}" + fi + done +} + +freebsd_do_patches() { + if [[ ${#PATCHES[@]} -gt 1 ]] ; then + for x in "${PATCHES[@]}"; do + epatch "${x}" + done + else + for x in ${PATCHES} ; do + epatch "${x}" + done + fi + + # Upstream patches need to be applied on WORKDIR. + if [[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] ; then + cd "${WORKDIR}" || die + epatch $(freebsd_upstream_patches -s) + cd "${S}" || die + fi + epatch_user +} + +freebsd_rename_libraries() { + ebegin "Renaming libraries" + # We don't use libtermcap, we use libncurses + find "${S}" -name Makefile -print0 | xargs -0 \ + sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g' + # flex provides libfl, not libl + find "${S}" -name Makefile -print0 | xargs -0 \ + sed -i -e 's:-ll$:-lfl:g; s:-ll :-lfl :g; s:{LIBL}:{LIBFL}:g' + # ncurses provides libncursesw not libcursesw + find "${S}" -name Makefile -print0 | xargs -0 \ + sed -i -e 's:-lcursesw:-lncursesw:g' + # we use expat instead of bsdxml + find "${S}" -name Makefile -print0 | xargs -0 \ + sed -i -e 's:-lbsdxml:-lexpat:g' + + eend $? +} + +freebsd_src_unpack() { + if [[ ${MY_PV} == *9999* ]]; then + S="${WORKDIR}" subversion_src_unpack + + # When share/mk exists in ${WORKDIR}, BSD's make will try to use it on FreeBSD 10.0 or later. + # We should remove "${WORKDIR}"/share/mk/*.mk to use /usr/share/mk{,/system}. + if [[ ${PN} != freebsd-mk-defs ]] ; then + [[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk/*.mk + fi + else + if version_is_at_least 10.0 ${RV} ; then + local tarball="freebsd-src-${MY_PV}.tar.xz" + local topdir="usr/src/" + local extractlist=() + for i in ${EXTRACTONLY} tools/ ; do + extractlist+=( ${topdir}${i} ) + done + ebegin "Unpacking parts of ${tarball} to ${WORKDIR}" + cd "${WORKDIR}" || die + tar -xJpf "${DISTDIR}/${tarball}" --strip-components=2 "${extractlist[@]}" 2> /dev/null || die "tar extract command failed" + cd - || die + else + for f in ${A} ; do + [[ ${f} == *.tar.* ]] && unpack ${f} + done + fi + fi + cd "${S}" + + dummy_mk ${REMOVE_SUBDIRS} + + freebsd_do_patches + if ! version_is_at_least 11.0 ${RV} ; then + freebsd_rename_libraries + fi + + # Starting from FreeBSD 9.2, its install command supports the -l option and + # they now use it. Emulate it if we are on a system that does not have it. + if version_is_at_least 9.2 ${RV} && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then + export INSTALL_LINK="ln -f" + export INSTALL_SYMLINK="ln -fs" + fi + # An older version of install command doesn't support the -T option. + if version_is_at_least 11.0 ${RV} && ! has_version ">=sys-freebsd/freebsd-ubin-${RV}" ; then + export INSTALL="sh ${WORKDIR}/tools/install.sh" + fi + + # If CC=clang, we should use clang-cpp instead of cpp. #478810, #595878 + if [[ $(tc-getCC) == *clang* ]] ; then + if type -P clang-cpp > /dev/null ; then + export CPP=clang-cpp + else + mkdir "${WORKDIR}"/workaround_clang-cpp || die "Could not create ${WORKDIR}/workaround_clang-cpp" + ln -s "$(type -P clang)" "${WORKDIR}"/workaround_clang-cpp/clang-cpp || die "Could not create clang-cpp symlink." + export CPP="${WORKDIR}/workaround_clang-cpp/clang-cpp" + fi + fi + + # Add the special CFLAGS required for multilib support. + use amd64-fbsd && export CFLAGS_x86_fbsd="${CFLAGS_x86_fbsd} -DCOMPAT_32BIT -B/usr/lib32 -L/usr/lib32" +} + +freebsd_src_compile() { + use profile && filter-flags "-fomit-frame-pointer" + if version_is_at_least 11.0 ${RV} ; then + if ! use profile ; then + mymakeopts="${mymakeopts} WITHOUT_PROFILE= " + fi + # Disable the debugging information, use FEATURES=splitdebug instead. + mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " + # We don't support test yet. + mymakeopts="${mymakeopts} WITHOUT_TESTS= " + # Set the SRCTOP to detect the source directory. + mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " + # Set the common settings. + mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " + else + use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " + fi + + mymakeopts="${mymakeopts} NO_FSCHG=" + + # Make sure to use FreeBSD definitions while crosscompiling + [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" + + # Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of + # tree builds easily. + if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then + mkmake obj || die + fi + + bsdmk_src_compile "$@" +} + +# Helper function to make a multilib build with FreeBSD Makefiles. +# Usage: +# MULTIBUILD_VARIANTS=( $(get_all_abis) ) +# multibuild_foreach_variant freebsd_multilib_multibuild_wrapper my_function +# +# Important note: To use this function you _have_ to: +# - inherit multilib.eclass and multibuild.eclass +# - set MULTIBUILD_VARIANTS + +freebsd_multilib_multibuild_wrapper() { + # Get the ABI from multibuild.eclass + # This assumes MULTIBUILD_VARIANTS contains only valid ABIs. + local ABI=${MULTIBUILD_VARIANT} + + # First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts. + for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do + export ${i}_SAVE="${!i}" + done + + # Setup the variables specific to this ABI. + multilib_toolchain_setup "${ABI}" + + local target="$(tc-arch-kernel ${CHOST})" + mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)" + if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then + mymakeopts="${mymakeopts} COMPAT_32BIT=" + fi + + einfo "Building for ABI=${ABI} and TARGET=${target}" + + export MAKEOBJDIRPREFIX="${BUILD_DIR}" + if [ ! -d "${MAKEOBJDIRPREFIX}" ] ; then + mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}." + fi + + CTARGET="${CHOST}" "$@" + + # Restore the variables now. + for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do + ii="${i}_SAVE" + export ${i}="${!ii}" + done +} + +freebsd_src_install() { + if version_is_at_least 11.0 ${RV} ; then + if ! use profile ; then + mymakeopts="${mymakeopts} WITHOUT_PROFILE= " + fi + # Disable the debugging information, use FEATURES=splitdebug instead. + mymakeopts="${mymakeopts} WITHOUT_DEBUG_FILES= " + # We don't support test yet. + mymakeopts="${mymakeopts} WITHOUT_TESTS= " + # Set the SRCTOP to detect the source directory. + mymakeopts="${mymakeopts} SRCTOP=${WORKDIR} " + # Set the common settings. + mymakeopts="${mymakeopts} WITHOUT_MANCOMPRESS= WITHOUT_INFOCOMPRESS= " + else + use profile || mymakeopts="${mymakeopts} NO_PROFILE= " + mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " + fi + + mymakeopts="${mymakeopts} NO_FSCHG=" + + [[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)" + + bsdmk_src_install "$@" +} diff -uNr a/eclass/freedict.eclass b/eclass/freedict.eclass --- a/eclass/freedict.eclass false +++ b/eclass/freedict.eclass 3de71eb54d53b37f24fb08476bc02bf5e311c1cd106c9afff6451f6f0777a9db2b4241a8b62a0f9b7e59d90c9f5efe7c2a17039120254d7b12d523839d80c1e5 @@ -0,0 +1,51 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: freedict.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @AUTHOR: +# Original author: Seemant Kulleen +# @BLURB: Ease the installation of freedict translation dictionaries +# @DESCRIPTION: +# This eclass exists to ease the installation of freedict translation +# dictionaries. The only variables which need to be defined in the actual +# ebuilds are FORLANG and TOLANG for the source and target languages, +# respectively. + +# @ECLASS-VARIABLE: FORLANG +# @DESCRIPTION: +# Please see above for a description. + +# @ECLASS-VARIABLE: TOLANG +# @DESCRIPTION: +# Please see above for a description. + +case ${EAPI:-0} in + 6) ;; + *) die "${ECLASS}.eclass is banned in EAPI=${EAPI}" ;; +esac + +MY_P=${PN/freedict-/} + +DESCRIPTION="Freedict for language translation from ${FORLANG} to ${TOLANG}" +HOMEPAGE="http://freedict.sourceforge.net/" +SRC_URI="http://freedict.sourceforge.net/download/linux/${MY_P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" + +RDEPEND="app-text/dictd" + +S="${WORKDIR}" + +# @FUNCTION: freedict_src_install +# @DESCRIPTION: +# The freedict src_install function, which is exported +freedict_src_install() { + insinto /usr/$(get_libdir)/dict + doins ${MY_P}.dict.dz + doins ${MY_P}.index +} + +EXPORT_FUNCTIONS src_install diff -uNr a/eclass/games-mods.eclass b/eclass/games-mods.eclass --- a/eclass/games-mods.eclass false +++ b/eclass/games-mods.eclass fc9d8e00deda1700330c7faa342860a06e34adba6d6ba7b9286b1740e090e0eaa6553f5159be5e76a4763b96c691b69608828f8432161e840f608e8ca8a8bdbe @@ -0,0 +1,320 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Variables to specify in an ebuild which uses this eclass: +# GAME - (doom3, quake4 or ut2004, etc), unless ${PN} starts with e.g. "doom3-" +# MOD_DESC - Description for the mod +# MOD_NAME - Creates a command-line wrapper and desktop icon for the mod +# MOD_DIR - Subdirectory name for the mod, if applicable +# MOD_ICON - Custom icon for the mod, instead of the default + +inherit eutils games + +EXPORT_FUNCTIONS src_install pkg_postinst + +[[ -z ${GAME} ]] && GAME=${PN%%-*} + +case ${GAME} in + doom3) + GAME_PKGS="games-fps/doom3" + GAME_DIRS=( "${GAMES_PREFIX_OPT}"/doom3 ) + GAME_NAME="Doom 3" + GAME_BIN="doom3" + GAME_ICON="doom3" + DED_PKGS="" + DED_BIN="doom3-ded" + DED_OPTS="+set dedicated 1 +exec server.cfg" + DED_CFG_DIR=".doom3" + SELECT_MOD="+set fs_game " + ;; + enemy-territory) + GAME_PKGS="games-fps/enemy-territory" + GAME_DIRS=( "${GAMES_PREFIX_OPT}"/enemy-territory ) + GAME_NAME="Enemy Territory" + GAME_BIN="et" + GAME_ICON="ET" + DED_PKGS="" + DED_BIN="et-ded" + DED_OPTS="+set dedicated 1 +exec server.cfg" + DED_CFG_DIR=".etwolf" + SELECT_MOD="+set fs_game " + ;; + quake3) + GAME_PKGS="games-fps/quake3 games-fps/quake3-bin" + GAME_DIRS=( "${GAMES_DATADIR}"/quake3 "${GAMES_PREFIX_OPT}"/quake3 ) + GAME_NAME="Quake III" + GAME_BIN="quake3" + GAME_ICON="quake3" + DED_PKGS="" + DED_BIN="quake3-ded" + DED_OPTS="+set dedicated 1 +exec server.cfg" + DED_CFG_DIR=".q3a" + SELECT_MOD="+set fs_game " + ;; + quake4) + GAME_PKGS="games-fps/quake4-bin" + GAME_DIRS=( "${GAMES_PREFIX_OPT}"/quake4 ) + GAME_NAME="Quake 4" + GAME_BIN="quake4" + GAME_ICON="/usr/share/pixmaps/quake4.bmp" + DED_PKGS="" + DED_BIN="quake4-ded" + DED_OPTS="+set dedicated 1 +exec server.cfg" + DED_CFG_DIR=".quake4" + SELECT_MOD="+set fs_game " + ;; + ut2003) + GAME_PKGS="games-fps/ut2003" + GAME_DIRS=( "${GAMES_PREFIX_OPT}"/ut2003 ) + GAME_NAME="UT2003" + GAME_BIN="ut2003" + GAME_ICON="ut2003" + DED_PKGS="" + DED_BIN="ucc" + DED_OPTS="" + DED_CFG_DIR="" + SELECT_MOD="-mod=" + ;; + ut2004) + GAME_PKGS="games-fps/ut2004" + GAME_DIRS=( "${GAMES_PREFIX_OPT}"/{ut2004,ut2004-ded} ) + GAME_NAME="UT2004" + GAME_BIN="ut2004" + GAME_ICON="ut2004" + DED_PKGS="games-server/ut2004-ded" + DED_BIN="ut2004-ded" + DED_OPTS="" + DED_CFG_DIR="" + SELECT_MOD="-mod=" + ;; + *) + eerror "This game is either not supported or you must set the GAME" + eerror "variable to the proper game." + die "games-mods.eclass: unsupported GAME" + ;; +esac + +MOD_BIN="${GAME_BIN}-${PN/${GAME}-}" +MOD_DED_BIN="${MOD_BIN}-ded" + +games-mods_get_rdepend() { + local pkgs + + if [[ ${1} == "--ded" ]] ; then + pkgs=( ${DED_PKGS} ${GAME_PKGS} ) + else + pkgs=( ${GAME_PKGS} ) + fi + + [[ ${#pkgs[@]} -gt 1 ]] && echo -n "|| ( " + + case ${EAPI:-0} in + 0|1) echo -n "${pkgs[@]}" ;; + [23456]) + local p + if [[ ${1} == "--ded" ]] ; then + echo -n "${DED_PKGS}" + for p in ${GAME_PKGS} ; do + echo -n " ${p}[dedicated]" + done + else + for p in ${GAME_PKGS} ; do + echo -n " || ( ${p}[opengl] ${p}[-dedicated] )" + done + fi + ;; + *) die "EAPI ${EAPI} not supported" + esac + + [[ ${#pkgs[@]} -gt 1 ]] && echo -n " )" +} + +DESCRIPTION="${GAME_NAME} ${MOD_NAME} - ${MOD_DESC}" + +SLOT="0" +IUSE="dedicated opengl" +RESTRICT="mirror strip" + +DEPEND="app-arch/unzip" +RDEPEND="dedicated? ( $(games-mods_get_rdepend --ded) ) + opengl? ( $(games-mods_get_rdepend) ) + !dedicated? ( !opengl? ( $(games-mods_get_rdepend) ) )" + +S=${WORKDIR} + +INS_DIR=${GAMES_DATADIR}/${GAME} + +games-mods_use_opengl() { + [[ -z ${MOD_DIR} ]] && return 1 + + if use opengl || ! use dedicated ; then + # Use opengl by default + return 0 + fi + + return 1 +} + +games-mods_use_dedicated() { + [[ -z ${MOD_DIR} ]] && return 1 + + use dedicated && return 0 || return 1 +} + +games-mods_dosyms() { + # We are installing everything for these mods into ${INS_DIR}, + # ${GAMES_DATADIR}/${GAME} in most cases, and symlinking it + # into ${GAMES_PREFIX_OPT}/${GAME} for each game. This should + # allow us to support both binary and source-based games easily. + local dir + for dir in "${GAME_DIRS[@]}" ; do + [[ -z ${dir} || ${INS_DIR} == ${dir} ]] && continue + pushd "${D}/${INS_DIR}" > /dev/null || die "pushd failed" + local i + for i in * ; do + if [[ -d ${i} ]] ; then + if [[ ${i} == ${MOD_DIR} ]] ; then + dosym "${INS_DIR}/${i}" "${dir}/${i}" \ + || die "dosym ${i} failed" + else + local f + while read f ; do + dosym "${INS_DIR}/${f}" "${dir}/${f}" \ + || die "dosym ${f} failed" + done < <(find "${i}" -type f) + fi + elif [[ -f ${i} ]] ; then + dosym "${INS_DIR}/${i}" "${dir}/${i}" \ + || die "dosym ${i} failed" + else + die "${i} shouldn't be there" + fi + done + popd > /dev/null || die "popd failed" + done +} + +games-mods_make_initd() { + cat <<EOF > "${T}"/${MOD_DED_BIN} +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Generated by games-mods.eclass + +depend() { + need net +} + +start() { + ebegin "Starting ${MOD_DED_BIN}" + start-stop-daemon --start --quiet --background --make-pidfile \\ + --pidfile /var/run/${MOD_DED_BIN}.pid \\ + --chuid \${${MOD_DED_BIN//-/_}_user}:\${${MOD_DED_BIN//-/_}_group} \\ + --env HOME="\${${MOD_DED_BIN//-/_}_home}" \\ + --exec "${GAMES_BINDIR}/${MOD_DED_BIN}" \\ + -- \${${MOD_DED_BIN//-/_}_opts} + eend \$? +} + +stop() { + ebegin "Stopping ${MOD_DED_BIN}" + start-stop-daemon --stop \\ + --pidfile /var/run/${MOD_DED_BIN}.pid + eend \$? +} +EOF + + doinitd "${T}"/${MOD_DED_BIN} || die "doinitd failed" +} + +games-mods_make_confd() { + cat <<-EOF > "${T}"/${MOD_DED_BIN} + # User and group the server should run as + ${MOD_DED_BIN//-/_}_user="${GAMES_USER_DED}" + ${MOD_DED_BIN//-/_}_group="${GAMES_GROUP}" + + # Directory to use for HOME + ${MOD_DED_BIN//-/_}_home="${GAMES_PREFIX}" + + # Any extra options you want to pass to the dedicated server + ${MOD_DED_BIN//-/_}_opts="" + EOF + + doconfd "${T}"/${MOD_DED_BIN} || die "doconfd failed" +} + +games-mods_src_install() { + if games-mods_use_opengl ; then + if [[ -n ${MOD_ICON} ]] ; then + # Install custom icon + local ext=${MOD_ICON##*.} + if [[ -f ${MOD_ICON} ]] ; then + newicon "${MOD_ICON}" ${PN}.${ext} || die "newicon failed" + else + newicon ${MOD_DIR}/"${MOD_ICON}" ${PN}.${ext} \ + || die "newicon failed" + fi + case ${ext} in + bmp|ico) + MOD_ICON=/usr/share/pixmaps/${PN}.${ext} + ;; + *) + MOD_ICON=${PN} + ;; + esac + else + # Use the game's standard icon + MOD_ICON=${GAME_ICON} + fi + + games_make_wrapper ${MOD_BIN} "${GAME_BIN} ${SELECT_MOD}${MOD_DIR}" + make_desktop_entry ${MOD_BIN} "${GAME_NAME} - ${MOD_NAME}" "${MOD_ICON}" + # Since only quake3 has both a binary and a source-based install, + # we only look for quake3 here. + case ${GAME} in + quake3) + if has_version games-fps/quake3-bin ; then + games_make_wrapper ${GAME_BIN}-bin-${PN/${GAME}-} \ + "${GAME_BIN}-bin ${SELECT_MOD}${MOD_DIR}" + fi + make_desktop_entry ${GAME_BIN}-bin-${PN/${GAME}-} \ + "${GAME_NAME} - ${MOD_NAME} (binary)" "${MOD_ICON}" + ;; + esac + fi + + # We expect anything not wanted to have been deleted by the ebuild + insinto "${INS_DIR}" + doins -r * || die "doins -r failed" + games-mods_dosyms + + if games-mods_use_dedicated ; then + if [[ -f ${FILESDIR}/server.cfg ]] ; then + insinto "${GAMES_SYSCONFDIR}"/${GAME}/${MOD_DIR} + doins "${FILESDIR}"/server.cfg || die "doins server.cfg failed" + dosym "${GAMES_SYSCONFDIR}"/${GAME}/${MOD_DIR}/server.cfg \ + "${GAMES_PREFIX}"/${DED_CFG_DIR}/${MOD_DIR}/server.cfg \ + || die "dosym server.cfg failed" + fi + games_make_wrapper ${MOD_DED_BIN} \ + "\"${GAMES_BINDIR}/${DED_BIN}\" ${SELECT_MOD}${MOD_DIR} ${DED_OPTS}" + games-mods_make_initd + games-mods_make_confd + fi + + prepgamesdirs +} + +games-mods_pkg_postinst() { + games_pkg_postinst + if games-mods_use_opengl ; then + elog "To play this mod run:" + elog " ${MOD_BIN}" + fi + if games-mods_use_dedicated ; then + elog "To launch a dedicated server run:" + elog " ${MOD_DED_BIN}" + elog "To launch the server at startup run:" + elog " rc-update add ${MOD_DED_BIN} default" + fi +} diff -uNr a/eclass/games.eclass b/eclass/games.eclass --- a/eclass/games.eclass false +++ b/eclass/games.eclass df887f119faafda3ccee16b114d402720254f2392245e96f01b0b866d7130b904298782cfdd922946beba1b5c442a33022db1fb60292e09bce02efab24eb8ba4 @@ -0,0 +1,395 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: games.eclass +# @MAINTAINER: +# Games team <games@gentoo.org> +# @BLURB: Standardizing the install of games. +# @DESCRIPTION: +# This eclass makes sure that games are consistently handled in gentoo. +# It installs game files by default in FHS-compatible directories +# like /usr/share/games and sets more restrictive permissions in order +# to avoid some security bugs. +# +# The installation directories as well as the user and group files are +# installed as can be controlled by the user. See the variables like +# GAMES_BINDIR, GAMES_USER etc. below. These are NOT supposed to be set +# by ebuilds! +# +# For a general guide on writing games ebuilds, see: +# https://wiki.gentoo.org/wiki/Project:Games/Ebuild_howto +# +# WARNING: This eclass is DEPRECATED and must not be used by new games +# ebuilds, bug #574082. When writing game ebuilds, no specific eclass +# is needed. For more details, see the QA team policies page: +# https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies#Games + + +if [[ -z ${_GAMES_ECLASS} ]]; then +_GAMES_ECLASS=1 + +inherit base multilib toolchain-funcs eutils user + +case ${EAPI:-0} in + 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;; + 2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;; + *) die "games.eclass is banned in EAPI=${EAPI}, see https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies#Games" ;; +esac + +if [[ ${CATEGORY}/${PN} != "games-misc/games-envd" ]] ; then + # environment file + RDEPEND="games-misc/games-envd" +fi + +# @ECLASS-VARIABLE: GAMES_PREFIX +# @DESCRIPTION: +# Prefix where to install games, mostly used by GAMES_BINDIR. Games data should +# still go into GAMES_DATADIR. May be set by the user. +GAMES_PREFIX=${GAMES_PREFIX:-/usr/games} + +# @ECLASS-VARIABLE: GAMES_PREFIX_OPT +# @DESCRIPTION: +# Prefix where to install precompiled/blob games, usually followed by +# package name. May be set by the user. +GAMES_PREFIX_OPT=${GAMES_PREFIX_OPT:-/opt} + +# @ECLASS-VARIABLE: GAMES_DATADIR +# @DESCRIPTION: +# Base directory where to install game data files, usually followed by +# package name. May be set by the user. +GAMES_DATADIR=${GAMES_DATADIR:-/usr/share/games} + +# @ECLASS-VARIABLE: GAMES_DATADIR_BASE +# @DESCRIPTION: +# Similar to GAMES_DATADIR, but only used when a package auto appends 'games' +# to the path. May be set by the user. +GAMES_DATADIR_BASE=${GAMES_DATADIR_BASE:-/usr/share} + +# @ECLASS-VARIABLE: GAMES_SYSCONFDIR +# @DESCRIPTION: +# Where to install global games configuration files, usually followed by +# package name. May be set by the user. +GAMES_SYSCONFDIR=${GAMES_SYSCONFDIR:-/etc/games} + +# @ECLASS-VARIABLE: GAMES_STATEDIR +# @DESCRIPTION: +# Where to install/store global variable game data, usually followed by +# package name. May be set by the user. +GAMES_STATEDIR=${GAMES_STATEDIR:-/var/games} + +# @ECLASS-VARIABLE: GAMES_LOGDIR +# @DESCRIPTION: +# Where to store global game log files, usually followed by +# package name. May be set by the user. +GAMES_LOGDIR=${GAMES_LOGDIR:-/var/log/games} + +# @ECLASS-VARIABLE: GAMES_BINDIR +# @DESCRIPTION: +# Where to install the game binaries. May be set by the user. This is in PATH. +GAMES_BINDIR=${GAMES_BINDIR:-${GAMES_PREFIX}/bin} + +# @ECLASS-VARIABLE: GAMES_ENVD +# @INTERNAL +# @DESCRIPTION: +# The games environment file name which sets games specific LDPATH and PATH. +GAMES_ENVD="90games" + +# @ECLASS-VARIABLE: GAMES_USER +# @DESCRIPTION: +# The USER who owns all game files and usually has write permissions. +# May be set by the user. +GAMES_USER=${GAMES_USER:-root} + +# @ECLASS-VARIABLE: GAMES_USER_DED +# @DESCRIPTION: +# The USER who owns all game files related to the dedicated server part +# of a package. May be set by the user. +GAMES_USER_DED=${GAMES_USER_DED:-games} + +# @ECLASS-VARIABLE: GAMES_GROUP +# @DESCRIPTION: +# The GROUP that owns all game files and usually does not have +# write permissions. May be set by the user. +# If you want games world-executable, then you can at least set this variable +# to 'users' which is almost the same. +GAMES_GROUP=${GAMES_GROUP:-games} + +# @FUNCTION: games_get_libdir +# @DESCRIPTION: +# Gets the directory where to install games libraries. This is in LDPATH. +games_get_libdir() { + echo ${GAMES_PREFIX}/$(get_libdir) +} + +# @FUNCTION: egamesconf +# @USAGE: [<args>...] +# @DESCRIPTION: +# Games equivalent to 'econf' for autotools based build systems. It passes +# the necessary games specific directories automatically. +egamesconf() { + # handle verbose build log pre-EAPI5 + local _gamesconf + if has "${EAPI:-0}" 0 1 2 3 4 ; then + if grep -q -s disable-silent-rules "${ECONF_SOURCE:-.}"/configure ; then + _gamesconf="--disable-silent-rules" + fi + fi + + # bug 493954 + if grep -q -s datarootdir "${ECONF_SOURCE:-.}"/configure ; then + _gamesconf="${_gamesconf} --datarootdir=/usr/share" + fi + + econf \ + --prefix="${GAMES_PREFIX}" \ + --libdir="$(games_get_libdir)" \ + --datadir="${GAMES_DATADIR}" \ + --sysconfdir="${GAMES_SYSCONFDIR}" \ + --localstatedir="${GAMES_STATEDIR}" \ + ${_gamesconf} \ + "$@" +} + +# @FUNCTION: gameswrapper +# @USAGE: <command> [<args>...] +# @INTERNAL +# @DESCRIPTION: +# Wraps an install command like dobin, dolib etc, so that +# it has GAMES_PREFIX as prefix. +gameswrapper() { + # dont want to pollute calling env + ( + into "${GAMES_PREFIX}" + cmd=$1 + shift + ${cmd} "$@" + ) +} + +# @FUNCTION: dogamesbin +# @USAGE: <path>... +# @DESCRIPTION: +# Install one or more games binaries. +dogamesbin() { gameswrapper ${FUNCNAME/games} "$@"; } + +# @FUNCTION: dogamessbin +# @USAGE: <path>... +# @DESCRIPTION: +# Install one or more games system binaries. +dogamessbin() { gameswrapper ${FUNCNAME/games} "$@"; } + +# @FUNCTION: dogameslib +# @USAGE: <path>... +# @DESCRIPTION: +# Install one or more games libraries. +dogameslib() { gameswrapper ${FUNCNAME/games} "$@"; } + +# @FUNCTION: dogameslib.a +# @USAGE: <path>... +# @DESCRIPTION: +# Install one or more static games libraries. +dogameslib.a() { gameswrapper ${FUNCNAME/games} "$@"; } + +# @FUNCTION: dogameslib.so +# @USAGE: <path>... +# @DESCRIPTION: +# Install one or more shared games libraries. +dogameslib.so() { gameswrapper ${FUNCNAME/games} "$@"; } + +# @FUNCTION: newgamesbin +# @USAGE: <path> <newname> +# @DESCRIPTION: +# Install one games binary with a new name. +newgamesbin() { gameswrapper ${FUNCNAME/games} "$@"; } + +# @FUNCTION: newgamessbin +# @USAGE: <path> <newname> +# @DESCRIPTION: +# Install one system games binary with a new name. +newgamessbin() { gameswrapper ${FUNCNAME/games} "$@"; } + +# @FUNCTION: games_make_wrapper +# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath] +# @DESCRIPTION: +# Create a shell wrapper script named wrapper in installpath +# (defaults to the games bindir) to execute target (default of wrapper) by +# first optionally setting LD_LIBRARY_PATH to the colon-delimited +# libpaths followed by optionally changing directory to chdir. +games_make_wrapper() { gameswrapper ${FUNCNAME/games_} "$@"; } + +# @FUNCTION: gamesowners +# @USAGE: [<args excluding owner/group>...] <path>... +# @DESCRIPTION: +# Run 'chown' with the given args on the given files. Owner and +# group are GAMES_USER and GAMES_GROUP and must not be passed +# as args. +gamesowners() { chown ${GAMES_USER}:${GAMES_GROUP} "$@"; } + +# @FUNCTION: gamesperms +# @USAGE: <path>... +# @DESCRIPTION: +# Run 'chmod' with games specific permissions on the given files. +gamesperms() { chmod u+rw,g+r-w,o-rwx "$@"; } + +# @FUNCTION: prepgamesdirs +# @DESCRIPTION: +# Fix all permissions/owners of files in games related directories, +# usually called at the end of src_install(). +prepgamesdirs() { + local dir f mode + for dir in \ + "${GAMES_PREFIX}" "${GAMES_PREFIX_OPT}" "${GAMES_DATADIR}" \ + "${GAMES_SYSCONFDIR}" "${GAMES_STATEDIR}" "$(games_get_libdir)" \ + "${GAMES_BINDIR}" "$@" + do + [[ ! -d ${D}/${dir} ]] && continue + ( + gamesowners -R "${D}/${dir}" + find "${D}/${dir}" -type d -print0 | xargs -0 chmod 750 + mode=o-rwx,g+r,g-w + [[ ${dir} = ${GAMES_STATEDIR} ]] && mode=o-rwx,g+r + find "${D}/${dir}" -type f -print0 | xargs -0 chmod $mode + + # common trees should not be games owned #264872 #537580 + fowners root:0 "${dir}" + fperms 755 "${dir}" + if [[ ${dir} == "${GAMES_PREFIX}" \ + || ${dir} == "${GAMES_PREFIX_OPT}" ]] ; then + for d in $(get_libdir) bin ; do + # check if dirs exist to avoid "nonfatal" option + if [[ -e ${D}/${dir}/${d} ]] ; then + fowners root:0 "${dir}/${d}" + fperms 755 "${dir}/${d}" + fi + done + fi + ) &>/dev/null + + f=$(find "${D}/${dir}" -perm +4000 -a -uid 0 2>/dev/null) + if [[ -n ${f} ]] ; then + eerror "A game was detected that is setuid root!" + eerror "${f}" + die "refusing to merge a setuid root game" + fi + done + [[ -d ${D}/${GAMES_BINDIR} ]] || return 0 + find "${D}/${GAMES_BINDIR}" -maxdepth 1 -type f -exec chmod 750 '{}' \; +} + +# @FUNCTION: games_pkg_setup +# @DESCRIPTION: +# Export some toolchain specific variables and create games related groups +# and users. This function is exported as pkg_setup(). +games_pkg_setup() { + tc-export CC CXX LD AR RANLIB + + enewgroup "${GAMES_GROUP}" 35 + [[ ${GAMES_USER} != "root" ]] \ + && enewuser "${GAMES_USER}" 35 -1 "${GAMES_PREFIX}" "${GAMES_GROUP}" + [[ ${GAMES_USER_DED} != "root" ]] \ + && enewuser "${GAMES_USER_DED}" 36 /bin/bash "${GAMES_PREFIX}" "${GAMES_GROUP}" + + # Dear portage team, we are so sorry. Lots of love, games team. + # See Bug #61680 + [[ ${USERLAND} != "GNU" ]] && return 0 + [[ $(egetshell "${GAMES_USER_DED}") == "/bin/false" ]] \ + && usermod -s /bin/bash "${GAMES_USER_DED}" +} + +# @FUNCTION: games_src_configure +# @DESCRIPTION: +# Runs egamesconf if there is a configure file. +# This function is exported as src_configure(). +games_src_configure() { + [[ -x "${ECONF_SOURCE:-.}"/configure ]] && egamesconf +} + +# @FUNCTION: games_src_compile +# @DESCRIPTION: +# Runs base_src_make(). This function is exported as src_compile(). +games_src_compile() { + case ${EAPI:-0} in + 0|1) games_src_configure ;; + esac + base_src_make +} + +# @FUNCTION: games_pkg_preinst +# @DESCRIPTION: +# Synchronizes GAMES_STATEDIR of the ebuild image with the live filesystem. +games_pkg_preinst() { + local f + + while read f ; do + if [[ -e ${ROOT}/${GAMES_STATEDIR}/${f} ]] ; then + cp -p \ + "${ROOT}/${GAMES_STATEDIR}/${f}" \ + "${D}/${GAMES_STATEDIR}/${f}" \ + || die "cp failed" + # make the date match the rest of the install + touch "${D}/${GAMES_STATEDIR}/${f}" + fi + done < <(find "${D}/${GAMES_STATEDIR}" -type f -printf '%P\n' 2>/dev/null) +} + +# @FUNCTION: games_pkg_postinst +# @DESCRIPTION: +# Prints some warnings and infos, also related to games groups. +games_pkg_postinst() { + if [[ -z "${GAMES_SHOW_WARNING}" ]] ; then + ewarn "Remember, in order to play games, you have to" + ewarn "be in the '${GAMES_GROUP}' group." + echo + case ${CHOST} in + *-darwin*) ewarn "Just run 'niutil -appendprop / /groups/games users <USER>'";; + *-freebsd*|*-dragonfly*) ewarn "Just run 'pw groupmod ${GAMES_GROUP} -m <USER>'";; + *) ewarn "Just run 'gpasswd -a <USER> ${GAMES_GROUP}', then have <USER> re-login.";; + esac + echo + einfo "For more info about Gentoo gaming in general, see our website:" + einfo " https://games.gentoo.org/" + echo + fi +} + +# @FUNCTION: games_ut_unpack +# @USAGE: <directory or file to unpack> +# @DESCRIPTION: +# Unpack .uz2 files for UT2003/UT2004. +games_ut_unpack() { + local ut_unpack="$1" + local f= + + if [[ -z ${ut_unpack} ]] ; then + die "You must provide an argument to games_ut_unpack" + fi + if [[ -f ${ut_unpack} ]] ; then + uz2unpack "${ut_unpack}" "${ut_unpack%.uz2}" \ + || die "uncompressing file ${ut_unpack}" + fi + if [[ -d ${ut_unpack} ]] ; then + while read f ; do + uz2unpack "${ut_unpack}/${f}" "${ut_unpack}/${f%.uz2}" \ + || die "uncompressing file ${f}" + rm -f "${ut_unpack}/${f}" || die "deleting compressed file ${f}" + done < <(find "${ut_unpack}" -maxdepth 1 -name '*.uz2' -printf '%f\n' 2>/dev/null) + fi +} + +# @FUNCTION: games_umod_unpack +# @USAGE: <file to unpack> +# @DESCRIPTION: +# Unpacks .umod/.ut2mod/.ut4mod files for UT/UT2003/UT2004. +# Don't forget to set 'dir' and 'Ddir'. +games_umod_unpack() { + local umod=$1 + mkdir -p "${Ddir}"/System + cp "${dir}"/System/{ucc-bin,{Manifest,Def{ault,User}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int} "${Ddir}"/System + cd "${Ddir}"/System + UT_DATA_PATH=${Ddir}/System ./ucc-bin umodunpack -x "${S}/${umod}" -nohomedir &> /dev/null \ + || die "uncompressing file ${umod}" + rm -f "${Ddir}"/System/{ucc-bin,{Manifest,Def{ault,User},User,UT200{3,4}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int,ucc.log} &>/dev/null \ + || die "Removing temporary files" +} + +fi diff -uNr a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass --- a/eclass/ghc-package.eclass false +++ b/eclass/ghc-package.eclass 0e3a9b4ef2a3971873acd68547137564203ce32f463275285fcfeea70b3c2f7b269fa7717be21e57200ff9ea57c771ee1dc9691ae7ed1ff55887fa16e58a7ff6 @@ -0,0 +1,344 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ghc-package.eclass +# @MAINTAINER: +# "Gentoo's Haskell Language team" <haskell@gentoo.org> +# @AUTHOR: +# Original Author: Andres Loeh <kosmikus@gentoo.org> +# @BLURB: This eclass helps with the Glasgow Haskell Compiler's package configuration utility. +# @DESCRIPTION: +# Helper eclass to handle ghc installation/upgrade/deinstallation process. + +inherit multiprocessing versionator + +# @FUNCTION: ghc-getghc +# @DESCRIPTION: +# returns the name of the ghc executable +ghc-getghc() { + type -P ${HC:-ghc} +} + +# @FUNCTION: ghc-getghcpkg +# @DESCRIPTION: +# Internal function determines returns the name of the ghc-pkg executable +ghc-getghcpkg() { + type -P ${HC_PKG:-ghc-pkg} +} + +# @FUNCTION: ghc-getghcpkgbin +# @DESCRIPTION: +# returns the name of the ghc-pkg binary (ghc-pkg +# itself usually is a shell script, and we have to +# bypass the script under certain circumstances); +# for Cabal, we add an empty global package config file, +# because for some reason the global package file +# must be specified +ghc-getghcpkgbin() { + if version_is_at_least "7.9.20141222" "$(ghc-version)"; then + # ghc-7.10 stopped supporting single-file database + local empty_db="${T}/empty.conf.d" ghc_pkg="$(ghc-libdir)/bin/ghc-pkg" + if [[ ! -d ${empty_db} ]]; then + "${ghc_pkg}" init "${empty_db}" || die "Failed to initialize empty global db" + fi + echo "$(ghc-libdir)/bin/ghc-pkg" "--global-package-db=${empty_db}" + + elif version_is_at_least "7.7.20121101" "$(ghc-version)"; then + # the ghc-pkg executable changed name in ghc 6.10, as it no longer needs + # the wrapper script with the static flags + # was moved to bin/ subtree by: + # http://www.haskell.org/pipermail/cvs-ghc/2012-September/076546.html + echo '[]' > "${T}/empty.conf" + echo "$(ghc-libdir)/bin/ghc-pkg" "--global-package-db=${T}/empty.conf" + + elif version_is_at_least "7.5.20120516" "$(ghc-version)"; then + echo '[]' > "${T}/empty.conf" + echo "$(ghc-libdir)/ghc-pkg" "--global-package-db=${T}/empty.conf" + + else + echo '[]' > "${T}/empty.conf" + echo "$(ghc-libdir)/ghc-pkg" "--global-conf=${T}/empty.conf" + fi +} + +# @FUNCTION: ghc-version +# @DESCRIPTION: +# returns upstream version of ghc +# as reported by '--numeric-version' +# Examples: "7.10.2", "7.9.20141222" +_GHC_VERSION_CACHE="" +ghc-version() { + if [[ -z "${_GHC_VERSION_CACHE}" ]]; then + _GHC_VERSION_CACHE="$($(ghc-getghc) --numeric-version)" + fi + echo "${_GHC_VERSION_CACHE}" +} + +# @FUNCTION: ghc-pm-version +# @DESCRIPTION: +# returns package manager(PM) version of ghc +# as reported by '$(best_version)' +# Examples: "PM:7.10.2", "PM:7.10.2_rc1", "PM:7.8.4-r4" +_GHC_PM_VERSION_CACHE="" +ghc-pm-version() { + local pm_ghc_p + + if [[ -z "${_GHC_PM_VERSION_CACHE}" ]]; then + pm_ghc_p=$(best_version dev-lang/ghc) + _GHC_PM_VERSION_CACHE="PM:${pm_ghc_p#dev-lang/ghc-}" + fi + echo "${_GHC_PM_VERSION_CACHE}" +} + +# @FUNCTION: ghc-cabal-version +# @DESCRIPTION: +# return version of the Cabal library bundled with ghc +ghc-cabal-version() { + if version_is_at_least "7.9.20141222" "$(ghc-version)"; then + # outputs in format: 'version: 1.18.1.5' + set -- `$(ghc-getghcpkg) --package-db=$(ghc-libdir)/package.conf.d.initial field Cabal version` + echo "$2" + else + local cabal_package=`echo "$(ghc-libdir)"/Cabal-*` + # /path/to/ghc/Cabal-${VER} -> ${VER} + echo "${cabal_package/*Cabal-/}" + fi +} + +# @FUNCTION: ghc-is-dynamic +# @DESCRIPTION: +# checks if ghc is built against dynamic libraries +# binaries linked against GHC library (and using plugin loading) +# have to be linked the same way: +# https://ghc.haskell.org/trac/ghc/ticket/10301 +ghc-is-dynamic() { + $(ghc-getghc) --info | grep "GHC Dynamic" | grep -q "YES" +} + +# @FUNCTION: ghc-supports-shared-libraries +# @DESCRIPTION: +# checks if ghc is built with support for building +# shared libraries (aka '-dynamic' option) +ghc-supports-shared-libraries() { + $(ghc-getghc) --info | grep "RTS ways" | grep -q "dyn" +} + +# @FUNCTION: ghc-supports-threaded-runtime +# @DESCRIPTION: +# checks if ghc is built with support for threaded +# runtime (aka '-threaded' option) +ghc-supports-threaded-runtime() { + $(ghc-getghc) --info | grep "RTS ways" | grep -q "thr" +} + +# @FUNCTION: ghc-supports-smp +# @DESCRIPTION: +# checks if ghc is built with support for multiple cores runtime +ghc-supports-smp() { + $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES" +} + +# @FUNCTION: ghc-supports-interpreter +# @DESCRIPTION: +# checks if ghc has interpreter mode (aka GHCi) +# It usually means that ghc supports for template haskell. +ghc-supports-interpreter() { + $(ghc-getghc) --info | grep "Have interpreter" | grep -q "YES" +} + +# @FUNCTION: ghc-supports-parallel-make +# @DESCRIPTION: +# checks if ghc has support for '--make -j' mode +# The option was introduced in ghc-7.8-rc1. +ghc-supports-parallel-make() { + $(ghc-getghc) --info | grep "Support parallel --make" | grep -q "YES" +} + +# @FUNCTION: ghc-extractportageversion +# @DESCRIPTION: +# extract the version of a portage-installed package +ghc-extractportageversion() { + local pkg + local version + pkg="$(best_version $1)" + version="${pkg#$1-}" + version="${version%-r*}" + version="${version%_pre*}" + echo "${version}" +} + +# @FUNCTION: ghc-libdir +# @DESCRIPTION: +# returns the library directory +_GHC_LIBDIR_CACHE="" +ghc-libdir() { + if [[ -z "${_GHC_LIBDIR_CACHE}" ]]; then + _GHC_LIBDIR_CACHE="$($(ghc-getghc) --print-libdir)" + fi + echo "${_GHC_LIBDIR_CACHE}" +} + +# @FUNCTION: ghc-make-args +# @DESCRIPTION: +# Returns default arguments passed along 'ghc --make' +# build mode. Used mainly to enable parallel build mode. +ghc-make-args() { + local ghc_make_args=() + # parallel on all available cores + if ghc-supports-smp && ghc-supports-parallel-make; then + # It should have been just -j$(makeopts_jobs) + # but GHC does not yet have nice defaults: + # https://ghc.haskell.org/trac/ghc/ticket/9221#comment:57 + # SMP is a requirement for parallel GC's gen0 + # 'qb' balancing. + echo "-j$(makeopts_jobs) +RTS -A256M -qb0 -RTS" + ghc_make_args=() + fi + echo "${ghc_make_args[@]}" +} + +# @FUNCTION: ghc-confdir +# @DESCRIPTION: +# returns the (Gentoo) library configuration directory, we +# store here a hint for 'haskell-updater' about packages +# installed for old ghc versions and current ones. +ghc-confdir() { + echo "$(ghc-libdir)/gentoo" +} + +# @FUNCTION: ghc-package-db +# @DESCRIPTION: +# returns the global package database directory +ghc-package-db() { + echo "$(ghc-libdir)/package.conf.d" +} + +# @FUNCTION: ghc-localpkgconfd +# @DESCRIPTION: +# returns the name of the local (package-specific) +# package configuration file +ghc-localpkgconfd() { + echo "${PF}.conf.d" +} + +# @FUNCTION: ghc-package-exists +# @DESCRIPTION: +# tests if a ghc package exists +ghc-package-exists() { + $(ghc-getghcpkg) describe "$1" > /dev/null 2>&1 +} + +# @FUNCTION: check-for-collisions +# @DESCRIPTION: +# makes sure no packages +# have the same version as initial package setup +check-for-collisions() { + local localpkgconf=$1 + local checked_pkg + local initial_pkg_db="$(ghc-libdir)/package.conf.d.initial" + + for checked_pkg in `$(ghc-getghcpkgbin) -f "${localpkgconf}" list --simple-output` + do + # should return empty output + local collided=`$(ghc-getghcpkgbin) -f ${initial_pkg_db} list --simple-output "${checked_pkg}"` + + if [[ -n ${collided} ]]; then + eerror "Cabal package '${checked_pkg}' is shipped with '$(ghc-pm-version)' ('$(ghc-version)')." + eerror "Ebuild author forgot an entry in CABAL_CORE_LIB_GHC_PV='${CABAL_CORE_LIB_GHC_PV}'." + eerror "Found in ${initial_pkg_db}." + die + fi + done +} + +# @FUNCTION: ghc-install-pkg +# @DESCRIPTION: +# moves the local (package-specific) package configuration +# file to its final destination +ghc-install-pkg() { + local pkg_config_file=$1 + local localpkgconf="${T}/$(ghc-localpkgconfd)" + local pkg_path pkg pkg_db="${D}/$(ghc-package-db)" hint_db="${D}/$(ghc-confdir)" + + $(ghc-getghcpkgbin) init "${localpkgconf}" || die "Failed to initialize empty local db" + $(ghc-getghcpkgbin) -f "${localpkgconf}" update - --force \ + < "${pkg_config_file}" || die "failed to register ${pkg}" + + check-for-collisions "${localpkgconf}" + + mkdir -p "${pkg_db}" || die + for pkg_path in "${localpkgconf}"/*.conf; do + pkg=$(basename "${pkg_path}") + cp "${pkg_path}" "${pkg_db}/${pkg}" || die + done + + mkdir -p "${hint_db}" || die + cp "${pkg_config_file}" "${hint_db}/${PF}.conf" || die + chmod 0644 "${hint_db}/${PF}.conf" || die +} + +# @FUNCTION: ghc-recache-db +# @DESCRIPTION: +# updates 'package.cache' binary cacne for registered '*.conf' +# packages +ghc-recache-db() { + einfo "Recaching GHC package DB" + $(ghc-getghcpkg) recache +} + +# @FUNCTION: ghc-register-pkg +# @DESCRIPTION: +# registers all packages in the local (package-specific) +# package configuration file +ghc-register-pkg() { + ghc-recache-db +} + +# @FUNCTION: ghc-reregister +# @DESCRIPTION: +# re-adds all available .conf files to the global +# package conf file, to be used on a ghc reinstallation +ghc-reregister() { + ghc-recache-db +} + +# @FUNCTION: ghc-unregister-pkg +# @DESCRIPTION: +# unregisters a package configuration file +ghc-unregister-pkg() { + ghc-recache-db +} + +# @FUNCTION: ghc-pkgdeps +# @DESCRIPTION: +# exported function: loads a package dependency in a form +# cabal_package version +ghc-pkgdeps() { + echo $($(ghc-getghcpkg) describe "${1}") \ + | sed \ + -e '/depends/,/^.*:/ !d' \ + -e 's/$.*$-$.*$-$.*$/\1 \2/' \ + -e 's/^.*://g' +} + +# @FUNCTION: ghc-package_pkg_postinst +# @DESCRIPTION: +# updates package.cache after package install +ghc-package_pkg_postinst() { + ghc-recache-db +} + +# @FUNCTION: ghc-package_pkg_prerm +# @DESCRIPTION: +# updates package.cache after package deinstall +ghc-package_pkg_prerm() { + ewarn "ghc-package.eclass: 'ghc-package_pkg_prerm()' is a noop" + ewarn "ghc-package.eclass: consider 'haskell-cabal_pkg_postrm()' instead" +} + +# @FUNCTION: ghc-package_pkg_postrm +# @DESCRIPTION: +# updates package.cache after package deinstall +ghc-package_pkg_postrm() { + ghc-recache-db +} diff -uNr a/eclass/git-2.eclass b/eclass/git-2.eclass --- a/eclass/git-2.eclass false +++ b/eclass/git-2.eclass 071ab977894be3d3bb2f34ba135b3902d12172f23d1a5a3eb82e299b3b676a4f7c01ef9750db97972f606f4e5518edb6b98acc0a2b8d16436c4ee79053a31743 @@ -0,0 +1,606 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: git-2.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @BLURB: Eclass for fetching and unpacking git repositories. +# @DESCRIPTION: +# Eclass for easing maintenance of live ebuilds using git as remote repository. +# Eclass support working with git submodules and branching. +# +# This eclass is DEPRECATED. Please use git-r3 instead. + +if [[ ${EAPI} == 6 ]]; then + die "${ECLASS}.eclass is banned in EAPI ${EAPI}" +fi + +# This eclass support all EAPIs. +EXPORT_FUNCTIONS src_unpack + +DEPEND="dev-vcs/git" + +# @ECLASS-VARIABLE: EGIT_SOURCEDIR +# @DESCRIPTION: +# This variable specifies destination where the cloned +# data are copied to. +# +# EGIT_SOURCEDIR="${S}" + +# @ECLASS-VARIABLE: EGIT_STORE_DIR +# @DESCRIPTION: +# Storage directory for git sources. +# +# EGIT_STORE_DIR="${DISTDIR}/egit-src" + +# @ECLASS-VARIABLE: EGIT_HAS_SUBMODULES +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty this variable enables support for git submodules in our +# checkout. Also this makes the checkout to be non-bare for now. + +# @ECLASS-VARIABLE: EGIT_OPTIONS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Variable specifying additional options for fetch command. + +# @ECLASS-VARIABLE: EGIT_MASTER +# @DESCRIPTION: +# Variable for specifying master branch. +# Useful when upstream don't have master branch or name it differently. +# +# EGIT_MASTER="master" + +# @ECLASS-VARIABLE: EGIT_PROJECT +# @DESCRIPTION: +# Variable specifying name for the folder where we check out the git +# repository. Value of this variable should be unique in the +# EGIT_STORE_DIR as otherwise you would override another repository. +# +# EGIT_PROJECT="${EGIT_REPO_URI##*/}" + +# @ECLASS-VARIABLE: EGIT_DIR +# @DESCRIPTION: +# Directory where we want to store the git data. +# This variable should not be overridden. +# +# EGIT_DIR="${EGIT_STORE_DIR}/${EGIT_PROJECT}" + +# @ECLASS-VARIABLE: EGIT_REPO_URI +# @REQUIRED +# @DEFAULT_UNSET +# @DESCRIPTION: +# URI for the repository +# e.g. http://foo, git://bar +# +# It can be overridden via env using packagename_LIVE_REPO +# variable. +# +# Support multiple values: +# EGIT_REPO_URI="git://a/b.git http://c/d.git" + +# @ECLASS-VARIABLE: EVCS_OFFLINE +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty this variable prevents performance of any online +# operations. + +# @ECLASS-VARIABLE: EGIT_BRANCH +# @DESCRIPTION: +# Variable containing branch name we want to check out. +# It can be overridden via env using packagename_LIVE_BRANCH +# variable. +# +# EGIT_BRANCH="${EGIT_MASTER}" + +# @ECLASS-VARIABLE: EGIT_COMMIT +# @DESCRIPTION: +# Variable containing commit hash/tag we want to check out. +# It can be overridden via env using packagename_LIVE_COMMIT +# variable. +# +# EGIT_COMMIT="${EGIT_BRANCH}" + +# @ECLASS-VARIABLE: EGIT_REPACK +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty this variable specifies that repository will be repacked to +# save space. However this can take a REALLY LONG time with VERY big +# repositories. + +# @ECLASS-VARIABLE: EGIT_PRUNE +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty this variable enables pruning all loose objects on each fetch. +# This is useful if upstream rewinds and rebases branches often. + +# @ECLASS-VARIABLE: EGIT_NONBARE +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty this variable specifies that all checkouts will be done using +# non bare repositories. This is useful if you can't operate with bare +# checkouts for some reason. + +# @ECLASS-VARIABLE: EGIT_NOUNPACK +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty this variable bans unpacking of ${A} content into the srcdir. +# Default behavior is to unpack ${A} content. + +# @FUNCTION: git-2_init_variables +# @INTERNAL +# @DESCRIPTION: +# Internal function initializing all git variables. +# We define it in function scope so user can define +# all the variables before and after inherit. +git-2_init_variables() { + debug-print-function ${FUNCNAME} "$@" + + local esc_pn liverepo livebranch livecommit + esc_pn=${PN//[-+]/_} + + : ${EGIT_SOURCEDIR="${S}"} + + : ${EGIT_STORE_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/egit-src"} + + : ${EGIT_HAS_SUBMODULES:=} + + : ${EGIT_OPTIONS:=} + + : ${EGIT_MASTER:=master} + + liverepo=${esc_pn}_LIVE_REPO + EGIT_REPO_URI=${!liverepo:-${EGIT_REPO_URI}} + [[ ${EGIT_REPO_URI} ]] || die "EGIT_REPO_URI must have some value" + + : ${EVCS_OFFLINE:=} + + livebranch=${esc_pn}_LIVE_BRANCH + [[ ${!livebranch} ]] && ewarn "QA: using \"${esc_pn}_LIVE_BRANCH\" variable, you won't get any support" + EGIT_BRANCH=${!livebranch:-${EGIT_BRANCH:-${EGIT_MASTER}}} + + livecommit=${esc_pn}_LIVE_COMMIT + [[ ${!livecommit} ]] && ewarn "QA: using \"${esc_pn}_LIVE_COMMIT\" variable, you won't get any support" + EGIT_COMMIT=${!livecommit:-${EGIT_COMMIT:-${EGIT_BRANCH}}} + + : ${EGIT_REPACK:=} + + : ${EGIT_PRUNE:=} +} + +# @FUNCTION: git-2_submodules +# @INTERNAL +# @DESCRIPTION: +# Internal function wrapping the submodule initialisation and update. +git-2_submodules() { + debug-print-function ${FUNCNAME} "$@" + if [[ ${EGIT_HAS_SUBMODULES} ]]; then + if [[ ${EVCS_OFFLINE} ]]; then + # for submodules operations we need to be online + debug-print "${FUNCNAME}: not updating submodules in offline mode" + return 1 + fi + + debug-print "${FUNCNAME}: working in \"${1}\"" + pushd "${EGIT_DIR}" > /dev/null || die + + debug-print "${FUNCNAME}: git submodule init" + git submodule init || die + debug-print "${FUNCNAME}: git submodule sync" + git submodule sync || die + debug-print "${FUNCNAME}: git submodule update" + git submodule update || die + + popd > /dev/null || die + fi +} + +# @FUNCTION: git-2_branch +# @INTERNAL +# @DESCRIPTION: +# Internal function that changes branch for the repo based on EGIT_COMMIT and +# EGIT_BRANCH variables. +git-2_branch() { + debug-print-function ${FUNCNAME} "$@" + + local branchname src + + debug-print "${FUNCNAME}: working in \"${EGIT_SOURCEDIR}\"" + pushd "${EGIT_SOURCEDIR}" > /dev/null || die + + local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH} + if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then + branchname=tree-${EGIT_COMMIT} + src=${EGIT_COMMIT} + fi + debug-print "${FUNCNAME}: git checkout -b ${branchname} ${src}" + git checkout -b ${branchname} ${src} \ + || die "${FUNCNAME}: changing the branch failed" + + popd > /dev/null || die +} + +# @FUNCTION: git-2_gc +# @INTERNAL +# @DESCRIPTION: +# Internal function running garbage collector on checked out tree. +git-2_gc() { + debug-print-function ${FUNCNAME} "$@" + + local args + + if [[ ${EGIT_REPACK} || ${EGIT_PRUNE} ]]; then + pushd "${EGIT_DIR}" > /dev/null || die + ebegin "Garbage collecting the repository" + [[ ${EGIT_PRUNE} ]] && args='--prune' + debug-print "${FUNCNAME}: git gc ${args}" + git gc ${args} + eend $? + popd > /dev/null || die + fi +} + +# @FUNCTION: git-2_prepare_storedir +# @INTERNAL +# @DESCRIPTION: +# Internal function preparing directory where we are going to store SCM +# repository. +git-2_prepare_storedir() { + debug-print-function ${FUNCNAME} "$@" + + local clone_dir + + # initial clone, we have to create master git storage directory and play + # nicely with sandbox + if [[ ! -d ${EGIT_STORE_DIR} ]]; then + debug-print "${FUNCNAME}: Creating git main storage directory" + addwrite / + mkdir -m 775 -p "${EGIT_STORE_DIR}" \ + || die "${FUNCNAME}: can't mkdir \"${EGIT_STORE_DIR}\"" + fi + + # allow writing into EGIT_STORE_DIR + addwrite "${EGIT_STORE_DIR}" + + # calculate git.eclass store dir for data + # We will try to clone the old repository, + # and we will remove it if we don't need it anymore. + EGIT_OLD_CLONE= + if [[ ${EGIT_STORE_DIR} == */egit-src ]]; then + local old_store_dir=${EGIT_STORE_DIR/%egit-src/git-src} + local old_location=${old_store_dir}/${EGIT_PROJECT:-${PN}} + + if [[ -d ${old_location} ]]; then + EGIT_OLD_CLONE=${old_location} + # required to remove the old clone + addwrite "${old_store_dir}" + fi + fi + + # calculate the proper store dir for data + # If user didn't specify the EGIT_DIR, we check if he did specify + # the EGIT_PROJECT or get the folder name from EGIT_REPO_URI. + EGIT_REPO_URI=${EGIT_REPO_URI%/} + if [[ ! ${EGIT_DIR} ]]; then + if [[ ${EGIT_PROJECT} ]]; then + clone_dir=${EGIT_PROJECT} + else + local strippeduri=${EGIT_REPO_URI%/.git} + clone_dir=${strippeduri##*/} + fi + EGIT_DIR=${EGIT_STORE_DIR}/${clone_dir} + + if [[ ${EGIT_OLD_CLONE} && ! -d ${EGIT_DIR} ]]; then + elog "${FUNCNAME}: ${CATEGORY}/${PF} will be cloned from old location." + elog "It will be necessary to rebuild the package to fetch updates." + EGIT_REPO_URI="${EGIT_OLD_CLONE} ${EGIT_REPO_URI}" + fi + fi + export EGIT_DIR=${EGIT_DIR} + debug-print "${FUNCNAME}: Storing the repo into \"${EGIT_DIR}\"." +} + +# @FUNCTION: git-2_move_source +# @INTERNAL +# @DESCRIPTION: +# Internal function moving sources from the EGIT_DIR to EGIT_SOURCEDIR dir. +git-2_move_source() { + debug-print-function ${FUNCNAME} "$@" + + debug-print "${FUNCNAME}: ${MOVE_COMMAND} \"${EGIT_DIR}\" \"${EGIT_SOURCEDIR}\"" + pushd "${EGIT_DIR}" > /dev/null || die + mkdir -p "${EGIT_SOURCEDIR}" \ + || die "${FUNCNAME}: failed to create ${EGIT_SOURCEDIR}" + ${MOVE_COMMAND} "${EGIT_SOURCEDIR}" \ + || die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed" + popd > /dev/null || die +} + +# @FUNCTION: git-2_initial_clone +# @INTERNAL +# @DESCRIPTION: +# Internal function running initial clone on specified repo_uri. +git-2_initial_clone() { + debug-print-function ${FUNCNAME} "$@" + + local repo_uri + + EGIT_REPO_URI_SELECTED="" + for repo_uri in ${EGIT_REPO_URI}; do + debug-print "${FUNCNAME}: git clone ${EGIT_LOCAL_OPTIONS} \"${repo_uri}\" \"${EGIT_DIR}\"" + if git clone ${EGIT_LOCAL_OPTIONS} "${repo_uri}" "${EGIT_DIR}"; then + # global variable containing the repo_name we will be using + debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\"" + EGIT_REPO_URI_SELECTED="${repo_uri}" + break + fi + done + + [[ ${EGIT_REPO_URI_SELECTED} ]] \ + || die "${FUNCNAME}: can't fetch from ${EGIT_REPO_URI}" +} + +# @FUNCTION: git-2_update_repo +# @INTERNAL +# @DESCRIPTION: +# Internal function running update command on specified repo_uri. +git-2_update_repo() { + debug-print-function ${FUNCNAME} "$@" + + local repo_uri + + if [[ ${EGIT_LOCAL_NONBARE} ]]; then + # checkout master branch and drop all other local branches + git checkout ${EGIT_MASTER} || die "${FUNCNAME}: can't checkout master branch ${EGIT_MASTER}" + for x in $(git branch | grep -v "* ${EGIT_MASTER}" | tr '\n' ' '); do + debug-print "${FUNCNAME}: git branch -D ${x}" + git branch -D ${x} > /dev/null + done + fi + + EGIT_REPO_URI_SELECTED="" + for repo_uri in ${EGIT_REPO_URI}; do + # git urls might change, so reset it + git config remote.origin.url "${repo_uri}" + + debug-print "${EGIT_UPDATE_CMD}" + if ${EGIT_UPDATE_CMD} > /dev/null; then + # global variable containing the repo_name we will be using + debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\"" + EGIT_REPO_URI_SELECTED="${repo_uri}" + break + fi + done + + [[ ${EGIT_REPO_URI_SELECTED} ]] \ + || die "${FUNCNAME}: can't update from ${EGIT_REPO_URI}" +} + +# @FUNCTION: git-2_fetch +# @INTERNAL +# @DESCRIPTION: +# Internal function fetching repository from EGIT_REPO_URI and storing it in +# specified EGIT_STORE_DIR. +git-2_fetch() { + debug-print-function ${FUNCNAME} "$@" + + local oldsha cursha repo_type + + [[ ${EGIT_LOCAL_NONBARE} ]] && repo_type="non-bare repository" || repo_type="bare repository" + + if [[ ! -d ${EGIT_DIR} ]]; then + git-2_initial_clone + pushd "${EGIT_DIR}" > /dev/null || die + cursha=$(git rev-parse ${UPSTREAM_BRANCH}) + echo "GIT NEW clone -->" + echo " repository: ${EGIT_REPO_URI_SELECTED}" + echo " at the commit: ${cursha}" + + popd > /dev/null || die + elif [[ ${EVCS_OFFLINE} ]]; then + pushd "${EGIT_DIR}" > /dev/null || die + cursha=$(git rev-parse ${UPSTREAM_BRANCH}) + echo "GIT offline update -->" + echo " repository: $(git config remote.origin.url)" + echo " at the commit: ${cursha}" + popd > /dev/null || die + else + pushd "${EGIT_DIR}" > /dev/null || die + oldsha=$(git rev-parse ${UPSTREAM_BRANCH}) + git-2_update_repo + cursha=$(git rev-parse ${UPSTREAM_BRANCH}) + + # fetch updates + echo "GIT update -->" + echo " repository: ${EGIT_REPO_URI_SELECTED}" + # write out message based on the revisions + if [[ "${oldsha}" != "${cursha}" ]]; then + echo " updating from commit: ${oldsha}" + echo " to commit: ${cursha}" + else + echo " at the commit: ${cursha}" + fi + + # print nice statistic of what was changed + git --no-pager diff --stat ${oldsha}..${UPSTREAM_BRANCH} + popd > /dev/null || die + fi + # export the version the repository is at + export EGIT_VERSION="${cursha}" + # log the repo state + [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] \ + && echo " commit: ${EGIT_COMMIT}" + echo " branch: ${EGIT_BRANCH}" + echo " storage directory: \"${EGIT_DIR}\"" + echo " checkout type: ${repo_type}" + + # Cleanup after git.eclass + if [[ ${EGIT_OLD_CLONE} ]]; then + einfo "${FUNCNAME}: removing old clone in ${EGIT_OLD_CLONE}." + rm -rf "${EGIT_OLD_CLONE}" + fi +} + +# @FUNCTION: git_bootstrap +# @INTERNAL +# @DESCRIPTION: +# Internal function that runs bootstrap command on unpacked source. +git-2_bootstrap() { + debug-print-function ${FUNCNAME} "$@" + + # @ECLASS-VARIABLE: EGIT_BOOTSTRAP + # @DESCRIPTION: + # Command to be executed after checkout and clone of the specified + # repository. + # enviroment the package will fail if there is no update, thus in + # combination with --keep-going it would lead in not-updating + # pakcages that are up-to-date. + if [[ ${EGIT_BOOTSTRAP} ]]; then + pushd "${EGIT_SOURCEDIR}" > /dev/null || die + einfo "Starting bootstrap" + + if [[ -f ${EGIT_BOOTSTRAP} ]]; then + # we have file in the repo which we should execute + debug-print "${FUNCNAME}: bootstraping with file \"${EGIT_BOOTSTRAP}\"" + + if [[ -x ${EGIT_BOOTSTRAP} ]]; then + eval "./${EGIT_BOOTSTRAP}" \ + || die "${FUNCNAME}: bootstrap script failed" + else + eerror "\"${EGIT_BOOTSTRAP}\" is not executable." + eerror "Report upstream, or bug ebuild maintainer to remove bootstrap command." + die "\"${EGIT_BOOTSTRAP}\" is not executable" + fi + else + # we execute some system command + debug-print "${FUNCNAME}: bootstraping with commands \"${EGIT_BOOTSTRAP}\"" + + eval "${EGIT_BOOTSTRAP}" \ + || die "${FUNCNAME}: bootstrap commands failed" + fi + + einfo "Bootstrap finished" + popd > /dev/null || die + fi +} + +# @FUNCTION: git-2_migrate_repository +# @INTERNAL +# @DESCRIPTION: +# Internal function migrating between bare and normal checkout repository. +# This is based on usage of EGIT_SUBMODULES, at least until they +# start to work with bare checkouts sanely. +# This function also set some global variables that differ between +# bare and non-bare checkout. +git-2_migrate_repository() { + debug-print-function ${FUNCNAME} "$@" + + local bare returnstate + + # first find out if we have submodules + # or user explicitly wants us to use non-bare clones + if ! [[ ${EGIT_HAS_SUBMODULES} || ${EGIT_NONBARE} ]]; then + bare=1 + fi + + # test if we already have some repo and if so find out if we have + # to migrate the data + if [[ -d ${EGIT_DIR} ]]; then + if [[ ${bare} && -d ${EGIT_DIR}/.git ]]; then + debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy" + + ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy" + mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare" + export GIT_DIR="${EGIT_DIR}.bare" + git config core.bare true > /dev/null + returnstate=$? + unset GIT_DIR + rm -rf "${EGIT_DIR}" + mv "${EGIT_DIR}.bare" "${EGIT_DIR}" + eend ${returnstate} + elif [[ ! ${bare} && ! -d ${EGIT_DIR}/.git ]]; then + debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy" + + ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy" + git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null + returnstate=$? + rm -rf "${EGIT_DIR}" + mv "${EGIT_DIR}.nonbare" "${EGIT_DIR}" + eend ${returnstate} + fi + fi + if [[ ${returnstate} -ne 0 ]]; then + debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" failed, removing to start from scratch" + + # migration failed, remove the EGIT_DIR to play it safe + einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratch." + rm -rf "${EGIT_DIR}" + fi + + # set various options to work with both targets + if [[ ${bare} ]]; then + debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\"" + EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare" + MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }" + EGIT_UPDATE_CMD="git fetch -t -f -u origin ${EGIT_BRANCH}:${EGIT_BRANCH}" + UPSTREAM_BRANCH="${EGIT_BRANCH}" + EGIT_LOCAL_NONBARE= + else + debug-print "${FUNCNAME}: working in bare repository for non-bare \"${EGIT_DIR}\"" + MOVE_COMMAND="cp -pPR ." + EGIT_LOCAL_OPTIONS="${EGIT_OPTIONS}" + EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}" + UPSTREAM_BRANCH="origin/${EGIT_BRANCH}" + EGIT_LOCAL_NONBARE="true" + fi +} + +# @FUNCTION: git-2_cleanup +# @INTERNAL +# @DESCRIPTION: +# Internal function cleaning up all the global variables +# that are not required after the unpack has been done. +git-2_cleanup() { + debug-print-function ${FUNCNAME} "$@" + + # Here we can unset only variables that are GLOBAL + # defined by the eclass, BUT NOT subject to change + # by user (like EGIT_PROJECT). + # If ebuild writer polutes his environment it is + # his problem only. + unset EGIT_DIR + unset MOVE_COMMAND + unset EGIT_LOCAL_OPTIONS + unset EGIT_UPDATE_CMD + unset UPSTREAM_BRANCH + unset EGIT_LOCAL_NONBARE +} + +# @FUNCTION: git-2_src_unpack +# @DESCRIPTION: +# Default git src_unpack function. +git-2_src_unpack() { + debug-print-function ${FUNCNAME} "$@" + + git-2_init_variables + git-2_prepare_storedir + git-2_migrate_repository + git-2_fetch "$@" + git-2_gc + git-2_submodules + git-2_move_source + git-2_branch + git-2_bootstrap + git-2_cleanup + echo ">>> Unpacked to ${EGIT_SOURCEDIR}" + + # Users can specify some SRC_URI and we should + # unpack the files too. + if [[ ! ${EGIT_NOUNPACK} ]]; then + if has ${EAPI:-0} 0 1; then + [[ ${A} ]] && unpack ${A} + else + default_src_unpack + fi + fi +} diff -uNr a/eclass/git-r3.eclass b/eclass/git-r3.eclass --- a/eclass/git-r3.eclass false +++ b/eclass/git-r3.eclass d59ad7ace343bcf285f63117580b5a8c3530121e5aa25c7a2bad51ae4b0655eda7f7d7d6daf68b357e2da22463a2a6a7e7f677b074c19b6025bb0557457ada1d @@ -0,0 +1,1126 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: git-r3.eclass +# @MAINTAINER: +# Michał Górny <mgorny@gentoo.org> +# @BLURB: Eclass for fetching and unpacking git repositories. +# @DESCRIPTION: +# Third generation eclass for easing maintenance of live ebuilds using +# git as remote repository. + +case "${EAPI:-0}" in + 0|1|2|3|4|5|6|7) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +EXPORT_FUNCTIONS src_unpack + +if [[ ! ${_GIT_R3} ]]; then + +if [[ ! ${_INHERITED_BY_GIT_2} ]]; then + if [[ ${EAPI:-0} != [0123456] ]]; then + BDEPEND=">=dev-vcs/git-1.8.2.1" + else + DEPEND=">=dev-vcs/git-1.8.2.1" + fi +fi + +# @ECLASS-VARIABLE: EGIT_CLONE_TYPE +# @DESCRIPTION: +# Type of clone that should be used against the remote repository. +# This can be either of: 'mirror', 'single', 'shallow'. +# +# This is intended to be set by user in make.conf. Ebuilds are supposed +# to set EGIT_MIN_CLONE_TYPE if necessary instead. +# +# The 'mirror' type clones all remote branches and tags with complete +# history and all notes. EGIT_COMMIT can specify any commit hash. +# Upstream-removed branches and tags are purged from the local clone +# while fetching. This mode is suitable for cloning the local copy +# for development or hosting a local git mirror. However, clones +# of repositories with large diverged branches may quickly grow large. +# +# The 'single+tags' type clones the requested branch and all tags +# in the repository. All notes are fetched as well. EGIT_COMMIT +# can safely specify hashes throughout the current branch and all tags. +# No purging of old references is done (if you often switch branches, +# you may need to remove stale branches yourself). This mode is intended +# mostly for use with broken git servers such as Google Code that fail +# to fetch tags along with the branch in 'single' mode. +# +# The 'single' type clones only the requested branch or tag. Tags +# referencing commits throughout the branch history are fetched as well, +# and all notes. EGIT_COMMIT can safely specify only hashes +# in the current branch. No purging of old references is done (if you +# often switch branches, you may need to remove stale branches +# yourself). This mode is suitable for general use. +# +# The 'shallow' type clones only the newest commit on requested branch +# or tag. EGIT_COMMIT can only specify tags, and since the history is +# unavailable calls like 'git describe' will not reference prior tags. +# No purging of old references is done. This mode is intended mostly for +# embedded systems with limited disk space. +: ${EGIT_CLONE_TYPE:=single} + +# @ECLASS-VARIABLE: EGIT_MIN_CLONE_TYPE +# @DESCRIPTION: +# 'Minimum' clone type supported by the ebuild. Takes same values +# as EGIT_CLONE_TYPE. When user sets a type that's 'lower' (that is, +# later on the list) than EGIT_MIN_CLONE_TYPE, the eclass uses +# EGIT_MIN_CLONE_TYPE instead. +# +# This variable is intended to be used by ebuilds only. Users are +# supposed to set EGIT_CLONE_TYPE instead. +# +# A common case is to use 'single' whenever the build system requires +# access to full branch history, or 'single+tags' when Google Code +# or a similar remote is used that does not support shallow clones +# and fetching tags along with commits. Please use sparingly, and to fix +# fatal errors rather than 'non-pretty versions'. +: ${EGIT_MIN_CLONE_TYPE:=shallow} + +# @ECLASS-VARIABLE: EGIT3_STORE_DIR +# @DESCRIPTION: +# Storage directory for git sources. +# +# This is intended to be set by user in make.conf. Ebuilds must not set +# it. +# +# EGIT3_STORE_DIR=${DISTDIR}/git3-src + +# @ECLASS-VARIABLE: EGIT_MIRROR_URI +# @DEFAULT_UNSET +# @DESCRIPTION: +# 'Top' URI to a local git mirror. If specified, the eclass will try +# to fetch from the local mirror instead of using the remote repository. +# +# The mirror needs to follow EGIT3_STORE_DIR structure. The directory +# created by eclass can be used for that purpose. +# +# Example: +# @CODE +# EGIT_MIRROR_URI="git://mirror.lan/" +# @CODE + +# @ECLASS-VARIABLE: EGIT_REPO_URI +# @REQUIRED +# @DESCRIPTION: +# URIs to the repository, e.g. https://foo. If multiple URIs are +# provided, the eclass will consider the remaining URIs as fallbacks +# to try if the first URI does not work. For supported URI syntaxes, +# read the manpage for git-clone(1). +# +# URIs should be using https:// whenever possible. http:// and git:// +# URIs are completely unsecured and their use (even if only as +# a fallback) renders the ebuild completely vulnerable to MITM attacks. +# +# It can be overridden via env using ${PN}_LIVE_REPO variable. +# +# Can be a whitespace-separated list or an array. +# +# Example: +# @CODE +# EGIT_REPO_URI="https://a/b.git https://c/d.git" +# @CODE + +# @ECLASS-VARIABLE: EVCS_OFFLINE +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty, this variable prevents any online operations. + +# @ECLASS-VARIABLE: EVCS_UMASK +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable to a custom umask. This is intended to be set by +# users. By setting this to something like 002, it can make life easier +# for people who do development as non-root (but are in the portage +# group), and then switch over to building with FEATURES=userpriv. +# Or vice-versa. Shouldn't be a security issue here as anyone who has +# portage group write access already can screw the system over in more +# creative ways. + +# @ECLASS-VARIABLE: EGIT_BRANCH +# @DEFAULT_UNSET +# @DESCRIPTION: +# The branch name to check out. If unset, the upstream default (HEAD) +# will be used. +# +# It can be overridden via env using ${PN}_LIVE_BRANCH variable. + +# @ECLASS-VARIABLE: EGIT_COMMIT +# @DEFAULT_UNSET +# @DESCRIPTION: +# The tag name or commit identifier to check out. If unset, newest +# commit from the branch will be used. Note that if set to a commit +# not on HEAD branch, EGIT_BRANCH needs to be set to a branch on which +# the commit is available. +# +# It can be overridden via env using ${PN}_LIVE_COMMIT variable. + +# @ECLASS-VARIABLE: EGIT_COMMIT_DATE +# @DEFAULT_UNSET +# @DESCRIPTION: +# Attempt to check out the repository state for the specified timestamp. +# The date should be in format understood by 'git rev-list'. The commits +# on EGIT_BRANCH will be considered. +# +# The eclass will select the last commit with commit date preceding +# the specified date. When merge commits are found, only first parents +# will be considered in order to avoid switching into external branches +# (assuming that merges are done correctly). In other words, each merge +# will be considered alike a single commit with date corresponding +# to the merge commit date. +# +# It can be overridden via env using ${PN}_LIVE_COMMIT_DATE variable. + +# @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR +# @DESCRIPTION: +# The directory to check the git sources out to. +# +# EGIT_CHECKOUT_DIR=${WORKDIR}/${P} + +# @ECLASS-VARIABLE: EGIT_SUBMODULES +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of inclusive and exclusive wildcards on submodule names, +# stating which submodules are fetched and checked out. Exclusions +# start with '-', and exclude previously matched submodules. +# +# If unset, all submodules are enabled. Empty list disables all +# submodules. In order to use an exclude-only list, start the array +# with '*'. +# +# Remember that wildcards need to be quoted in order to prevent filename +# expansion. +# +# Examples: +# @CODE +# # Disable all submodules +# EGIT_SUBMODULES=() +# +# # Include only foo and bar +# EGIT_SUBMODULES=( foo bar ) +# +# # Use all submodules except for test-* but include test-lib +# EGIT_SUBMODULES=( '*' '-test-*' test-lib ) +# @CODE + +# @FUNCTION: _git-r3_env_setup +# @INTERNAL +# @DESCRIPTION: +# Set the eclass variables as necessary for operation. This can involve +# setting EGIT_* to defaults or ${PN}_LIVE_* variables. +_git-r3_env_setup() { + debug-print-function ${FUNCNAME} "$@" + + # check the clone type + case "${EGIT_CLONE_TYPE}" in + mirror|single+tags|single|shallow) + ;; + *) + die "Invalid EGIT_CLONE_TYPE=${EGIT_CLONE_TYPE}" + esac + case "${EGIT_MIN_CLONE_TYPE}" in + shallow) + ;; + single) + if [[ ${EGIT_CLONE_TYPE} == shallow ]]; then + einfo "git-r3: ebuild needs to be cloned in '\e[1msingle\e[22m' mode, adjusting" + EGIT_CLONE_TYPE=single + fi + ;; + single+tags) + if [[ ${EGIT_CLONE_TYPE} == shallow || ${EGIT_CLONE_TYPE} == single ]]; then + einfo "git-r3: ebuild needs to be cloned in '\e[1msingle+tags\e[22m' mode, adjusting" + EGIT_CLONE_TYPE=single+tags + fi + ;; + mirror) + if [[ ${EGIT_CLONE_TYPE} != mirror ]]; then + einfo "git-r3: ebuild needs to be cloned in '\e[1mmirror\e[22m' mode, adjusting" + EGIT_CLONE_TYPE=mirror + fi + ;; + *) + die "Invalid EGIT_MIN_CLONE_TYPE=${EGIT_MIN_CLONE_TYPE}" + esac + + if [[ ${EGIT_SUBMODULES[@]+1} && $(declare -p EGIT_SUBMODULES) != "declare -a"* ]] + then + die 'EGIT_SUBMODULES must be an array.' + fi + + local esc_pn livevar + esc_pn=${PN//[-+]/_} + [[ ${esc_pn} == [0-9]* ]] && esc_pn=_${esc_pn} + + livevar=${esc_pn}_LIVE_REPO + EGIT_REPO_URI=${!livevar-${EGIT_REPO_URI}} + [[ ${!livevar} ]] \ + && ewarn "Using ${livevar}, no support will be provided" + + livevar=${esc_pn}_LIVE_BRANCH + EGIT_BRANCH=${!livevar-${EGIT_BRANCH}} + [[ ${!livevar} ]] \ + && ewarn "Using ${livevar}, no support will be provided" + + livevar=${esc_pn}_LIVE_COMMIT + EGIT_COMMIT=${!livevar-${EGIT_COMMIT}} + [[ ${!livevar} ]] \ + && ewarn "Using ${livevar}, no support will be provided" + + livevar=${esc_pn}_LIVE_COMMIT_DATE + EGIT_COMMIT_DATE=${!livevar-${EGIT_COMMIT_DATE}} + [[ ${!livevar} ]] \ + && ewarn "Using ${livevar}, no support will be provided" + + if [[ ${EGIT_COMMIT} && ${EGIT_COMMIT_DATE} ]]; then + die "EGIT_COMMIT and EGIT_COMMIT_DATE can not be specified simultaneously" + fi + + # Migration helpers. Remove them when git-2 is removed. + + if [[ ${EGIT_SOURCEDIR} ]]; then + eerror "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR. While updating" + eerror "your ebuild, please check whether the variable is necessary at all" + eerror "since the default has been changed from \${S} to \${WORKDIR}/\${P}." + eerror "Therefore, proper setting of S may be sufficient." + die "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR." + fi + + if [[ ${EGIT_MASTER} ]]; then + eerror "EGIT_MASTER has been removed. Instead, the upstream default (HEAD)" + eerror "is used by the eclass. Please remove the assignment or use EGIT_BRANCH" + eerror "as necessary." + die "EGIT_MASTER has been removed." + fi + + if [[ ${EGIT_HAS_SUBMODULES} ]]; then + eerror "EGIT_HAS_SUBMODULES has been removed. The eclass no longer needs" + eerror "to switch the clone type in order to support submodules and therefore" + eerror "submodules are detected and fetched automatically. If you need to" + eerror "disable or filter submodules, see EGIT_SUBMODULES." + die "EGIT_HAS_SUBMODULES is no longer necessary." + fi + + if [[ ${EGIT_PROJECT} ]]; then + eerror "EGIT_PROJECT has been removed. Instead, the eclass determines" + eerror "the local clone path using path in canonical EGIT_REPO_URI." + eerror "If the current algorithm causes issues for you, please report a bug." + die "EGIT_PROJECT is no longer necessary." + fi + + if [[ ${EGIT_BOOTSTRAP} ]]; then + eerror "EGIT_BOOTSTRAP has been removed. Please create proper src_prepare()" + eerror "instead." + die "EGIT_BOOTSTRAP has been removed." + fi + + if [[ ${EGIT_NOUNPACK} ]]; then + eerror "EGIT_NOUNPACK has been removed. The eclass no longer calls default" + eerror "unpack function. If necessary, please declare proper src_unpack()." + die "EGIT_NOUNPACK has been removed." + fi +} + +# @FUNCTION: _git-r3_set_gitdir +# @USAGE: <repo-uri> +# @INTERNAL +# @DESCRIPTION: +# Obtain the local repository path and set it as GIT_DIR. Creates +# a new repository if necessary. +# +# <repo-uri> may be used to compose the path. It should therefore be +# a canonical URI to the repository. +_git-r3_set_gitdir() { + debug-print-function ${FUNCNAME} "$@" + + local repo_name=${1#*://*/} + + # strip the trailing slash + repo_name=${repo_name%/} + + # strip common prefixes to make paths more likely to match + # e.g. git://X/Y.git vs https://X/git/Y.git + # (but just one of the prefixes) + case "${repo_name}" in + # gnome.org... who else? + browse/*) repo_name=${repo_name#browse/};; + # cgit can proxy requests to git + cgit/*) repo_name=${repo_name#cgit/};; + # pretty common + git/*) repo_name=${repo_name#git/};; + # gentoo.org + gitroot/*) repo_name=${repo_name#gitroot/};; + # sourceforge + p/*) repo_name=${repo_name#p/};; + # kernel.org + pub/scm/*) repo_name=${repo_name#pub/scm/};; + esac + # ensure a .git suffix, same reason + repo_name=${repo_name%.git}.git + # now replace all the slashes + repo_name=${repo_name//\//_} + + local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}} + : ${EGIT3_STORE_DIR:=${distdir}/git3-src} + + GIT_DIR=${EGIT3_STORE_DIR}/${repo_name} + + if [[ ! -d ${EGIT3_STORE_DIR} && ! ${EVCS_OFFLINE} ]]; then + ( + addwrite / + mkdir -p "${EGIT3_STORE_DIR}" + ) || die "Unable to create ${EGIT3_STORE_DIR}" + fi + + addwrite "${EGIT3_STORE_DIR}" + if [[ ! -d ${GIT_DIR} ]]; then + if [[ ${EVCS_OFFLINE} ]]; then + eerror "A clone of the following repository is required to proceed:" + eerror " ${1}" + eerror "However, networking activity has been disabled using EVCS_OFFLINE and there" + eerror "is no local clone available." + die "No local clone of ${1}. Unable to proceed with EVCS_OFFLINE." + fi + + local saved_umask + if [[ ${EVCS_UMASK} ]]; then + saved_umask=$(umask) + umask "${EVCS_UMASK}" || die "Bad options to umask: ${EVCS_UMASK}" + fi + mkdir "${GIT_DIR}" || die + git init --bare || die + if [[ ${saved_umask} ]]; then + umask "${saved_umask}" || die + fi + fi +} + +# @FUNCTION: _git-r3_set_submodules +# @USAGE: <file-contents> +# @INTERNAL +# @DESCRIPTION: +# Parse .gitmodules contents passed as <file-contents> +# as in "$(cat .gitmodules)"). Composes a 'submodules' array that +# contains in order (name, URL, path) for each submodule. +_git-r3_set_submodules() { + debug-print-function ${FUNCNAME} "$@" + + local data=${1} + + # ( name url path ... ) + submodules=() + + local l + while read l; do + # submodule.<path>.path=<path> + # submodule.<path>.url=<url> + [[ ${l} == submodule.*.url=* ]] || continue + + l=${l#submodule.} + local subname=${l%%.url=*} + + # filter out on EGIT_SUBMODULES + if declare -p EGIT_SUBMODULES &>/dev/null; then + local p l_res res= + for p in "${EGIT_SUBMODULES[@]}"; do + if [[ ${p} == -* ]]; then + p=${p#-} + l_res= + else + l_res=1 + fi + + [[ ${subname} == ${p} ]] && res=${l_res} + done + + if [[ ! ${res} ]]; then + einfo "Skipping submodule \e[1m${subname}\e[22m" + continue + fi + fi + + # skip modules that have 'update = none', bug #487262. + local upd=$(echo "${data}" | git config -f /dev/fd/0 \ + submodule."${subname}".update) + [[ ${upd} == none ]] && continue + + # https://github.com/git/git/blob/master/refs.c#L31 + # we are more restrictive than git itself but that should not + # cause any issues, #572312, #606950 + # TODO: check escaped names for collisions + local enc_subname=${subname//[^a-zA-Z0-9-]/_} + + submodules+=( + "${enc_subname}" + "$(echo "${data}" | git config -f /dev/fd/0 \ + submodule."${subname}".url || die)" + "$(echo "${data}" | git config -f /dev/fd/0 \ + submodule."${subname}".path || die)" + ) + done < <(echo "${data}" | git config -f /dev/fd/0 -l || die) +} + +# @FUNCTION: _git-r3_set_subrepos +# @USAGE: <submodule-uri> <parent-repo-uri>... +# @INTERNAL +# @DESCRIPTION: +# Create 'subrepos' array containing absolute (canonical) submodule URIs +# for the given <submodule-uri>. If the URI is relative, URIs will be +# constructed using all <parent-repo-uri>s. Otherwise, this single URI +# will be placed in the array. +_git-r3_set_subrepos() { + debug-print-function ${FUNCNAME} "$@" + + local suburl=${1} + subrepos=( "${@:2}" ) + + if [[ ${suburl} == ./* || ${suburl} == ../* ]]; then + # drop all possible trailing slashes for consistency + subrepos=( "${subrepos[@]%%/}" ) + + while true; do + if [[ ${suburl} == ./* ]]; then + suburl=${suburl:2} + elif [[ ${suburl} == ../* ]]; then + suburl=${suburl:3} + + # XXX: correctness checking + + # drop the last path component + subrepos=( "${subrepos[@]%/*}" ) + # and then the trailing slashes, again + subrepos=( "${subrepos[@]%%/}" ) + else + break + fi + done + + # append the preprocessed path to the preprocessed URIs + subrepos=( "${subrepos[@]/%//${suburl}}") + else + subrepos=( "${suburl}" ) + fi +} + + +# @FUNCTION: _git-r3_is_local_repo +# @USAGE: <repo-uri> +# @INTERNAL +# @DESCRIPTION: +# Determine whether the given URI specifies a local (on-disk) +# repository. +_git-r3_is_local_repo() { + debug-print-function ${FUNCNAME} "$@" + + local uri=${1} + + [[ ${uri} == file://* || ${uri} == /* ]] +} + +# @FUNCTION: git-r3_fetch +# @USAGE: [<repo-uri> [<remote-ref> [<local-id> [<commit-date>]]]] +# @DESCRIPTION: +# Fetch new commits to the local clone of repository. +# +# <repo-uri> specifies the repository URIs to fetch from, as a space- +# -separated list. The first URI will be used as repository group +# identifier and therefore must be used consistently. When not +# specified, defaults to ${EGIT_REPO_URI}. +# +# <remote-ref> specifies the remote ref or commit id to fetch. +# It is preferred to use 'refs/heads/<branch-name>' for branches +# and 'refs/tags/<tag-name>' for tags. Other options are 'HEAD' +# for upstream default branch and hexadecimal commit SHA1. Defaults +# to the first of EGIT_COMMIT, EGIT_BRANCH or literal 'HEAD' that +# is set to a non-null value. +# +# <local-id> specifies the local branch identifier that will be used to +# locally store the fetch result. It should be unique to multiple +# fetches within the repository that can be performed at the same time +# (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT%/*}. +# This default should be fine unless you are fetching multiple trees +# from the same repository in the same ebuild. +# +# <commit-id> requests attempting to use repository state as of specific +# date. For more details, see EGIT_COMMIT_DATE. +# +# The fetch operation will affect the EGIT_STORE only. It will not touch +# the working copy, nor export any environment variables. +# If the repository contains submodules, they will be fetched +# recursively. +git-r3_fetch() { + debug-print-function ${FUNCNAME} "$@" + + # process repos first since we create repo_name from it + local repos + if [[ ${1} ]]; then + repos=( ${1} ) + elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then + repos=( "${EGIT_REPO_URI[@]}" ) + else + repos=( ${EGIT_REPO_URI} ) + fi + + [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset" + + local r + for r in "${repos[@]}"; do + if [[ ${r} == git:* || ${r} == http:* ]]; then + ewarn "git-r3: ${r%%:*} protocol is completely unsecure and may render the ebuild" + ewarn "easily susceptible to MITM attacks (even if used only as fallback). Please" + ewarn "use https instead." + ewarn "[URI: ${r}]" + fi + done + + local -x GIT_DIR + _git-r3_set_gitdir "${repos[0]}" + + # prepend the local mirror if applicable + if [[ ${EGIT_MIRROR_URI} ]]; then + repos=( + "${EGIT_MIRROR_URI%/}/${GIT_DIR##*/}" + "${repos[@]}" + ) + fi + + # get the default values for the common variables and override them + local branch_name=${EGIT_BRANCH} + local commit_id=${2:-${EGIT_COMMIT}} + local commit_date=${4:-${EGIT_COMMIT_DATE}} + + # support new override API for EAPI 6+ + if ! has "${EAPI:-0}" 0 1 2 3 4 5; then + # get the name and do some more processing: + # 1) kill .git suffix, + # 2) underscore (remaining) non-variable characters, + # 3) add preceding underscore if it starts with a digit, + # 4) uppercase. + local override_name=${GIT_DIR##*/} + override_name=${override_name%.git} + override_name=${override_name//[^a-zA-Z0-9_]/_} + override_name=${override_name^^} + + local varmap=( + REPO:repos + BRANCH:branch_name + COMMIT:commit_id + COMMIT_DATE:commit_date + ) + + local localvar livevar live_warn= + for localvar in "${varmap[@]}"; do + livevar=EGIT_OVERRIDE_${localvar%:*}_${override_name} + localvar=${localvar#*:} + + if [[ -n ${!livevar} ]]; then + [[ ${localvar} == repos ]] && repos=() + live_warn=1 + ewarn "Using ${livevar}=${!livevar}" + declare "${localvar}=${!livevar}" + fi + done + + if [[ ${live_warn} ]]; then + ewarn "No support will be provided." + fi + fi + + # set final variables after applying overrides + local branch=${branch_name:+refs/heads/${branch_name}} + local remote_ref=${commit_id:-${branch:-HEAD}} + local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}} + local local_ref=refs/git-r3/${local_id}/__main__ + + # try to fetch from the remote + local success saved_umask + if [[ ${EVCS_UMASK} ]]; then + saved_umask=$(umask) + umask "${EVCS_UMASK}" || die "Bad options to umask: ${EVCS_UMASK}" + fi + for r in "${repos[@]}"; do + if [[ ! ${EVCS_OFFLINE} ]]; then + einfo "Fetching \e[1m${r}\e[22m ..." + + local fetch_command=( git fetch "${r}" ) + local clone_type=${EGIT_CLONE_TYPE} + + if [[ ${r} == http://* || ${r} == https://* ]] && + [[ ! ${EGIT_CURL_WARNED} ]] + then + case ${EAPI:-0} in + 0|1|2|3|4) + ROOT=/ has_version 'dev-vcs/git[curl]';; + 5|6) + has_version --host-root 'dev-vcs/git[curl]';; + *) + has_version -b 'dev-vcs/git[curl]';; + esac + + if [[ ${?} -ne 0 ]]; then + ewarn "git-r3: fetching from HTTP(S) requested. In order to support HTTP(S)," + ewarn "dev-vcs/git needs to be built with USE=curl. Example solution:" + ewarn + ewarn " echo dev-vcs/git curl >> /etc/portage/package.use" + ewarn " emerge -1v dev-vcs/git" + ewarn + ewarn "HTTP(S) URIs will be skipped." + fi + + EGIT_CURL_WARNED=1 + fi + + if [[ ${clone_type} == mirror ]]; then + fetch_command+=( + --prune + # mirror the remote branches as local branches + "+refs/heads/*:refs/heads/*" + # pull tags explicitly in order to prune them properly + "+refs/tags/*:refs/tags/*" + # notes in case something needs them + "+refs/notes/*:refs/notes/*" + # and HEAD in case we need the default branch + # (we keep it in refs/git-r3 since otherwise --prune interferes) + "+HEAD:refs/git-r3/HEAD" + ) + else # single or shallow + local fetch_l fetch_r + + if [[ ${remote_ref} == HEAD ]]; then + # HEAD + fetch_l=HEAD + elif [[ ${remote_ref} == refs/* ]]; then + # regular branch, tag or some other explicit ref + fetch_l=${remote_ref} + else + # tag or commit id... + # let ls-remote figure it out + local tagref=$(git ls-remote "${r}" "refs/tags/${remote_ref}") + + # if it was a tag, ls-remote obtained a hash + if [[ ${tagref} ]]; then + # tag + fetch_l=refs/tags/${remote_ref} + else + # commit id + # so we need to fetch the whole branch + if [[ ${branch} ]]; then + fetch_l=${branch} + else + fetch_l=HEAD + fi + + # fetching by commit in shallow mode? can't do. + if [[ ${clone_type} == shallow ]]; then + clone_type=single + fi + fi + fi + + # checkout by date does not make sense in shallow mode + if [[ ${commit_date} && ${clone_type} == shallow ]]; then + clone_type=single + fi + + if [[ ${fetch_l} == HEAD ]]; then + fetch_r=refs/git-r3/HEAD + else + fetch_r=${fetch_l} + fi + + fetch_command+=( + "+${fetch_l}:${fetch_r}" + ) + + if [[ ${clone_type} == single+tags ]]; then + fetch_command+=( + # pull tags explicitly as requested + "+refs/tags/*:refs/tags/*" + ) + fi + fi + + if [[ ${clone_type} == shallow ]]; then + if _git-r3_is_local_repo; then + # '--depth 1' causes sandbox violations with local repos + # bug #491260 + clone_type=single + elif [[ ! $(git rev-parse --quiet --verify "${fetch_r}") ]] + then + # use '--depth 1' when fetching a new branch + fetch_command+=( --depth 1 ) + fi + else # non-shallow mode + if [[ -f ${GIT_DIR}/shallow ]]; then + fetch_command+=( --unshallow ) + fi + fi + + set -- "${fetch_command[@]}" + echo "${@}" >&2 + "${@}" || continue + + if [[ ${clone_type} == mirror || ${fetch_l} == HEAD ]]; then + # update our HEAD to match our remote HEAD ref + git symbolic-ref HEAD refs/git-r3/HEAD \ + || die "Unable to update HEAD" + fi + fi + + # now let's see what the user wants from us + if [[ ${commit_date} ]]; then + local dated_commit_id=$( + git rev-list --first-parent --before="${commit_date}" \ + -n 1 "${remote_ref}" + ) + if [[ ${?} -ne 0 ]]; then + die "Listing ${remote_ref} failed (wrong ref?)." + elif [[ ! ${dated_commit_id} ]]; then + die "Unable to find commit for date ${commit_date}." + else + set -- git update-ref --no-deref "${local_ref}" "${dated_commit_id}" + fi + else + local full_remote_ref=$( + git rev-parse --verify --symbolic-full-name "${remote_ref}" + ) + + if [[ ${full_remote_ref} ]]; then + # when we are given a ref, create a symbolic ref + # so that we preserve the actual argument + set -- git symbolic-ref "${local_ref}" "${full_remote_ref}" + else + # otherwise, we were likely given a commit id + set -- git update-ref --no-deref "${local_ref}" "${remote_ref}" + fi + fi + + echo "${@}" >&2 + if ! "${@}"; then + if [[ ${EVCS_OFFLINE} ]]; then + eerror "A clone of the following repository is required to proceed:" + eerror " ${r}" + eerror "However, networking activity has been disabled using EVCS_OFFLINE and the local" + eerror "clone does not have requested ref:" + eerror " ${remote_ref}" + die "Local clone of ${r} does not have requested ref: ${remote_ref}. Unable to proceed with EVCS_OFFLINE." + else + die "Referencing ${remote_ref} failed (wrong ref?)." + fi + fi + + success=1 + break + done + if [[ ${saved_umask} ]]; then + umask "${saved_umask}" || die + fi + [[ ${success} ]] || die "Unable to fetch from any of EGIT_REPO_URI" + + # submodules can reference commits in any branch + # always use the 'mirror' mode to accomodate that, bug #503332 + local EGIT_CLONE_TYPE=mirror + + # recursively fetch submodules + if git cat-file -e "${local_ref}":.gitmodules &>/dev/null; then + local submodules + _git-r3_set_submodules \ + "$(git cat-file -p "${local_ref}":.gitmodules || die)" + + while [[ ${submodules[@]} ]]; do + local subname=${submodules[0]} + local url=${submodules[1]} + local path=${submodules[2]} + + # use only submodules for which path does exist + # (this is in par with 'git submodule'), bug #551100 + # note: git cat-file does not work for submodules + if [[ $(git ls-tree -d "${local_ref}" "${path}") ]] + then + local commit=$(git rev-parse "${local_ref}:${path}" || die) + + if [[ ! ${commit} ]]; then + die "Unable to get commit id for submodule ${subname}" + fi + + local subrepos + _git-r3_set_subrepos "${url}" "${repos[@]}" + + git-r3_fetch "${subrepos[*]}" "${commit}" "${local_id}/${subname}" + fi + + submodules=( "${submodules[@]:3}" ) # shift + done + fi +} + +# @FUNCTION: git-r3_checkout +# @USAGE: [<repo-uri> [<checkout-path> [<local-id> [<checkout-paths>...]]]] +# @DESCRIPTION: +# Check the previously fetched tree to the working copy. +# +# <repo-uri> specifies the repository URIs, as a space-separated list. +# The first URI will be used as repository group identifier +# and therefore must be used consistently with git-r3_fetch. +# The remaining URIs are not used and therefore may be omitted. +# When not specified, defaults to ${EGIT_REPO_URI}. +# +# <checkout-path> specifies the path to place the checkout. It defaults +# to ${EGIT_CHECKOUT_DIR} if set, otherwise to ${WORKDIR}/${P}. +# +# <local-id> needs to specify the local identifier that was used +# for respective git-r3_fetch. +# +# If <checkout-paths> are specified, then the specified paths are passed +# to 'git checkout' to effect a partial checkout. Please note that such +# checkout will not cause the repository to switch branches, +# and submodules will be skipped at the moment. The submodules matching +# those paths might be checked out in a future version of the eclass. +# +# The checkout operation will write to the working copy, and export +# the repository state into the environment. If the repository contains +# submodules, they will be checked out recursively. +git-r3_checkout() { + debug-print-function ${FUNCNAME} "$@" + + local repos + if [[ ${1} ]]; then + repos=( ${1} ) + elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then + repos=( "${EGIT_REPO_URI[@]}" ) + else + repos=( ${EGIT_REPO_URI} ) + fi + + local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}} + local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}} + local checkout_paths=( "${@:4}" ) + + local -x GIT_DIR + _git-r3_set_gitdir "${repos[0]}" + + einfo "Checking out \e[1m${repos[0]}\e[22m to \e[1m${out_dir}\e[22m ..." + + if ! git cat-file -e refs/git-r3/"${local_id}"/__main__; then + die "Logic error: no local clone of ${repos[0]}. git-r3_fetch not used?" + fi + local remote_ref=$( + git symbolic-ref --quiet refs/git-r3/"${local_id}"/__main__ + ) + local new_commit_id=$( + git rev-parse --verify refs/git-r3/"${local_id}"/__main__ + ) + + git-r3_sub_checkout() { + local orig_repo=${GIT_DIR} + local -x GIT_DIR=${out_dir}/.git + local -x GIT_WORK_TREE=${out_dir} + + mkdir -p "${out_dir}" || die + + # use git init+fetch instead of clone since the latter doesn't like + # non-empty directories. + + git init --quiet || die + # setup 'alternates' to avoid copying objects + echo "${orig_repo}/objects" > "${GIT_DIR}"/objects/info/alternates || die + # now copy the refs + cp -R "${orig_repo}"/refs/* "${GIT_DIR}"/refs/ || die + if [[ -f ${orig_repo}/packed-refs ]]; then + cp "${orig_repo}"/packed-refs "${GIT_DIR}"/packed-refs || die + fi + + # (no need to copy HEAD, we will set it via checkout) + + if [[ -f ${orig_repo}/shallow ]]; then + cp "${orig_repo}"/shallow "${GIT_DIR}"/ || die + fi + + set -- git checkout --quiet + if [[ ${remote_ref} ]]; then + set -- "${@}" "${remote_ref#refs/heads/}" + else + set -- "${@}" "${new_commit_id}" + fi + if [[ ${checkout_paths[@]} ]]; then + set -- "${@}" -- "${checkout_paths[@]}" + fi + echo "${@}" >&2 + "${@}" || die "git checkout ${remote_ref:-${new_commit_id}} failed" + } + git-r3_sub_checkout + unset -f git-r3_sub_checkout + + local old_commit_id=$( + git rev-parse --quiet --verify refs/git-r3/"${local_id}"/__old__ + ) + if [[ ! ${old_commit_id} ]]; then + echo "GIT NEW branch -->" + echo " repository: ${repos[0]}" + echo " at the commit: ${new_commit_id}" + else + # diff against previous revision + echo "GIT update -->" + echo " repository: ${repos[0]}" + # write out message based on the revisions + if [[ "${old_commit_id}" != "${new_commit_id}" ]]; then + echo " updating from commit: ${old_commit_id}" + echo " to commit: ${new_commit_id}" + + set -- git --no-pager diff --stat \ + ${old_commit_id}..${new_commit_id} + if [[ ${checkout_paths[@]} ]]; then + set -- "${@}" -- "${checkout_paths[@]}" + fi + "${@}" + else + echo " at the commit: ${new_commit_id}" + fi + fi + git update-ref --no-deref refs/git-r3/"${local_id}"/{__old__,__main__} || die + + # recursively checkout submodules + if [[ -f ${out_dir}/.gitmodules && ! ${checkout_paths} ]]; then + local submodules + _git-r3_set_submodules \ + "$(<"${out_dir}"/.gitmodules)" + + while [[ ${submodules[@]} ]]; do + local subname=${submodules[0]} + local url=${submodules[1]} + local path=${submodules[2]} + + # use only submodules for which path does exist + # (this is in par with 'git submodule'), bug #551100 + if [[ -d ${out_dir}/${path} ]]; then + local subrepos + _git-r3_set_subrepos "${url}" "${repos[@]}" + + git-r3_checkout "${subrepos[*]}" "${out_dir}/${path}" \ + "${local_id}/${subname}" + fi + + submodules=( "${submodules[@]:3}" ) # shift + done + fi + + # keep this *after* submodules + export EGIT_DIR=${GIT_DIR} + export EGIT_VERSION=${new_commit_id} +} + +# @FUNCTION: git-r3_peek_remote_ref +# @USAGE: [<repo-uri> [<remote-ref>]] +# @DESCRIPTION: +# Peek the reference in the remote repository and print the matching +# (newest) commit SHA1. +# +# <repo-uri> specifies the repository URIs to fetch from, as a space- +# -separated list. When not specified, defaults to ${EGIT_REPO_URI}. +# +# <remote-ref> specifies the remote ref to peek. It is preferred to use +# 'refs/heads/<branch-name>' for branches and 'refs/tags/<tag-name>' +# for tags. Alternatively, 'HEAD' may be used for upstream default +# branch. Defaults to the first of EGIT_COMMIT, EGIT_BRANCH or literal +# 'HEAD' that is set to a non-null value. +# +# The operation will be done purely on the remote, without using local +# storage. If commit SHA1 is provided as <remote-ref>, the function will +# fail due to limitations of git protocol. +# +# On success, the function returns 0 and writes hexadecimal commit SHA1 +# to stdout. On failure, the function returns 1. +git-r3_peek_remote_ref() { + debug-print-function ${FUNCNAME} "$@" + + local repos + if [[ ${1} ]]; then + repos=( ${1} ) + elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then + repos=( "${EGIT_REPO_URI[@]}" ) + else + repos=( ${EGIT_REPO_URI} ) + fi + + local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}} + local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}} + + [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset" + + local r success + for r in "${repos[@]}"; do + einfo "Peeking \e[1m${remote_ref}\e[22m on \e[1m${r}\e[22m ..." >&2 + + local lookup_ref + if [[ ${remote_ref} == refs/* || ${remote_ref} == HEAD ]] + then + lookup_ref=${remote_ref} + else + # ls-remote by commit is going to fail anyway, + # so we may as well pass refs/tags/ABCDEF... + lookup_ref=refs/tags/${remote_ref} + fi + + # split on whitespace + local ref=( + $(git ls-remote "${r}" "${lookup_ref}") + ) + + if [[ ${ref[0]} ]]; then + echo "${ref[0]}" + return 0 + fi + done + + return 1 +} + +git-r3_src_fetch() { + debug-print-function ${FUNCNAME} "$@" + + if [[ ! ${EGIT3_STORE_DIR} && ${EGIT_STORE_DIR} ]]; then + ewarn "You have set EGIT_STORE_DIR but not EGIT3_STORE_DIR. Please consider" + ewarn "setting EGIT3_STORE_DIR for git-r3.eclass. It is recommended to use" + ewarn "a different directory than EGIT_STORE_DIR to ease removing old clones" + ewarn "when git-2 eclass becomes deprecated." + fi + + _git-r3_env_setup + git-r3_fetch +} + +git-r3_src_unpack() { + debug-print-function ${FUNCNAME} "$@" + + _git-r3_env_setup + git-r3_src_fetch + git-r3_checkout +} + +# https://bugs.gentoo.org/show_bug.cgi?id=482666 +git-r3_pkg_needrebuild() { + debug-print-function ${FUNCNAME} "$@" + + local new_commit_id=$(git-r3_peek_remote_ref) + [[ ${new_commit_id} && ${EGIT_VERSION} ]] || die "Lookup failed" + + if [[ ${EGIT_VERSION} != ${new_commit_id} ]]; then + einfo "Update from \e[1m${EGIT_VERSION}\e[22m to \e[1m${new_commit_id}\e[22m" + else + einfo "Local and remote at \e[1m${EGIT_VERSION}\e[22m" + fi + + [[ ${EGIT_VERSION} != ${new_commit_id} ]] +} + +# 'export' locally until this gets into EAPI +pkg_needrebuild() { git-r3_pkg_needrebuild; } + +_GIT_R3=1 +fi diff -uNr a/eclass/gkrellm-plugin.eclass b/eclass/gkrellm-plugin.eclass --- a/eclass/gkrellm-plugin.eclass false +++ b/eclass/gkrellm-plugin.eclass b8fdc6e240310ca03267548c20d7336c05fd2f0535a22493afeca047895bd9a711dc2c2afbecf42a736ff6b180897dcad0b1cd71b8658a99bdd8e4b9203fc332 @@ -0,0 +1,99 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: gkrellm-plugin.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @AUTHOR: +# Original author: Jim Ramsay +# EAPI 6 author: David Seifert +# @BLURB: Provides src_install used by (almost) all gkrellm plugins +# @DESCRIPTION: +# - Sets up default dependencies +# - Provides a common src_install method to avoid code duplication +# +# Changelog: +# 03 January 2018: David Seifert <soap@gentoo.org> +# - Port to EAPI 6, remove built_with_use, simplify a lot +# 12 March 2007: Jim Ramsay <lack@gentoo.org> +# - Added server plugin support +# 09 March 2007: Jim Ramsay <lack@gentoo.org> +# - Initial commit +# + +# @ECLASS-VARIABLE: PLUGIN_SO +# @DESCRIPTION: +# The name of the plugin's .so file which will be installed in +# the plugin dir. Defaults to "${PN}$(get_modname)". Has to be a bash array. + +# @ECLASS-VARIABLE: PLUGIN_SERVER_SO +# @DESCRIPTION: +# The name of the plugin's server plugin $(get_modname) portion. +# Unset by default. Has to be a bash array. + +# @ECLASS-VARIABLE: PLUGIN_DOCS +# @DESCRIPTION: +# An optional list of docs to be installed, in addition to the default +# DOCS variable which is respected too. Has to be a bash array. + +case ${EAPI:-0} in + [0-5]) + die "${ECLASS} is banned in EAPI ${EAPI:-0}" + ;; + 6) + ;; + *) + die "Unknown EAPI ${EAPI:-0}" + ;; +esac + +inherit multilib + +EXPORT_FUNCTIONS src_install + +if [[ ! ${_GKRELLM_PLUGIN_R1} ]]; then + +DEPEND="virtual/pkgconfig" + +# @FUNCTION: gkrellm-plugin_src_install +# @DESCRIPTION: +# Install the plugins and call einstalldocs +gkrellm-plugin_src_install() { + exeinto /usr/$(get_libdir)/gkrellm2/plugins + + if ! declare -p PLUGIN_SO >/dev/null 2>&1 ; then + doexe ${PN}$(get_modname) + elif declare -p PLUGIN_SO | grep -q "^declare -a " ; then + doexe "${PLUGIN_SO[@]}" + else + die "PLUGIN_SO has to be a bash array!" + fi + + + if [[ -n ${PLUGIN_SERVER_SO} ]]; then + exeinto /usr/$(get_libdir)/gkrellm2/plugins-gkrellmd + + if declare -p PLUGIN_SERVER_SO | grep -q "^declare -a " ; then + doexe "${PLUGIN_SERVER_SO[@]}" + else + die "PLUGIN_SERVER_SO has to be a bash array!" + fi + fi + + einstalldocs + local d + for d in Changelog* ChangeLog*; do + [[ -s "${d}" ]] && dodoc "${d}" + done + + if [[ -n ${PLUGIN_DOCS} ]]; then + if declare -p PLUGIN_DOCS | grep -q "^declare -a " ; then + dodoc "${PLUGIN_DOCS[@]}" + else + die "PLUGIN_DOCS has to be a bash array!" + fi + fi +} + +_GKRELLM_PLUGIN_R1=1 +fi diff -uNr a/eclass/gnatbuild-r1.eclass b/eclass/gnatbuild-r1.eclass --- a/eclass/gnatbuild-r1.eclass false +++ b/eclass/gnatbuild-r1.eclass 470a27f2dee9df12973f6ec091b8fb6319f9cfd2da61432ea47e8a54f12b272cbc1b63f5af3ec7d5098e87837095748368c323f41231aae327ce22801e37fce3 @@ -0,0 +1,1102 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @DEAD +# Removal on 2018-05-18. + +# Author: George Shapovalov <george@gentoo.org> +# Author: Steve Arnold <nerdboy@gentoo.org> +# No maintainer <maintainer-needed@gentoo.org> +# +# Notes: +# HOMEPAGE and LICENSE are set in appropriate ebuild, as +# gnat is developed by FSF and AdaCore "in parallel" +# +# The following vars can be set in ebuild before inheriting this eclass. They +# will be respected: +# SLOT +# BOOT_SLOT - where old bootstrap is used as it works fine for 4.4 - 4.6 + +#WANT_AUTOMAKE="1.8" +#WANT_AUTOCONF="2.1" + +inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator + +FEATURES=${FEATURES/multilib-strict/} + +EXPORTED_FUNCTIONS="pkg_setup pkg_postinst pkg_postrm src_unpack src_configure src_compile src_install" + +EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} + +IUSE="nls openmp hardened multilib" +# multilib is supported via profiles now, multilib usevar is deprecated + +RDEPEND="virtual/libiconv + nls? ( virtual/libintl )" + +DEPEND="${RDEPEND} + >=app-eselect/eselect-gnat-1.5 + >=sys-libs/glibc-2.12 + >=sys-devel/binutils-2.23 + sys-devel/bc + >=sys-devel/bison-1.875 + >=sys-devel/flex-2.5.4 + nls? ( sys-devel/gettext )" + +# Note! +# It may not be safe to source this at top level. Only source inside local +# functions! +GnatCommon="/usr/share/gnat/lib/gnat-common.bash" + +#---->> globals and SLOT <<---- + +# just a check, this location seems to vary too much, easier to track it in +# ebuild +#[ -z "${GNATSOURCE}" ] && die "please set GNATSOURCE in ebuild! (before inherit)" + +# versioning +# because of gnatpro/gnatgpl we need to track both gcc and gnat versions + +# these simply default to $PV +GNATMAJOR=$(get_version_component_range 1) +GNATMINOR=$(get_version_component_range 2) +GNATBRANCH=$(get_version_component_range 1-2) +GNATRELEASE=$(get_version_component_range 1-3) +# this one is for the gnat-gpl which is versioned by gcc backend and ACT version +# number added on top +ACT_Ver=$(get_version_component_range 4) + +# GCCVER and SLOT logic +# +# I better define vars for package names, as there was discussion on proper +# naming and it may change +PN_GnatGCC="gnat-gcc" +PN_GnatGpl="gnat-gpl" + +# ATTN! GCCVER stands for the provided backend gcc, not the one on the system +# so tc-* functions are of no use here. The present versioning scheme makes +# GCCVER basically a part of PV, but *this may change*!! +# +# GCCVER can be set in the ebuild. +[[ -z ${GCCVER} ]] && GCCVER="${GNATRELEASE}" + + +# finally extract GCC version strings +GCCMAJOR=$(get_version_component_range 1 "${GCCVER}") +GCCMINOR=$(get_version_component_range 2 "${GCCVER}") +GCCBRANCH=$(get_version_component_range 1-2 "${GCCVER}") +GCCRELEASE=$(get_version_component_range 1-3 "${GCCVER}") + +# SLOT logic, make it represent gcc backend, as this is what matters most +# There are some special cases, so we allow it to be defined in the ebuild +# ATTN!! If you set SLOT in the ebuild, don't forget to make sure that +# BOOT_SLOT is also set properly! +[[ -z ${SLOT} ]] && SLOT="${GCCBRANCH}" + +# possible future crosscompilation support +export CTARGET=${CTARGET:-${CHOST}} + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +# Bootstrap CTARGET and SLOT logic. For now BOOT_TARGET=CHOST is "guaranteed" by +# profiles, so mostly watch out for the right SLOT used in the bootstrap. +# As above, with SLOT, it may need to be defined in the ebuild +BOOT_TARGET=${CTARGET} +[[ -z ${BOOT_SLOT} ]] && BOOT_SLOT=${SLOT} + +# for newer bootstrap starting with 4.9 (still experimental) +BOOT_VER=${GCCRELEASE} + +# set our install locations +PREFIX=${GNATBUILD_PREFIX:-/usr} # not sure we need this hook, but may be.. +LIBPATH=${PREFIX}/$(get_libdir)/${PN}/${CTARGET}/${SLOT} +LIBEXECPATH=${PREFIX}/libexec/${PN}/${CTARGET}/${SLOT} +INCLUDEPATH=${LIBPATH}/include +BINPATH=${PREFIX}/${CTARGET}/${PN}-bin/${SLOT} +DATAPATH=${PREFIX}/share/${PN}-data/${CTARGET}/${SLOT} +# ATTN! the one below should match the path defined in eselect-gnat module +CONFIG_PATH="/usr/share/gnat/eselect" +gnat_profile="${CTARGET}-${PN}-${SLOT}" +gnat_config_file="${CONFIG_PATH}/${gnat_profile}" + +# ebuild globals +if [[ ${PN} == "${PN_GnatPro}" ]] && [[ ${GNATMAJOR} == "3" ]]; then + DEPEND="x86? ( >=app-shells/tcsh-6.0 )" +fi +S="${WORKDIR}/gcc-${GCCVER}" + +# bootstrap globals, common to src_unpack and src_compile +GNATBOOT="${WORKDIR}/usr" +GNATBUILD="${WORKDIR}/build" +#GNATBUILD="${BUILD_DIR}" + +# necessary for detecting lib locations and creating env.d entry +#XGCC="${GNATBUILD}/gcc/xgcc -B${GNATBUILD}/gcc" + +#----<< globals and SLOT >>---- + +# set SRC_URI's in ebuilds for now + +#----<< global toolchain vars >>---- + +: ${TARGET_ABI:=${ABI}} +: ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}} +: ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}} + + +#---->> specs + env.d logic <<---- +# TODO!!! +# set MANPATH, etc.. +#----<< specs + env.d logic >>---- + + +#---->> some helper functions <<---- +tc_version_is_at_least() { + version_is_at_least "$1" "${2:-${GCCBRANCH}}" +} + +guess_patch_type_in_dir() { + [[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \ + && EPATCH_SUFFIX="patch.bz2" \ + || EPATCH_SUFFIX="patch" +} + +# configure to build with the hardened GCC specs as the default +make_gcc_hard() { + # we want to be able to control the pie patch logic via something other + # than ALL_CFLAGS... + sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \ + -e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \ + -i "${S}"/gcc/Makefile.in + # Need to add HARD_CFLAGS to ALL_CXXFLAGS on >= 4.7 + if tc_version_is_at_least 4.7 ; then + sed -e '/^ALL_CXXFLAGS/iHARD_CFLAGS = ' \ + -e 's|^ALL_CXXFLAGS = |ALL_CXXFLAGS = $(HARD_CFLAGS) |' \ + -i "${S}"/gcc/Makefile.in + fi + + # defaults to enable for new gnatbuild + if use hardened ; then + gcc_hard_flags=" -DEFAULT_PIE_SSP" + else + gcc_hard_flags+=" -DEFAULT_SSP" + fi + + sed -i \ + -e "/^HARD_CFLAGS = /s|=|= ${gcc_hard_flags} |" \ + "${S}"/gcc/Makefile.in || die + +} + +gcc-multilib-configure() { + if ! is_multilib ; then + confgcc="${confgcc} --disable-multilib" + # Fun times: if we are building for a target that has multiple + # possible ABI formats, and the user has told us to pick one + # that isn't the default, then not specifying it via the list + # below will break that on us. + else + confgcc="${confgcc} --enable-multilib" + fi + + # translate our notion of multilibs into gcc's + local abi list + for abi in $(get_all_abis TARGET) ; do + local l=$(gcc-abi-map ${abi}) + [[ -n ${l} ]] && list+=",${l}" + done + if [[ -n ${list} ]] ; then + case ${CTARGET} in + x86_64*) + tc_version_is_at_least 4.8 && confgcc="${confgcc} --with-multilib-list=${list:1}" + ;; + esac + fi +} + +gcc-abi-map() { + # Convert the ABI name we use in Gentoo to what gcc uses + local map=() + case ${CTARGET} in + mips*) map=("o32 32" "n32 n32" "n64 64") ;; + x86_64*) map=("amd64 m64" "x86 m32" "x32 mx32") ;; + esac + + local m + for m in "${map[@]}" ; do + l=( ${m} ) + [[ $1 == ${l[0]} ]] && echo ${l[1]} && break + done +} + +is_multilib() { + tc_version_is_at_least 3 || return 1 + use multilib +} + +## note: replaced with minspecs (sort of) +#create_specs_file() { +# einfo "Creating a vanilla gcc specs file" +# "${WORKDIR}"/build/gcc/xgcc -dumpspecs > "${WORKDIR}"/build/vanilla.specs +#} + +# eselect stuff taken straight from toolchain.eclass and greatly simplified +add_profile_eselect_conf() { + local gnat_config_file=$1 + local abi=$2 + local var + + echo >> "${D}/${gnat_config_file}" + if ! is_multilib ; then + echo " ctarget=${CTARGET}" >> "${D}/${gnat_config_file}" + else + echo "[${abi}]" >> "${D}/${gnat_config_file}" + var="CTARGET_${abi}" + if [[ -n ${!var} ]] ; then + echo " ctarget=${!var}" >> "${D}/${gnat_config_file}" + else + var="CHOST_${abi}" + if [[ -n ${!var} ]] ; then + echo " ctarget=${!var}" >> "${D}/${gnat_config_file}" + else + echo " ctarget=${CTARGET}" >> "${D}/${gnat_config_file}" + fi + fi + fi + + var="CFLAGS_${abi}" + if [[ -n ${!var} ]] ; then + echo " cflags=${!var}" >> "${D}/${gnat_config_file}" + fi +} + +create_eselect_conf() { + local abi + + dodir ${CONFIG_PATH} + + echo "[global]" > "${D}/${gnat_config_file}" + echo " version=${CTARGET}-${SLOT}" >> "${D}/${gnat_config_file}" + echo " binpath=${BINPATH}" >> "${D}/${gnat_config_file}" + echo " libexecpath=${LIBEXECPATH}" >> "${D}/${gnat_config_file}" + echo " ldpath=${LIBPATH}" >> "${D}/${gnat_config_file}" + echo " manpath=${DATAPATH}/man" >> "${D}/${gnat_config_file}" + echo " infopath=${DATAPATH}/info" >> "${D}/${gnat_config_file}" + echo " bin_prefix=${CTARGET}" >> "${D}/${gnat_config_file}" + + for abi in $(get_all_abis) ; do + add_profile_eselect_conf "${gnat_config_file}" "${abi}" + done +} + +should_we_eselect_gnat() { + # we only want to switch compilers if installing to / or /tmp/stage1root + [[ ${ROOT} == "/" ]] || return 1 + + # if the current config is invalid, we definitely want a new one + # Note: due to bash quirkiness, the following must not be 1 line + local curr_config + curr_config=$(eselect --colour=no gnat show | grep ${CTARGET} | awk '{ print $1 }') || return 0 + [[ -z ${curr_config} ]] && return 0 + + # The logic is basically "try to keep the same profile if possible" + + if [[ ${curr_config} == ${CTARGET}-${PN}-${SLOT} ]] ; then + return 0 + else + elog "The current gcc config appears valid, so it will not be" + elog "automatically switched for you. If you would like to" + elog "switch to the newly installed gcc version, do the" + elog "following:" + echo + elog "eselect gnat set <profile>" + echo + return 1 + fi +} + +# active compiler selection, called from pkg_postinst +do_gnat_config() { + eselect gnat set ${CTARGET}-${PN}-${SLOT} &> /dev/null + + elog "The following gnat profile has been activated:" + elog "${CTARGET}-${PN}-${SLOT}" + elog "" + elog "The compiler has been installed as gnatgcc, and the coverage testing" + elog "tool as gnatgcov." + elog "" + elog "Ada handling in Gentoo allows you to have multiple gnat variants" + elog "installed in parallel and automatically manage Ada libs." + elog "Please take a look at the Ada project page for some documentation:" + elog "http://www.gentoo.org/proj/en/prog_lang/ada/index.xml" +} + + +# Taken straight from the toolchain.eclass. Only removed the "obsolete hunk" +# +# The purpose of this DISGUSTING gcc multilib hack is to allow 64bit libs +# to live in lib instead of lib64 where they belong, with 32bit libraries +# in lib32. This hack has been around since the beginning of the amd64 port, +# and we're only now starting to fix everything that's broken. Eventually +# this should go away. +# +# Travis Tilley <lv@gentoo.org> (03 Sep 2004) +# +disgusting_gcc_multilib_HACK() { + local config + local libdirs + if has_multilib_profile ; then + case $(tc-arch) in + amd64) + config="i386/t-linux64" + libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \ + ;; + ppc64) + config="rs6000/t-linux64" + libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \ + ;; + esac + else + die "Your profile is no longer supported by portage." + fi + + einfo "updating multilib directories to be: ${libdirs}" + sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" "${S}"/gcc/config/${config} +} + + +#---->> pkg_* <<---- +gnatbuild-r1_pkg_setup() { + debug-print-function ${FUNCNAME} $@ + + # Setup variables which would normally be in the profile + if is_crosscompile ; then + multilib_env ${CTARGET} + fi + + # we dont want to use the installed compiler's specs to build gnat! + unset GCC_SPECS + unset LANGUAGES #265283 +} + +gnatbuild-r1_pkg_postinst() { + if should_we_eselect_gnat; then + do_gnat_config + else + eselect gnat update + fi + + # if primary compiler list is empty, add this profile to the list, so + # that users are not left without active compilers (making sure that + # libs are getting built for at least one) + elog + . ${GnatCommon} || die "failed to source common code" + if [[ ! -f ${PRIMELIST} ]] || [[ ! -s ${PRIMELIST} ]]; then + echo "${gnat_profile}" > ${PRIMELIST} + elog "The list of primary compilers was empty and got assigned ${gnat_profile}." + fi + elog "Please edit ${PRIMELIST} and list there gnat profiles intended" + elog "for common use." +} + + +gnatbuild-r1_pkg_postrm() { + # "eselect gnat update" now removes the env.d file if the corresponding + # gnat profile was unmerged + eselect gnat update + elog "If you just unmerged the last gnat in this SLOT, your active gnat" + elog "profile got unset. Please check what eselect gnat show tells you" + elog "and set the desired profile" +} +#---->> pkg_* <<---- + +#---->> src_* <<---- + +# common unpack stuff +gnatbuild-r1_src_unpack() { + debug-print-function ${FUNCNAME} $@ + + [ -z "$1" ] && gnatbuild-r1_src_unpack all + + while [ "$1" ]; do + case $1 in + base_unpack) + unpack ${A} + pax-mark E $(find ${GNATBOOT} -name gnat1) + + cd "${S}" + # patching gcc sources, following the toolchain + # first, the common patches + guess_patch_type_in_dir "${WORKDIR}"/patch + EPATCH_MULTI_MSG="Applying common Gentoo patches ..." \ + epatch "${WORKDIR}"/patch + guess_patch_type_in_dir "${WORKDIR}"/piepatch + EPATCH_MULTI_MSG="Applying Gentoo PIE patches ..." \ + epatch "${WORKDIR}"/piepatch + + if [[ -d "${FILESDIR}"/patches ]] && [[ ! -z $(ls "${FILESDIR}"/patches/*.patch 2>/dev/null) ]] ; then + EPATCH_MULTI_MSG="Applying local Gentoo patches ..." \ + epatch "${FILESDIR}"/patches/*.patch + fi + # + # then per SLOT + if [[ -d "${FILESDIR}"/patches/${SLOT} ]] && [[ ! -z $(ls "${FILESDIR}"/patches/${SLOT}/*.patch 2>/dev/null) ]] ; then + EPATCH_MULTI_MSG="Applying SLOT-specific Gentoo patches ..." \ + epatch "${FILESDIR}"/patches/${SLOT}/*.patch + fi + + # add hardening as per toolchain eclass + make_gcc_hard + + # Replacing obsolete head/tail with POSIX compliant ones + ht_fix_file */configure + +# if ! is_crosscompile && is_multilib && \ +# [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then +# disgusting_gcc_multilib_HACK || die "multilib hack failed" +# fi + + # Fixup libtool to correctly generate .la files with portage + cd "${S}" + elibtoolize --portage --shallow --no-uclibc + + gnuconfig_update + # update configure files + einfo "Fixing misc issues in configure files" + for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do + ebegin " Updating ${f}" + patch "${f}" "${FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \ + || eerror "Please file a bug about this" + eend $? + done + + # apply global slot/path patch + EPATCH_MULTI_MSG="Adjusting default paths for gnat-gcc ..." \ + epatch "${FILESDIR}"/${PN}-4.9.3-make-default-paths-match-slot.patch + sed -i -e "s|SLOT_MARKER|${BOOT_SLOT}|" "${S}"/gcc/Makefile.in + + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch + +# this is only needed for gnat-gpl-4.1 and breaks for gnat-gcc, so +# this block was moved to corresponding ebuild +# pushd "${S}"/gnattools &> /dev/null +# eautoconf +# popd &> /dev/null + ;; + + common_prep) + # Prepare the gcc source directory + cd "${S}/gcc" + touch cstamp-h.in + touch ada/[es]info.h + touch ada/nmake.ad[bs] + # set the compiler name to gnatgcc + for i in `find ada/ -name '*.ad[sb]'`; do \ + sed -i -e "s/\"gcc\"/\"gnatgcc\"/g" ${i}; \ + done + # add -fPIC flag to shared libs for 3.4* backend + if [ "3.4" == "${GCCBRANCH}" ] ; then + cd ada + epatch "${FILESDIR}"/gnat-Make-lang.in.patch + fi + + # gcc 4.3 sources seem to have a common omission of $(DESTDIR), + # that leads to make install trying to rm -f file on live system. + # As we do not need this rm, we simply remove the whole line + if [ "4.3" == "${GCCBRANCH}" ] ; then + sed -i -e "/\$(RM) \$(bindir)/d" "${S}"/gcc/ada/Make-lang.in + fi + + find "${S}" -name Makefile.in \ + -exec sed -i '/^pkgconfigdir/s:=.*:=$(toolexeclibdir)/pkgconfig:' {} + + + mkdir -p "${GNATBUILD}" + ;; + + all) + gnatbuild-r1_src_unpack base_unpack common_prep + ;; + esac + shift + done +} + +# for now just dont run default configure +gnatbuild-r1_src_configure() { + : +} + +# it would be nice to split configure and make steps +# but both need to operate inside specially tuned evironment +# so just do sections for now (as in eclass section of handbook) +# sections are: configure, make-tools, bootstrap, +# gnatlib_and_tools, gnatlib-shared +gnatbuild-r1_src_compile() { + debug-print-function ${FUNCNAME} $@ + + if [[ -z "$1" ]]; then + gnatbuild-r1_src_compile all + return $? + fi + + if [[ "all" == "$1" ]] + then # specialcasing "all" to avoid scanning sources unnecessarily + gnatbuild-r1_src_compile configure make-tools \ + bootstrap gnatlib_and_tools gnatlib-shared + + else + # Set some paths to our bootstrap compiler. + export PATH="${GNATBOOT}/bin:${PATH}" + # !ATTN! the bootstrap compilers have a very simplystic structure, + # so many paths are not identical to the installed ones. + # Plus it was simplified even more in new releases. + if [[ ${BOOT_SLOT} > 4.1 ]] ; then + case $(tc-arch) in + arm) + GNATLIB="${GNATBOOT}/lib/gcc/${BOOT_TARGET}/${BOOT_SLOT}" + ;; + x86|amd64) + GNATLIB="${GNATBOOT}/lib/gcc/${BOOT_TARGET}/${BOOT_VER}" + ;; + *) + GNATLIB="${GNATBOOT}/lib" + ;; + esac + else + GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}" + fi + + export CC="${GNATBOOT}/bin/gnatgcc" + export CXX="${GNATBOOT}/bin/gnatg++" + export LDFLAGS="${LDFLAGS}" + export CFLAGS="${CFLAGS}" + export CXXFLAGS="${CFLAGS}" + # CPATH is supposed to be applied for any language, thus + # superceding either of C/CPLUS/OBJC_INCLUDE_PATHs + export CPATH="${GNATLIB}/include" + LIB_DIR="${GNATLIB}" + LDFLAGS="${LDFLAGS} -L${GNATLIB}" + + # additional vars from gnuada and elsewhere + export LIBRARY_PATH="${GNATLIB}" + + STDCXX_INCDIR="${LIBPATH}/include/g++-v${SLOT/\.*/}" + + export ADA_OBJECTS_PATH="${GNATLIB}/adalib" + export ADA_INCLUDE_PATH="${GNATLIB}/adainclude" + + while [ "$1" ]; do + case $1 in + configure) + debug-print-section configure + + # Configure gcc + local confgcc + confgcc="${confgcc} --host=${CHOST}" + + # some cross-compile logic from toolchain + if is_crosscompile || tc-is-cross-compiler ; then + confgcc="${confgcc} --target=${CTARGET}" + fi + [[ -n ${CBUILD} ]] && confgcc="${confgcc} --build=${CBUILD}" + + # Native Language Support + if use nls ; then + confgcc="${confgcc} --enable-nls --without-included-gettext" + else + confgcc="${confgcc} --disable-nls" + fi + + # bug 586538: extra lto-wrapper dorks up system gcc + confgcc="${confgcc} --disable-lto" + + # setup multilib abi stuff + gcc-multilib-configure + + use hardened && confgcc="${confgcc} --enable-esp" + + # reasonably sane globals (from toolchain) + # also disable mudflap and ssp + confgcc="${confgcc} \ + --enable-languages="c,ada,c++" \ + --with-gcc \ + --with-system-zlib \ + --enable-obsolete \ + --enable-secureplt \ + --disable-werror \ + --enable-checking=release \ + --enable-libstdcxx-time \ + --disable-libmudflap \ + --disable-libssp \ + --disable-altivec \ + --disable-fixed-point \ + --disable-libgcj \ + --disable-libcilkrts \ + --disable-libquadmath \ + --enable-libsanitizer \ + --enable-targets=all \ + --with-bugurl=https://bugs.gentoo.org/ \ + --with-python-dir=${DATAPATH/$PREFIX/}/python" + + if in_iuse openmp ; then + # Make sure target has pthreads support. #326757 #335883 + # There shouldn't be a chicken&egg problem here as openmp won't + # build without a C library, and you can't build that w/out + # already having a compiler ... + if ! is_crosscompile || \ + $(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null + then + case $(tc-arch) in + arm) + confgcc="${confgcc} --disable-libgomp" + ;; + *) + if use openmp ; then + confgcc="${confgcc} --enable-libgomp" + else + confgcc="${confgcc} --disable-libgomp" + fi + ;; + esac + else + # Force disable as the configure script can be dumb #359855 + confgcc="${confgcc} --disable-libgomp" + fi + else + # For gcc variants where we don't want openmp (e.g. kgcc) + confgcc="${confgcc} --disable-libgomp" + fi + + # ACT's gnat-gpl does not like libada for whatever reason.. + if tc_version_is_at_least 4.2 ; then + confgcc="${confgcc} --enable-libada" +# else +# einfo "ACT's gnat-gpl does not like libada, disabling" +# confgcc="${confgcc} --disable-libada" + fi + + # set some specifics available in later versions + confgcc="${confgcc} --enable-shared" + if tc_version_is_at_least 4.7 ; then + einfo "setting gnat thread model" + confgcc="${confgcc} --enable-threads=posix" + confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada" + elif tc_version_is_at_least 4.3 ; then + confgcc="${confgcc} --enable-threads=gnat" + confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada" + else + confgcc="${confgcc} --enable-threads=posix" + fi + + # harfloat vs soft + case $(tc-is-softfloat) in + yes) confgcc="${confgcc} --with-float=soft" ;; + softfp) confgcc="${confgcc} --with-float=softfp" ;; + *) + # If they've explicitly opt-ed in, do hardfloat, + # otherwise let the gcc default kick in. + case ${CTARGET//_/-} in + *-hardfloat-*|*eabihf) confgcc="${confgcc} --with-float=hard" ;; + esac + esac + + # multilib and arch support + case $(tc-arch) in + arm) + local a arm_arch=${CTARGET%%-*} + # Remove trailing endian variations first: eb el be bl b l + for a in e{b,l} {b,l}e b l ; do + if [[ ${arm_arch} == *${a} ]] ; then + arm_arch=${arm_arch%${a}} + break + fi + done + # Convert armv7{a,r,m} to armv7-{a,r,m} + [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-} + # See if this is a valid --with-arch flag + if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch}; + . "${srcdir}"/config.gcc) &>/dev/null + then + confgcc="${confgcc} --with-arch=${arm_arch}" + fi + + # Make default mode thumb for microcontroller classes #418209 + [[ ${arm_arch} == *-m ]] && confgcc="${confgcc} --with-mode=thumb" + + # Enable hardvfp + if [[ $(tc-is-softfloat) == "no" ]] && \ + [[ ${CTARGET} == armv[67]* ]] + then + # Follow the new arm hardfp distro standard by default + confgcc="${confgcc} --with-float=hard" + case ${CTARGET} in + armv6*) confgcc="${confgcc} --with-fpu=vfp" ;; + armv7*) confgcc="${confgcc} --with-fpu=vfpv3-d16" ;; + esac + fi + ;; + mips) + # Add --with-abi flags to set default ABI + confgcc="${confgcc} --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI})" + ;; + ppc) + # Set up defaults based on current CFLAGS + is-flagq -mfloat-gprs=double && confgcc="${confgcc} --enable-e500-double" + [[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc="${confgcc} --enable-e500-double" + ;; + amd64) + if is_multilib ; then + confgcc="${confgcc} --enable-multilib" + if has x32 $(get_all_abis TARGET) ; then + confgcc="${confgcc} --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI})" + fi + else + confgcc="${confgcc} --disable-multilib" + fi + ;; + x86) + confgcc="${confgcc} --with-arch=${CTARGET%%-*}" + confgcc="${confgcc} --disable-multilib" + ;; + esac + + # __cxa_atexit is "essential for fully standards-compliant handling of + # destructors", but apparently requires glibc. + if [[ ${CTARGET} == *-gnu* ]] ; then + confgcc="${confgcc} --enable-__cxa_atexit" + confgcc="${confgcc} --enable-clocale=gnu" + fi + + export gcc_cv_lto_plugin=1 # okay to build, default to opt-in + export gcc_cv_prog_makeinfo_modern=no + export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries=' + use hardened && export gcc_cv_libc_provides_ssp=yes + + # need to strip graphite/lto flags or we'll get the + # dreaded C compiler cannot create executables... + # error. +# filter-flags -floop-interchange -floop-strip-mine -floop-block +# filter-flags -fuse-linker-plugin -flto* + strip-flags + replace-flags -O? -O2 + filter-flags '-mabi*' -m31 -m32 -m64 + filter-flags -frecord-gcc-switches + filter-flags -mno-rtm -mno-htm + + # gold linker barfs on some arches/configs :/ + #tc-ld-is-gold && tc-ld-disable-gold + + case $(tc-arch) in + amd64|x86) + filter-flags '-mcpu=*' + ;; + *) + ;; + esac + +# strip-unsupported-flags + + STAGE1_CFLAGS="${CFLAGS} -fPIC" + use hardened && STAGE1_CFLAGS="-O2 -fPIC" + BOOT_CFLAGS="$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS} -fPIC" + is_crosscompile && BOOT_CFLAGS="-O2 -fPIC" + + einfo "Environment vars: + CC=${CC}, + CXX=${CXX}, + CTARGET=${CTARGET} + ABI=${TARGET_DEFAULT_ABI}, + TARGET_ABI=${TARGET_ABI}. + TARGET_MULTILIB_ABIS=${TARGET_MULTILIB_ABIS}, + TARGET_DEFAULT_ABI=${TARGET_DEFAULT_ABI}, + GCC_ABI=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) + ADA_OBJECTS_PATH=${ADA_OBJECTS_PATH}, + ADA_INCLUDE_PATH=${ADA_INCLUDE_PATH}, + PATH=${PATH}" + + confgcc="${confgcc} ${EXTRA_ECONF}" + einfo "Configuring with confgcc=${confgcc}" + + pushd "${GNATBUILD}" > /dev/null + CC="${CC}" CXX="${CXX}" \ + LDFLAGS="${LDFLAGS}" \ + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CFLAGS}" \ + "${S}"/configure \ + --prefix="${PREFIX}" \ + --bindir="${BINPATH}" \ + --includedir="${INCLUDEPATH}" \ + --datadir="${DATAPATH}" \ + --mandir="${DATAPATH}"/man \ + --infodir="${DATAPATH}"/info \ + --with-gxx-include-dir="${STDCXX_INCDIR}" \ + --with-pkgversion="Gentoo Hardened ${GNATRELEASE} p${PATCH_VER}, pie-${PIE_VER}" \ + ${confgcc} || die "configure failed" + popd > /dev/null + ;; + + make-tools) + debug-print-section make-tools + # Compile helper tools + cd "${GNATBOOT}" + cp "${S}"/gcc/ada/xtreeprs.adb . + cp "${S}"/gcc/ada/xsinfo.adb . + cp "${S}"/gcc/ada/xeinfo.adb . + cp "${S}"/gcc/ada/xnmake.adb . + cp "${S}"/gcc/ada/xutil.ad{s,b} . + if (( ${GNATMINOR} > 5 )) ; then + cp "${S}"/gcc/ada/einfo.ad{s,b} . + cp "${S}"/gcc/ada/csinfo.adb . + cp "${S}"/gcc/ada/ceinfo.adb . + fi + + gnatmake xtreeprs && \ + gnatmake xsinfo && \ + gnatmake xeinfo && \ + gnatmake xnmake || die "building helper tools" + + mv xeinfo xnmake xsinfo xtreeprs bin/ + ;; + + bootstrap) + debug-print-section bootstrap + # and, finally, the build itself + # do we need this? STAGE1_CFLAGS="${CFLAGS}" + # or this? bootstrap-lean + # removing both to try --disable-bootstrap + pushd "${GNATBUILD}" >/dev/null + + emake \ + LDFLAGS="${LDFLAGS}" \ + LIBPATH="${LIBPATH}" \ + CC="${CC}" CXX="${CXX}" \ + STAGE1_CFLAGS="${STAGE1_CFLAGS}" \ + LIBRARY_VERSION="${SLOT}" \ + BOOT_CFLAGS="${BOOT_CFLAGS}" \ + bootstrap-lean \ + || die "bootstrap failed" + + popd >/dev/null + ;; + + gnatlib_and_tools) + debug-print-section gnatlib_and_tools + einfo "building gnatlib_and_tools" + cd "${GNATBUILD}" + emake -j1 -C gcc gnatlib_and_tools || \ + die "gnatlib_and_tools failed" + ;; + + gnatlib-shared) + debug-print-section gnatlib-shared + einfo "building shared lib" + cd "${GNATBUILD}" + rm -f gcc/ada/rts/*.{o,ali} || die + #otherwise make tries to reuse already compiled (without -fPIC) objs.. + emake -j1 -C gcc gnatlib-shared LIBRARY_VERSION="${SLOT}" || \ + die "gnatlib-shared failed" + ;; + + esac + shift + done # while + fi # "all" == "$1" +} +# -- end gnatbuild-r1_src_compile + + +gnatbuild-r1_src_install() { + debug-print-function ${FUNCNAME} $@ + + if [[ -z "$1" ]] ; then + gnatbuild-r1_src_install all + return $? + fi + + while [ "$1" ]; do + case $1 in + install) # runs provided make install + debug-print-section install + + # Looks like we need an access to the bootstrap compiler here too + # as gnat apparently wants to compile something during the installation + # The spotted obuser was xgnatugn, used to process gnat_ugn_urw.texi, + # during preparison of the docs. + export PATH="${GNATBOOT}/bin:${PATH}" + if [[ ${BOOT_SLOT} > 4.1 ]] ; then + GNATLIB="${GNATBOOT}/lib" + elif [[ ${BOOT_SLOT} > 4.8 ]] ; then + GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_VER}" + else + GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}" + fi + + export CC="${GNATBOOT}/bin/gnatgcc" + #export INCLUDE_DIR="${GNATLIB}/include" + #export C_INCLUDE_PATH="${GNATLIB}/include" + #export CPLUS_INCLUDE_PATH="${GNATLIB}/include" + export ADA_OBJECTS_PATH="${GNATLIB}/adalib" + export ADA_INCLUDE_PATH="${GNATLIB}/adainclude" + + # Do not allow symlinks in /usr/lib/gcc/${CHOST}/${MY_PV}/include as + # this can break the build. + find "${GNATBUILD}"/\*gcc/include/ -type l -delete + + # Remove generated headers, as they can cause things to break + # (ncurses, openssl, etc). (from toolchain.eclass) + for x in $(find "${WORKDIR}"/build/gcc/include/ -name '*.h') ; do + grep -q 'It has been auto-edited by fixincludes from' "${x}" \ + && rm -f "${x}" + done + + + cd "${GNATBUILD}" + make -j1 DESTDIR="${D}" install || die + + find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \; + find "${D}" -name libiberty.a -delete + + # Disable RANDMMAP so PCH works. #301299 + pax-mark r "${D}${LIBEXECPATH}"/{gnat1,cc1,cc1plus} + + # Quiet QA warnings, wait for adacore exec stack patch in gcc 7 + # (note: needs testing with hardened emulate trampolines) + #if use hardened ; then + # pax-mark Emr "${D}"${BINPATH}/{gnatmake,gnatname,gnatls,gnatclean,gnat} + #else + # export QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatname + # ${BINPATH:1}/gnatmake ${BINPATH:1}/gnatclean ${BINPATH:1}/gnat + # ${LIBEXECPATH:1}/gnat1 ${LIBPATH:1}/adalib/libgnat-${SLOT}.so" + #fi +# export QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatname +# ${BINPATH:1}/gnatmake ${BINPATH:1}/gnatclean ${BINPATH:1}/gnat" + + use hardened && pax-mark E "${D}${BINPATH}"/{gnatmake,gnatname,gnatls,gnatclean,gnat} + + if use doc ; then + if (( $(bc <<< "${GNATBRANCH} > 4.3") )) ; then + #make a convenience info link + ewarn "Yay! Math works." + dosym gnat_ugn.info ${DATAPATH}/info/gnat.info + fi + fi + ;; + + move_libs) + debug-print-section move_libs + + # first we need to remove some stuff to make moving easier + #rm -rf "${D}${LIBPATH}"/{32,include} + # gcc insists on installing libs in its own place + cp -a -t "${D}${LIBPATH}"/ "${D}${PREFIX}"/lib/gcc/"${CTARGET}/${GCCRELEASE}"/* + cp -a -t "${D}${LIBEXECPATH}"/ "${D}${PREFIX}"/libexec/gcc/"${CTARGET}/${GCCRELEASE}"/* + rm -rf "${D}${PREFIX}"/libexec/gcc + + # libgcc_s and, with gcc>=4.0, other libs get installed in multilib specific locations by gcc + # we pull everything together to simplify working environment + if is_multilib ; then + case $(tc-arch) in + amd64) + cp -a -t "${D}${LIBPATH}"/ "${D}${PREFIX}"/lib/"${PN}/${CTARGET}/${SLOT}"/* + mv -t "${D}${LIBPATH}"/32/ "${D}${PREFIX}"/lib32/* + mv -t "${D}${LIBPATH}"/ "${D}${PREFIX}"/lib64/lib* + rm -rf "${D}${PREFIX}"/lib "${D}${PREFIX}"/lib32 + ;; + ppc64) + # not supported yet, will have to be adjusted when we + # actually build gnat for that arch + ;; + esac + else + # x86 cleanup (maybe arm) + mv -t "${D}${LIBPATH}"/ "${D}${PREFIX}/lib/gcc/${CTARGET}/${GCCRELEASE}"/* + mv -t "${D}${LIBPATH}"/ "${D}${PREFIX}"/lib/lib* + #mv -t "${D}${LIBPATH}"/include/ "${D}${LIBPATH}"/gcc/"${CTARGET}/${GCCRELEASE}"/include/* + rm -rf "${D}${PREFIX}"/lib/gcc + rm -rf "${D}${LIBPATH}"/gcc + fi + + local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/} + pushd "${D}${LIBPATH}" >/dev/null + for py in $(find . -name '*-gdb.py') ; do + local multidir=${py%/*} + insinto "${gdbdir}/${multidir}" + sed -i "/^libdir =/s:=.*:= '${LIBPATH}/${multidir}':" "${py}" || die + doins "${py}" || die + rm "${py}" || die + done + popd >/dev/null + ;; + + cleanup) + debug-print-section cleanup + + # force gnatgcc to use its own specs - versions prior to 3.4.6 read specs + # from system gcc location. Do the simple wrapper trick for now + # !ATTN! change this if eselect-gnat starts to follow eselect-compiler + cd "${D}${BINPATH}" + if [[ ${GCCVER} < 3.4.6 ]] ; then + # gcc 4.1 uses builtin specs. What about 4.0? + mv gnatgcc gnatgcc_2wrap + cat > gnatgcc << EOF +#! /bin/bash +# wrapper to cause gnatgcc read appropriate specs and search for the right .h +# files (in case no matching gcc is installed) +BINDIR=\$(dirname \$0) +# The paths in the next line have to be absolute, as gnatgcc may be called from +# any location +\${BINDIR}/gnatgcc_2wrap -specs="${LIBPATH}/specs" -I"${LIBPATH}/include" \$@ +EOF + chmod a+x gnatgcc + else + local i + for i in cpp gcc gcov c++ g++ ; do + ln -s ${i} gnat${i} + done + fi + + # earlier gnat's generate some Makefile's at generic location, need to + # move to avoid collisions + [ -f "${D}${PREFIX}"/share/gnat/Makefile.generic ] && + mv "${D}${PREFIX}"/share/gnat/Makefile.* "${D}${DATAPATH}" + + rm -rf "${D}${LIBPATH}"/install-tools "${D}${LIBEXECPATH}"/install-tools + + # remove duplicate docs + rm -rf "${D}${DATAPATH}"/info + rm -rf "${D}${DATAPATH}"/man + + # fix .la path for lto plugin + [ -f "${D}${LIBEXECPATH}"/liblto_plugin.la ] && + sed -i -e \ + "/libdir=/c\libdir='${LIBEXECPATH}'" \ + "${D}${LIBEXECPATH}"/liblto_plugin.la + + # use gid of 0 because some stupid ports don't have + # the group 'root' set to gid 0 (toolchain.eclass) + chown -R root:0 "${D}${LIBPATH}" 2>/dev/null + + # add hardening spec stuff + if use hardened ; then + insinto "${LIBPATH}" + doins "${WORKDIR}"/specs/*.specs || die "failed to install specs" + fi + ;; + + prep_env) + # instead of putting junk under /etc/env.d/gnat we recreate env files as + # needed with eselect + create_eselect_conf + ;; + + all) + # remove the move to test new install paths # move_libs + gnatbuild-r1_src_install install move_libs cleanup prep_env + ;; + esac + shift + done # while +} +# -- end gnatbuild-r1_src_install diff -uNr a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass --- a/eclass/gnatbuild.eclass false +++ b/eclass/gnatbuild.eclass eb8f72e5861fac453c1a7fe2184bb60ce16c85e87ad59ac4659db76635e7830cfe2af3f117acb77dac65c5479f7f4e81d00a0a6546e956be3cc1be6ca1437573 @@ -0,0 +1,849 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @DEAD +# Removal on 2018-05-18. + +# Author: George Shapovalov <george@gentoo.org> +# Author: Steve Arnold <nerdboy@gentoo.org> +# No maintainer <maintainer-needed@gentoo.org> +# +# Notes: +# HOMEPAGE and LICENSE are set in appropriate ebuild, as +# gnat is developed by FSF and AdaCore "in parallel" +# +# The following vars can be set in ebuild before inheriting this eclass. They +# will be respected: +# SLOT +# BOOT_SLOT - where old bootstrap is used as it works fine + +#WANT_AUTOMAKE="1.8" +#WANT_AUTOCONF="2.1" + +inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator + +FEATURES=${FEATURES/multilib-strict/} + +EXPORT_FUNCTIONS="pkg_setup pkg_postinst pkg_postrm src_unpack src_configure src_compile src_install" + +IUSE="nls" +# multilib is supported via profiles now, multilib usevar is deprecated + +RDEPEND="app-eselect/eselect-gnat + virtual/libiconv + nls? ( virtual/libintl )" + +DEPEND="${RDEPEND} + >=app-eselect/eselect-gnat-1.3-r1 + >=sys-libs/glibc-2.12 + >=sys-devel/binutils-2.23 + sys-devel/bc + >=sys-devel/bison-1.875 + >=sys-devel/flex-2.5.4 + nls? ( sys-devel/gettext )" + +# Note! +# It may not be safe to source this at top level. Only source inside local +# functions! +GnatCommon="/usr/share/gnat/lib/gnat-common.bash" + +#---->> globals and SLOT <<---- + +# just a check, this location seems to vary too much, easier to track it in +# ebuild +#[ -z "${GNATSOURCE}" ] && die "please set GNATSOURCE in ebuild! (before inherit)" + +# versioning +# because of gnatpro/gnatgpl we need to track both gcc and gnat versions + +# these simply default to $PV +GNATMAJOR=$(get_version_component_range 1) +GNATMINOR=$(get_version_component_range 2) +GNATBRANCH=$(get_version_component_range 1-2) +GNATRELEASE=$(get_version_component_range 1-3) +# this one is for the gnat-gpl which is versioned by gcc backend and ACT version +# number added on top +ACT_Ver=$(get_version_component_range 4) + +# GCCVER and SLOT logic +# +# I better define vars for package names, as there was discussion on proper +# naming and it may change +PN_GnatGCC="gnat-gcc" +PN_GnatGpl="gnat-gpl" + +# ATTN! GCCVER stands for the provided backend gcc, not the one on the system +# so tc-* functions are of no use here. The present versioning scheme makes +# GCCVER basically a part of PV, but *this may change*!! +# +# GCCVER can be set in the ebuild. +[[ -z ${GCCVER} ]] && GCCVER="${GNATRELEASE}" + + +# finally extract GCC version strings +GCCMAJOR=$(get_version_component_range 1 "${GCCVER}") +GCCMINOR=$(get_version_component_range 2 "${GCCVER}") +GCCBRANCH=$(get_version_component_range 1-2 "${GCCVER}") +GCCRELEASE=$(get_version_component_range 1-3 "${GCCVER}") + +# SLOT logic, make it represent gcc backend, as this is what matters most +# There are some special cases, so we allow it to be defined in the ebuild +# ATTN!! If you set SLOT in the ebuild, don't forget to make sure that +# BOOT_SLOT is also set properly! +[[ -z ${SLOT} ]] && SLOT="${GCCBRANCH}" + +# possible future crosscompilation support +export CTARGET=${CTARGET:-${CHOST}} + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +# Bootstrap CTARGET and SLOT logic. For now BOOT_TARGET=CHOST is "guaranteed" by +# profiles, so mostly watch out for the right SLOT used in the bootstrap. +# As above, with SLOT, it may need to be defined in the ebuild +BOOT_TARGET=${CTARGET} +[[ -z ${BOOT_SLOT} ]] && BOOT_SLOT=${SLOT} + +# set our install locations +PREFIX=${GNATBUILD_PREFIX:-/usr} # not sure we need this hook, but may be.. +LIBPATH=${PREFIX}/$(get_libdir)/${PN}/${CTARGET}/${SLOT} +LIBEXECPATH=${PREFIX}/libexec/${PN}/${CTARGET}/${SLOT} +INCLUDEPATH=${LIBPATH}/include +BINPATH=${PREFIX}/${CTARGET}/${PN}-bin/${SLOT} +DATAPATH=${PREFIX}/share/${PN}-data/${CTARGET}/${SLOT} +# ATTN! the one below should match the path defined in eselect-gnat module +CONFIG_PATH="/usr/share/gnat/eselect" +gnat_profile="${CTARGET}-${PN}-${SLOT}" +gnat_config_file="${CONFIG_PATH}/${gnat_profile}" + + +# ebuild globals +if [[ ${PN} == "${PN_GnatPro}" ]] && [[ ${GNATMAJOR} == "3" ]]; then + DEPEND="x86? ( >=app-shells/tcsh-6.0 )" +fi +S="${WORKDIR}/gcc-${GCCVER}" + +# bootstrap globals, common to src_unpack and src_compile +GNATBOOT="${WORKDIR}/usr" +GNATBUILD="${WORKDIR}/build" + +# necessary for detecting lib locations and creating env.d entry +#XGCC="${GNATBUILD}/gcc/xgcc -B${GNATBUILD}/gcc" + +#----<< globals and SLOT >>---- + +# set SRC_URI's in ebuilds for now + +#----<< support checks >>---- +# skipping this section - do not care about hardened/multilib for now + +#---->> specs + env.d logic <<---- +# TODO!!! +# set MANPATH, etc.. +#----<< specs + env.d logic >>---- + + +#---->> some helper functions <<---- +is_multilib() { + [[ ${GCCMAJOR} < 3 ]] && return 1 + case ${CTARGET} in + mips64*|powerpc64*|s390x*|sparc64*|x86_64*) + has_multilib_profile ;; + *) false ;; + esac +} + +# adapted from toolchain, +# left only basic multilib functionality and cut off mips stuff + +create_specs_file() { + einfo "Creating a vanilla gcc specs file" + "${WORKDIR}"/build/gcc/xgcc -dumpspecs > "${WORKDIR}"/build/vanilla.specs +} + + +# eselect stuff taken straight from toolchain.eclass and greatly simplified +add_profile_eselect_conf() { + local gnat_config_file=$1 + local abi=$2 + local var + + echo >> "${D}/${gnat_config_file}" + if ! is_multilib ; then + echo " ctarget=${CTARGET}" >> "${D}/${gnat_config_file}" + else + echo "[${abi}]" >> "${D}/${gnat_config_file}" + var="CTARGET_${abi}" + if [[ -n ${!var} ]] ; then + echo " ctarget=${!var}" >> "${D}/${gnat_config_file}" + else + var="CHOST_${abi}" + if [[ -n ${!var} ]] ; then + echo " ctarget=${!var}" >> "${D}/${gnat_config_file}" + else + echo " ctarget=${CTARGET}" >> "${D}/${gnat_config_file}" + fi + fi + fi + + var="CFLAGS_${abi}" + if [[ -n ${!var} ]] ; then + echo " cflags=${!var}" >> "${D}/${gnat_config_file}" + fi +} + + +create_eselect_conf() { + local abi + + dodir ${CONFIG_PATH} + + echo "[global]" > "${D}/${gnat_config_file}" + echo " version=${CTARGET}-${SLOT}" >> "${D}/${gnat_config_file}" + echo " binpath=${BINPATH}" >> "${D}/${gnat_config_file}" + echo " libexecpath=${LIBEXECPATH}" >> "${D}/${gnat_config_file}" + echo " ldpath=${LIBPATH}" >> "${D}/${gnat_config_file}" + echo " manpath=${DATAPATH}/man" >> "${D}/${gnat_config_file}" + echo " infopath=${DATAPATH}/info" >> "${D}/${gnat_config_file}" + echo " bin_prefix=${CTARGET}" >> "${D}/${gnat_config_file}" + + for abi in $(get_all_abis) ; do + add_profile_eselect_conf "${gnat_config_file}" "${abi}" + done +} + + + +should_we_eselect_gnat() { + # we only want to switch compilers if installing to / or /tmp/stage1root + [[ ${ROOT} == "/" ]] || return 1 + + # if the current config is invalid, we definitely want a new one + # Note: due to bash quirkiness, the following must not be 1 line + local curr_config + curr_config=$(eselect --colour=no gnat show | grep ${CTARGET} | awk '{ print $1 }') || return 0 + [[ -z ${curr_config} ]] && return 0 + + # The logic is basically "try to keep the same profile if possible" + + if [[ ${curr_config} == ${CTARGET}-${PN}-${SLOT} ]] ; then + return 0 + else + elog "The current gcc config appears valid, so it will not be" + elog "automatically switched for you. If you would like to" + elog "switch to the newly installed gcc version, do the" + elog "following:" + echo + elog "eselect gnat set <profile>" + echo + return 1 + fi +} + +# active compiler selection, called from pkg_postinst +do_gnat_config() { + eselect gnat set ${CTARGET}-${PN}-${SLOT} &> /dev/null + + elog "The following gnat profile has been activated:" + elog "${CTARGET}-${PN}-${SLOT}" + elog "" + elog "The compiler has been installed as gnatgcc, and the coverage testing" + elog "tool as gnatgcov." + elog "" + elog "Ada handling in Gentoo allows you to have multiple gnat variants" + elog "installed in parallel and automatically manage Ada libs." + elog "Please take a look at the Ada project page for some documentation:" + elog "http://www.gentoo.org/proj/en/prog_lang/ada/index.xml" +} + + +# Taken straight from the toolchain.eclass. Only removed the "obsolete hunk" +# +# The purpose of this DISGUSTING gcc multilib hack is to allow 64bit libs +# to live in lib instead of lib64 where they belong, with 32bit libraries +# in lib32. This hack has been around since the beginning of the amd64 port, +# and we're only now starting to fix everything that's broken. Eventually +# this should go away. +# +# Travis Tilley <lv@gentoo.org> (03 Sep 2004) +# +disgusting_gcc_multilib_HACK() { + local config + local libdirs + if has_multilib_profile ; then + case $(tc-arch) in + amd64) + config="i386/t-linux64" + libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \ + ;; + ppc64) + config="rs6000/t-linux64" + libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \ + ;; + esac + else + die "Your profile is no longer supported by portage." + fi + + einfo "updating multilib directories to be: ${libdirs}" + sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" "${S}"/gcc/config/${config} +} + + +#---->> pkg_* <<---- +gnatbuild_pkg_setup() { + debug-print-function ${FUNCNAME} $@ + + # Setup variables which would normally be in the profile + if is_crosscompile ; then + multilib_env ${CTARGET} + fi + + # we dont want to use the installed compiler's specs to build gnat! + unset GCC_SPECS +} + +gnatbuild_pkg_postinst() { + if should_we_eselect_gnat; then + do_gnat_config + else + eselect gnat update + fi + + # if primary compiler list is empty, add this profile to the list, so + # that users are not left without active compilers (making sure that + # libs are getting built for at least one) + elog + . ${GnatCommon} || die "failed to source common code" + if [[ ! -f ${PRIMELIST} ]] || [[ ! -s ${PRIMELIST} ]]; then + echo "${gnat_profile}" > ${PRIMELIST} + elog "The list of primary compilers was empty and got assigned ${gnat_profile}." + fi + elog "Please edit ${PRIMELIST} and list there gnat profiles intended" + elog "for common use." +} + + +gnatbuild_pkg_postrm() { + # "eselect gnat update" now removes the env.d file if the corresponding + # gnat profile was unmerged + eselect gnat update + elog "If you just unmerged the last gnat in this SLOT, your active gnat" + elog "profile got unset. Please check what eselect gnat show tells you" + elog "and set the desired profile" +} +#---->> pkg_* <<---- + +#---->> src_* <<---- + +# common unpack stuff +gnatbuild_src_unpack() { + debug-print-function ${FUNCNAME} $@ + if [[ -z "$1" ]]; then + gnatbuild_src_unpack all + return $? + fi + + while [ "$1" ]; do + case $1 in + base_unpack) + unpack ${A} + pax-mark E $(find ${GNATBOOT} -name gnat1) + + cd "${S}" + # patching gcc sources, following the toolchain + # first, the common patches + if [[ -d "${FILESDIR}"/patches ]] && [[ ! -z $(ls "${FILESDIR}"/patches/*.patch 2>/dev/null) ]] ; then + EPATCH_MULTI_MSG="Applying common Gentoo patches ..." \ + epatch "${FILESDIR}"/patches/*.patch + fi + # + # then per SLOT + if [[ -d "${FILESDIR}"/patches/${SLOT} ]] && [[ ! -z $(ls "${FILESDIR}"/patches/${SLOT}/*.patch 2>/dev/null) ]] ; then + EPATCH_MULTI_MSG="Applying SLOT-specific Gentoo patches ..." \ + epatch "${FILESDIR}"/patches/${SLOT}/*.patch + fi + # Replacing obsolete head/tail with POSIX compliant ones + ht_fix_file */configure + +# if ! is_crosscompile && is_multilib && \ +# [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then +# disgusting_gcc_multilib_HACK || die "multilib hack failed" +# fi + + # Fixup libtool to correctly generate .la files with portage + cd "${S}" + elibtoolize --portage --shallow --no-uclibc + + gnuconfig_update + # update configure files + einfo "Fixing misc issues in configure files" + for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do + ebegin " Updating ${f}" + patch "${f}" "${FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \ + || eerror "Please file a bug about this" + eend $? + done + +# this is only needed for gnat-gpl-4.1 and breaks for gnat-gcc, so +# this block was moved to corresponding ebuild +# pushd "${S}"/gnattools &> /dev/null +# eautoconf +# popd &> /dev/null + ;; + + common_prep) + # Prepare the gcc source directory + cd "${S}/gcc" + touch cstamp-h.in + touch ada/[es]info.h + touch ada/nmake.ad[bs] + # set the compiler name to gnatgcc + for i in `find ada/ -name '*.ad[sb]'`; do \ + sed -i -e "s/\"gcc\"/\"gnatgcc\"/g" ${i}; \ + done + # add -fPIC flag to shared libs for 3.4* backend + if [ "3.4" == "${GCCBRANCH}" ] ; then + cd ada + epatch "${FILESDIR}"/gnat-Make-lang.in.patch + fi + + # gcc 4.3 sources seem to have a common omission of $(DESTDIR), + # that leads to make install trying to rm -f file on live system. + # As we do not need this rm, we simply remove the whole line + if [ "4.3" == "${GCCBRANCH}" ] ; then + sed -i -e "/\$(RM) \$(bindir)/d" "${S}"/gcc/ada/Make-lang.in + fi + + mkdir -p "${GNATBUILD}" + ;; + + all) + gnatbuild_src_unpack base_unpack common_prep + ;; + esac + shift + done +} + +# for now just dont run default configure +gnatbuild_src_configure() { + # do nothing + : +} + +# it would be nice to split configure and make steps +# but both need to operate inside specially tuned evironment +# so just do sections for now (as in eclass section of handbook) +# sections are: configure, make-tools, bootstrap, +# gnatlib_and_tools, gnatlib-shared +gnatbuild_src_compile() { + debug-print-function ${FUNCNAME} $@ + if [[ -z "$1" ]]; then + gnatbuild_src_compile all + return $? + fi + + if [[ "all" == "$1" ]] + then # specialcasing "all" to avoid scanning sources unnecessarily + gnatbuild_src_compile configure make-tools \ + bootstrap gnatlib_and_tools gnatlib-shared + + else + # Set some paths to our bootstrap compiler. + export PATH="${GNATBOOT}/bin:${PATH}" + # !ATTN! the bootstrap compilers have a very simplystic structure, + # so many paths are not identical to the installed ones. + # Plus it was simplified even more in new releases. + if [[ ${BOOT_SLOT} > 4.1 ]] ; then + case $(tc-arch) in + arm) + GNATLIB="${GNATBOOT}/lib/gcc/${BOOT_TARGET}/${BOOT_SLOT}" + ;; + *) + GNATLIB="${GNATBOOT}/lib" + ;; + esac + else + GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}" + fi + + export CC="${GNATBOOT}/bin/gnatgcc" + # CPATH is supposed to be applied for any language, thus + # superceding either of C/CPLUS/OBJC_INCLUDE_PATHs + export CPATH="${GNATLIB}/include" + #export INCLUDE_DIR="${GNATLIB}/include" + #export C_INCLUDE_PATH="${GNATLIB}/include" + #export CPLUS_INCLUDE_PATH="${GNATLIB}/include" + export LIB_DIR="${GNATLIB}" + export LDFLAGS="-L${GNATLIB}" + + # additional vars from gnuada and elsewhere + #export LD_RUN_PATH="${LIBPATH}" + export LIBRARY_PATH="${GNATLIB}" + #export LD_LIBRARY_PATH="${GNATLIB}" +# export COMPILER_PATH="${GNATBOOT}/bin/" + + export ADA_OBJECTS_PATH="${GNATLIB}/adalib" + export ADA_INCLUDE_PATH="${GNATLIB}/adainclude" + + einfo "CC=${CC}, + ADA_INCLUDE_PATH=${ADA_INCLUDE_PATH}, + LDFLAGS=${LDFLAGS}, + PATH=${PATH}" + + while [ "$1" ]; do + case $1 in + configure) + debug-print-section configure + # Configure gcc + local confgcc + + # some cross-compile logic from toolchain + confgcc="${confgcc} --host=${CHOST}" + if is_crosscompile || tc-is-cross-compiler ; then + confgcc="${confgcc} --target=${CTARGET}" + fi + [[ -n ${CBUILD} ]] && confgcc="${confgcc} --build=${CBUILD}" + + # Native Language Support + if use nls ; then + confgcc="${confgcc} --enable-nls --without-included-gettext" + else + confgcc="${confgcc} --disable-nls" + fi + + if version_is_at_least 4.6 ; then + confgcc="${confgcc} --enable-lto" + elif tc_version_is_at_least 4.5 ; then + confgcc="${confgcc} --disable-lto --disable-plugin" + fi + + # reasonably sane globals (from toolchain) + # also disable mudflap and ssp + confgcc="${confgcc} \ + --with-system-zlib \ + --disable-checking \ + --disable-werror \ + --disable-libmudflap \ + --disable-libssp \ + --disable-altivec \ + --disable-fixed-point \ + --disable-libgcj \ + --disable-libcilkrts \ + --disable-libsanitizer \ + --disable-libunwind-exceptions" + + if in_iuse openmp ; then + # Make sure target has pthreads support. #326757 #335883 + # There shouldn't be a chicken&egg problem here as openmp won't + # build without a C library, and you can't build that w/out + # already having a compiler ... + if ! is_crosscompile || \ + $(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null + then + case $(tc-arch) in + arm) + confgcc="${confgcc} --disable-libgomp" + ;; + *) + confgcc="${confgcc} $(use_enable openmp libgomp)" + ;; + esac + else + # Force disable as the configure script can be dumb #359855 + confgcc="${confgcc} --disable-libgomp" + fi + else + # For gcc variants where we don't want openmp (e.g. kgcc) + confgcc="${confgcc} --disable-libgomp" + fi + + # ACT's gnat-gpl does not like libada for whatever reason.. + if version_is_at_least 4.2 ; then + confgcc="${confgcc} --enable-libada" +# else +# einfo "ACT's gnat-gpl does not like libada, disabling" +# confgcc="${confgcc} --disable-libada" + fi + + # set some specifics available in later versions + if version_is_at_least 4.7 ; then + einfo "setting gnat thread model" + confgcc="${confgcc} --enable-threads=posix" + confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada" + elif version_is_at_least 4.3 ; then + confgcc="${confgcc} --enable-threads=gnat" + confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada" + else + confgcc="${confgcc} --enable-threads=posix" + confgcc="${confgcc} --enable-shared" + fi + + # multilib support + if is_multilib ; then + confgcc="${confgcc} --enable-multilib" + else + confgcc="${confgcc} --disable-multilib" + fi + + # __cxa_atexit is "essential for fully standards-compliant handling of + # destructors", but apparently requires glibc. + if [[ ${CTARGET} == *-gnu* ]] ; then + confgcc="${confgcc} --enable-__cxa_atexit" + confgcc="${confgcc} --enable-clocale=gnu" + fi + + einfo "confgcc=${confgcc}" + + export gcc_cv_lto_plugin=1 # okay to build, default to opt-in + export gcc_cv_prog_makeinfo_modern=no + export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries=' + export gcc_cv_libc_provides_ssp=yes + + # need to strip graphite/lto flags or we'll get the + # dreaded C compiler cannot create executables... + # error. + strip-flags + replace-flags -O? -O2 + filter-flags '-mabi*' -m31 -m32 -m64 + filter-flags -frecord-gcc-switches + filter-flags -mno-rtm -mno-htm + #filter-flags -floop-interchange -floop-strip-mine -floop-block + #filter-flags -fuse-linker-plugin -flto* + + cd "${GNATBUILD}" + CC="${CC}" CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" "${S}"/configure \ + --prefix="${PREFIX}" \ + --bindir="${BINPATH}" \ + --includedir="${INCLUDEPATH}" \ + --libdir="${LIBPATH}" \ + --libexecdir="${LIBEXECPATH}" \ + --datadir="${DATAPATH}" \ + --mandir="${DATAPATH}"/man \ + --infodir="${DATAPATH}"/info \ + --enable-languages=c,ada \ + --with-gcc \ + ${confgcc} || die "configure failed" + ;; + + make-tools) + debug-print-section make-tools + # Compile helper tools + cd "${GNATBOOT}" + cp "${S}"/gcc/ada/xtreeprs.adb . + cp "${S}"/gcc/ada/xsinfo.adb . + cp "${S}"/gcc/ada/xeinfo.adb . + cp "${S}"/gcc/ada/xnmake.adb . + cp "${S}"/gcc/ada/xutil.ad{s,b} . + if (( ${GNATMINOR} > 5 )) ; then + cp "${S}"/gcc/ada/einfo.ad{s,b} . + cp "${S}"/gcc/ada/csinfo.adb . + cp "${S}"/gcc/ada/ceinfo.adb . + fi + gnatmake xtreeprs && \ + gnatmake xsinfo && \ + gnatmake xeinfo && \ + gnatmake xnmake || die "building helper tools" + + mv xeinfo xnmake xsinfo xtreeprs bin/ + ;; + + bootstrap) + debug-print-section bootstrap + # and, finally, the build itself + cd "${GNATBUILD}" + emake \ + LDFLAGS="${LDFLAGS}" \ + LIBPATH="${LIBPATH}" \ + CC="${CC}" \ + bootstrap-lean || die "bootstrap failed" + ;; + + gnatlib_and_tools) + debug-print-section gnatlib_and_tools + einfo "building gnatlib_and_tools" + cd "${GNATBUILD}" + emake -j1 -C gcc gnatlib_and_tools || \ + die "gnatlib_and_tools failed" + ;; + + gnatlib-shared) + debug-print-section gnatlib-shared + einfo "building shared lib" + cd "${GNATBUILD}" + rm -f gcc/ada/rts/*.{o,ali} || die + #otherwise make tries to reuse already compiled (without -fPIC) objs.. + emake -j1 -C gcc gnatlib-shared LIBRARY_VERSION="${GCCBRANCH}" || \ + die "gnatlib-shared failed" + ;; + + esac + shift + done # while + fi # "all" == "$1" +} +# -- end gnatbuild_src_compile + + +gnatbuild_src_install() { + debug-print-function ${FUNCNAME} $@ + + if [[ -z "$1" ]] ; then + gnatbuild_src_install all + return $? + fi + + while [ "$1" ]; do + case $1 in + install) # runs provided make install + debug-print-section install + + # Looks like we need an access to the bootstrap compiler here too + # as gnat apparently wants to compile something during the installation + # The spotted obuser was xgnatugn, used to process gnat_ugn_urw.texi, + # during preparison of the docs. + export PATH="${GNATBOOT}/bin:${PATH}" + if [[ ${BOOT_SLOT} > 4.1 ]] ; then + GNATLIB="${GNATBOOT}/lib" + else + GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}" + fi + + export CC="${GNATBOOT}/bin/gnatgcc" + export INCLUDE_DIR="${GNATLIB}/include" + export C_INCLUDE_PATH="${GNATLIB}/include" + export CPLUS_INCLUDE_PATH="${GNATLIB}/include" + export LIB_DIR="${GNATLIB}" + export LDFLAGS="-L${GNATLIB}" + export ADA_OBJECTS_PATH="${GNATLIB}/adalib" + export ADA_INCLUDE_PATH="${GNATLIB}/adainclude" + + # Do not allow symlinks in /usr/lib/gcc/${CHOST}/${MY_PV}/include as + # this can break the build. + for x in "${GNATBUILD}"/gcc/include/* ; do + if [ -L ${x} ] ; then + rm -f ${x} + fi + done + # Remove generated headers, as they can cause things to break + # (ncurses, openssl, etc). (from toolchain.eclass) + for x in $(find "${WORKDIR}"/build/gcc/include/ -name '*.h') ; do + grep -q 'It has been auto-edited by fixincludes from' "${x}" \ + && rm -f "${x}" + done + + + cd "${GNATBUILD}" + make DESTDIR="${D}" install || die + + # Disable RANDMMAP so PCH works. #301299 + pax-mark r "${D}"${LIBEXECPATH}/{gnat1,cc1,cc1plus} + # Quiet QA warnings, wait for adacore exec stack patch in gcc 7 + export QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatname + ${BINPATH:1}/gnatmake ${BINPATH:1}/gnatclean ${BINPATH:1}/gnat" + + if use doc ; then + if (( $(bc <<< "${GNATBRANCH} > 4.3") )) ; then + #make a convenience info link + ewarn "Yay! Math works." + dosym gnat_ugn.info ${DATAPATH}/info/gnat.info + fi + fi + ;; + + move_libs) + debug-print-section move_libs + + # first we need to remove some stuff to make moving easier + rm -rf "${D}${LIBPATH}"/{32,include,libiberty.a} + # gcc insists on installing libs in its own place + mv "${D}${LIBPATH}/gcc/${CTARGET}/${GCCRELEASE}"/* "${D}${LIBPATH}" + mv "${D}${LIBEXECPATH}/gcc/${CTARGET}/${GCCRELEASE}"/* "${D}${LIBEXECPATH}" + + # libgcc_s and, with gcc>=4.0, other libs get installed in multilib specific locations by gcc + # we pull everything together to simplify working environment + if has_multilib_profile ; then + case $(tc-arch) in + amd64) + mv "${D}${LIBPATH}"/../$(get_abi_LIBDIR amd64)/* "${D}${LIBPATH}" + mv "${D}${LIBPATH}"/../$(get_abi_LIBDIR x86)/* "${D}${LIBPATH}"/32 + ;; + ppc64) + # not supported yet, will have to be adjusted when we + # actually build gnat for that arch + ;; + esac + fi + + # force gnatgcc to use its own specs - versions prior to 3.4.6 read specs + # from system gcc location. Do the simple wrapper trick for now + # !ATTN! change this if eselect-gnat starts to follow eselect-compiler + cd "${D}${BINPATH}" + if [[ ${GCCVER} < 3.4.6 ]] ; then + # gcc 4.1 uses builtin specs. What about 4.0? + mv gnatgcc gnatgcc_2wrap + cat > gnatgcc << EOF +#! /bin/bash +# wrapper to cause gnatgcc read appropriate specs and search for the right .h +# files (in case no matching gcc is installed) +BINDIR=\$(dirname \$0) +# The paths in the next line have to be absolute, as gnatgcc may be called from +# any location +\${BINDIR}/gnatgcc_2wrap -specs="${LIBPATH}/specs" -I"${LIBPATH}/include" \$@ +EOF + chmod a+x gnatgcc + else + local i + for i in cpp gcc gcov ; do + ln -s ${i} gnat${i} + done + fi + + # earlier gnat's generate some Makefile's at generic location, need to + # move to avoid collisions + [ -f "${D}${PREFIX}"/share/gnat/Makefile.generic ] && + mv "${D}${PREFIX}"/share/gnat/Makefile.* "${D}${DATAPATH}" + + # use gid of 0 because some stupid ports don't have + # the group 'root' set to gid 0 (toolchain.eclass) +# chown -R root:0 "${D}${LIBPATH}" + ;; + + cleanup) + debug-print-section cleanup + + rm -rf "${D}${LIBPATH}"/{gcc,install-tools,../lib{32,64}} + rm -rf "${D}${LIBEXECPATH}"/{gcc,install-tools} + + # this one is installed by gcc and is a duplicate even here anyway + rm -f "${D}${BINPATH}/${CTARGET}-gcc-${GCCRELEASE}" + + # remove duplicate docs + rm -f "${D}${DATAPATH}"/info/{dir,gcc,cpp}* + rm -rf "${D}${DATAPATH}"/man/man7/ + + # fix .la path for lto plugin + if use lto ; then + sed -i -e \ + "/libdir=/c\libdir='${LIBEXECPATH}'" \ + "${D}${LIBEXECPATH}"/liblto_plugin.la \ + || die "sed update of .la file failed!" + fi + ;; + + prep_env) + # instead of putting junk under /etc/env.d/gnat we recreate env files as + # needed with eselect + create_eselect_conf + ;; + + all) + gnatbuild_src_install install move_libs cleanup prep_env + ;; + esac + shift + done # while +} +# -- end gnatbuild_src_install diff -uNr a/eclass/gnome-games.eclass b/eclass/gnome-games.eclass --- a/eclass/gnome-games.eclass false +++ b/eclass/gnome-games.eclass 0430b75b8a9a5463e3595e29911e46514653961ab44189d8648fb9f367c26f8aac6d2edae54088ae266b74cd48b9da54223563bf768217356574b21a90920e5d @@ -0,0 +1,118 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @DEAD +# Removal on 2018-05-18. + +# @ECLASS: gnome-games.eclass +# @MAINTAINER: +# Gnome team <gnome@gentoo.org> +# @AUTHOR: +# Author: Pacho Ramos <pacho@gentoo.org> +# @BLURB: An eclass to build gnome-games. +# @DESCRIPTION: +# An eclass to build gnome-games using proper phases from gnome2 and +# games eclasses. + +case "${EAPI:-0}" in + 0|1) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 2|3|4|5) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +inherit autotools games gnome2 + +EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm + +if [[ ! ${_GNOME_GAMES} ]]; then + +DEPEND=">=dev-util/intltool-0.50.2-r1" +RDEPEND="!gnome-extra/gnome-games" + +# @FUNCTION: gnome-games_pkg_setup +# @DESCRIPTION: +# Set proper phase defaults +gnome-games_pkg_setup() { + debug-print-function ${FUNCNAME} "${@}" + games_pkg_setup +} + +# @FUNCTION: gnome-games_src_prepare +# @DESCRIPTION: +# Set proper phase defaults +gnome-games_src_prepare() { + debug-print-function ${FUNCNAME} "${@}" + + # Fix intltoolize broken file: + # https://bugs.launchpad.net/intltool/+bug/398571 + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf + + gnome2_src_prepare +} + +# @FUNCTION: gnome-games_src_configure +# @DESCRIPTION: +# Set proper phase defaults, relying on gnome2_src_configure +# and passing extra arguments from egamesconf (games.eclass) +gnome-games_src_configure() { + debug-print-function ${FUNCNAME} "${@}" + gnome2_src_configure \ + --prefix="${GAMES_PREFIX}" \ + --libdir="$(games_get_libdir)" \ + --sysconfdir="${GAMES_SYSCONFDIR}" \ + --localstatedir=/var \ + --localedir=/usr/share/locale \ + "$@" +} + +# @FUNCTION: gnome-games_src_compile +# @DESCRIPTION: +# Set proper phase defaults +gnome-games_src_compile() { + debug-print-function ${FUNCNAME} "${@}" + gnome2_src_compile +} + +# @FUNCTION: gnome-games_src_install +# @DESCRIPTION: +# Set proper phase defaults +gnome-games_src_install() { + debug-print-function ${FUNCNAME} "${@}" + gnome2_src_install + prepgamesdirs +} + +# @FUNCTION: gnome-games_pkg_preinst +# @DESCRIPTION: +# Set proper phase defaults +gnome-games_pkg_preinst() { + debug-print-function ${FUNCNAME} "${@}" + gnome2_pkg_preinst + games_pkg_preinst +} + +# @FUNCTION: gnome-games_pkg_postinst +# @DESCRIPTION: +# Set proper phase defaults +gnome-games_pkg_postinst() { + debug-print-function ${FUNCNAME} "${@}" + gnome2_pkg_postinst + games_pkg_postinst +} + +# @FUNCTION: gnome-games_pkg_postrm +# @DESCRIPTION: +# Set proper phase defaults +gnome-games_pkg_postrm() { + debug-print-function ${FUNCNAME} "${@}" + gnome2_pkg_postrm +} + +_GNOME_GAMES=1 +fi diff -uNr a/eclass/gnome-python-common-r1.eclass b/eclass/gnome-python-common-r1.eclass --- a/eclass/gnome-python-common-r1.eclass false +++ b/eclass/gnome-python-common-r1.eclass e710b453351cad400463620e69bad8d69eb50b8b4fdd8e8daef47f4766a40879f8c5e9b98e163df707e29d57e37a21132a199660cde75cb03ad13b5542069a5b @@ -0,0 +1,105 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: gnome-python-common-r1.eclass +# @MAINTAINER: +# GNOME team <gnome@gentoo.org> +# @AUTHOR: +# Author: Michał Górny <mgorny@gentoo.org> +# Based on the work of: Arun raghaven <ford_prefect@gentoo.org> +# which in turn was based on the work of Jim Ramsay <lack@gentoo.org> +# @BLURB: Common functionality for building gnome-python* bindings +# @DESCRIPTION: +# This eclass provides python-r1 support for the GNOME2 library Python +# bindings. + +: ${GNOME_ORG_MODULE:=gnome-python} +: ${GNOME_TARBALL_SUFFIX:=bz2} +: ${GNOME2_LA_PUNT:=yes} +: ${GCONF_DEBUG:=no} + +# @ECLASS-VARIABLE: G_PY_BINDINGS +# @DESCRIPTION: +# The actual '--enable-<binding>' name. If multiple bindings are to +# be enabled, must be an array. +: ${G_PY_BINDINGS:=${PN%-python}} + +# @ECLASS-VARIABLE: EXAMPLES +# @DEFAULT_UNSET +# @DESCRIPTION: +# The set of example files to be installed if the 'examples' USE flag +# is set. + +case "${EAPI:-0}" in + 0|1|2|3|4) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 5) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +inherit eutils gnome2 python-r1 + +EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install + +HOMEPAGE="http://pygtk.org/" + +RESTRICT="${RESTRICT} test" + +DOCS="AUTHORS ChangeLog NEWS README" + +if [[ ${GNOME_ORG_MODULE} != "gnome-python" ]]; then + DOCS="${DOCS} MAINTAINERS" +fi + +RDEPEND="~dev-python/${GNOME_ORG_MODULE}-base-${PV} + ${PYTHON_DEPS}" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +gnome-python-common-r1_src_prepare() { + gnome2_src_prepare + + # The .pc file is installed by respective gnome-python*-base package + sed -i '/^pkgconfig_DATA/d' Makefile.in || die "sed failed" + sed -i '/^pkgconfigdir/d' Makefile.in || die "sed failed" +# +# python_copy_sources +} + +gnome-python-common-r1_src_configure() { + local myconf=( + --disable-allbindings + "${G_PY_BINDINGS[@]/#/--enable-}" + ) + + ECONF_SOURCE=${S} \ + python_foreach_impl \ + gnome2_src_configure "${myconf[@]}" "${@}" +} + +gnome-python-common-r1_src_compile() { + python_foreach_impl default +} + +gnome-python-common-r1_src_test() { + python_foreach_impl default +} + +# Do a regular gnome2 src_install and then install examples if required. +# Set the variable EXAMPLES to provide the set of examples to be installed. +# (to install a directory recursively, specify it with a trailing '/' - for +# example, foo/bar/) +gnome-python-common-r1_src_install() { + python_foreach_impl gnome2_src_install + + if in_iuse examples && use examples; then + docinto examples + dodoc -r "${EXAMPLES[@]}" + fi +} diff -uNr a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass --- a/eclass/gnome.org.eclass false +++ b/eclass/gnome.org.eclass 7deb450b63c266790aadf71c26024f4cb43c574fa1bb69691b1c4f04a8d91ec77be68551b15187394bc91bc801e59ba1cddc0e58b765ade9df9c99549ebf971f @@ -0,0 +1,48 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: gnome.org.eclass +# @MAINTAINER: +# gnome@gentoo.org +# @AUTHOR: +# Authors: Spidler <spidler@gentoo.org> with help of carparski. +# eclass variable additions and documentation: Gilles Dartiguelongue <eva@gentoo.org> +# @BLURB: Helper eclass for gnome.org hosted archives +# @DESCRIPTION: +# Provide a default SRC_URI for tarball hosted on gnome.org mirrors. + +inherit versionator + +# @ECLASS-VARIABLE: GNOME_TARBALL_SUFFIX +# @DESCRIPTION: +# Most projects hosted on gnome.org mirrors provide tarballs as tar.bz2 or +# tar.xz. This eclass defaults to bz2 for EAPI 0, 1, 2, 3 and defaults to xz for +# everything else. This is because the gnome mirrors are moving to only have xz +# tarballs for new releases. +if has "${EAPI:-0}" 0 1 2 3; then + : ${GNOME_TARBALL_SUFFIX:="bz2"} +else + : ${GNOME_TARBALL_SUFFIX:="xz"} +fi + +# Even though xz-utils are in @system, they must still be added to DEPEND; see +# https://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml +if [[ ${GNOME_TARBALL_SUFFIX} == "xz" ]]; then + DEPEND="${DEPEND} app-arch/xz-utils" +fi + +# @ECLASS-VARIABLE: GNOME_ORG_MODULE +# @DESCRIPTION: +# Name of the module as hosted on gnome.org mirrors. +# Leave unset if package name matches module name. +: ${GNOME_ORG_MODULE:=$PN} + +# @ECLASS-VARIABLE: GNOME_ORG_PVP +# @INTERNAL +# @DESCRIPTION: +# Major and minor numbers of the version number. +: ${GNOME_ORG_PVP:=$(get_version_component_range 1-2)} + +SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_PVP}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}" + +S="${WORKDIR}/${GNOME_ORG_MODULE}-${PV}" diff -uNr a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass --- a/eclass/gnome2-utils.eclass false +++ b/eclass/gnome2-utils.eclass 48873808a192beafa6a561afed26ba0d531a93a4e67bf6a5215863cec4aa06cf947b546ffcbf7f4055ff9af2dc80d9e276896fca2a4efeb54bbb0ffabd601d3e @@ -0,0 +1,522 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: gnome2-utils.eclass +# @MAINTAINER: +# gnome@gentoo.org +# @BLURB: Auxiliary functions commonly used by Gnome packages. +# @DESCRIPTION: +# This eclass provides a set of auxiliary functions needed by most Gnome +# packages. It may be used by non-Gnome packages as needed for handling various +# Gnome stack related functions such as: +# * Gtk+ icon cache management +# * GSettings schemas management +# * GConf schemas management +# * scrollkeeper (old Gnome help system) management + +[[ ${EAPI:-0} == [012345] ]] && inherit multilib +inherit eutils xdg-utils + +case "${EAPI:-0}" in + 0|1|2|3|4|5|6) ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +# @ECLASS-VARIABLE: GCONFTOOL_BIN +# @INTERNAL +# @DESCRIPTION: +# Path to gconftool-2 +: ${GCONFTOOL_BIN:="/usr/bin/gconftool-2"} + +# @ECLASS-VARIABLE: SCROLLKEEPER_DIR +# @INTERNAL +# @DESCRIPTION: +# Directory where scrollkeeper-update should do its work +: ${SCROLLKEEPER_DIR:="/var/lib/scrollkeeper"} + +# @ECLASS-VARIABLE: SCROLLKEEPER_UPDATE_BIN +# @INTERNAL +# @DESCRIPTION: +# Path to scrollkeeper-update +: ${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"} + +# @ECLASS-VARIABLE: GTK_UPDATE_ICON_CACHE +# @INTERNAL +# @DESCRIPTION: +# Path to gtk-update-icon-cache +: ${GTK_UPDATE_ICON_CACHE:="/usr/bin/gtk-update-icon-cache"} + +# @ECLASS-VARIABLE: GLIB_COMPILE_SCHEMAS +# @INTERNAL +# @DESCRIPTION: +# Path to glib-compile-schemas +: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"} + +# @ECLASS-VARIABLE: GNOME2_ECLASS_SCHEMAS +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of GConf schemas provided by the package + +# @ECLASS-VARIABLE: GNOME2_ECLASS_ICONS +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of icons provided by the package + +# @ECLASS-VARIABLE: GNOME2_ECLASS_SCROLLS +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of scrolls (documentation files) provided by the package + +# @ECLASS-VARIABLE: GNOME2_ECLASS_GLIB_SCHEMAS +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of GSettings schemas provided by the package + +# @ECLASS-VARIABLE: GNOME2_ECLASS_GDK_PIXBUF_LOADERS +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of gdk-pixbuf loaders provided by the package + +DEPEND=">=sys-apps/sed-4" + + +# @FUNCTION: gnome2_environment_reset +# @DESCRIPTION: +# Reset various variables inherited from root's evironment to a reasonable +# default for ebuilds to help avoid access violations and test failures. +gnome2_environment_reset() { + xdg_environment_reset + + # Respected by >=glib-2.30.1-r1 + export G_HOME="${T}" + + # GST_REGISTRY is to work around gst utilities trying to read/write /root + export GST_REGISTRY="${T}/registry.xml" + + # Ensure we don't rely on dconf/gconf while building, bug #511946 + export GSETTINGS_BACKEND="memory" + + if has ${EAPI:-0} 6; then + # Try to cover the packages honoring this variable, bug #508124 + export GST_INSPECT="$(type -P true)" + + # Stop relying on random DISPLAY variable values, bug #534312 + unset DISPLAY + fi +} + +# @FUNCTION: gnome2_gconf_savelist +# @DESCRIPTION: +# Find the GConf schemas that are about to be installed and save their location +# in the GNOME2_ECLASS_SCHEMAS environment variable. +# This function should be called from pkg_preinst. +gnome2_gconf_savelist() { + has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" + pushd "${ED}" > /dev/null || die + export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null) + popd > /dev/null || die +} + +# @FUNCTION: gnome2_gconf_install +# @DESCRIPTION: +# Applies any schema files installed by the current ebuild to Gconf's database +# using gconftool-2. +# This function should be called from pkg_postinst. +gnome2_gconf_install() { + has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" + local updater="${EROOT}${GCONFTOOL_BIN}" + + if [[ ! -x "${updater}" ]]; then + debug-print "${updater} is not executable" + return + fi + + if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then + debug-print "No GNOME 2 GConf schemas found" + return + fi + + # We are ready to install the GCONF Scheme now + unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")" + + einfo "Installing GNOME 2 GConf schemas" + + local F + for F in ${GNOME2_ECLASS_SCHEMAS}; do + if [[ -e "${EROOT}${F}" ]]; then + debug-print "Installing schema: ${F}" + "${updater}" --makefile-install-rule "${EROOT}${F}" 1>/dev/null + fi + done + + # have gconf reload the new schemas + pids=$(pgrep -x gconfd-2) + if [[ $? == 0 ]] ; then + ebegin "Reloading GConf schemas" + kill -HUP ${pids} + eend $? + fi +} + +# @FUNCTION: gnome2_gconf_uninstall +# @DESCRIPTION: +# Removes schema files previously installed by the current ebuild from Gconf's +# database. +gnome2_gconf_uninstall() { + has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" + local updater="${EROOT}${GCONFTOOL_BIN}" + + if [[ ! -x "${updater}" ]]; then + debug-print "${updater} is not executable" + return + fi + + if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then + debug-print "No GNOME 2 GConf schemas found" + return + fi + + unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")" + + einfo "Uninstalling GNOME 2 GConf schemas" + + local F + for F in ${GNOME2_ECLASS_SCHEMAS}; do + if [[ -e "${EROOT}${F}" ]]; then + debug-print "Uninstalling gconf schema: ${F}" + "${updater}" --makefile-uninstall-rule "${EROOT}${F}" 1>/dev/null + fi + done + + # have gconf reload the new schemas + pids=$(pgrep -x gconfd-2) + if [[ $? == 0 ]] ; then + ebegin "Reloading GConf schemas" + kill -HUP ${pids} + eend $? + fi +} + +# @FUNCTION: gnome2_icon_savelist +# @DESCRIPTION: +# Find the icons that are about to be installed and save their location +# in the GNOME2_ECLASS_ICONS environment variable. +# This function should be called from pkg_preinst. +gnome2_icon_savelist() { + has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" + pushd "${ED}" > /dev/null || die + export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) + popd > /dev/null || die +} + +# @FUNCTION: gnome2_icon_cache_update +# @DESCRIPTION: +# Updates Gtk+ icon cache files under /usr/share/icons if the current ebuild +# have installed anything under that location. +# This function should be called from pkg_postinst and pkg_postrm. +gnome2_icon_cache_update() { + has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" + local updater="${EROOT}${GTK_UPDATE_ICON_CACHE}" + + if [[ ! -x "${updater}" ]] ; then + debug-print "${updater} is not executable" + return + fi + + ebegin "Updating icons cache" + + local retval=0 + local fails=( ) + + for dir in "${EROOT%/}"/usr/share/icons/* + do + if [[ -f "${dir}/index.theme" ]] ; then + local rv=0 + + "${updater}" -qf "${dir}" + rv=$? + + if [[ ! $rv -eq 0 ]] ; then + debug-print "Updating cache failed on ${dir}" + + # Add to the list of failures + fails+=( "${dir}" ) + + retval=2 + fi + elif [[ $(ls "${dir}") = "icon-theme.cache" ]]; then + # Clear stale cache files after theme uninstallation + rm "${dir}/icon-theme.cache" + fi + + if [[ -z $(ls "${dir}") ]]; then + # Clear empty theme directories after theme uninstallation + rmdir "${dir}" + fi + done + + eend ${retval} + + for f in "${fails[@]}" ; do + eerror "Failed to update cache with icon $f" + done +} + +# @FUNCTION: gnome2_omf_fix +# @DESCRIPTION: +# Workaround applied to Makefile rules in order to remove redundant +# calls to scrollkeeper-update and sandbox violations. +# This function should be called from src_prepare. +gnome2_omf_fix() { + local omf_makefiles filename + + omf_makefiles="$@" + + if [[ -f ${S}/omf.make ]] ; then + omf_makefiles="${omf_makefiles} ${S}/omf.make" + fi + + if [[ -f ${S}/gnome-doc-utils.make ]] ; then + omf_makefiles="${omf_makefiles} ${S}/gnome-doc-utils.make" + fi + + # testing fixing of all makefiles found + # The sort is important to ensure .am is listed before the respective .in for + # maintainer mode regeneration not kicking in due to .am being newer than .in + for filename in $(find "${S}" -name "Makefile.in" -o -name "Makefile.am" |sort) ; do + omf_makefiles="${omf_makefiles} ${filename}" + done + + ebegin "Fixing OMF Makefiles" + + local retval=0 + local fails=( ) + + for omf in ${omf_makefiles} ; do + sed -i -e 's:scrollkeeper-update:true:' "${omf}" + retval=$? + + if [[ $retval -ne 0 ]] ; then + debug-print "updating of ${omf} failed" + + # Add to the list of failures + fails[$(( ${#fails[@]} + 1 ))]=$omf + + retval=2 + fi + done + + eend $retval + + for f in "${fails[@]}" ; do + eerror "Failed to update OMF Makefile $f" + done +} + +# @FUNCTION: gnome2_scrollkeeper_savelist +# @DESCRIPTION: +# Find the scrolls that are about to be installed and save their location +# in the GNOME2_ECLASS_SCROLLS environment variable. +# This function should be called from pkg_preinst. +gnome2_scrollkeeper_savelist() { + has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" + pushd "${ED}" > /dev/null || die + export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null) + popd > /dev/null || die +} + +# @FUNCTION: gnome2_scrollkeeper_update +# @DESCRIPTION: +# Updates the global scrollkeeper database. +# This function should be called from pkg_postinst and pkg_postrm. +gnome2_scrollkeeper_update() { + has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" + local updater="${EROOT}${SCROLLKEEPER_UPDATE_BIN}" + + if [[ ! -x "${updater}" ]] ; then + debug-print "${updater} is not executable" + return + fi + + if [[ -z "${GNOME2_ECLASS_SCROLLS}" ]]; then + debug-print "No scroll cache to update" + return + fi + + ebegin "Updating scrollkeeper database ..." + "${updater}" -q -p "${EROOT}${SCROLLKEEPER_DIR}" + eend $? +} + +# @FUNCTION: gnome2_schemas_savelist +# @DESCRIPTION: +# Find if there is any GSettings schema to install and save the list in +# GNOME2_ECLASS_GLIB_SCHEMAS variable. +# This function should be called from pkg_preinst. +gnome2_schemas_savelist() { + has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" + pushd "${ED}" > /dev/null || die + export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null) + popd > /dev/null || die +} + +# @FUNCTION: gnome2_schemas_update +# @USAGE: gnome2_schemas_update +# @DESCRIPTION: +# Updates GSettings schemas if GNOME2_ECLASS_GLIB_SCHEMAS has some. +# This function should be called from pkg_postinst and pkg_postrm. +gnome2_schemas_update() { + has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" + local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}" + + if [[ ! -x ${updater} ]]; then + debug-print "${updater} is not executable" + return + fi + + ebegin "Updating GSettings schemas" + ${updater} --allow-any-name "$@" "${EROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null + eend $? +} + +# @FUNCTION: gnome2_gdk_pixbuf_savelist +# @DESCRIPTION: +# Find if there is any gdk-pixbuf loader to install and save the list in +# GNOME2_ECLASS_GDK_PIXBUF_LOADERS variable. +# This function should be called from pkg_preinst. +gnome2_gdk_pixbuf_savelist() { + has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" + pushd "${ED}" > /dev/null || die + export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null) + popd > /dev/null || die +} + +# @FUNCTION: gnome2_gdk_pixbuf_update +# @USAGE: gnome2_gdk_pixbuf_update +# @DESCRIPTION: +# Updates gdk-pixbuf loader cache if GNOME2_ECLASS_GDK_PIXBUF_LOADERS has some. +# This function should be called from pkg_postinst and pkg_postrm. +gnome2_gdk_pixbuf_update() { + has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" + local updater="${EROOT}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders" + + if [[ ! -x ${updater} ]]; then + updater="${EROOT}/usr/bin/gdk-pixbuf-query-loaders" + fi + + if [[ ! -x ${updater} ]]; then + debug-print "${updater} is not executable" + return + fi + + if [[ -z ${GNOME2_ECLASS_GDK_PIXBUF_LOADERS} ]]; then + debug-print "gdk-pixbuf loader cache does not need an update" + return + fi + + ebegin "Updating gdk-pixbuf loader cache" + local tmp_file=$(emktemp) + ${updater} 1> "${tmp_file}" && + chmod 0644 "${tmp_file}" && + cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" && + rm "${tmp_file}" # don't replace this with mv, required for SELinux support + eend $? +} + +# @FUNCTION: gnome2_query_immodules_gtk2 +# @USAGE: gnome2_query_immodules_gtk2 +# @DESCRIPTION: +# Updates gtk2 immodules/gdk-pixbuf loaders listing. +gnome2_query_immodules_gtk2() { + local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0 + [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0 + + ebegin "Updating gtk2 input method module cache" + GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \ + "${updater}" --update-cache + eend $? +} + +# @FUNCTION: gnome2_query_immodules_gtk3 +# @USAGE: gnome2_query_immodules_gtk3 +# @DESCRIPTION: +# Updates gtk3 immodules/gdk-pixbuf loaders listing. +gnome2_query_immodules_gtk3() { + local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0 + [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0 + + ebegin "Updating gtk3 input method module cache" + GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \ + "${updater}" --update-cache + eend $? +} + +# @FUNCTION: gnome2_giomodule_cache_update +# @USAGE: gnome2_giomodule_cache_update +# @DESCRIPTION: +# Updates glib's gio modules cache. +# This function should be called from pkg_postinst and pkg_postrm. +gnome2_giomodule_cache_update() { + has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" + local updater="${EROOT}/usr/bin/${CHOST}-gio-querymodules" + + if [[ ! -x ${updater} ]]; then + updater="${EROOT}/usr/bin/gio-querymodules" + fi + + if [[ ! -x ${updater} ]]; then + debug-print "${updater} is not executable" + return + fi + + ebegin "Updating GIO modules cache" + ${updater} "${EROOT%/}"/usr/$(get_libdir)/gio/modules + eend $? +} + +# @FUNCTION: gnome2_disable_deprecation_warning +# @DESCRIPTION: +# Disable deprecation warnings commonly found in glib based packages. +# Should be called from src_prepare. +gnome2_disable_deprecation_warning() { + local retval=0 + local fails=( ) + local makefile + + ebegin "Disabling deprecation warnings" + # The sort is important to ensure .am is listed before the respective .in for + # maintainer mode regeneration not kicking in due to .am being newer than .in + while read makefile ; do + if ! grep -qE "(DISABLE_DEPRECATED|GSEAL_ENABLE)" "${makefile}"; then + continue + fi + + LC_ALL=C sed -r -i \ + -e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(/bin/true):g' \ + -e 's:-DGSEAL_ENABLE(=[A-Za-z0-9_]*)?:$(/bin/true):g' \ + -i "${makefile}" + + if [[ $? -ne 0 ]]; then + # Add to the list of failures + fails+=( "${makefile}" ) + retval=2 + fi + done < <(find "${S}" -name "Makefile.in" \ + -o -name "Makefile.am" -o -name "Makefile.decl" \ + | sort; [[ -f "${S}"/configure ]] && echo configure) +# TODO: sedding configure.ac can trigger maintainer mode; bug #439602 +# -o -name "configure.ac" -o -name "configure.in" \ +# | sort; echo configure) + eend ${retval} + + for makefile in "${fails[@]}" ; do + ewarn "Failed to disable deprecation warnings in ${makefile}" + done +} diff -uNr a/eclass/gnome2.eclass b/eclass/gnome2.eclass --- a/eclass/gnome2.eclass false +++ b/eclass/gnome2.eclass 532d6cec41da17553634563ae27b4943212e3d421f6ceea728846411ca22f5982480b77a72cd696013ef794542f1aa25628aa1e1c3b20a9f3c1b9c4793180598 @@ -0,0 +1,375 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: gnome2.eclass +# @MAINTAINER: +# gnome@gentoo.org +# @BLURB: Provides phases for Gnome/Gtk+ based packages. +# @DESCRIPTION: +# Exports portage base functions used by ebuilds written for packages using the +# GNOME framework. For additional functions, see gnome2-utils.eclass. + +# @ECLASS-VARIABLE: GNOME2_EAUTORECONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Run eautoreconf instead of only elibtoolize +GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""} + +[[ ${GNOME2_EAUTORECONF} == 'yes' ]] && inherit autotools +inherit eutils libtool gnome.org gnome2-utils xdg + +case "${EAPI:-0}" in + 4|5) + EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm + ;; + 6) + EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm + ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +# @ECLASS-VARIABLE: DOCS +# @DEFAULT_UNSET +# @DESCRIPTION: +# String containing documents passed to dodoc command for eapi4. +# In eapi5 we rely on einstalldocs (from eutils.eclass) and for newer EAPIs we +# follow PMS spec. + +# @ECLASS-VARIABLE: ELTCONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Extra options passed to elibtoolize +ELTCONF=${ELTCONF:-""} + +# @ECLASS-VARIABLE: G2CONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Extra configure opts passed to econf. +# Deprecated, pass extra arguments to gnome2_src_configure. +# Banned in eapi6 and newer. +if has ${EAPI:-0} 4 5; then + G2CONF=${G2CONF:-""} +fi + +# @ECLASS-VARIABLE: GCONF_DEBUG +# @DEFAULT_UNSET +# @DESCRIPTION: +# Whether to handle debug or not. +# Some gnome applications support various levels of debugging (yes, no, minimum, +# etc), but using --disable-debug also removes g_assert which makes debugging +# harder. This variable should be set to yes for such packages for the eclass +# to handle it properly. It will enable minimal debug with USE=-debug. +# Note that this is most commonly found in configure.ac as GNOME_DEBUG_CHECK. +# +# Banned since eapi6 as upstream is moving away from this obsolete macro in favor +# of autoconf-archive macros, that do not expose this issue (bug #270919) +if has ${EAPI:-0} 4 5; then + if [[ ${GCONF_DEBUG} != "no" ]]; then + IUSE="debug" + fi +fi + +# @ECLASS-VARIABLE: GNOME2_ECLASS_GIO_MODULES +# @INTERNAL +# @DESCRIPTION: +# Array containing glib GIO modules + +# @ECLASS-VARIABLE: GNOME2_LA_PUNT +# @DESCRIPTION: +# For eapi4 it sets if we should delete ALL or none of the .la files +# For eapi5 and newer it relies on prune_libtool_files (from eutils.eclass) +# for this. Available values for GNOME2_LA_PUNT: +# - "no": will not clean any .la files +# - "yes": will run prune_libtool_files --modules +# - If it is not set, it will run prune_libtool_files +if has ${EAPI:-0} 4; then + GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"} +else + GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} +fi + +# @FUNCTION: gnome2_src_unpack +# @DESCRIPTION: +# Stub function for old EAPI. +gnome2_src_unpack() { + if has ${EAPI:-0} 4 5; then + unpack ${A} + cd "${S}" + else + die "gnome2_src_unpack is banned from eapi6" + fi +} + +# @FUNCTION: gnome2_src_prepare +# @DESCRIPTION: +# Prepare environment for build, fix build of scrollkeeper documentation, +# run elibtoolize. +gnome2_src_prepare() { + xdg_src_prepare + + # Prevent assorted access violations and test failures + gnome2_environment_reset + + # Prevent scrollkeeper access violations + # We stop to run it from eapi6 as scrollkeeper helpers from + # rarian are not running anything and, then, access violations + # shouldn't occur. + has ${EAPI:-0} 4 5 && gnome2_omf_fix + + # Disable all deprecation warnings + gnome2_disable_deprecation_warning + + # Run libtoolize or eautoreconf, bug #591584 + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + if [[ ${GNOME2_EAUTORECONF} == 'yes' ]]; then + eautoreconf + else + elibtoolize ${ELTCONF} + fi +} + +# @FUNCTION: gnome2_src_configure +# @DESCRIPTION: +# Gnome specific configure handling +gnome2_src_configure() { + # Deprecated for a long time now and banned since eapi6, see Gnome team policies + if [[ -n ${G2CONF} ]] ; then + if has ${EAPI:-0} 4 5; then + eqawarn "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure" + else + die "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure" + fi + fi + + local g2conf=() + + if has ${EAPI:-0} 4 5; then + if [[ ${GCONF_DEBUG} != 'no' ]] ; then + if use debug ; then + g2conf+=( --enable-debug=yes ) + fi + fi + else + if [[ -n ${GCONF_DEBUG} ]] ; then + die "GCONF_DEBUG is banned since eapi6 in favor of each ebuild taking care of the proper handling of debug configure option" + fi + fi + + # Starting with EAPI=5, we consider packages installing gtk-doc to be + # handled by adding DEPEND="dev-util/gtk-doc-am" which provides tools to + # relink URLs in documentation to already installed documentation. + # This decision also greatly helps with constantly broken doc generation. + # Remember to drop 'doc' USE flag from your package if it was only used to + # rebuild docs. + # Preserve old behavior for older EAPI. + if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then + if has ${EAPI:-0} 4 && in_iuse doc ; then + g2conf+=( $(use_enable doc gtk-doc) ) + else + g2conf+=( --disable-gtk-doc ) + fi + fi + + # Pass --disable-maintainer-mode when needed + if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \ + "${ECONF_SOURCE:-.}"/configure.*; then + g2conf+=( --disable-maintainer-mode ) + fi + + # Pass --disable-scrollkeeper when possible + if grep -q "disable-scrollkeeper" "${ECONF_SOURCE:-.}"/configure; then + g2conf+=( --disable-scrollkeeper ) + fi + + # Pass --disable-silent-rules when possible (not needed since eapi5), bug #429308 + if has ${EAPI:-0} 4; then + if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then + g2conf+=( --disable-silent-rules ) + fi + fi + + # Pass --disable-schemas-install when possible + if grep -q "disable-schemas-install" "${ECONF_SOURCE:-.}"/configure; then + g2conf+=( --disable-schemas-install ) + fi + + # Pass --disable-schemas-compile when possible + if grep -q "disable-schemas-compile" "${ECONF_SOURCE:-.}"/configure; then + g2conf+=( --disable-schemas-compile ) + fi + + # Pass --disable-update-mimedb when possible + if grep -q "disable-update-mimedb" "${ECONF_SOURCE:-.}"/configure; then + g2conf+=( --disable-update-mimedb ) + fi + + # Pass --enable-compile-warnings=minimum as we don't want -Werror* flags, bug #471336 + if grep -q "enable-compile-warnings" "${ECONF_SOURCE:-.}"/configure; then + g2conf+=( --enable-compile-warnings=minimum ) + fi + + # Pass --docdir with proper directory, bug #482646 (not needed since eapi6) + if has ${EAPI:-0} 4 5; then + if grep -q "^ *--docdir=" "${ECONF_SOURCE:-.}"/configure; then + g2conf+=( --docdir="${EPREFIX}"/usr/share/doc/${PF} ) + fi + fi + + # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) + if has ${EAPI:-0} 4 5; then + addwrite "$(unset HOME; echo ~)/.gnome2" + else + addpredict "$(unset HOME; echo ~)/.gnome2" + fi + + if has ${EAPI:-0} 4 5; then + econf ${g2conf[@]} ${G2CONF} "$@" + else + econf ${g2conf[@]} "$@" + fi +} + +# @FUNCTION: gnome2_src_compile +# @DESCRIPTION: +# Only default src_compile for now +gnome2_src_compile() { + if has ${EAPI:-0} 4 5; then + emake + else + default + fi +} + +# @FUNCTION: gnome2_src_install +# @DESCRIPTION: +# Gnome specific install. Handles typical GConf and scrollkeeper setup +# in packages and removal of .la files if requested +gnome2_src_install() { + # we must delay gconf schema installation due to sandbox + export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" + + local sk_tmp_dir="/var/lib/scrollkeeper" + # scrollkeeper-update from rarian doesn't do anything. Then, since eapi6 + # we stop taking care of it + # + # if this is not present, scrollkeeper-update may segfault and + # create bogus directories in /var/lib/ + if has ${EAPI:-0} 4 5; then + dodir "${sk_tmp_dir}" || die "dodir failed" + emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed" + else + default + fi + + unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + + # Handle documentation as 'default' for eapi5, bug #373131 + # Since eapi6 this is handled by default on its own plus MAINTAINERS and HACKING + # files that are really common in gnome packages (bug #573390) + if has ${EAPI:-0} 4; then + # Manual document installation + if [[ -n "${DOCS}" ]]; then + dodoc ${DOCS} || die "dodoc failed" + fi + elif has ${EAPI:-0} 5; then + einstalldocs + else + local d + for d in HACKING MAINTAINERS; do + [[ -s "${d}" ]] && dodoc "${d}" + done + fi + + # Do not keep /var/lib/scrollkeeper because: + # 1. The scrollkeeper database is regenerated at pkg_postinst() + # 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg + # thus it makes no sense if pkg_postinst ISN'T run for some reason. + rm -rf "${ED}${sk_tmp_dir}" + rmdir "${ED}/var/lib" 2>/dev/null + rmdir "${ED}/var" 2>/dev/null + + # Make sure this one doesn't get in the portage db + rm -fr "${ED}/usr/share/applications/mimeinfo.cache" + + # Delete all .la files + if has ${EAPI:-0} 4; then + if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then + ebegin "Removing .la files" + if ! use_if_iuse static-libs ; then + find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed" + fi + eend + fi + else + case "${GNOME2_LA_PUNT}" in + yes) prune_libtool_files --modules;; + no) ;; + *) prune_libtool_files;; + esac + fi +} + +# @FUNCTION: gnome2_pkg_preinst +# @DESCRIPTION: +# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst +gnome2_pkg_preinst() { + xdg_pkg_preinst + gnome2_gconf_savelist + gnome2_icon_savelist + gnome2_schemas_savelist + gnome2_scrollkeeper_savelist + gnome2_gdk_pixbuf_savelist + + local f + + GNOME2_ECLASS_GIO_MODULES=() + while IFS= read -r -d '' f; do + GNOME2_ECLASS_GIO_MODULES+=( ${f} ) + done < <(cd "${D}" && find usr/$(get_libdir)/gio/modules -type f -print0 2>/dev/null) + + export GNOME2_ECLASS_GIO_MODULES +} + +# @FUNCTION: gnome2_pkg_postinst +# @DESCRIPTION: +# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime +# database updates. +gnome2_pkg_postinst() { + xdg_pkg_postinst + gnome2_gconf_install + if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then + gnome2_icon_cache_update + fi + if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then + gnome2_schemas_update + fi + gnome2_scrollkeeper_update + gnome2_gdk_pixbuf_update + + if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then + gnome2_giomodule_cache_update + fi +} + +# # FIXME Handle GConf schemas removal +#gnome2_pkg_prerm() { +# gnome2_gconf_uninstall +#} + +# @FUNCTION: gnome2_pkg_postrm +# @DESCRIPTION: +# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates. +gnome2_pkg_postrm() { + xdg_pkg_postrm + if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then + gnome2_icon_cache_update + fi + if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then + gnome2_schemas_update + fi + gnome2_scrollkeeper_update + + if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then + gnome2_giomodule_cache_update + fi +} diff -uNr a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass --- a/eclass/gnuconfig.eclass false +++ b/eclass/gnuconfig.eclass d03219cfec8c7da7ba56d86d546cc2832a1a57183943fff2609899ecfe55720209be3c464ca3b488bdd74ece745f8a6a1ad6a21eb356bd799beb71f6238f3118 @@ -0,0 +1,98 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# THIS ECLASS IS DEAD: It has been integrated into portage +# +# Author: Will Woods <wwoods@gentoo.org> +# +# 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 ...] +# 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. +gnuconfig_update() { + +# hmm some packages (like binutils gcc glibc) still use this ... +# echo +# ewarn "QA Notice: Please stop using me, portage updates files for you." +# echo + + local startdir # declared here ... used in gnuconfig_do_update + + if [[ $1 == /* ]] ; then + startdir=$1 + shift + else + startdir=${S} + fi + + if [[ $# -gt 0 ]] ; then + gnuconfig_do_update "$@" + else + gnuconfig_do_update config.sub config.guess + fi + + return $? +} + +# 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 +# +# Note that since bash using dynamic scoping, startdir is available here from +# the gnuconfig_update function +gnuconfig_do_update() { + local configsubs_dir target targetlist file + + [[ $# -eq 0 ]] && die "do not call gnuconfig_do_update; use gnuconfig_update" + + configsubs_dir=$(gnuconfig_findnewest) + einfo "Using GNU config files from ${configsubs_dir}" + for file in "$@" ; do + if [[ ! -r ${configsubs_dir}/${file} ]] ; then + eerror "Can't read ${configsubs_dir}/${file}, skipping.." + continue + fi + targetlist=$(find "${startdir}" -name "${file}") + if [[ -n ${targetlist} ]] ; then + for target in ${targetlist} ; do + [[ -L ${target} ]] && rm -f "${target}" + einfo " Updating ${target/$startdir\//}" + cp -f "${configsubs_dir}/${file}" "${target}" + eend $? + done + else + ewarn " No ${file} found in ${startdir}, skipping ..." + fi + done + + return 0 +} + +# 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 + ) + grep -s '^timestamp' "${locations[@]}" | \ + sort -r -n -t\' -k2 | \ + sed -n '1{s,/config.sub:.*$,,;p;q}' +} diff -uNr a/eclass/gnustep-2.eclass b/eclass/gnustep-2.eclass --- a/eclass/gnustep-2.eclass false +++ b/eclass/gnustep-2.eclass 863e42aa2263f2b07f8c5a8d34d0fe1e6fb2fa3dcf815d0242c9eeee4b48b48851840a035afd52b040b3b9129dc8e6f820e7033ed4570daa6839af12a655f015 @@ -0,0 +1,26 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: gnustep-2.eclass +# @MAINTAINER: +# GNUstep Herd <gnustep@gentoo.org> +# @BLURB: eclass for GNUstep Apps, Frameworks, and Bundles build +# @DESCRIPTION: +# This eclass sets up GNUstep environment to properly install +# GNUstep packages + +inherit gnustep-base + +DEPEND=">=gnustep-base/gnustep-make-2.0 + virtual/gnustep-back" +RDEPEND="${DEPEND} + debug? ( !<sys-devel/gdb-6.0 )" + +# The following gnustep-based EXPORT_FUNCTIONS are available: +# * gnustep-base_pkg_setup +# * gnustep-base_src_unpack (EAPI 0|1 only) +# * gnustep-base_src_prepare (EAPI>=2 only) +# * gnustep-base_src_configure (EAPI>=2 only) +# * gnustep-base_src_compile +# * gnustep-base_src_install +# * gnustep-base_pkg_postinst diff -uNr a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass --- a/eclass/gnustep-base.eclass false +++ b/eclass/gnustep-base.eclass cc6291944f6fabc61b4ac4276b96e8b9a9a3c82b2f9c43a412ae813ce00ec785048a9679461c806eec141381582ef18fe85aa911724bb91b303067f3189239ea @@ -0,0 +1,268 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: gnustep-base.eclass +# @MAINTAINER: +# GNUstep Herd <gnustep@gentoo.org> +# @BLURB: Internal handling of GNUstep pacakges +# @DESCRIPTION: +# Inner gnustep eclass, should only be inherited directly by gnustep-base +# packages + +inherit eutils flag-o-matic + +# IUSE variables across all GNUstep packages +# "debug": enable code for debugging +# "doc": build and install documentation, if available +IUSE="debug doc" + +# packages needed to build any base gnustep package +GNUSTEP_CORE_DEPEND="doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html )" + +# New layout is used when ${EPREFIX}/usr/share/GNUstep/Makefiles exists +# Where to install GNUstep (with old layout) +GNUSTEP_PREFIX="${EPREFIX}/usr/GNUstep" + +# GNUstep environment array +typeset -a GS_ENV + +# Ebuild function overrides +gnustep-base_pkg_setup() { + if test_version_info 3.3 ; then + strip-unsupported-flags + elif test_version_info 3.4 ; then + # strict-aliasing is known to break obj-c stuff in gcc-3.4* + filter-flags -fstrict-aliasing + fi + + # known to break ObjC (bug 86089) + filter-flags -fomit-frame-pointer +} + +gnustep-base_src_unpack() { + unpack ${A} + cd "${S}" + + gnustep-base_src_prepare +} + +gnustep-base_src_prepare() { + if [[ -f ./GNUmakefile ]] ; then + # Kill stupid includes that are simply overdone or useless on normal + # Gentoo, but (may) cause major headaches on Prefixed Gentoo. If this + # only removes a part of a path it's good that it bails out, as we want + # to know when they use some direct include. + ebegin "Cleaning paths from GNUmakefile" + sed -i \ + -e 's|-I/usr/X11R6/include/\?||g' \ + -e 's|-I/usr/include/\?||g' \ + -e 's|-L/usr/X11R6/lib/\?||g' \ + -e 's|-L/usr/lib/\?||g' \ + GNUmakefile + eend $? + fi + + has ${EAPI:-0} 6 && default +} + +gnustep-base_src_configure() { + egnustep_env + if [[ -x ./configure ]] ; then + econf || die "configure failed" + fi +} + +gnustep-base_src_compile() { + egnustep_env + case ${EAPI:-0} in + 0|1) gnustep-base_src_configure ;; + esac + + egnustep_make +} + +gnustep-base_src_install() { + egnustep_env + egnustep_install + if use doc ; then + egnustep_env + egnustep_doc + fi + egnustep_install_config +} + +gnustep-base_pkg_postinst() { + [[ $(type -t gnustep_config_script) != "function" ]] && return 0 + + local SCRIPT_PATH + if [[ -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then + SCRIPT_PATH="/usr/bin" + else + SCRIPT_PATH=${GNUSTEP_SYSTEM_TOOLS}/Gentoo + fi + elog "To use this package, as *user* you should run:" + elog " ${SCRIPT_PATH}/config-${PN}.sh" +} + +# Clean/reset an ebuild to the installed GNUstep environment +egnustep_env() { + # Get additional variables + GNUSTEP_SH_EXPORT_ALL_VARIABLES="true" + + # Makefiles path + local GS_MAKEFILES + if [[ -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then + GS_MAKEFILES=${EPREFIX}/usr/share/GNUstep/Makefiles + else + GS_MAKEFILES=${GNUSTEP_PREFIX}/System/Library/Makefiles + fi + if [[ -f ${GS_MAKEFILES}/GNUstep.sh ]] ; then + # Reset GNUstep variables + source "${GS_MAKEFILES}"/GNUstep-reset.sh + source "${GS_MAKEFILES}"/GNUstep.sh + + # Create compilation GNUstep.conf if it does not exist yet + if [[ ! -f ${WORKDIR}/GNUstep.conf ]]; then + cp "${EPREFIX}"/etc/GNUstep/GNUstep.conf "${WORKDIR}" \ + || die "GNUstep.conf copy failed" + sed -e "s#$GNUSTEP_USER_.*DIR.*=$#\1${WORKDIR}/#" \ + -i "${WORKDIR}"/GNUstep.conf || die "GNUstep.conf sed failed" + fi + + + if [[ ! -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then + # Set rpath in ldflags when available + case ${CHOST} in + *-linux-gnu|*-solaris*) + is-ldflagq -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" \ + || append-ldflags \ + -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" + ;; + esac + fi + + # Set up env vars for make operations + GS_ENV=( AUXILIARY_LDFLAGS="${LDFLAGS}" \ + ADDITIONAL_NATIVE_LIB_DIRS="${GNUSTEP_SYSTEM_LIBRARIES}" \ + DESTDIR="${D}" \ + HOME="${T}" \ + GNUSTEP_CONFIG_FILE="${WORKDIR}"/GNUstep.conf \ + GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \ + TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \ + messages=yes ) + + use doc \ + && GS_ENV=( "${GS_ENV[@]}" VARTEXFONTS="${T}"/fonts ) + + use debug \ + && GS_ENV=( "${GS_ENV[@]}" "debug=yes" ) \ + || GS_ENV=( "${GS_ENV[@]}" "debug=no" ) + + if has_version "gnustep-base/gnustep-make[libobjc2]"; + then + # Set clang for packages that do not respect gnustep-make + # settings (gnustep-base's configure for example) + export CC=clang CXX=clang CPP="clang -E" LD="clang" + fi + + return 0 + fi + die "gnustep-make not installed!" +} + +# Make utilizing GNUstep Makefiles +egnustep_make() { + if [[ -f ./Makefile || -f ./makefile || -f ./GNUmakefile ]] ; then + emake ${*} "${GS_ENV[@]}" all || die "package make failed" + return 0 + fi + die "no Makefile found" +} + +# Make-install utilizing GNUstep Makefiles +egnustep_install() { + if [[ ! -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then + # avoid problems due to our "weird" prefix, make sure it exists + mkdir -p "${D}"${GNUSTEP_SYSTEM_TOOLS} + fi + if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then + emake ${*} "${GS_ENV[@]}" install || die "package install failed" + return 0 + fi + die "no Makefile found" +} + +# Make and install docs using GNUstep Makefiles +egnustep_doc() { + if [[ -d "${S}"/Documentation ]] ; then + # Check documentation presence + pushd "${S}"/Documentation || die + if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then + emake "${GS_ENV[@]}" all || die "doc make failed" + emake "${GS_ENV[@]}" install || die "doc install failed" + fi + popd || die + fi +} + +egnustep_install_config() { + [[ $(type -t gnustep_config_script) != "function" ]] && return 0 + + local cfile=config-${PN}.sh + + cat << 'EOF' > "${T}"/${cfile} +#!/usr/bin/env bash +gnustep_append_default() { + if [[ -z $1 || -z $2 || -z $3 ]]; then + echo "warning: invalid script invocation" + return + fi + dom=$1 + key=$2 + val=$3 + cur=$(defaults read ${dom} ${key}) 2> /dev/null + if [[ -z $cur ]] ; then + echo " * setting ${dom} ${key}" + defaults write ${dom} ${key} "( ${val} )" + elif [[ ${cur} != *${val}* ]] ; then + echo " * adding ${val} to ${dom} ${key}" + echo "${cur%)\'}, \"${val}\" )'" | defaults write + else + echo " * ${val} already present in ${dom} ${key}" + fi +} + +gnustep_set_default() { + if [[ -z $1 || -z $2 || -z $3 ]]; then + echo "warning: invalid script invocation" + return + fi + dom=$1 + key=$2 + val=$3 + echo " * setting ${dom} ${key}" + defaults write ${dom} ${key} ${val} +} + +EOF + + echo "echo \"Applying ${P} default configuration ...\"" >> "${T}"/${cfile} + + gnustep_config_script | \ + while read line ; do + echo "${line}" >> "${T}"/${cfile} + done + echo 'echo "done"' >> "${T}"/${cfile} + + if [[ -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then + exeinto /usr/bin + else + exeinto ${GNUSTEP_SYSTEM_TOOLS#${EPREFIX}}/Gentoo + fi + doexe "${T}"/${cfile} +} + +case ${EAPI:-0} in + 0|1) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst ;; + *) EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install pkg_postinst ;; +esac diff -uNr a/eclass/go-mono.eclass b/eclass/go-mono.eclass --- a/eclass/go-mono.eclass false +++ b/eclass/go-mono.eclass 39783a8c21826e05f15d199582e23a4b31776cabc90b44ed73438784ffb90f2cb553c00134a13d20b57f31f39c4d5859ab444043a3ff04eb9bdc441de4960bf0 @@ -0,0 +1,135 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: go-mono.eclass +# @MAINTAINER: +# dotnet@gentoo.org +# @BLURB: Common functionality for go-mono.org apps +# @DESCRIPTION: +# Common functionality needed by all go-mono.org apps. + +inherit base versionator mono + +PRE_URI="http://mono.ximian.com/monobuild/preview/sources" + +GIT_PN="${PN/mono-debugger/debugger}" + +ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src/mono" + +GO_MONO_SUB_BRANCH=${GO_MONO_SUB_BRANCH} + +if [[ "${PV%_rc*}" != "${PV}" ]] +then + GO_MONO_P="${P%_rc*}" + SRC_URI="${PRE_URI}/${PN}/${GO_MONO_P}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${GO_MONO_P}" +elif [[ "${PV%_pre*}" != "${PV}" ]] +then + GO_MONO_P="${P%_pre*}" + SRC_URI="${PRE_URI}/${PN}/${GO_MONO_P}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${GO_MONO_P}" +elif [[ "${PV}" == "9999" ]] +then + GO_MONO_P=${P} + EGIT_REPO_URI="https://github.com/mono/${GIT_PN}.git" + SRC_URI="" + inherit autotools git +elif [[ "${PV%.9999}" != "${PV}" ]] +then + GO_MONO_P=${P} + EGIT_REPO_URI="https://github.com/mono/${GIT_PN}.git" + EGIT_BRANCH="mono-$(get_version_component_range 1)-$(get_version_component_range 2)${GO_MONO_SUB_BRANCH}" + SRC_URI="" + inherit autotools git +else + GO_MONO_P=${P} + SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2" +fi + + +NO_MONO_DEPEND=( "dev-lang/mono" "dev-dotnet/libgdiplus" "dev-dotnet/gluezilla" ) + +if [[ "$(get_version_component_range 3)" != "9999" ]] +then + GO_MONO_REL_PV="$(get_version_component_range 1-2)" + +else + GO_MONO_REL_PV="${PV}" +fi + +if ! has "${CATEGORY}/${PN}" "${NO_MONO_DEPEND[@]}" +then + RDEPEND=">=dev-lang/mono-${GO_MONO_REL_PV}" + DEPEND="${RDEPEND}" +fi + +DEPEND="${DEPEND} + virtual/pkgconfig" + +# @FUNCTION: go-mono_src_unpack +# @DESCRIPTION: +# Runs default() +go-mono_src_unpack() { + if [[ "${PV%.9999}" != "${PV}" || "${PV}" == "9999" ]] + then + default + git_src_unpack + else + default + fi +} + +# @FUNCTION: go-mono_src_prepare +# @DESCRIPTION: +# Runs autopatch from base.eclass, if PATCHES is set. +go-mono_src_prepare() { + if [[ "${PV%.9999}" != "${PV}" || "${PV}" == "9999" ]] + then + base_src_prepare + [[ "$EAUTOBOOTSTRAP" != "no" ]] && eautoreconf + else + base_src_prepare + fi +} + +# @FUNCTION: go-mono_src_configure +# @DESCRIPTION: +# Runs econf, disabling static libraries and dependency-tracking. +go-mono_src_configure() { + econf --disable-dependency-tracking \ + --disable-static \ + "$@" +} + +# @FUNCTION: go-mono_src_compile +# @DESCRIPTION: +# Runs emake. +go-mono_src_compile() { + emake "$@" || die "emake failed" +} + +# @ECLASS-VARIABLE: DOCS +# @DESCRIPTION: +# Insert path of docs you want installed. If more than one, +# consider using an array. + +# @FUNCTION: go-mono_src_install +# @DESCRIPTION: +# Rune emake, installs common doc files, if DOCS is +# set, installs those. Gets rid of .la files. +go-mono_src_install () { + emake -j1 DESTDIR="${D}" "$@" install || die "install failed" + mono_multilib_comply + local commondoc=( AUTHORS ChangeLog README TODO ) + for docfile in "${commondoc[@]}" + do + [[ -e "${docfile}" ]] && dodoc "${docfile}" + done + if [[ "${DOCS[@]}" ]] + then + dodoc "${DOCS[@]}" || die "dodoc DOCS failed" + fi + find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" +} + +EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install diff -uNr a/eclass/golang-base.eclass b/eclass/golang-base.eclass --- a/eclass/golang-base.eclass false +++ b/eclass/golang-base.eclass 70c73fa94dceaebaa9927cacedfa79aa444bbe50cd0aac088b6458fee288612e208874b41a5232c75eeec52c5e00f9e4197775dfbed0e985b8a420751bf3f443 @@ -0,0 +1,81 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: golang-base.eclass +# @MAINTAINER: +# William Hubbs <williamh@gentoo.org> +# @BLURB: Eclass that provides base functions for Go packages. +# @DESCRIPTION: +# This eclass provides base functions for software written in the Go +# programming language; it also provides the build-time dependency on +# dev-lang/go. + +case "${EAPI:-0}" in + 5|6) + ;; + *) + die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})" + ;; +esac + +if [[ -z ${_GOLANG_BASE} ]]; then + +_GOLANG_BASE=1 + +DEPEND=">=dev-lang/go-1.9" + +# Do not complain about CFLAGS etc since go projects do not use them. +QA_FLAGS_IGNORED='.*' + +STRIP_MASK="*.a" + +# @ECLASS-VARIABLE: EGO_PN +# @REQUIRED +# @DESCRIPTION: +# This is the import path for the go package to build. Please emerge +# dev-lang/go and read "go help importpath" for syntax. +# +# Example: +# @CODE +# EGO_PN=github.com/user/package +# @CODE + +# @FUNCTION: ego_pn_check +# @DESCRIPTION: +# Make sure EGO_PN has a value. +ego_pn_check() { + [[ -z "${EGO_PN}" ]] && + die "${ECLASS}.eclass: EGO_PN is not set" + return 0 +} + +# @FUNCTION: get_golibdir +# @DESCRIPTION: +# Return the non-prefixed library directory where Go packages +# should be installed +get_golibdir() { + echo /usr/lib/go-gentoo +} + +# @FUNCTION: get_golibdir_gopath +# @DESCRIPTION: +# Return the library directory where Go packages should be installed +# This is the prefixed version which should be included in GOPATH +get_golibdir_gopath() { + echo "${EPREFIX}$(get_golibdir)" +} + +# @FUNCTION: golang_install_pkgs +# @DESCRIPTION: +# Install Go packages. +# This function assumes that $cwd is a Go workspace. +golang_install_pkgs() { + debug-print-function ${FUNCNAME} "$@" + + ego_pn_check + insinto "$(get_golibdir)" + insopts -m0644 -p # preserve timestamps for bug 551486 + doins -r pkg src +} + +fi diff -uNr a/eclass/golang-build.eclass b/eclass/golang-build.eclass --- a/eclass/golang-build.eclass false +++ b/eclass/golang-build.eclass 321e3ea03f2350c1559d1f64bc3f5626fd46602a2fe0ce179834da20544412fe78b1a623e0fb4b001e212a0d956de14c46852c37ea1626cece5a9d57241c93a0 @@ -0,0 +1,83 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: golang-build.eclass +# @MAINTAINER: +# William Hubbs <williamh@gentoo.org> +# @BLURB: Eclass for compiling go packages. +# @DESCRIPTION: +# This eclass provides default src_compile, src_test and src_install +# functions for software written in the Go programming language. + +inherit golang-base + +case "${EAPI:-0}" in + 5|6) + ;; + *) + die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})" + ;; +esac + +EXPORT_FUNCTIONS src_compile src_install src_test + +if [[ -z ${_GOLANG_BUILD} ]]; then + +_GOLANG_BUILD=1 + +# @ECLASS-VARIABLE: EGO_BUILD_FLAGS +# @DEFAULT_UNSET +# @DESCRIPTION: +# This allows you to pass build flags to the Go compiler. These flags +# are common to the "go build" and "go install" commands used below. +# Please emerge dev-lang/go and run "go help build" for the +# documentation for these flags. +# +# Example: +# @CODE +# EGO_BUILD_FLAGS="-ldflags \"-X main.version ${PV}\"" +# @CODE + +# @ECLASS-VARIABLE: EGO_PN +# @REQUIRED +# @DESCRIPTION: +# This is the import path for the go package(s) to build. Please emerge +# dev-lang/go and read "go help importpath" for syntax. +# +# Example: +# @CODE +# EGO_PN=github.com/user/package +# @CODE + +golang-build_src_compile() { + debug-print-function ${FUNCNAME} "$@" + + ego_pn_check + set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ + go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" + echo "$@" + "$@" || die +} + +golang-build_src_install() { + debug-print-function ${FUNCNAME} "$@" + + ego_pn_check + set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ + go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" + echo "$@" + "$@" || die + golang_install_pkgs +} + +golang-build_src_test() { + debug-print-function ${FUNCNAME} "$@" + + ego_pn_check + set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ + go test -v -work -x "${EGO_PN}" + echo "$@" + "$@" || die +} + +fi diff -uNr a/eclass/golang-vcs-snapshot.eclass b/eclass/golang-vcs-snapshot.eclass --- a/eclass/golang-vcs-snapshot.eclass false +++ b/eclass/golang-vcs-snapshot.eclass 15a81d9fe72fae0c72bb45bcbfede5f3d4d9014507b3e83f355a44a25387eb1340a08cb8e630e864b8c185ab29f163064d20fa4f2ae6ad031fb245648d67475b @@ -0,0 +1,117 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: golang-vcs-snapshot.eclass +# @MAINTAINER: +# William Hubbs <williamh@gentoo.org> +# @BLURB: support eclass for unpacking VCS snapshot tarballs for +# software written in the Go programming language +# @DESCRIPTION: +# This eclass provides a convenience src_unpack() which unpacks the +# first tarball mentioned in SRC_URI to its appropriate location in +# ${WORKDIR}/${P}, treating ${WORKDIR}/${P} as a go workspace. +# Also, it provides a downstream method of vendoring packages. +# +# The location where the tarball is extracted is defined as +# ${WORKDIR}/${P}/src/${EGO_PN}. The location of vendored packages is +# defined as ${WORKDIR}/${P}/src/${EGO_PN%/*}/vendor to match Go's +# vendoring setup. +# +# The typical use case is VCS snapshots coming from github, bitbucket +# and similar services. +# +# Please note that this eclass currently handles only tarballs +# (.tar.gz), but support for more formats may be added in the future. +# +# @EXAMPLE: +# +# @CODE +# EGO_PN=github.com/user/package +# EGO_VENDOR=( +# "github.com/xenolf/lego 6cac0ea7d8b28c889f709ec7fa92e92b82f490dd" +# "golang.org/x/crypto 453249f01cfeb54c3d549ddb75ff152ca243f9d8 github.com/golang/crypto" +# ) +# +# inherit golang-vcs-snapshot +# +# SRC_URI="https://github.com/example/${PN}/tarball/v${PV} -> ${P}.tar.gz +# ${EGO_VENDOR_URI}" +# @CODE +# +# The above example will extract the tarball to +# ${WORKDIR}/${P}/src/github.com/user/package +# and add the vendored tarballs to ${WORKDIR}/src/${EGO_PN}/vendor + +inherit golang-base + +case ${EAPI:-0} in + 5|6) ;; + *) die "${ECLASS} API in EAPI ${EAPI} not yet established." +esac + +EXPORT_FUNCTIONS src_unpack + +# @ECLASS-VARIABLE: EGO_VENDOR +# @DESCRIPTION: +# This variable contains a list of vendored packages. +# The items of this array are strings that contain the +# import path and the git commit hash for a vendored package. +# If the import path does not start with github.com, the third argument +# can be used to point to a github repository. + +declare -arg EGO_VENDOR + +_golang-vcs-snapshot_set_vendor_uri() { + EGO_VENDOR_URI= + local lib + for lib in "${EGO_VENDOR[@]}"; do + lib=(${lib}) + if [[ -n ${lib[2]} ]]; then + EGO_VENDOR_URI+=" https://${lib[2]}/archive/${lib[1]}.tar.gz -> ${lib[2]//\//-}-${lib[1]}.tar.gz" + else + EGO_VENDOR_URI+=" https://${lib[0]}/archive/${lib[1]}.tar.gz -> ${lib[0]//\//-}-${lib[1]}.tar.gz" + fi + done + readonly EGO_VENDOR_URI +} + +_golang-vcs-snapshot_set_vendor_uri +unset -f _golang-vcs-snapshot_set_vendor_uri + +_golang-vcs-snapshot_dovendor() { + local VENDOR_PATH=$1 VENDORPN=$2 TARBALL=$3 + rm -fr "${VENDOR_PATH}/${VENDORPN}" || die + mkdir -p "${VENDOR_PATH}/${VENDORPN}" || die + tar -C "${VENDOR_PATH}/${VENDORPN}" -x --strip-components 1\ + -f "${DISTDIR}"/${TARBALL} || die +} + +# @FUNCTION: golang-vcs-snapshot_src_unpack +# @DESCRIPTION: +# Extract the first archive from ${A} to the appropriate location for GOPATH. +golang-vcs-snapshot_src_unpack() { + local lib vendor_path x + ego_pn_check + set -- ${A} + x="$1" + mkdir -p "${WORKDIR}/${P}/src/${EGO_PN%/...}" || die + tar -C "${WORKDIR}/${P}/src/${EGO_PN%/...}" -x --strip-components 1 \ + -f "${DISTDIR}/${x}" || die + + if [[ -n "${EGO_VENDOR}" ]]; then + vendor_path="${WORKDIR}/${P}/src/${EGO_PN%/...}/vendor" + mkdir -p "${vendor_path}" || die + for lib in "${EGO_VENDOR[@]}"; do + lib=(${lib}) + if [[ -n ${lib[2]} ]]; then + einfo "Vendoring ${lib[0]} ${lib[2]//\//-}-${lib[1]}.tar.gz" + _golang-vcs-snapshot_dovendor "${vendor_path}" ${lib[0]} \ + ${lib[2]//\//-}-${lib[1]}.tar.gz + else + einfo "Vendoring ${lib[0]} ${lib[0]//\//-}-${lib[1]}.tar.gz" + _golang-vcs-snapshot_dovendor "${vendor_path}" ${lib[0]} \ + ${lib[0]//\//-}-${lib[1]}.tar.gz + fi + done + fi +} diff -uNr a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass --- a/eclass/golang-vcs.eclass false +++ b/eclass/golang-vcs.eclass 45e9aea9f129a3ccd6899918ae68d0d5b30207ac250aaf9d47889f8d0cc0389ec4c392c325dab7281554db2625bd906ef201ca05e7d0b158092720d7469c8e02 @@ -0,0 +1,135 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: golang-vcs.eclass +# @MAINTAINER: +# William Hubbs <williamh@gentoo.org> +# @BLURB: Eclass for fetching and unpacking go repositories. +# @DESCRIPTION: +# This eclass is written to ease the maintenance of live ebuilds +# of software written in the Go programming language. + +inherit eutils golang-base + +case "${EAPI:-0}" in + 5|6) + ;; + *) + die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})" + ;; +esac + +EXPORT_FUNCTIONS src_unpack + +if [[ -z ${_GOLANG_VCS} ]]; then + +_GOLANG_VCS=1 + +# @ECLASS-VARIABLE: EGO_PN +# @REQUIRED +# @DESCRIPTION: +# This is the import path for the go package(s). Please emerge dev-lang/go +# and read "go help importpath" for syntax. +# +# Example: +# @CODE +# EGO_PN="github.com/user/package" +# EGO_PN="github.com/user1/package1 github.com/user2/package2" +# @CODE + +# @ECLASS-VARIABLE: EGO_STORE_DIR +# @DESCRIPTION: +# Storage directory for Go sources. +# +# This is intended to be set by the user in make.conf. Ebuilds must not set +# it. +# +# EGO_STORE_DIR=${DISTDIR}/go-src + +# @ECLASS-VARIABLE: EVCS_OFFLINE +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty, this variable prevents any online operations. + +# @ECLASS-VARIABLE: EVCS_UMASK +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable to a custom umask. This is intended to be set by +# users. By setting this to something like 002, it can make life easier +# for people who do development as non-root (but are in the portage +# group) and use FEATURES=userpriv. + +# @FUNCTION: _golang-vcs_env_setup +# @INTERNAL +# @DESCRIPTION: +# Create EGO_STORE_DIR if necessary. +_golang-vcs_env_setup() { + debug-print-function ${FUNCNAME} "$@" + + local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}} + : ${EGO_STORE_DIR:=${distdir}/go-src} + + [[ -n ${EVCS_UMASK} ]] && eumask_push $EVCS_UMASK + + if [[ ! -d ${EGO_STORE_DIR} ]]; then + ( + addwrite / + mkdir -p "${EGO_STORE_DIR}" + ) || die "${ECLASS}: unable to create ${EGO_STORE_DIR}" + fi + + addwrite "${EGO_STORE_DIR}" + + [[ -n ${EVCS_UMASK} ]] && eumask_pop + mkdir -p "${WORKDIR}/${P}/src" || + die "${ECLASS}: unable to create ${WORKDIR}/${P}" + return 0 +} + +# @FUNCTION: _golang-vcs_fetch +# @INTERNAL +# @DESCRIPTION: +# Retrieve the EGO_PN go package along with its dependencies. +_golang-vcs_fetch() { + debug-print-function ${FUNCNAME} "$@" + + ego_pn_check + + if [[ -z ${EVCS_OFFLINE} ]]; then + [[ -n ${EVCS_UMASK} ]] && eumask_push ${EVCS_UMASK} + + set -- env GOPATH="${EGO_STORE_DIR}" go get -d -t -u -v -x "${EGO_PN}" + echo "$@" + "$@" || die + # The above dies if you pass repositories in EGO_PN instead of + # packages, e.g. golang.org/x/tools instead of golang.org/x/tools/cmd/vet. + # This is being discussed in the following upstream issue: + # https://github.com/golang/go/issues/11090 + + [[ -n ${EVCS_UMASK} ]] && eumask_pop + fi + local go_srcpath="${WORKDIR}/${P}/src/${EGO_PN%/...}" + set -- mkdir -p "${go_srcpath}" + echo "$@" + "$@" || die "Unable to create ${go_srcpath}" + set -- cp -r "${EGO_STORE_DIR}/src/${EGO_PN%/...}" \ + "${go_srcpath}/.." + echo "$@" + "$@" || die "Unable to copy sources to ${go_srcpath}" + return 0 +} + +golang-vcs_src_fetch() { + debug-print-function ${FUNCNAME} "$@" + + _golang-vcs_env_setup + _golang-vcs_fetch +} + +golang-vcs_src_unpack() { + debug-print-function ${FUNCNAME} "$@" + + golang-vcs_src_fetch +} + +fi diff -uNr a/eclass/gstreamer.eclass b/eclass/gstreamer.eclass --- a/eclass/gstreamer.eclass false +++ b/eclass/gstreamer.eclass 7fdcffe0e4c4b3e2dd551c618040ddfe5e738b25c16c218119956bdbe4985eb1b3aa771912ca88951ef6dfab0802f94419dcf1c6beddf182e7dd621c89fdc1b4 @@ -0,0 +1,267 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: gstreamer.eclass +# @MAINTAINER: +# gstreamer@gentoo.org +# @AUTHOR: +# Michał Górny <mgorny@gentoo.org> +# Gilles Dartiguelongue <eva@gentoo.org> +# Saleem Abdulrasool <compnerd@gentoo.org> +# foser <foser@gentoo.org> +# zaheerm <zaheerm@gentoo.org> +# @BLURB: Helps building core & split gstreamer plugins. +# @DESCRIPTION: +# Eclass to make external gst-plugins emergable on a per-plugin basis +# and to solve the problem with gst-plugins generating far too much +# unneeded dependencies. +# +# GStreamer consuming applications should depend on the specific plugins +# they need as defined in their source code. Usually you can find that +# out by grepping the source tree for 'factory_make'. If it uses playbin +# plugin, consider adding media-plugins/gst-plugins-meta dependency, but +# also list any packages that provide explicitly requested plugins. + +inherit eutils multilib multilib-minimal toolchain-funcs versionator xdg-utils + +case "${EAPI:-0}" in + 5|6) + ;; + 0|1|2|3|4) + die "EAPI=\"${EAPI:-0}\" is not supported anymore" + ;; + *) + die "EAPI=\"${EAPI}\" is not supported yet" + ;; +esac + +# @ECLASS-VARIABLE: GST_PLUGINS_BUILD +# @DESCRIPTION: +# Defines the plugins to be built. +# May be set by an ebuild and contain more than one indentifier, space +# seperated (only src_configure can handle mutiple plugins at this time). +: ${GST_PLUGINS_BUILD:=${PN/gst-plugins-/}} + +# @ECLASS-VARIABLE: GST_PLUGINS_BUILD_DIR +# @DESCRIPTION: +# Actual build directory of the plugin. +# Most often the same as the configure switch name. +: ${GST_PLUGINS_BUILD_DIR:=${PN/gst-plugins-/}} + +# @ECLASS-VARIABLE: GST_TARBALL_SUFFIX +# @DESCRIPTION: +# Most projects hosted on gstreamer.freedesktop.org mirrors provide +# tarballs as tar.bz2 or tar.xz. This eclass defaults to xz. This is +# because the gstreamer mirrors are moving to only have xz tarballs for +# new releases. +: ${GST_TARBALL_SUFFIX:="xz"} + +# Even though xz-utils are in @system, they must still be added to DEPEND; see +# https://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml +if [[ ${GST_TARBALL_SUFFIX} == "xz" ]]; then + DEPEND="${DEPEND} app-arch/xz-utils" +fi + +# @ECLASS-VARIABLE: GST_ORG_MODULE +# @DESCRIPTION: +# Name of the module as hosted on gstreamer.freedesktop.org mirrors. +# Leave unset if package name matches module name. +: ${GST_ORG_MODULE:=$PN} + +# @ECLASS-VARIABLE: GST_ORG_PVP +# @INTERNAL +# @DESCRIPTION: +# Major and minor numbers of the version number. +: ${GST_ORG_PVP:=$(get_version_component_range 1-2)} + + +DESCRIPTION="${BUILD_GST_PLUGINS} plugin for gstreamer" +HOMEPAGE="https://gstreamer.freedesktop.org/" +SRC_URI="https://gstreamer.freedesktop.org/src/${GST_ORG_MODULE}/${GST_ORG_MODULE}-${PV}.tar.${GST_TARBALL_SUFFIX}" + +LICENSE="GPL-2" +case ${GST_ORG_PVP} in + 0.10) SLOT="0.10"; GST_MIN_PV="0.10.36-r2" ;; + 1.*) SLOT="1.0"; GST_MIN_PV="1.2.4-r1" ;; + *) die "Unkown gstreamer release." +esac + +S="${WORKDIR}/${GST_ORG_MODULE}-${PV}" + +RDEPEND=" + >=dev-libs/glib-2.38.2-r1:2[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-${GST_MIN_PV}:${SLOT}[${MULTILIB_USEDEP}] +" +DEPEND=" + >=sys-apps/sed-4 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" + +# Export common multilib phases. +multilib_src_configure() { gstreamer_multilib_src_configure; } + +if [[ ${PN} != ${GST_ORG_MODULE} ]]; then + # Do not run test phase for invididual plugin ebuilds. + RESTRICT="test" + RDEPEND="${RDEPEND} + >=media-libs/${GST_ORG_MODULE}-${PV}:${SLOT}[${MULTILIB_USEDEP}]" + + # Export multilib phases used for split builds. + multilib_src_compile() { gstreamer_multilib_src_compile; } + multilib_src_install() { gstreamer_multilib_src_install; } + multilib_src_install_all() { gstreamer_multilib_src_install_all; } +else + IUSE="nls" + DEPEND="${DEPEND} nls? ( >=sys-devel/gettext-0.17 )" +fi + +DEPEND="${DEPEND} ${RDEPEND}" + +# @FUNCTION: gstreamer_environment_reset +# @INTERNAL +# @DESCRIPTION: +# Clean up environment for clean builds. +# >=dev-lang/orc-0.4.23 rely on environment variables to find a place to +# allocate files to mmap. +gstreamer_environment_reset() { + xdg_environment_reset +} + +# @FUNCTION: gstreamer_get_plugins +# @INTERNAL +# @DESCRIPTION: +# Get the list of plugins requiring external dependencies. +gstreamer_get_plugins() { + # Must be called from src_prepare/src_configure + GST_PLUGINS_LIST=$(sed -rn 's/^AG_GST_CHECK_FEATURE\((\w+),.*/ \1 /p' \ + "${ECONF_SOURCE:-${S}}"/configure.* | LC_ALL='C' tr '[:upper:]' '[:lower:]') +} + +# @FUNCTION: gstreamer_get_plugin_dir +# @USAGE: gstreamer_get_plugin_dir [<build_dir>] +# @INTERNAL +# @DESCRIPTION: +# Finds plugin build directory and output it. +# Defaults to ${GST_PLUGINS_BUILD_DIR} if argument is not provided +gstreamer_get_plugin_dir() { + local build_dir=${1:-${GST_PLUGINS_BUILD_DIR}} + + if [[ ! -d ${S}/ext/${build_dir} ]]; then + if [[ ! -d ${S}/sys/${build_dir} ]]; then + ewarn "No such plugin directory" + die + fi + einfo "Building system plugin in ${build_dir}..." >&2 + echo sys/${build_dir} + else + einfo "Building external plugin in ${build_dir}..." >&2 + echo ext/${build_dir} + fi +} + +# @FUNCTION: gstreamer_system_link +# @USAGE: gstreamer_system_link gst-libs/gst/audio:gstreamer-audio [...] +# @DESCRIPTION: +# Walks through makefiles in order to make sure build will link against system +# libraries. +# Takes a list of path fragments and corresponding pkgconfig libraries +# separated by colon (:). Will replace the path fragment by the output of +# pkgconfig. +gstreamer_system_link() { + local pdir directory libs pkgconfig pc tuple + pkgconfig=$(tc-getPKG_CONFIG) + + for plugin_dir in ${GST_PLUGINS_BUILD_DIR} ; do + pdir=$(gstreamer_get_plugin_dir ${plugin_dir}) + + for tuple in $@ ; do + directory=${tuple%:*} + pc=${tuple#*:}-${SLOT} + libs="$(${pkgconfig} --libs-only-l ${pc} || die)" + sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \ + -i "${pdir}"/Makefile.{am,in} || die + done + done +} + +# @FUNCTION: gstreamer_multilib_src_configure +# @DESCRIPTION: +# Handles logic common to configuring gstreamer plugins +gstreamer_multilib_src_configure() { + local plugin gst_conf=() ECONF_SOURCE=${ECONF_SOURCE:-${S}} + + gstreamer_get_plugins + gstreamer_environment_reset + + for plugin in ${GST_PLUGINS_LIST} ; do + if has ${plugin} ${GST_PLUGINS_BUILD} ; then + gst_conf+=( --enable-${plugin} ) + else + gst_conf+=( --disable-${plugin} ) + fi + done + + if grep -q "ORC_CHECK" "${ECONF_SOURCE}"/configure.* ; then + if in_iuse orc ; then + gst_conf+=( $(use_enable orc) ) + else + gst_conf+=( --disable-orc ) + fi + fi + + if grep -q "AM_MAINTAINER_MODE" "${ECONF_SOURCE}"/configure.* ; then + gst_conf+=( --disable-maintainer-mode ) + fi + + if grep -q "disable-schemas-compile" "${ECONF_SOURCE}"/configure ; then + gst_conf+=( --disable-schemas-compile ) + fi + + if [[ ${PN} == ${GST_ORG_MODULE} ]]; then + gst_conf+=( $(use_enable nls) ) + fi + + einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..." + econf \ + --with-package-name="Gentoo GStreamer ebuild" \ + --with-package-origin="https://www.gentoo.org" \ + "${gst_conf[@]}" "${@}" +} + +# @FUNCTION: gstreamer_multilib_src_compile +# @DESCRIPTION: +# Compiles requested gstreamer plugin. +gstreamer_multilib_src_compile() { + local plugin_dir + + for plugin_dir in ${GST_PLUGINS_BUILD_DIR} ; do + emake -C "$(gstreamer_get_plugin_dir ${plugin_dir})" + done +} + +# @FUNCTION: gstreamer_multilib_src_install +# @DESCRIPTION: +# Installs requested gstreamer plugin. +gstreamer_multilib_src_install() { + local plugin_dir + + for plugin_dir in ${GST_PLUGINS_BUILD_DIR} ; do + emake -C "$(gstreamer_get_plugin_dir ${plugin_dir})" \ + DESTDIR="${D}" install + done +} + +# @FUNCTION: gstreamer_multilib_src_install_all +# @DESCRIPTION: +# Installs documentation for requested gstreamer plugin, and removes .la +# files. +gstreamer_multilib_src_install_all() { + local plugin_dir + + for plugin_dir in ${GST_PLUGINS_BUILD_DIR} ; do + local dir=$(gstreamer_get_plugin_dir ${plugin_dir}) + [[ -e ${dir}/README ]] && dodoc "${dir}"/README + done + + prune_libtool_files --modules +} diff -uNr a/eclass/gtk-sharp-module.eclass b/eclass/gtk-sharp-module.eclass --- a/eclass/gtk-sharp-module.eclass false +++ b/eclass/gtk-sharp-module.eclass ff438deff63a608c297b154bf332ab5740d16075329a220867c56bcc2f9be0e29ef3d86498fbca33c3595b2ac85a1cb10c88aae287086d1499c5b07f79094695 @@ -0,0 +1,561 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: gtk-sharp-module.eclass +# @MAINTAINER: +# dotnet@gentoo.org +# @BLURB: Manages the modules of the gtk-, gnome-, and gnome-desktop-sharp tarballs +# @DESCRIPTION: +# This eclass provides phase functions and helper functions for the modules +# of the gtk-sharp, gnome-sharp and gnome-desktop-sharp tarballs. +# PLEASE TAKE NOTE: ONLY FOR EAPI-2 EBUILDS + +WANT_AUTOMAKE=none +WANT_AUTOCONF=none + +inherit eutils mono multilib libtool autotools base versionator + +case ${EAPI:-0} in + 2|3|4|5) ;; + *) die "Unknown EAPI." ;; +esac + +# @ECLASS-VARIABLE: GTK_SHARP_MODULE +# @DESCRIPTION: +# The name of the Gtk# module. +# Default value: ${PN/-sharp/} +GTK_SHARP_MODULE=${GTK_SHARP_MODULE:=${PN/-sharp/}} + +# @ECLASS-VARIABLE: GTK_SHARP_MODULE_DIR +# @DESCRIPTION: +# The subdirectory of S in which GTK_SHARP_MODULE is installed. +# Default value: ${PN/-sharp/} +GTK_SHARP_MODULE_DIR=${GTK_SHARP_MODULE_DIR:=${PN/-sharp/}} + +# @ECLASS-VARIABLE: GTK_SHARP_REQUIRED_VERSION +# @DESCRIPTION: +# The version of the gtk-sharp tarball this package requires. +# Optional. +GTK_SHARP_REQUIRED_VERSION="${GTK_SHARP_REQUIRED_VERSION}" + +# @ECLASS-VARIABLE: gapi_users_list +# @DESCRIPTION: +# List of modules that use one of gapi2-codegen, gapi2-fixup or gapi2-parser +# No ebuild-serviceable parts inside. +gapi_users_list="art gnome gnomevfs ${gnome_desktop_sharp_module_list} atk gtk gdk glade pango" + +# @ECLASS-VARIABLE: PV_MAJOR +# @DESCRIPTION: +# The first two components of the PV variable. +PV_MAJOR=$(get_version_component_range 1-2) + +# @FUNCTION: add_bdepend +# @USAGE: <package atom> +# @DESCRIPTION: +# Adds to the DEPEND variable +add_bdepend() { + [[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs ONE (1) argument" + DEPEND="${DEPEND} $@" +} + +# @FUNCTION: add_rdepend +# @USAGE: <package atom> +# @DESCRIPTION: +# Adds to the RDEPEND variable +add_rdepend() { + [[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs ONE (1) argument" + RDEPEND="${RDEPEND} $@" +} + +# @FUNCTION: add_depend +# @USAGE: <package atom> +# @DESCRIPTION: +# Adds to the DEPEND and RDEPEND variables +add_depend() { + [[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs ONE (1) argument" + DEPEND="${DEPEND} $@" + RDEPEND="${RDEPEND} $@" +} + +# @ECLASS-VARIABLE: TARBALL +# @DESCRIPTION: +# The GtkSharp modules are currently divided into three seperate tarball +# distributions. The TARBALL variable holds the name of the tarball +# to which GTK_SHARP_MODULE belongs. +case ${GTK_SHARP_MODULE} in + glib|glade|gtk|gdk|atk|pango|gtk-dotnet|gtk-gapi|gtk-docs) + TARBALL="gtk-sharp" + case ${PVR} in + 2.12.10*) + SRC_URI="mirror://gentoo/${TARBALL}-2.12.7.patch.bz2" + #Upstream: https://bugzilla.novell.com/show_bug.cgi?id=$bugno + #Upstream bug #470390 for the gtk-sharp-2.12.7.patch + PATCHES=( + "${WORKDIR}/${TARBALL}-2.12.7.patch" + ) + ;; + 2.12.11*) + SRC_URI="mirror://gentoo/${TARBALL}-2.12.11.patch.bz2" + PATCHES=( + "${WORKDIR}/${TARBALL}-2.12.11.patch" + ) + ;; + esac + case ${PVR} in + 2.12.1*) + EAUTORECONF="YES" + add_bdepend "=sys-devel/automake-1.10*" + add_bdepend ">=sys-devel/autoconf-2.61" + ;; + esac + ;; + art|gnome|gnomevfs|gconf) + TARBALL="gnome-sharp" + add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*" + has "${GTK_SHARP_MODULE}" "${gapi_users_list}" && \ + add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*" + case ${PVR} in + 2.24.1*) + SRC_URI="mirror://gentoo/${TARBALL}-2.24.1.patch.bz2" + # Upstream bug: https://bugzilla.novell.com/show_bug.cgi?id=483251 + PATCHES=( + "${WORKDIR}/${TARBALL}-2.24.1.patch" + ) + EAUTORECONF="YES" + add_bdepend "=sys-devel/automake-1.10*" + add_bdepend ">=sys-devel/autoconf-2.61" + ;; + 2.24.2*) + add_depend ">=dev-lang/mono-2.7" + ;; + esac + ;; + gnome-desktop|gnome-print|gnome-panel|gtkhtml|gtksourceview|nautilusburn|rsvg|vte|wnck) + TARBALL="gnome-desktop-sharp" + add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*" + add_depend "=dev-dotnet/gnome-sharp-2.24*" + add_depend "gnome-base/gnome-desktop:2" + add_bdepend "|| ( >=dev-dotnet/gtk-sharp-2.12.21 =dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}* )" + ;; + *) + eerror "Huh? Sonny boy, looks like your GTK_SHARP_MODULE is not on the approved list. BAILING!" + die "How did we get here!!?" + ;; +esac + +case ${PF} in + #gtk-sharp tarball + gtk-sharp-docs*) + add_depend ">=dev-lang/mono-2.0" + ;; + gtk-sharp-gapi*) + add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2" + add_depend "dev-perl/XML-LibXML" + ;; + gtk-sharp-*) + add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}" + add_depend "~dev-dotnet/glib-sharp-${PV}" + add_depend "~dev-dotnet/atk-sharp-${PV}" + add_depend "~dev-dotnet/gdk-sharp-${PV}" + add_depend "~dev-dotnet/pango-sharp-${PV}" + ;; + gdk-sharp-*) + add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}" + add_depend "~dev-dotnet/glib-sharp-${PV}" + add_depend "x11-libs/gtk+:2" + add_depend "~dev-dotnet/pango-sharp-${PV}" + add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2" + ;; + atk-sharp-*) + add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}" + add_depend "~dev-dotnet/glib-sharp-${PV}" + add_depend "dev-libs/atk" + add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2" + ;; + glib-sharp-*) + add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2" + add_depend "dev-libs/glib:2" + ;; + pango-sharp-*) + add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}" + add_depend "~dev-dotnet/glib-sharp-${PV}" + add_depend "x11-libs/pango" + add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2" + ;; + gtk-dotnet-*) + add_depend "~dev-dotnet/glib-sharp-${PV}" + add_depend "~dev-dotnet/gdk-sharp-${PV}" + add_depend "~dev-dotnet/pango-sharp-${PV}" + add_depend "~dev-dotnet/gtk-sharp-${PV}" + add_depend "dev-lang/mono[-minimal]" + add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2" + ;; + glade-sharp-*) + add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}" + add_depend "~dev-dotnet/glib-sharp-${PV}" + add_depend "~dev-dotnet/atk-sharp-${PV}" + add_depend "~dev-dotnet/gdk-sharp-${PV}" + add_depend "~dev-dotnet/gtk-sharp-${PV}" + add_depend "~dev-dotnet/pango-sharp-${PV}" + add_depend ">=gnome-base/libglade-2.3.6:2.0" + ;; + #gnome-sharp tarball + art-sharp-*) + add_depend ">=media-libs/libart_lgpl-2.3.20" + ;; + gnome-sharp-*) + add_depend ">=gnome-base/libgnomeui-${PV_MAJOR}" + add_depend "~dev-dotnet/gnomevfs-sharp-${PV}" + add_depend "~dev-dotnet/art-sharp-${PV}" + add_depend ">=gnome-base/libgnomecanvas-${GNOMECANVAS_REQUIRED_VERSION}" + add_depend ">=x11-libs/gtk+-2.14.0:2" + ;; + gconf-sharp-*) + add_depend ">=gnome-base/gconf-${PV_MAJOR}:2" + add_depend "=dev-dotnet/glade-sharp-${GTK_SHARP_REQUIRED_VERSION}*" + add_depend "~dev-dotnet/gnome-sharp-${PV}" + add_depend "~dev-dotnet/art-sharp-${PV}" + ;; + gnomevfs-sharp-*) + add_depend ">=gnome-base/gnome-vfs-${PV_MAJOR}:2" + ;; + #gnome-desktop-sharp tarball + gnome-desktop-sharp-*) + # NOTE: libgnome-desktop-2.so has been known to make binary- + # incompatible changes, requiring .so bumps. gnome-desktop-sharp + # is locked to a specific .so.n version, so strict dependencies + # may be required in the future (as it has in the past). + add_depend ">=gnome-base/gnome-desktop-${PV_MAJOR}:2" + ;; + gnome-panel-sharp-*) + add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}" + ;; + gnome-print-sharp-*) + add_depend "gnome-base/libgnomeprint:2.2" + add_depend "gnome-base/libgnomeprintui:2.2" + ;; + gtkhtml-sharp-*) + #NOTE: gtkhtml dependency must follow gtkhtml-sharp version. + #i.e. gtkhtml-sharp-2.24.0 >=gtkhtml-3.24 + # gtkhtml-sharp-2.16.0 >=gtkhtml-3.16 + # See bug 249540 for unpleasant side effects. + add_depend ">=gnome-extra/gtkhtml-$(($(get_version_component_range 1) + 1 )).$(get_version_component_range 2):3.14" + ;; + gtksourceview-sharp-*) + add_depend ">=x11-libs/gtksourceview-${GTKSOURCEVIEW_REQUIRED_VERSION}:2.0" + ;; + nautilusburn-sharp-*) + add_depend ">=gnome-extra/nautilus-cd-burner-2.24.0" + ;; + rsvg-sharp-*) + add_depend ">=gnome-base/librsvg-${RSVG_REQUIRED_VERSION}:2" + ;; + vte-sharp-*) + add_depend ">=x11-libs/vte-${VTE_REQUIRED_VERSION}:0" + ;; + wnck-sharp-*) + add_depend ">=x11-libs/libwnck-${PV_MAJOR}:1" + ;; +esac + +# @ECLASS-VARIABLE: DESCRIPTION +# @DESCRIPTION: +# Default value: GtkSharp's ${GTK_SHARP_MODULE} module of the ${TARBALL} tarball +DESCRIPTION="GtkSharp's ${GTK_SHARP_MODULE} module of the ${TARBALL} tarball" +# @ECLASS-VARIABLE: HOMEPAGE +# @DESCRIPTION: +# Default value: http://www.mono-project.com/GtkSharp +HOMEPAGE="http://www.mono-project.com/GtkSharp" +# @ECLASS-VARIABLE: LICENSE +# @DESCRIPTION: +# Default value: LGPL-2.1 +LICENSE="LGPL-2.1" + +add_depend ">=dev-lang/mono-2.0.1" +add_bdepend ">=sys-apps/sed-4" +add_bdepend "virtual/pkgconfig" +add_bdepend ">=app-shells/bash-3.1" + +IUSE="debug" +# @ECLASS-VARIABLE: S +# @DESCRIPTION: +# Default value: ${WORKDIR}/${TARBALL}-${PV} +S="${WORKDIR}/${TARBALL}-${PV}" +# @ECLASS-VARIABLE: SRC_URI +# @DESCRIPTION: +# Default value: mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2 +if [[ ${TARBALL} == "gtk-sharp" ]]; then + SRC_URI="${SRC_URI} + http://download.mono-project.com/sources/gtk-sharp212/${TARBALL}-${PV}.tar.bz2" +else + SRC_URI="${SRC_URI} + mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2" +fi + +# @FUNCTION: get_sharp_apis +# @USAGE: <type> <pkgconfig-package> +# @RETURN: .NET API files +# @DESCRIPTION: +# Given a valid pkg-config package, will return a list of API xml files. +# <type> can be either --prefixed or --bare. If prefixed, each API file +# will be prefixed with -I: +get_sharp_apis() { + [[ ${#@} -eq 2 ]] || die "${FUNCNAME} needs two arguments" + get_sharp_assemblies "$@" +} + +# @FUNCTION: get_sharp_assemblies +# @USAGE: <type> <pkgconfig-package> +# @RETURN: .NET .dll assemblies +# @DESCRIPTION: +# Given a valid pkg-config package, will return a list of .dll assemblies. +# <type> can be either --prefixed or --bare. If prefixed, each .dll file +# will be prefixed with -r: +get_sharp_assemblies() { + [[ ${#@} -eq 2 ]] || die "${FUNCNAME} needs two arguments" + local string config=libs prefix="-r:" + local -a rvalue + [[ "${FUNCNAME[1]}" = "get_sharp_apis" ]] && config=cflags && prefix="-I:" + for string in $(pkg-config --${config} ${2} 2> /dev/null) + do + rvalue+=( ${string#-?:} ) + done + + case $1 in + --bare) + : + ;; + --prefixed) + for (( i=0 ; i< ${#rvalue[@]} ; i++ )) + do + rvalue[$i]=${prefix}${rvalue[$i]} + done + ;; + *) + die "${FUNCNAME}: Unknown parameter" + ;; + esac + echo "${rvalue[@]}" +} + +# @FUNCTION: phase_hook +# @USAGE: <prefix> +# @DESCRIPTION: +# Looks for functions named <prefix>_caller_suffix and executes them. +# _caller_suffix is the calling function with the prefix +# gtk-sharp-module removed. +phase_hook() { + [[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs one argument" + if [[ "$(type -t ${1}${FUNCNAME[1]#gtk-sharp-module})" = "function" ]] + then + ebegin "Phase-hook: Running ${1}${FUNCNAME[1]#gtk-sharp-module}" + ${1}${FUNCNAME[1]#gtk-sharp-module} + eend 0 + fi +} + +# @FUNCTION: ac_path_prog_override +# @USAGE: <PROG> [path] +# @DESCRIPTION: +# Override AC_PATH_PROG() autoconf macros. Path will be set to " " if +# not specified. +ac_path_prog_override() { + if [[ ${#@} -lt 1 || ${#@} -gt 2 ]] + then + eerror "${FUNCNAME[0]} requires at least one parameter and takes at most two:" + eerror "AC_PATH_PROG(PARAM1, param2)" + die "${FUNCNAME[0]} requires at least one parameter and takes at most two:" + fi + export ac_cv_path_${1}="${2:- }" +} + + +# @FUNCTION: pkg_check_modules_override +# @USAGE: <GROUP> [package1] [package2] +# @DESCRIPTION: +# Will export the appropriate variables to override PKG_CHECK_MODULES autoconf +# macros, with the string " " by default. If packages are specified, they will +# be looked up with pkg-config and the appropriate LIBS and CFLAGS substituted. +# LIBS and CFLAGS can also be specified per-package with the following syntax: +# @CODE +# package=LIBS%CFLAGS +# @CODE +# = and % have no effect unless both are specified. +# Here is an example: +# @CODE +# pkg_check_modules_override GASH "gtk+-2.0=-jule%" gobject-2.0 +# @CODE +# The above example will do: +# export GASH_CFLAGS+=" -jule" +# export GASH_LIBS+=" " +# export GASH_CFLAGS+=" $(pkg-config --cflags gobject-2.0)" +# export GASH_LIBS+=" $(pkg-config --libs gobject-2.0)" +# +# NOTE: If a package is not found, the string " " will be inserted in place of +# <GROUP>_CFLAGS and <GROUP>_LIBS +pkg_check_modules_override() { + local package + local group="${1}" + local packages="${*:2}" + export ${group}_CFLAGS=" " + export ${group}_LIBS=" " + + if [[ ${#@} -lt 1 ]] + then + eerror "${FUNCNAME[0]} requires at least one parameter: GROUP" + eerror "PKG_CHECK_MODULES(GROUP, package1 package2 etc)" + die "${FUNCNAME[0]} requires at least one parameter: GROUP" + fi + + for package in $packages + do + if [[ ${package/=} != ${package} && ${package/\%} != ${package} ]] + then + package_cflag_libs=${package##*=} + export ${group}_CFLAGS+=" ${package_cflag_libs%%\%*}" + export ${group}_LIBS+=" ${package_cflag_libs##*\%}" + else + if pkg-config --exists $package + then + export ${group}_CFLAGS+=" $(pkg-config --cflags $package)" + export ${group}_LIBS+=" $(pkg-config --libs $package)" + else + export ${group}_CFLAGS+=" " + export ${group}_LIBS+=" " + fi + fi + done +} + +# @FUNCTION: gtk-sharp-tarball-post_src_prepare +# @DESCRIPTION: +# Runs a M-m-m-monster sed on GTK_SHARP_MODULE_DIR to convert references to +# local assemblies to the installed ones. Is only called by src_prepare when +# $GTK_SHARP_MODULE is a member of $gtk_sharp_module_list. +gtk-sharp-tarball-post_src_prepare() { + has "${EAPI:-0}" 2 && ! use prefix && EPREFIX= + cd "${S}/${GTK_SHARP_MODULE_DIR}" + sed -i \ + -e "s; \$(srcdir)/../glib/glib-api.xml; $(get_sharp_apis --bare glib-sharp-2.0);" \ + -e "s; ../pango/pango-api.xml; $(get_sharp_apis --bare pango-sharp-2.0);" \ + -e "s; ../atk/atk-api.xml; $(get_sharp_apis --bare atk-sharp-2.0);" \ + -e "s; ../gdk/gdk-api.xml; $(get_sharp_apis --bare gdk-sharp-2.0);" \ + -e "s; ../gtk/gtk-api.xml; $(get_sharp_apis --bare gtk-sharp-2.0);" \ + -e "s; \.\./glib/glib-sharp.dll; $(get_sharp_assemblies --bare glib-sharp-2.0);g" \ + -e "s; \.\./pango/pango-sharp.dll; $(get_sharp_assemblies --bare pango-sharp-2.0);g" \ + -e "s; \.\./atk/atk-sharp.dll; $(get_sharp_assemblies --bare atk-sharp-2.0);g" \ + -e "s; \.\./gdk/gdk-sharp.dll; $(get_sharp_assemblies --bare gdk-sharp-2.0);g" \ + -e "s; \.\./gtk/gtk-sharp.dll; $(get_sharp_assemblies --bare gtk-sharp-2.0);g" \ + -e "s;\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe;${EPREFIX}/usr/bin/gapi2-fixup;" \ + -e "s;\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe;${EPREFIX}/usr/bin/gapi2-codegen;" \ + -e "s:\$(SYMBOLS) \$(top_builddir)/parser/gapi-fixup.exe:\$(SYMBOLS):" \ + -e "s:\$(INCLUDE_API) \$(top_builddir)/generator/gapi_codegen.exe:\$(INCLUDE_API):" \ + $(find . -name Makefile.in) || die "failed to fix ${TARBALL}-tarball makefiles" +} + +# @FUNCTION: gnome-sharp-tarball-post_src_prepare +# @DESCRIPTION: +# Runs a M-m-m-monster sed on GTK_SHARP_MODULE_DIR to convert references to +# local assemblies to the installed ones. Is only called by src_prepare when +# $GTK_SHARP_MODULE is a member of $gnome_sharp_module_list. +gnome-sharp-tarball-post_src_prepare() { + cd "${S}/${GTK_SHARP_MODULE_DIR}" + sed -i \ + -e "s; ../gnomevfs/gnome-vfs-api.xml; $(get_sharp_apis --bare gnome-vfs-sharp-2.0);" \ + -e "s; ../art/art-api.xml; $(get_sharp_apis --bare art-sharp-2.0);" \ + -e "s; \.\./art/art-sharp.dll; $(get_sharp_assemblies --bare art-sharp-2.0);g" \ + -e "s; \.\./gnomevfs/gnome-vfs-sharp.dll; $(get_sharp_assemblies --bare gnome-vfs-sharp-2.0);g" \ + -e "s;/r:\$(top_builddir)/art/art-sharp.dll;$(get_sharp_assemblies --prefixed art-sharp-2.0);" \ + -e "s;/r:\$(top_builddir)/gnome/gnome-sharp.dll;$(get_sharp_assemblies --prefixed gnome-sharp-2.0);" \ + $(find . -name Makefile.in) || die "failed to fix ${TARBALL}-tarball makefiles" +} + +# @FUNCTION: gtk-sharp-module_src_prepare +# @DESCRIPTION: +# Runs autopatch from base.eclass, eautoreconf if EAUTORECONF is set to any +# value. +# Contains a phase_hook, runs very last. +# phase_hook prefix trigger: ${TARBALL}-tarball-post +# Is exported. +gtk-sharp-module_src_prepare() { + base_src_prepare +# @ECLASS-VARIABLE: EAUTORECONF +# @DESCRIPTION: +# If set, EAUTORECONF will be run during src_prepare. + [[ ${EAUTORECONF} ]] && eautoreconf + phase_hook ${TARBALL}-tarball-post + elibtoolize +} + +# @FUNCTION: gtk-sharp-tarball_src_configure +# @DESCRIPTION: +# Sets some environment variables that will allow us to make the dependencies +# for each ebuild be only its own dependencies, without patching configure. +# Is only called by gtk-sharp-module_src_configure when $GTK_SHARP_MODULE +# is a member of $gtk_sharp_module_list. +gtk-sharp-tarball_src_configure() { + pkg_check_modules_override GLIB gobject-2.0 + pkg_check_modules_override GIO gio-2.0 + pkg_check_modules_override PANGO pango + pkg_check_modules_override ATK atk + pkg_check_modules_override GTK gtk+-2.0 + pkg_check_modules_override GLADE libglade-2.0 +} + +# @FUNCTION: gnome-sharp-tarball_src_configure +# @DESCRIPTION: +# Sets some environment variables that will allow us to make the dependencies +# for each ebuild be only its own dependencies. Without patching configure. +# Is only called by gtk-sharp-module_src_configure when $GTK_SHARP_MODULE +# is a member of $gnome_sharp_module_list. +gnome-sharp-tarball_src_configure() { + has "${EAPI:-0}" 2 && ! use prefix && EPREFIX= + pkg_check_modules_override GLADESHARP glade-sharp-2.0 + pkg_check_modules_override GAPI gapi-2.0 + ac_path_prog_override GAPI_PARSER "${EPREFIX}"/usr/bin/gapi2-parser + ac_path_prog_override GAPI_CODEGEN "${EPREFIX}"/usr/bin/gapi2-codegen + ac_path_prog_override GAPI_FIXUP "${EPREFIX}"/usr/bin/gapi2-fixup +} + +# @FUNCTION: gtk-sharp-module_src_configure +# @USAGE: [econf-arguments] +# @DESCRIPTION: +# Calls econf with some default values. +# Contains a phase_hook, run before econf. +# phase_hook prefix trigger: ${TARBALL}-tarball +# Is exported. +gtk-sharp-module_src_configure() { + phase_hook ${TARBALL}-tarball + econf --disable-static \ + --disable-dependency-tracking \ + --disable-maintainer-mode \ + $(use debug &&echo "--enable-debug" ) \ + ${@} || die "econf failed" +} + +# @FUNCTION: gtk-sharp-module_src_compile +# @DESCRIPTION: +# Calls emake in the subdir of the module. +# Sets CSC=/usr/bin/mcs. Deletes top_srcdir Makefiles to prevent recursing in +# case we missed some dll references. +# Is exported. +gtk-sharp-module_src_compile() { + rm -f "${S}"/Makefile* &> /dev/null + cd "${S}/${GTK_SHARP_MODULE_DIR}" + emake CSC=/usr/bin/mcs || die "emake failed" +} + +# @FUNCTION: gtk-sharp-module_src_install +# @DESCRIPTION: +# Installs the module. Fixes up lib paths so they're multilib-safe. +# Gets rid of .la files. +# Is exported. +gtk-sharp-module_src_install() { + cd "${S}/${GTK_SHARP_MODULE_DIR}" + emake DESTDIR="${D}" install || die "emake install failed" + mono_multilib_comply + find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" + [[ $(find "${D}" -type f|wc -l) -lt 3 ]] && die "Too few files. This smells like a failed install." +} + +EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install diff -uNr a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass --- a/eclass/haskell-cabal.eclass false +++ b/eclass/haskell-cabal.eclass 0a70447f523b50a0aec752ea11935adfeff077b6cd53fe9ffaf63122c5f6d5e6d83fb3f8008f7bbca5c4dd7d9051e3571b8aab633923736bc104a292cf409568 @@ -0,0 +1,741 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: haskell-cabal.eclass +# @MAINTAINER: +# Haskell herd <haskell@gentoo.org> +# @AUTHOR: +# Original author: Andres Loeh <kosmikus@gentoo.org> +# Original author: Duncan Coutts <dcoutts@gentoo.org> +# @BLURB: for packages that make use of the Haskell Common Architecture for Building Applications and Libraries (cabal) +# @DESCRIPTION: +# Basic instructions: +# +# Before inheriting the eclass, set CABAL_FEATURES to +# reflect the tools and features that the package makes +# use of. +# +# Currently supported features: +# haddock -- for documentation generation +# hscolour -- generation of colourised sources +# hoogle -- generation of documentation search index +# profile -- if package supports to build profiling-enabled libraries +# bootstrap -- only used for the cabal package itself +# lib -- the package installs libraries +# nocabaldep -- don't add dependency on cabal. +# only used for packages that _must_ not pull the dependency +# on cabal, but still use this eclass (e.g. haskell-updater). +# ghcdeps -- constraint dependency on package to ghc onces +# only used for packages that use libghc internally and _must_ +# not pull upper versions +# test-suite -- add support for cabal test-suites (introduced in Cabal-1.8) + +inherit eutils ghc-package multilib toolchain-funcs + +# @ECLASS-VARIABLE: CABAL_EXTRA_CONFIGURE_FLAGS +# @DESCRIPTION: +# User-specified additional parameters passed to 'setup configure'. +# example: /etc/portage/make.conf: +# CABAL_EXTRA_CONFIGURE_FLAGS="--enable-shared --enable-executable-dynamic" +: ${CABAL_EXTRA_CONFIGURE_FLAGS:=} + +# @ECLASS-VARIABLE: CABAL_EXTRA_BUILD_FLAGS +# @DESCRIPTION: +# User-specified additional parameters passed to 'setup build'. +# example: /etc/portage/make.conf: CABAL_EXTRA_BUILD_FLAGS=-v +: ${CABAL_EXTRA_BUILD_FLAGS:=} + +# @ECLASS-VARIABLE: GHC_BOOTSTRAP_FLAGS +# @DESCRIPTION: +# User-specified additional parameters for ghc when building +# _only_ 'setup' binary bootstrap. +# example: /etc/portage/make.conf: GHC_BOOTSTRAP_FLAGS=-dynamic to make +# linking 'setup' faster. +: ${GHC_BOOTSTRAP_FLAGS:=} + +# @ECLASS-VARIABLE: CABAL_EXTRA_TEST_FLAGS +# @DESCRIPTION: +# User-specified additional parameters passed to 'setup test'. +# example: /etc/portage/make.conf: +# CABAL_EXTRA_TEST_FLAGS="-v3 --show-details=streaming" +: ${CABAL_EXTRA_TEST_FLAGS:=} + +# @ECLASS-VARIABLE: CABAL_DEBUG_LOOSENING +# @DESCRIPTION: +# Show debug output for 'cabal_chdeps' function if set. +# Needs working 'diff'. +: ${CABAL_DEBUG_LOOSENING:=} + +HASKELL_CABAL_EXPF="pkg_setup src_compile src_test src_install pkg_postinst pkg_postrm" + +# 'dev-haskell/cabal' passes those options with ./configure-based +# configuration, but most packages don't need/don't accept it: +# #515362, #515362 +QA_CONFIGURE_OPTIONS+=" --with-compiler --with-hc --with-hc-pkg --with-gcc" + +case "${EAPI:-0}" in + 2|3|4|5|6) HASKELL_CABAL_EXPF+=" src_configure" ;; + *) ;; +esac + +EXPORT_FUNCTIONS ${HASKELL_CABAL_EXPF} + +for feature in ${CABAL_FEATURES}; do + case ${feature} in + haddock) CABAL_USE_HADDOCK=yes;; + hscolour) CABAL_USE_HSCOLOUR=yes;; + hoogle) CABAL_USE_HOOGLE=yes;; + profile) CABAL_USE_PROFILE=yes;; + bootstrap) CABAL_BOOTSTRAP=yes;; + lib) CABAL_HAS_LIBRARIES=yes;; + nocabaldep) CABAL_FROM_GHC=yes;; + ghcdeps) CABAL_GHC_CONSTRAINT=yes;; + test-suite) CABAL_TEST_SUITE=yes;; + + # does nothing, removed 2016-09-04 + bin) ;; + + *) CABAL_UNKNOWN="${CABAL_UNKNOWN} ${feature}";; + esac +done + +if [[ -n "${CABAL_USE_HADDOCK}" ]]; then + IUSE="${IUSE} doc" + # don't require depend on itself to build docs. + # ebuild bootstraps docs from just built binary + # + # starting from ghc-7.10.2 we install haddock bundled with + # ghc to keep links to base and ghc library, otherwise + # newer haddock versions change index format and can't + # read index files for packages coming with ghc. + [[ ${CATEGORY}/${PN} = "dev-haskell/haddock" ]] || \ + DEPEND="${DEPEND} doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )" +fi + +if [[ -n "${CABAL_USE_HSCOLOUR}" ]]; then + IUSE="${IUSE} hscolour" + DEPEND="${DEPEND} hscolour? ( dev-haskell/hscolour )" +fi + +if [[ -n "${CABAL_USE_HOOGLE}" ]]; then + # enabled only in ::haskell + #IUSE="${IUSE} hoogle" + CABAL_USE_HOOGLE= +fi + +if [[ -n "${CABAL_USE_PROFILE}" ]]; then + IUSE="${IUSE} profile" +fi + +if [[ -n "${CABAL_TEST_SUITE}" ]]; then + IUSE="${IUSE} test" +fi + +# returns the version of cabal currently in use. +# Rarely it's handy to pin cabal version from outside. +: ${_CABAL_VERSION_CACHE:=""} +cabal-version() { + if [[ -z "${_CABAL_VERSION_CACHE}" ]]; then + if [[ "${CABAL_BOOTSTRAP}" ]]; then + # We're bootstrapping cabal, so the cabal version is the version + # of this package itself. + _CABAL_VERSION_CACHE="${PV}" + elif [[ "${CABAL_FROM_GHC}" ]]; then + _CABAL_VERSION_CACHE="$(ghc-cabal-version)" + else + # We ask portage, not ghc, so that we only pick up + # portage-installed cabal versions. + _CABAL_VERSION_CACHE="$(ghc-extractportageversion dev-haskell/cabal)" + fi + fi + echo "${_CABAL_VERSION_CACHE}" +} + +cabal-bootstrap() { + local setupmodule + local cabalpackage + local setup_bootstrap_args=() + + if [[ -f "${S}/Setup.lhs" ]]; then + setupmodule="${S}/Setup.lhs" + elif [[ -f "${S}/Setup.hs" ]]; then + setupmodule="${S}/Setup.hs" + else + eqawarn "No Setup.lhs or Setup.hs found. Either add Setup.hs to package or call cabal-mksetup from ebuild" + cabal-mksetup + setupmodule="${S}/Setup.hs" + fi + + # We build the setup program using the latest version of + # cabal that we have installed + cabalpackage=Cabal-$(cabal-version) + einfo "Using cabal-$(cabal-version)." + + if $(ghc-supports-threaded-runtime); then + # Cabal has a bug that deadlocks non-threaded RTS: + # https://bugs.gentoo.org/537500 + # https://github.com/haskell/cabal/issues/2398 + setup_bootstrap_args+=(-threaded) + fi + + make_setup() { + set -- -package "${cabalpackage}" --make "${setupmodule}" \ + $(ghc-make-args) \ + "${setup_bootstrap_args[@]}" \ + ${HCFLAGS} \ + ${GHC_BOOTSTRAP_FLAGS} \ + "$@" \ + -o setup + echo $(ghc-getghc) "$@" + $(ghc-getghc) "$@" + } + if $(ghc-supports-shared-libraries); then + # # some custom build systems might use external libraries, + # # for which we don't have shared libs, so keep static fallback + # bug #411789, http://hackage.haskell.org/trac/ghc/ticket/5743#comment:3 + # http://hackage.haskell.org/trac/ghc/ticket/7062 + # http://hackage.haskell.org/trac/ghc/ticket/3072 + # ghc does not set RPATH for extralibs, thus we do it ourselves by hands + einfo "Prepending $(ghc-libdir) to LD_LIBRARY_PATH" + if [[ ${CHOST} != *-darwin* ]]; then + LD_LIBRARY_PATH="$(ghc-libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" + export LD_LIBRARY_PATH + else + DYLD_LIBRARY_PATH="$(ghc-libdir)${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}" + export DYLD_LIBRARY_PATH + fi + { make_setup -dynamic "$@" && ./setup --help >/dev/null; } || + make_setup "$@" || die "compiling ${setupmodule} failed" + else + make_setup "$@" || die "compiling ${setupmodule} failed" + fi +} + +cabal-mksetup() { + local setupdir=${1:-${S}} + local setup_src=${setupdir}/Setup.hs + + rm -vf "${setupdir}"/Setup.{lhs,hs} + elog "Creating 'Setup.hs' for 'Simple' build type." + + echo 'import Distribution.Simple; main = defaultMain' \ + > "${setup_src}" || die "failed to create default Setup.hs" +} + +cabal-hscolour() { + set -- hscolour "$@" + echo ./setup "$@" + ./setup "$@" || die "setup hscolour failed" +} + +cabal-haddock() { + set -- haddock "$@" + echo ./setup "$@" + ./setup "$@" || die "setup haddock failed" +} + +cabal-hoogle() { + ewarn "hoogle USE flag requires doc USE flag, building without hoogle" +} + +cabal-hscolour-haddock() { + # --hyperlink-source implies calling 'setup hscolour' + set -- haddock --hyperlink-source + echo ./setup "$@" + ./setup "$@" --hyperlink-source || die "setup haddock --hyperlink-source failed" +} + +cabal-hoogle-haddock() { + set -- haddock --hoogle + echo ./setup "$@" + ./setup "$@" || die "setup haddock --hoogle failed" +} + +cabal-hoogle-hscolour-haddock() { + cabal-hscolour-haddock + cabal-hoogle-haddock +} + +cabal-hoogle-hscolour() { + ewarn "hoogle USE flag requires doc USE flag, building without hoogle" + cabal-hscolour +} + +cabal-die-if-nonempty() { + local breakage_type=$1 + shift + + [[ "${#@}" == 0 ]] && return 0 + eerror "Detected ${breakage_type} packages: ${@}" + die "//==-- Please, run 'haskell-updater' to fix ${breakage_type} packages --==//" +} + +cabal-show-brokens() { + elog "ghc-pkg check: 'checking for other broken packages:'" + # pretty-printer + $(ghc-getghcpkg) check 2>&1 \ + | egrep -v '^Warning: haddock-(html|interfaces): ' \ + | egrep -v '^Warning: include-dirs: ' \ + | head -n 20 + + cabal-die-if-nonempty 'broken' \ + $($(ghc-getghcpkg) check --simple-output) +} + +cabal-show-old() { + cabal-die-if-nonempty 'outdated' \ + $("${EPREFIX}"/usr/sbin/haskell-updater --quiet --upgrade --list-only) +} + +cabal-show-brokens-and-die() { + cabal-show-brokens + cabal-show-old + + die "$@" +} + +cabal-configure() { + local cabalconf=() + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + + if [[ -n "${CABAL_USE_HADDOCK}" ]] && use doc; then + # We use the bundled with GHC version if exists + # Haddock is very picky about index files + # it generates for ghc's base and other packages. + local p=${EPREFIX}/usr/bin/haddock-ghc-$(ghc-version) + if [[ -f $p ]]; then + cabalconf+=(--with-haddock="${p}") + else + cabalconf+=(--with-haddock=${EPREFIX}/usr/bin/haddock) + fi + fi + if [[ -n "${CABAL_USE_PROFILE}" ]] && use profile; then + cabalconf+=(--enable-library-profiling) + fi + + if [[ -n "${CABAL_TEST_SUITE}" ]]; then + cabalconf+=($(use_enable test tests)) + fi + + if [[ -n "${CABAL_GHC_CONSTRAINT}" ]]; then + cabalconf+=($(cabal-constraint "ghc")) + fi + + cabalconf+=(--ghc-options="$(ghc-make-args)") + + local option + for option in ${HCFLAGS} + do + cabalconf+=(--ghc-option="$option") + done + + # toolchain + cabalconf+=(--with-ar="$(tc-getAR)") + + # Building GHCi libs on ppc64 causes "TOC overflow". + if use ppc64; then + cabalconf+=(--disable-library-for-ghci) + fi + + # currently cabal does not respect CFLAGS and LDFLAGS on it's own (bug #333217) + # so translate LDFLAGS to ghc parameters (without filtering) + local flag + for flag in $CFLAGS; do cabalconf+=(--ghc-option="-optc$flag"); done + for flag in $LDFLAGS; do cabalconf+=(--ghc-option="-optl$flag"); done + + # disable executable stripping for the executables, as portage will + # strip by itself, and pre-stripping gives a QA warning. + # cabal versions previous to 1.4 does not strip executables, and does + # not accept the flag. + # this fixes numerous bugs, amongst them; + # bug #251881, bug #251882, bug #251884, bug #251886, bug #299494 + cabalconf+=(--disable-executable-stripping) + + cabalconf+=(--docdir="${EPREFIX}"/usr/share/doc/${PF}) + # As of Cabal 1.2, configure is quite quiet. For diagnostic purposes + # it's better if the configure chatter is in the build logs: + cabalconf+=(--verbose) + + # We build shared version of our Cabal where ghc ships it's shared + # version of it. We will link ./setup as dynamic binary againt Cabal later. + [[ ${CATEGORY}/${PN} == "dev-haskell/cabal" ]] && \ + $(ghc-supports-shared-libraries) && \ + cabalconf+=(--enable-shared) + + if $(ghc-supports-shared-libraries); then + # Experimental support for dynamically linked binaries. + # We are enabling it since 7.10.1_rc3 + if version_is_at_least "7.10.0.20150316" "$(ghc-version)"; then + # we didn't enable it before as it was not stable on all arches + cabalconf+=(--enable-shared) + # Known to break on ghc-7.8/Cabal-1.18 + # https://ghc.haskell.org/trac/ghc/ticket/9625 + cabalconf+=(--enable-executable-dynamic) + fi + fi + + # --sysconfdir appeared in Cabal-1.18+ + if ./setup configure --help | grep -q -- --sysconfdir; then + cabalconf+=(--sysconfdir="${EPREFIX}"/etc) + fi + + # appeared in Cabal-1.18+ (see '--disable-executable-stripping') + if ./setup configure --help | grep -q -- --disable-library-stripping; then + cabalconf+=(--disable-library-stripping) + fi + + set -- configure \ + --ghc --prefix="${EPREFIX}"/usr \ + --with-compiler="$(ghc-getghc)" \ + --with-hc-pkg="$(ghc-getghcpkg)" \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --libsubdir=${P}/ghc-$(ghc-version) \ + --datadir="${EPREFIX}"/usr/share/ \ + --datasubdir=${P}/ghc-$(ghc-version) \ + "${cabalconf[@]}" \ + ${CABAL_CONFIGURE_FLAGS} \ + ${CABAL_EXTRA_CONFIGURE_FLAGS} \ + "$@" + echo ./setup "$@" + ./setup "$@" || cabal-show-brokens-and-die "setup configure failed" +} + +cabal-build() { + set -- build ${CABAL_EXTRA_BUILD_FLAGS} "$@" + echo ./setup "$@" + ./setup "$@" \ + || die "setup build failed" +} + +cabal-copy() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED=${D} + + set -- copy --destdir="${D}" "$@" + echo ./setup "$@" + ./setup "$@" || die "setup copy failed" + + # cabal is a bit eager about creating dirs, + # so remove them if they are empty + rmdir "${ED}/usr/bin" 2> /dev/null +} + +cabal-pkg() { + # This does not actually register since we're using true instead + # of ghc-pkg. So it just leaves the .conf file and we can + # register that ourselves (if it exists). + + if [[ -n ${CABAL_HAS_LIBRARIES} ]]; then + # Newer cabal can generate a package conf for us: + ./setup register --gen-pkg-config="${T}/${P}.conf" + ghc-install-pkg "${T}/${P}.conf" + fi +} + +# Some cabal libs are bundled along with some versions of ghc +# eg filepath-1.0 comes with ghc-6.6.1 +# by putting CABAL_CORE_LIB_GHC_PV="6.6.1" in an ebuild we are declaring that +# when building with this version of ghc, the ebuild is a dummy that is it will +# install no files since the package is already included with ghc. +# However portage still records the dependency and we can upgrade the package +# to a later one that's not included with ghc. +# You can also put a space separated list, eg CABAL_CORE_LIB_GHC_PV="6.6 6.6.1". +# Those versions are taken as-is from ghc `--numeric-version`. +# Package manager versions are also supported: +# CABAL_CORE_LIB_GHC_PV="7.10.* PM:7.8.4-r1". +cabal-is-dummy-lib() { + local bin_ghc_version=$(ghc-version) + local pm_ghc_version=$(ghc-pm-version) + + for version in ${CABAL_CORE_LIB_GHC_PV}; do + [[ "${bin_ghc_version}" == ${version} ]] && return 0 + [[ "${pm_ghc_version}" == ${version} ]] && return 0 + done + + return 1 +} + +# exported function: check if cabal is correctly installed for +# the currently active ghc (we cannot guarantee this with portage) +haskell-cabal_pkg_setup() { + if [[ -n ${CABAL_HAS_LIBRARIES} ]]; then + [[ ${RDEPEND} == *dev-lang/ghc* ]] || eqawarn "QA Notice: A library does not have runtime dependency on dev-lang/ghc." + fi + if [[ -n "${CABAL_UNKNOWN}" ]]; then + eqawarn "QA Notice: Unknown entry in CABAL_FEATURES: ${CABAL_UNKNOWN}" + fi + if cabal-is-dummy-lib; then + einfo "${P} is included in ghc-${CABAL_CORE_LIB_GHC_PV}, nothing to install." + fi +} + +haskell-cabal_src_configure() { + cabal-is-dummy-lib && return + + pushd "${S}" > /dev/null || die + + cabal-bootstrap + + cabal-configure "$@" + + popd > /dev/null || die +} + +# exported function: nice alias +cabal_src_configure() { + haskell-cabal_src_configure "$@" +} + +# exported function: cabal-style bootstrap configure and compile +cabal_src_compile() { + # it's a common mistake when one bumps ebuild to EAPI="2" (and upper) + # and forgets to separate src_compile() to src_configure()/src_compile(). + # Such error leads to default src_configure and we lose all passed flags. + if ! has "${EAPI:-0}" 0 1; then + local passed_flag + for passed_flag in "$@"; do + [[ ${passed_flag} == --flags=* ]] && \ + eqawarn "QA Notice: Cabal option '${passed_flag}' has effect only in src_configure()" + done + fi + + cabal-is-dummy-lib && return + + has src_configure ${HASKELL_CABAL_EXPF} || haskell-cabal_src_configure "$@" + cabal-build + + if [[ -n "${CABAL_USE_HADDOCK}" ]] && use doc; then + if [[ -n "${CABAL_USE_HSCOLOUR}" ]] && use hscolour; then + if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then + # hoogle, hscolour and haddock + cabal-hoogle-hscolour-haddock + else + # haddock and hscolour + cabal-hscolour-haddock + fi + else + if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then + # hoogle and haddock + cabal-hoogle-haddock + else + # just haddock + cabal-haddock + fi + fi + else + if [[ -n "${CABAL_USE_HSCOLOUR}" ]] && use hscolour; then + if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then + # hoogle and hscolour + cabal-hoogle-hscolour + else + # just hscolour + cabal-hscolour + fi + else + if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then + # just hoogle + cabal-hoogle + fi + fi + fi +} + +haskell-cabal_src_compile() { + pushd "${S}" > /dev/null || die + + cabal_src_compile "$@" + + popd > /dev/null || die +} + +haskell-cabal_src_test() { + local cabaltest=() + + pushd "${S}" > /dev/null || die + + if cabal-is-dummy-lib; then + einfo ">>> No tests for dummy library: ${CATEGORY}/${PF}" + else + einfo ">>> Test phase [cabal test]: ${CATEGORY}/${PF}" + + # '--show-details=streaming' appeared in Cabal-1.20 + if ./setup test --help | grep -q -- "'streaming'"; then + cabaltest+=(--show-details=streaming) + fi + + set -- test \ + "${cabaltest[@]}" \ + ${CABAL_TEST_FLAGS} \ + ${CABAL_EXTRA_TEST_FLAGS} \ + "$@" + echo ./setup "$@" + ./setup "$@" || die "cabal test failed" + fi + + popd > /dev/null || die +} + +# exported function: cabal-style copy and register +cabal_src_install() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + + if ! cabal-is-dummy-lib; then + cabal-copy + cabal-pkg + fi + + # create a dummy local package conf file for haskell-updater + # if it does not exist (dummy libraries and binaries w/o libraries) + local ghc_confdir_with_prefix="$(ghc-confdir)" + # remove EPREFIX + dodir ${ghc_confdir_with_prefix#${EPREFIX}} + local hint_db="${D}/$(ghc-confdir)" + local hint_file="${hint_db}/${PF}.conf" + mkdir -p "${hint_db}" || die + touch "${hint_file}" || die +} + +haskell-cabal_src_install() { + pushd "${S}" > /dev/null || die + + cabal_src_install + + popd > /dev/null || die +} + +haskell-cabal_pkg_postinst() { + ghc-package_pkg_postinst +} + +haskell-cabal_pkg_postrm() { + ghc-package_pkg_postrm +} + +# @FUNCTION: cabal_flag +# @DESCRIPTION: +# ebuild.sh:use_enable() taken as base +# +# Usage examples: +# +# CABAL_CONFIGURE_FLAGS=$(cabal_flag gui) +# leads to "--flags=gui" or "--flags=-gui" (useflag 'gui') +# +# CABAL_CONFIGURE_FLAGS=$(cabal_flag gtk gui) +# also leads to "--flags=gui" or " --flags=-gui" (useflag 'gtk') +# +cabal_flag() { + if [[ -z "$1" ]]; then + echo "!!! cabal_flag() called without a parameter." >&2 + echo "!!! cabal_flag() <USEFLAG> [<cabal_flagname>]" >&2 + return 1 + fi + + local UWORD=${2:-$1} + + if use "$1"; then + echo "--flags=${UWORD}" + else + echo "--flags=-${UWORD}" + fi + + return 0 +} + +# @FUNCTION: cabal_chdeps +# @DESCRIPTION: +# Allows easier patching of $CABAL_FILE (${S}/${PN}.cabal by default) +# depends +# +# Accepts argument list as pairs of substitutions: <from-string> <to-string>... +# +# Dies on error. +# +# Usage examples: +# +# src_prepare() { +# cabal_chdeps \ +# 'base >= 4.2 && < 4.6' 'base >= 4.2 && < 4.7' \ +# 'containers ==0.4.*' 'containers >= 0.4 && < 0.6' +#} +# or +# src_prepare() { +# CABAL_FILE=${S}/${MY_PN}.cabal cabal_chdeps \ +# 'base >= 4.2 && < 4.6' 'base >= 4.2 && < 4.7' +# CABAL_FILE=${S}/${MY_PN}-tools.cabal cabal_chdeps \ +# 'base == 3.*' 'base >= 4.2 && < 4.7' +#} +# +cabal_chdeps() { + local cabal_fn=${MY_PN:-${PN}}.cabal + local cf=${CABAL_FILE:-${S}/${cabal_fn}} + local from_ss # ss - substring + local to_ss + local orig_c # c - contents + local new_c + + [[ -f $cf ]] || die "cabal file '$cf' does not exist" + + orig_c=$(< "$cf") + + while :; do + from_pat=$1 + to_str=$2 + + [[ -n ${from_pat} ]] || break + [[ -n ${to_str} ]] || die "'${from_str}' does not have 'to' part" + + einfo "CHDEP: '${from_pat}' -> '${to_str}'" + + # escape pattern-like symbols + from_pat=${from_pat//\*/\\*} + from_pat=${from_pat//\[/\\[} + + new_c=${orig_c//${from_pat}/${to_str}} + + if [[ -n $CABAL_DEBUG_LOOSENING ]]; then + echo "${orig_c}" >"${T}/${cf}".pre + echo "${new_c}" >"${T}/${cf}".post + diff -u "${T}/${cf}".{pre,post} + fi + + [[ "${orig_c}" == "${new_c}" ]] && die "no trigger for '${from_pat}'" + orig_c=${new_c} + shift + shift + done + + echo "${new_c}" > "$cf" || + die "failed to update" +} + +# @FUNCTION: cabal-constraint +# @DESCRIPTION: +# Allowes to set contraint to the libraries that are +# used by specified package +cabal-constraint() { + while read p v ; do + echo "--constraint \"$p == $v\"" + done < $(ghc-pkgdeps ${1}) +} + +# @FUNCTION: replace-hcflags +# @USAGE: <old> <new> +# @DESCRIPTION: +# Replace the <old> flag with <new> in HCFLAGS. Accepts shell globs for <old>. +# The implementation is picked from flag-o-matic.eclass:replace-flags() +replace-hcflags() { + [[ $# != 2 ]] && die "Usage: replace-hcflags <old flag> <new flag>" + + local f new=() + for f in ${HCFLAGS} ; do + # Note this should work with globs like -O* + if [[ ${f} == ${1} ]]; then + einfo "HCFLAGS: replacing '${f}' to '${2}'" + f=${2} + fi + new+=( "${f}" ) + done + export HCFLAGS="${new[*]}" + + return 0 +} diff -uNr a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass --- a/eclass/intel-sdp.eclass false +++ b/eclass/intel-sdp.eclass 8e295efea38398efde99be1e6a9852dd7177bb3d6185f25f609b05eac14be46214ec4356638beb43dbd2f7728edb1b9b87f81bf6cd6b617921462596f3b94699 @@ -0,0 +1,502 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: intel-sdp.eclass +# @MAINTAINER: +# Justin Lecher <jlec@gentoo.org> +# Sci Team <sci@gentoo.org> +# @BLURB: Handling of Intel's Software Development Products package management + +if [[ ! ${_INTEL_SDP_ECLASS_} ]]; then + +case "${EAPI:-0}" in + 4|5) ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +# @ECLASS-VARIABLE: INTEL_DID +# @DEFAULT_UNSET +# @DESCRIPTION: +# The package download ID from Intel. +# To find out its value, see the links to download in +# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx +# +# e.g. 2504 +# +# Must be defined before inheriting the eclass + +# @ECLASS-VARIABLE: INTEL_DPN +# @DEFAULT_UNSET +# @DESCRIPTION: +# The package name to download from Intel. +# To find out its value, see the links to download in +# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx +# +# e.g. parallel_studio_xe +# +# Must be defined before inheriting the eclass + +# @ECLASS-VARIABLE: INTEL_DPV +# @DEFAULT_UNSET +# @DESCRIPTION: +# The package download version from Intel. +# To find out its value, see the links to download in +# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx +# +# e.g. 2011_sp1_update2 +# +# Must be defined before inheriting the eclass + +# @ECLASS-VARIABLE: INTEL_TARX +# @DESCRIPTION: +# The package extention. +# To find out its value, see the links to download in +# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx +# +# e.g. tar.gz +# +# Must be defined before inheriting the eclass +: ${INTEL_TARX:=tgz} + +# @ECLASS-VARIABLE: INTEL_SUBDIR +# @DEFAULT_UNSET +# @DESCRIPTION: +# The package sub-directory where it will end-up in /opt/intel +# To find out its value, you have to do a raw install from the Intel tar ball + +# @ECLASS-VARIABLE: INTEL_SKIP_LICENSE +# @DEFAULT_UNSET +# @DESCRIPTION: +# Possibility to skip the mandatory check for licenses. Only set this if there +# is really no fix. + +# @ECLASS-VARIABLE: INTEL_RPMS_DIR +# @DESCRIPTION: +# Main subdirectory which contains the rpms to extract. +: ${INTEL_RPMS_DIR:=rpm} + +# @ECLASS-VARIABLE: INTEL_X86 +# @DESCRIPTION: +# 32bit arch in rpm names +# +# e.g. i484 +: ${INTEL_X86:=i486} + +# @ECLASS-VARIABLE: INTEL_BIN_RPMS +# @DESCRIPTION: +# Functional name of rpm without any version/arch tag +# +# e.g. compilerprof +# +# if the rpm is located in a directory different to INTEL_RPMS_DIR you can +# specify the full path +# +# e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli +: ${INTEL_BIN_RPMS:=""} + +# @ECLASS-VARIABLE: INTEL_DAT_RPMS +# @DESCRIPTION: +# Functional name of rpm of common data which are arch free +# without any version tag +# +# e.g. openmp +# +# if the rpm is located in a directory different to INTEL_RPMS_DIR you can +# specify the full path +# +# e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli-common +: ${INTEL_DAT_RPMS:=""} + +# @ECLASS-VARIABLE: INTEL_SINGLE_ARCH +# @DESCRIPTION: +# Unset, if only the multilib package will be provided by intel +: ${INTEL_SINGLE_ARCH:=true} + +# @ECLASS-VARIABLE: INTEL_SDP_DB +# @DESCRIPTION: +# Full path to intel registry db +INTEL_SDP_DB="${EROOT%/}"/opt/intel/intel-sdp-products.db + +inherit check-reqs eutils multilib versionator + +_INTEL_PV1=$(get_version_component_range 1) +_INTEL_PV2=$(get_version_component_range 2) +_INTEL_PV3=$(get_version_component_range 3) +_INTEL_PV4=$(get_version_component_range 4) +_INTEL_URI="http://registrationcenter-download.intel.com/irc_nas/${INTEL_DID}/${INTEL_DPN}" + +if [ ${INTEL_SINGLE_ARCH} == true ]; then + SRC_URI=" + amd64? ( multilib? ( ${_INTEL_URI}_${INTEL_DPV}.${INTEL_TARX} ) ) + amd64? ( !multilib? ( ${_INTEL_URI}_${INTEL_DPV}_intel64.${INTEL_TARX} ) ) + x86? ( ${_INTEL_URI}_${INTEL_DPV}_ia32.${INTEL_TARX} )" +else + SRC_URI="${_INTEL_URI}_${INTEL_DPV}.${INTEL_TARX}" +fi + +LICENSE="Intel-SDP" +# Future work, #394411 +#SLOT="${_INTEL_PV1}.${_INTEL_PV2}" +SLOT="0" +IUSE="examples multilib" + +RESTRICT="mirror" + +RDEPEND="" +DEPEND="app-arch/rpm2targz" + +_INTEL_SDP_YEAR=${INTEL_DPV%_update*} +_INTEL_SDP_YEAR=${INTEL_DPV%_sp*} + +# @ECLASS-VARIABLE: INTEL_SDP_DIR +# @DESCRIPTION: +# Full rootless path to installation dir +INTEL_SDP_DIR="opt/intel/${INTEL_SUBDIR}-${_INTEL_SDP_YEAR:-${_INTEL_PV1}}.${_INTEL_PV3}.${_INTEL_PV4}" + +# @ECLASS-VARIABLE: INTEL_SDP_EDIR +# @DESCRIPTION: +# Full rooted path to installation dir +INTEL_SDP_EDIR="${EROOT%/}/${INTEL_SDP_DIR}" + +S="${WORKDIR}" + +QA_PREBUILT="${INTEL_SDP_DIR}/*" + +# @ECLASS-VARIABLE: INTEL_ARCH +# @DEFAULT_UNSET +# @DESCRIPTION: +# Intels internal names of the arches; will be set at runtime accordingly +# +# e.g. amd64-multilib -> INTEL_ARCH="intel64 ia32" + +# @FUNCTION: _isdp_big-warning +# @USAGE: [pre-check | test-failed] +# @INTERNAL +# @DESCRIPTION: +# warn user that we really require a license +_isdp_big-warning() { + debug-print-function ${FUNCNAME} "${@}" + + case ${1} in + pre-check ) + echo "" + ewarn "License file not found!" + ;; + + test-failed ) + echo + ewarn "Function test failed. Most probably due to an invalid license." + ewarn "This means you already tried to bypass the license check once." + ;; + esac + + echo "" + ewarn "Make sure you have received an Intel license." + ewarn "To receive a non-commercial license, you need to register at:" + ewarn "https://software.intel.com/en-us/qualify-for-free-software" + ewarn "Install the license file into ${INTEL_SDP_EDIR}/licenses/" + + case ${1} in + pre-check ) + ewarn "before proceeding with installation of ${P}" + echo "" + ;; + * ) + echo "" + ;; + esac +} + +# @FUNCTION: _isdp_version_test +# @INTERNAL +# @DESCRIPTION: +# Testing for valid license by asking for version information of the compiler +_isdp_version_test() { + debug-print-function ${FUNCNAME} "${@}" + + local comp comp_full arch warn + case ${PN} in + ifc ) + debug-print "Testing ifort" + comp=ifort + ;; + icc ) + debug-print "Testing icc" + comp=icc + ;; + *) + die "${PN} is not supported for testing" + ;; + esac + + for arch in ${INTEL_ARCH}; do + case ${EBUILD_PHASE} in + install ) + comp_full="${ED}/${INTEL_SDP_DIR}/bin/${arch}/${comp}" + ;; + postinst ) + comp_full="${INTEL_SDP_EDIR}/bin/${arch}/${comp}" + ;; + * ) + ewarn "Compile test not supported in ${EBUILD_PHASE}" + continue + ;; + esac + + debug-print "LD_LIBRARY_PATH=\"${INTEL_SDP_EDIR}/bin/${arch}/\" \"${comp_full}\" -V" + + LD_LIBRARY_PATH="${INTEL_SDP_EDIR}/bin/${arch}/" "${comp_full}" -V &>/dev/null + [[ $? -ne 0 ]] && warn=yes + done + [[ "${warn}" == "yes" ]] && _isdp_big-warning test-failed +} + +# @FUNCTION: _isdp_run-test +# @INTERNAL +# @DESCRIPTION: +# Test if installed compiler is working +_isdp_run-test() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ -z ${INTEL_SKIP_LICENSE} ]]; then + case ${PN} in + ifc | icc ) + _isdp_version_test ;; + * ) + debug-print "No test available for ${PN}" + ;; + esac + fi +} + +# @FUNCTION: intel-sdp_pkg_pretend +# @DESCRIPTION: +# +# * Check that the user has a (valid) license file before going on. +# +# * Check for space requirements being fullfilled +intel-sdp_pkg_pretend() { + debug-print-function ${FUNCNAME} "${@}" + + local warn=1 dir dirs ret arch a p + + : ${CHECKREQS_DISK_BUILD:=256M} + check-reqs_pkg_pretend + + if [[ -z ${INTEL_SKIP_LICENSE} ]]; then + if echo ${INTEL_LICENSE_FILE} | grep -q @; then + einfo "Looks like you are using following license server:" + einfo " ${INTEL_LICENSE_FILE}" + return 0 + fi + + dirs=( + "${INTEL_SDP_EDIR}/licenses" + "${INTEL_SDP_EDIR}/Licenses" + "${EPREFIX}/opt/intel/licenses" + ) + for dir in "${dirs[@]}" ; do + ebegin "Checking for a license in: ${dir}" + #maybe use nullglob or [[ $(echo ${dir/*lic) != "${dir}/*lic" ]] + [[ $( ls "${dir}"/*lic 2>/dev/null ) ]]; ret=$? + eend ${ret} + if [[ ${ret} == "0" ]]; then + warn=${ret} + break + fi + done + if [[ ${warn} == "1" ]]; then + _isdp_big-warning pre-check + die "Could not find license file" + fi + else + eqawarn "The ebuild doesn't check for presents of a proper intel license!" + eqawarn "This shouldn't be done unless there is a serious reason." + fi +} + +# @FUNCTION: intel-sdp_pkg_setup +# @DESCRIPTION: +# Setting up and sorting some internal variables +intel-sdp_pkg_setup() { + debug-print-function ${FUNCNAME} "${@}" + local arch a p + + if use x86; then + arch=${INTEL_X86} + INTEL_ARCH="ia32" + elif use amd64; then + arch=x86_64 + INTEL_ARCH="intel64" + if has_multilib_profile; then + arch="x86_64 ${INTEL_X86}" + INTEL_ARCH="intel64 ia32" + fi + fi + INTEL_RPMS=() + INTEL_RPMS_FULL=() + if [[ $(declare -p INTEL_BIN_RPMS) = "declare -a "* ]] ; then + _INTEL_BIN_RPMS=( ${INTEL_BIN_RPMS[@]} ) + else + read -r -d '' -a _INTEL_BIN_RPMS <<<"${INTEL_BIN_RPMS}" + fi + for p in "${_INTEL_BIN_RPMS[@]}"; do + for a in ${arch}; do + if [ ${p} == $(basename ${p}) ]; then + INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm ) + else + INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm ) + fi + done + done + if [[ $(declare -p INTEL_DAT_RPMS) = "declare -a "* ]] ; then + _INTEL_DAT_RPMS=( ${INTEL_DAT_RPMS[@]} ) + else + read -r -d '' -a _INTEL_DAT_RPMS <<<"${INTEL_DAT_RPMS}" + fi + for p in "${_INTEL_DAT_RPMS[@]}"; do + if [ ${p} == $(basename ${p}) ]; then + INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm ) + else + INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm ) + fi + done +} + +# @FUNCTION: intel-sdp_src_unpack +# @DESCRIPTION: +# Unpacking necessary rpms from tarball, extract them and rearrange the output. +intel-sdp_src_unpack() { + local l r subdir rb t list=() debug_list + + for t in ${A}; do + for r in "${INTEL_RPMS[@]}"; do + rpmdir=${t%%.*}/${INTEL_RPMS_DIR} + list+=( ${rpmdir}/${r} ) + done + + for r in "${INTEL_RPMS_FULL[@]}"; do + list+=( ${t%%.*}/${r} ) + done + + debug_list="$(IFS=$'\n'; echo ${list[@]} )" + + debug-print "Adding to decompression list:" + debug-print ${debug_list} + + tar xvf "${DISTDIR}"/${t} ${list[@]} &> "${T}"/rpm-extraction.log + + for r in ${list[@]}; do + rb=$(basename ${r}) + l=.${rb}_$(date +'%d%m%y_%H%M%S').log + einfo "Unpacking ${rb}" + rpm2tar -O ${r} | tar xvf - | sed -e \ + "s:^\.:${EROOT#/}:g" > ${l}; assert "unpacking ${r} failed" + mv ${l} opt/intel/ || die "failed moving extract log file" + done + done + + mv opt/intel/* ${INTEL_SDP_DIR} || die "mv to INTEL_SDP_DIR failed" +} + +# @FUNCTION: intel-sdp_src_install +# @DESCRIPTION: +# Install everything +intel-sdp_src_install() { + debug-print-function ${FUNCNAME} "${@}" + + if path_exists "${INTEL_SDP_DIR}"/uninstall*; then + ebegin "Cleaning out uninstall information" + find "${INTEL_SDP_DIR}"/uninstall* -delete || die + eend + fi + + if path_exists "${INTEL_SDP_DIR}"/Documentation; then + dodoc -r "${INTEL_SDP_DIR}"/Documentation/* + + ebegin "Cleaning out documentation" + find "${INTEL_SDP_DIR}"/Documentation -delete || die + eend + fi + + if path_exists "${INTEL_SDP_DIR}"/Samples; then + if use examples ; then + insinto /usr/share/${P}/examples/ + doins -r "${INTEL_SDP_DIR}"/Samples/* + fi + ebegin "Cleaning out examples" + find "${INTEL_SDP_DIR}"/Samples -delete || die + eend + fi + + if path_exists "${INTEL_SDP_DIR}"/man; then + path_exists "${INTEL_SDP_DIR}"/man/en_US/man1/* && \ + doman "${INTEL_SDP_DIR}"/man/en_US/man1/* + path_exists "${INTEL_SDP_DIR}"/man/man1/* && \ + doman "${INTEL_SDP_DIR}"/man/man1/* + has linguas_ja ${IUSE} && use linguas_ja && \ + doman -i18n=ja_JP "${INTEL_SDP_DIR}"/man/ja_JP/man1/* + + find "${INTEL_SDP_DIR}"/man -delete || die + fi + + ebegin "Tagging ${PN}" + find opt -name \*sh -type f -exec sed -i \ + -e "s:<.*DIR>:${INTEL_SDP_EDIR}:g" \ + '{}' + || die + eend + + [[ -d "${ED}" ]] || dodir / + mv opt "${ED}"/ || die "moving files failed" + + dodir "${INTEL_SDP_DIR}"/licenses /opt/intel/ism/rm + keepdir "${INTEL_SDP_DIR}"/licenses /opt/intel/ism/rm +} + +# @FUNCTION: intel-sdp_pkg_postinst +# @DESCRIPTION: +# Add things to intel database +intel-sdp_pkg_postinst() { + debug-print-function ${FUNCNAME} "${@}" + + # add product registry to intel "database" + local l r + for r in ${INTEL_RPMS}; do + l="$(ls -1 ${EROOT%/}/opt/intel/.${r}_*.log | head -n 1)" + echo >> ${INTEL_SDP_DB} \ + "<:${r%-${_INTEL_PV4}*}-${_INTEL_PV4}:${r}:${INTEL_SDP_EDIR}:${l}:>" + done + _isdp_run-test + + if [[ ${PN} = icc ]] && has_version ">=dev-util/ccache-3.1.9-r2" ; then + #add ccache links as icc might get installed after ccache + "${EROOT}"/usr/bin/ccache-config --install-links + fi +} + +# @FUNCTION: intel-sdp_pkg_postrm +# @DESCRIPTION: +# Sanitize intel database +intel-sdp_pkg_postrm() { + debug-print-function ${FUNCNAME} "${@}" + + # remove from intel "database" + if [[ -e ${INTEL_SDP_DB} ]]; then + local r + for r in ${INTEL_RPMS}; do + sed -i \ + -e "/${r}/d" \ + ${INTEL_SDP_DB} + done + fi + + if [[ ${PN} = icc ]] && has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then + # --remove-links would remove all links, --install-links updates them + "${EROOT}"/usr/bin/ccache-config --install-links + fi +} + +EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm pkg_pretend + +_INTEL_SDP_ECLASS_=1 +fi diff -uNr a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass --- a/eclass/java-ant-2.eclass false +++ b/eclass/java-ant-2.eclass af2c1bd63f00a574472e19b76f10703ba7f0036ab31d08fc536441cb7d906de89f73e7c3d2a6f55e422e4e621f24baeecb1f062da10c0e44c0a169fdb23ba2b7 @@ -0,0 +1,428 @@ +# Copyright 2004-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: java-ant-2.eclass +# @MAINTAINER: +# java@gentoo.org +# @AUTHOR: +# kiorky (kiorky@cryptelium.net), Petteri Räty (betelgeuse@gentoo.org) +# @BLURB: eclass for ant based Java packages +# @DESCRIPTION: +# Eclass for Ant-based Java packages. Provides support for both automatic and +# manual manipulation of build.xml files. Should be inherited after java-pkg-2 +# or java-pkg-opt-2 eclass. + +inherit java-utils-2 multilib + +# This eclass provides functionality for Java packages which use +# ant to build. In particular, it will attempt to fix build.xml files, so that +# they use the appropriate 'target' and 'source' attributes. + +# @ECLASS-VARIABLE: WANT_ANT_TASKS +# @DEFAULT_UNSET +# @DESCRIPTION: +# An $IFS separated list of ant tasks. +# Ebuild can specify this variable before inheriting java-ant-2 eclass to +# determine ANT_TASKS it needs. They will be automatically translated to +# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override +# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching. +# Ebuilds that need to depend conditionally on certain tasks and specify them +# differently for different eant calls can't use this simplified approach. +# You also cannot specify version or anything else than ant-*. +# +# @CODE +# WANT_ANT_TASKS="ant-junit ant-trax" +# @CODE + +#The implementation of dependencies is handled by java-utils-2.eclass +#WANT_ANT_TASKS + +# @ECLASS-VARIABLE: JAVA_ANT_DISABLE_ANT_CORE_DEP +# @DEFAULT_UNSET +# @DESCRIPTION: +# Setting this variable non-empty before inheriting java-ant-2 disables adding +# dev-java/ant-core into DEPEND. +if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then + JAVA_ANT_E_DEPEND+=" >=dev-java/ant-core-1.8.2" + [[ "${EAPI:-0}" != 0 ]] && JAVA_ANT_E_DEPEND+=":0" +fi + +# add ant tasks specified in WANT_ANT_TASKS to DEPEND +local ANT_TASKS_DEPEND; +ANT_TASKS_DEPEND="$(java-pkg_ant-tasks-depend)" +# check that java-pkg_ant-tasks-depend didn't fail +if [[ $? != 0 ]]; then + eerror "${ANT_TASKS_DEPEND}" + die "java-pkg_ant-tasks-depend() failed" +fi + +# We need some tools from javatoolkit. We also need portage 2.1 for phase hooks +# and ant dependencies constructed above. Python is there for +# java-ant_remove-taskdefs +JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} + ${ANT_TASKS_DEPEND} + ${JAVA_PKG_PORTAGE_DEP} + >=dev-java/javatoolkit-0.3.0-r2" + +# this eclass must be inherited after java-pkg-2 or java-pkg-opt-2 +# if it's java-pkg-opt-2, ant dependencies are pulled based on USE flag +if has java-pkg-opt-2 ${INHERITED}; then + JAVA_ANT_E_DEPEND="${JAVA_PKG_OPT_USE}? ( ${JAVA_ANT_E_DEPEND} )" +elif ! has java-pkg-2 ${INHERITED}; then + eerror "java-ant-2 eclass can only be inherited AFTER java-pkg-2 or java-pkg-opt-2" +fi + +DEPEND="${JAVA_ANT_E_DEPEND}" + +# @ECLASS-VARIABLE: JAVA_PKG_BSFIX +# @DESCRIPTION: +# Should we attempt to 'fix' ant build files to include the source/target +# attributes when calling javac? +JAVA_PKG_BSFIX=${JAVA_PKG_BSFIX:-"on"} + +# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_ALL +# @DESCRIPTION: +# If we're fixing build files, should we try to fix all the ones we can find? +JAVA_PKG_BSFIX_ALL=${JAVA_PKG_BSFIX_ALL:-"yes"} + +# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_NAME +# @DESCRIPTION: +# Filename of build files to fix/search for +JAVA_PKG_BSFIX_NAME=${JAVA_PKG_BSFIX_NAME:-"build.xml"} + +# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_TARGET_TAGS +# @DESCRIPTION: +# Targets to fix the 'source' attribute in +JAVA_PKG_BSFIX_TARGET_TAGS=${JAVA_PKG_BSFIX_TARGET_TAGS:-"javac xjavac javac.preset"} + +# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_SOURCE_TAGS +# @DESCRIPTION: +# Targets to fix the 'target' attribute in +JAVA_PKG_BSFIX_SOURCE_TAGS=${JAVA_PKG_BSFIX_SOURCE_TAGS:-"javadoc javac xjavac javac.preset"} + +# @ECLASS-VARIABLE: JAVA_ANT_CLASSPATH_TAGS +# @DESCRIPTION: +# Targets to add the classpath attribute to +JAVA_ANT_CLASSPATH_TAGS="javac xjavac" + +# @ECLASS-VARIABLE: JAVA_ANT_IGNORE_SYSTEM_CLASSES +# @DEFAULT_UNSET +# @DESCRIPTION: +# When set, <available> Ant tasks are rewritten to ignore Ant's runtime classpath. + +case "${EAPI:-0}" in + 0|1) : ;; + *) EXPORT_FUNCTIONS src_configure ;; +esac + +# @FUNCTION: java-ant-2_src_configure +# @DESCRIPTION: +# src_configure rewrites the build.xml files automatically, unless EAPI is undefined, 0 or 1. +java-ant-2_src_configure() { + # if java support is optional, don't perform this when the USE flag is off + if has java-pkg-opt-2 ${INHERITED}; then + use ${JAVA_PKG_OPT_USE} || return + fi + + # eant will call us unless called by Portage + [[ -e "${T}/java-ant-2_src_configure-run" ]] && return + + [[ "${JAVA_ANT_IGNORE_SYSTEM_CLASSES}" ]] \ + && java-ant_ignore-system-classes "${S}/build.xml" + + java-ant_bsfix + touch "${T}/java-ant-2_src_configure-run" +} + +# @FUNCTION: java-ant_bsfix +# @INTERNAL +# @DESCRIPTION: +# Attempts to fix build files. +# +# @CODE +# Affected by variables: +# JAVA_PKG_BSFIX +# JAVA_PKG_BSFIX_ALL +# JAVA_PKG_BSFIX_NAME, +# @CODE +java-ant_bsfix() { + debug-print-function ${FUNCNAME} $* + + [[ "${JAVA_PKG_BSFIX}" != "on" ]] && return + if ! java-pkg_needs-vm; then + echo "QA Notice: Package is using java-ant, but doesn't depend on a Java VM" + fi + + pushd "${S}" >/dev/null || die + + local find_args="" + [[ "${JAVA_PKG_BSFIX_ALL}" == "yes" ]] || find_args="-maxdepth 1" + + find_args="${find_args} -type f ( -name ${JAVA_PKG_BSFIX_NAME// / -o -name } )" + + local bsfix_these=() line + while IFS= read -r -d $'\0' line; do + bsfix_these+=( "${line}" ) + done < <(find . ${find_args} -print0) + + [[ "${bsfix_these[@]}" ]] && java-ant_bsfix_files "${bsfix_these[@]}" + + popd > /dev/null || die +} + +# @FUNCTION: java-ant_bsfix_files +# @USAGE: <path/to/first/build.xml> [path/to/second.build.xml ...] +# @DESCRIPTION: +# Attempts to fix named build files. +# +# @CODE +# Affected by variables: +# JAVA_PKG_BSFIX_SOURCE_TAGS +# JAVA_PKG_BSFIX_TARGET_TAGS +# JAVA_ANT_REWRITE_CLASSPATH +# JAVA_ANT_JAVADOC_INPUT_DIRS: Where we can find java sources for javadoc +# input. Can be a space separated list of +# directories +# JAVA_ANT_BSFIX_EXTRA_ARGS: You can use this to pass extra variables to the +# rewriter if you know what you are doing. +# @CODE +# +# If JAVA_ANT_JAVADOC_INPUT_DIRS is set, we will turn on the adding of a basic +# javadoc target to the ant's build.xml with the javadoc xml-rewriter feature. +# Then we will set EANT DOC TARGET to the added javadoc target +# NOTE: the variable JAVA_ANT_JAVADOC_OUTPUT_DIR points where we will +# generate the javadocs. This is a read-only variable, dont change it. + +# When changing this function, make sure that it works with paths with spaces in +# them. +java-ant_bsfix_files() { + debug-print-function ${FUNCNAME} $* + + [[ ${#} = 0 ]] && die "${FUNCNAME} called without arguments" + + local want_source="$(java-pkg_get-source)" + local want_target="$(java-pkg_get-target)" + + debug-print "${FUNCNAME}: target: ${want_target} source: ${want_source}" + + if [ -z "${want_source}" -o -z "${want_target}" ]; then + eerror "Could not find valid -source/-target values" + eerror "Please file a bug about this on bugs.gentoo.org" + die "Could not find valid -source/-target values" + else + local files=() + + for file in "${@}"; do + debug-print "${FUNCNAME}: ${file}" + + if [[ -n "${JAVA_PKG_DEBUG}" ]]; then + cp "${file}" "${file}.orig" || die "failed to copy ${file}" + fi + + if [[ ! -w "${file}" ]]; then + chmod u+w "${file}" || die "chmod u+w ${file} failed" + fi + + files+=( -f "${file}" ) + done + + local rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py" + local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite" + + if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then + [[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g" + [[ ${JAVA_ANT_ENCODING} ]] && local enc="-e ${JAVA_ANT_ENCODING}" + echo "cElementTree rewriter" + debug-print "${rewriter4} extra args: ${gcp} ${enc}" + ${rewriter4} ${gcp} ${enc} \ + -c "${JAVA_PKG_BSFIX_SOURCE_TAGS}" source ${want_source} \ + -c "${JAVA_PKG_BSFIX_TARGET_TAGS}" target ${want_target} \ + "${@}" || die "build-xml-rewrite failed" + else + debug-print "Using third generation rewriter" + echo "Rewriting attributes" + local bsfix_extra_args=() + # WARNING KEEP THE ORDER, ESPECIALLY FOR CHANGED ATTRIBUTES! + if [[ -n ${JAVA_ANT_REWRITE_CLASSPATH} ]]; then + local cp_tags="${JAVA_ANT_CLASSPATH_TAGS// / -e }" + bsfix_extra_args+=( -g -e ${cp_tags} ) + bsfix_extra_args+=( -a classpath -v '${gentoo.classpath}' ) + fi + if [[ -n ${JAVA_ANT_JAVADOC_INPUT_DIRS} ]]; then + if [[ -n ${JAVA_ANT_JAVADOC_OUTPUT_DIR} ]]; then + die "Do not define JAVA_ANT_JAVADOC_OUTPUT_DIR!" + fi + # Where will our generated javadoc go. + readonly JAVA_ANT_JAVADOC_OUTPUT_DIR="${WORKDIR}/gentoo_javadoc" + mkdir -p "${JAVA_ANT_JAVADOC_OUTPUT_DIR}" || die + + if has doc ${IUSE}; then + if use doc; then + if [[ -z ${EANT_DOC_TARGET} ]]; then + EANT_DOC_TARGET="gentoojavadoc" + else + die "You can't use javadoc adding and set EANT_DOC_TARGET too." + fi + + for dir in ${JAVA_ANT_JAVADOC_INPUT_DIRS};do + if [[ ! -d ${dir} ]]; then + eerror "This dir: ${dir} doesnt' exists" + die "You must specify directories for javadoc input/output dirs." + fi + done + bsfix_extra_args+=( --javadoc --source-directory ) + # filter third/double spaces + JAVA_ANT_JAVADOC_INPUT_DIRS=${JAVA_ANT_JAVADOC_INPUT_DIRS// /} + JAVA_ANT_JAVADOC_INPUT_DIRS=${JAVA_ANT_JAVADOC_INPUT_DIRS// /} + bsfix_extra_args+=( ${JAVA_ANT_JAVADOC_INPUT_DIRS// / --source-directory } ) + bsfix_extra_args+=( --output-directory "${JAVA_ANT_JAVADOC_OUTPUT_DIR}" ) + fi + else + die "You need to have doc in IUSE when using JAVA_ANT_JAVADOC_INPUT_DIRS" + fi + fi + + [[ -n ${JAVA_ANT_BSFIX_EXTRA_ARGS} ]] \ + && bsfix_extra_args+=( ${JAVA_ANT_BSFIX_EXTRA_ARGS} ) + + debug-print "bsfix_extra_args: ${bsfix_extra_args[*]}" + + ${rewriter3} "${files[@]}" \ + -c --source-element ${JAVA_PKG_BSFIX_SOURCE_TAGS// / --source-element } \ + --source-attribute source --source-value ${want_source} \ + --target-element ${JAVA_PKG_BSFIX_TARGET_TAGS// / --target-element } \ + --target-attribute target --target-value ${want_target} \ + --target-attribute nowarn --target-value yes \ + "${bsfix_extra_args[@]}" \ + || die "xml-rewrite-3 failed: ${file}" + fi + + if [[ -n "${JAVA_PKG_DEBUG}" ]]; then + for file in "${@}"; do + diff -NurbB "${file}.orig" "${file}" + done + fi + fi + return 0 # so that the 1 for diff doesn't get reported +} + + +# @FUNCTION: java-ant_bsfix_one +# @USAGE: <path/to/build.xml> +# @DESCRIPTION: +# Attempts to fix named build file. +# +# @CODE +# Affected by variables: +# JAVA_PKG_BSFIX_SOURCE_TAGS +# JAVA_PKG_BSFIX_TARGET_TAGS +# @CODE +java-ant_bsfix_one() { + debug-print-function ${FUNCNAME} $* + + if [ -z "${1}" ]; then + eerror "${FUNCNAME} needs one argument" + die "${FUNCNAME} needs one argument" + fi + + java-ant_bsfix_files "${1}" +} + +# @FUNCTION: java-ant_rewrite-classpath +# @USAGE: [path/to/build.xml] +# @DESCRIPTION: +# Adds 'classpath="${gentoo.classpath}"' to specified build file. +# +# Affected by: +# JAVA_ANT_CLASSPATH_TAGS +# +# Parameter defaults to build.xml when not specified +java-ant_rewrite-classpath() { + debug-print-function ${FUNCNAME} $* + + local file="${1}" + [[ -z "${1}" ]] && file=build.xml + [[ ${#} -gt 1 ]] && die "${FUNCNAME} currently can only rewrite one file." + + echo "Adding gentoo.classpath to ${file}" + debug-print "java-ant_rewrite-classpath: ${file}" + + cp "${file}" "${file}.orig" || die "failed to copy ${file}" + + chmod u+w "${file}" + + java-ant_xml-rewrite -f "${file}" --change \ + -e ${JAVA_ANT_CLASSPATH_TAGS// / -e } -a classpath -v '${gentoo.classpath}' + + if [[ -n "${JAVA_PKG_DEBUG}" ]]; then + diff -NurbB "${file}.orig" "${file}" + fi +} + +# @FUNCTION: java-ant_ignore-system-classes +# @USAGE: [path/to/build.xml] +# @DESCRIPTION: +# Makes the available task ignore classes in the system classpath +# Parameter defaults to build.xml when not specified +java-ant_ignore-system-classes() { + debug-print-function ${FUNCNAME} $* + local file=${1:-build.xml} + echo "Changing ignoresystemclasses to true for available tasks in ${file}" + java-ant_xml-rewrite -f "${file}" --change \ + -e available -a ignoresystemclasses -v "true" +} + +# @FUNCTION: java-ant_xml-rewrite +# @USAGE: <xml rewriter arguments> +# @DESCRIPTION: +# Run the right xml-rewrite binary with the given arguments +java-ant_xml-rewrite() { + local gen2="${EPREFIX}/usr/bin/xml-rewrite-2.py" + local gen2_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py" + # gen1 is deprecated + if [[ -x "${gen2}" ]]; then + ${gen2} "${@}" || die "${gen2} failed" + elif [[ -x "${gen2_1}" ]]; then + ${gen2_1} "${@}" || die "${gen2_1} failed" + else + eerror "No binary for rewriting found." + eerror "Do you have dev-java/javatoolkit installed?" + die "xml-rewrite not found" + fi +} + +# @FUNCTION: java-ant_rewrite-bootclasspath +# @USAGE: <version> [path/to/build.xml] [prepend] [append] +# @DESCRIPTION: +# Adds bootclasspath to javac-like tasks in build.xml filled with jars of a +# bootclasspath package of given version. +# +# @CODE +# Affected by: +# JAVA_PKG_BSFIX_TARGET_TAGS - the tags of javac tasks +# +# Parameters: +# $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath +# of the current JDK +# $2 - path to desired build.xml file, defaults to 'build.xml' +# $3 - (optional) what to prepend the bootclasspath with (to override) +# $4 - (optional) what to append to the bootclasspath +# @CODE +java-ant_rewrite-bootclasspath() { + local version="${1}" + local file="${2-build.xml}" + local extra_before="${3}" + local extra_after="${4}" + + local bcp="$(java-pkg_get-bootclasspath "${version}")" + + if [[ -n "${extra_before}" ]]; then + bcp="${extra_before}:${bcp}" + fi + if [[ -n "${extra_after}" ]]; then + bcp="${bcp}:${extra_after}" + fi + + java-ant_xml-rewrite -f "${file}" -c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \ + -a bootclasspath -v "${bcp}" +} diff -uNr a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass --- a/eclass/java-osgi.eclass false +++ b/eclass/java-osgi.eclass 2f0dac83818b9c8da82804c501e79a3fe364af908f94657930791de8a321b8832909867dd598635c06529a4efda0ec3bb9dab63a0c98b4fd4d79e3dfcb2ae154 @@ -0,0 +1,277 @@ +# Copyright 2007-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: java-osgi.eclass +# @MAINTAINER: +# java@gentoo.org +# @AUTHOR: +# Java maintainers (java@gentoo.org) +# @BLURB: Java OSGi eclass +# @DESCRIPTION: +# This eclass provides functionality which is used by packages that need to be +# OSGi compliant. This means that the generated jars will have special headers +# in their manifests. Currently this is used only by Eclipse-3.3 - later we +# could extend this so that Gentoo Java system would be fully OSGi compliant. + +inherit java-utils-2 + +# @ECLASS-VARIABLE: _OSGI_T +# @INTERNAL +# @DESCRIPTION: +# We define _OSGI_T so that it does not contain a slash at the end. +# According to Paludis guys, there is currently a proposal for EAPIs that +# would require all variables to end with a slash. +_OSGI_T="${T/%\//}" + +# must get Diego to commit something like this to portability.eclass +_canonicalise() { + if type -p realpath > /dev/null; then + realpath "${@}" + elif type -p readlink > /dev/null; then + readlink -f "${@}" + else + # can't die, subshell + eerror "No readlink nor realpath found, cannot canonicalise" + fi +} + +# @FUNCTION: _java-osgi_plugin +# @USAGE: <plugin name> +# @INTERNAL +# @DESCRIPTION: +# This is an internal function, not to be called directly. +# +# @CODE +# _java-osgi_plugin "JSch" +# @CODE +# +# @param $1 - bundle name +_java-osgi_plugin() { + # We hardcode Gentoo as the vendor name + + cat > "${_OSGI_T}/tmp_jar/plugin.properties" <<-EOF + bundleName="${1}" + vendorName="Gentoo" + EOF +} + +# @FUNCTION: _java-osgi_makejar +# @USAGE: <jar name> <symbolic name> <bundle name> <header name> +# @INTERNAL +# @DESCRIPTION: +# This is an internal function, not to be called directly. +# +# @CODE +# _java-osgi_makejar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true" +# @CODE +# +# @param $1 - name of jar to repackage with OSGi +# @param $2 - bundle symbolic name +# @param $3 - bundle name +# @param $4 - export-package header +_java-osgi_makejar() { + debug-print-function ${FUNCNAME} "$@" + + (( ${#} < 4 )) && die "Four arguments are needed for _java-osgi_makejar()" + + local absoluteJarPath="$(_canonicalise ${1})" + local jarName="$(basename ${1})" + + mkdir "${_OSGI_T}/tmp_jar" || die "Unable to create directory ${_OSGI_T}/tmp_jar" + [[ -d "${_OSGI_T}/osgi" ]] || mkdir "${_OSGI_T}/osgi" || die "Unable to create directory ${_OSGI_T}/osgi" + + cd "${_OSGI_T}/tmp_jar" && jar xf "${absoluteJarPath}" && cd - > /dev/null \ + || die "Unable to uncompress correctly the original jar" + + cat > "${_OSGI_T}/tmp_jar/META-INF/MANIFEST.MF" <<-EOF + Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %bundleName + Bundle-Vendor: %vendorName + Bundle-Localization: plugin + Bundle-SymbolicName: ${2} + Bundle-Version: ${PV} + Export-Package: ${4} + EOF + + _java-osgi_plugin "${3}" + + jar cfm "${_OSGI_T}/osgi/${jarName}" "${_OSGI_T}/tmp_jar/META-INF/MANIFEST.MF" \ + -C "${_OSGI_T}/tmp_jar/" . > /dev/null || die "Unable to recreate the OSGi compliant jar" + rm -rf "${_OSGI_T}/tmp_jar" +} + +# @FUNCTION: @java-osgi_dojar +# @USAGE: <jar name> <symbolic name> <bundle name> <header name> +# @DESCRIPTION: +# Rewrites a jar, and produce an OSGi compliant jar from arguments given on the command line. +# The arguments given correspond to the minimal set of headers +# that must be present on a Manifest file of an OSGi package. +# If you need more headers, you should use the *-fromfile functions below, +# that create the Manifest from a file. +# It will call java-pkg_dojar at the end. +# +# @CODE +# java-osgi_dojar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true" +# @CODE +# +# @param $1 - name of jar to repackage with OSGi +# @param $2 - bundle symbolic name +# @param $3 - bundle name +# @param $4 - export-package-header +java-osgi_dojar() { + debug-print-function ${FUNCNAME} "$@" + local jarName="$(basename ${1})" + _java-osgi_makejar "$@" + java-pkg_dojar "${_OSGI_T}/osgi/${jarName}" +} + +# @FUNCTION: java-osgi_newjar +# @USAGE: <jar name> <symbolic name> <bundle name> <header name> +# @DESCRIPTION: +# Rewrites a jar, and produce an OSGi compliant jar. +# The arguments given correspond to the minimal set of headers +# that must be present on a Manifest file of an OSGi package. +# If you need more headers, you should use the *-fromfile functions below, +# that create the Manifest from a file. +# It will call java-pkg_newjar at the end. +# +# @CODE +# java-osgi_newjar "dist/${PN}.jar" "com.jcraft.jsch" "JSch" "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true" +# @CODE +# +# @param $1 - name of jar to repackage with OSGi +# @param $2 (optional) - name of the target jar. It will default to package name if not specified. +# @param $3 - bundle symbolic name +# @param $4 - bundle name +# @param $5 - export-package header +java-osgi_newjar() { + debug-print-function ${FUNCNAME} "$@" + local jarName="$(basename $1)" + + if (( ${#} > 4 )); then + _java-osgi_makejar "${1}" "${3}" "${4}" "${5}" + java-pkg_newjar "${_OSGI_T}/osgi/${jarName}" "${2}" + else + _java-osgi_makejar "$@" + java-pkg_newjar "${_OSGI_T}/osgi/${jarName}" + fi +} + +# @FUNCTION:_java-osgi_makejar-fromfile +# @USAGE: <jar to repackage with OSGi> <Manifest file> <bundle name> <version rewriting> +# @INTERNAL +# @DESCRIPTION: +# This is an internal function, not to be called directly. +# +# @CODE +# _java-osgi_makejar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "JSch" 1 +# @CODE +# +# @param $1 - name of jar to repackage with OSGi +# @param $2 - path to the Manifest file +# @param $3 - bundle name +# @param $4 - automatic version rewriting (0 or 1) +_java-osgi_makejar-fromfile() { + debug-print-function ${FUNCNAME} "$@" + + ((${#} < 4)) && die "Four arguments are needed for _java-osgi_makejar-fromfile()" + + local absoluteJarPath="$(_canonicalise ${1})" + local jarName="$(basename ${1})" + + mkdir "${_OSGI_T}/tmp_jar" || die "Unable to create directory ${_OSGI_T}/tmp_jar" + [[ -d "${_OSGI_T}/osgi" ]] || mkdir "${_OSGI_T}/osgi" || die "Unable to create directory ${_OSGI_T}/osgi" + + cd "${_OSGI_T}/tmp_jar" && jar xf "${absoluteJarPath}" && cd - > /dev/null \ + || die "Unable to uncompress correctly the original jar" + + [[ -e "${2}" ]] || die "Manifest file ${2} not found" + + # We automatically change the version if automatic version rewriting is on + + if (( ${4} )); then + cat "${2}" | sed "s/Bundle-Version:.*/Bundle-Version: ${PV}/" > \ + "${_OSGI_T}/tmp_jar/META-INF/MANIFEST.MF" + else + cat "${2}" > "${_OSGI_T}/tmp_jar/META-INF/MANIFEST.MF" + fi + + _java-osgi_plugin "${3}" + + jar cfm "${_OSGI_T}/osgi/${jarName}" "${_OSGI_T}/tmp_jar/META-INF/MANIFEST.MF" \ + -C "${_OSGI_T}/tmp_jar/" . > /dev/null || die "Unable to recreate the OSGi compliant jar" + rm -rf "${_OSGI_T}/tmp_jar" +} + +# @FUNCTION: java-osgi_newjar-fromfile +# @USAGE: <jar to repackage with OSGi> <Manifest file> <bundle name> <version rewriting> +# @DESCRIPTION: +# This function produces an OSGi compliant jar from a given manifest file. +# The Manifest Bundle-Version header will be replaced by the current version +# of the package, unless the --no-auto-version option is given. +# It will call java-pkg_newjar at the end. +# +# @CODE +# java-osgi_newjar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "Standard Widget Toolkit for GTK 2.0" +# @CODE +# +# @param $opt +# --no-auto-version - This option disables automatic rewriting of the +# version in the Manifest file +# +# @param $1 - name of jar to repackage with OSGi +# @param $2 (optional) - name of the target jar. It will default to package name if not specified. +# @param $3 - path to the Manifest file +# @param $4 - bundle name +java-osgi_newjar-fromfile() { + debug-print-function ${FUNCNAME} "$@" + local versionRewriting=1 + + if [[ "${1}" == "--no-auto-version" ]]; then + versionRewriting=0 + shift + fi + local jarName="$(basename ${1})" + + if (( ${#} > 3 )); then + _java-osgi_makejar-fromfile "${1}" "${3}" "${4}" "${versionRewriting}" + java-pkg_newjar "${_OSGI_T}/osgi/${jarName}" "${2}" + else + _java-osgi_makejar-fromfile "$@" "${versionRewriting}" + java-pkg_newjar "${_OSGI_T}/osgi/${jarName}" + fi +} + +# @FUNCTION: java-osgi_dojar-fromfile +# @USAGE: <jar to repackage with OSGi> <Manifest file> <bundle name> +# @DESCRIPTION: +# This function produces an OSGi compliant jar from a given manifestfile. +# The Manifest Bundle-Version header will be replaced by the current version +# of the package, unless the --no-auto-version option is given. +# It will call java-pkg_dojar at the end. +# +# @CODE +# java-osgi_dojar-fromfile "dist/${PN}.jar" "${FILESDIR}/MANIFEST.MF" "Standard Widget Toolkit for GTK 2.0" +# @CODE +# +# @param $opt +# --no-auto-version - This option disables automatic rewriting of the +# version in the Manifest file +# +# @param $1 - name of jar to repackage with OSGi +# @param $2 - path to the Manifest file +# @param $3 - bundle name +java-osgi_dojar-fromfile() { + debug-print-function ${FUNCNAME} "$@" + local versionRewriting=1 + + if [[ "${1}" == "--no-auto-version" ]]; then + versionRewriting=0 + shift + fi + local jarName="$(basename ${1})" + + _java-osgi_makejar-fromfile "$@" "${versionRewriting}" + java-pkg_dojar "${_OSGI_T}/osgi/${jarName}" +} diff -uNr a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass --- a/eclass/java-pkg-2.eclass false +++ b/eclass/java-pkg-2.eclass 6d71cd24e54462679a2f6d84fe0f14be0ceb3f32b30cb0d3f8141e07301b364f0b51859d22c68a4c9accf5579af66dfe3bddb68911a71a77c8201a43ccb16824 @@ -0,0 +1,155 @@ +# Copyright 2004-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: java-pkg-2.eclass +# @MAINTAINER: +# java@gentoo.org +# @AUTHOR: +# Thomas Matthijs <axxo@gentoo.org> +# @BLURB: Eclass for Java Packages +# @DESCRIPTION: +# This eclass should be inherited for pure Java packages, or by packages which +# need to use Java. + +inherit java-utils-2 + +# @ECLASS-VARIABLE: JAVA_PKG_IUSE +# @DEFAULT_UNSET +# @DESCRIPTION: +# Use JAVA_PKG_IUSE instead of IUSE for doc, source and examples so that +# the eclass can automatically add the needed dependencies for the java-pkg_do* +# functions. +IUSE="${JAVA_PKG_IUSE}" + +# Java packages need java-config, and a fairly new release of Portage. +# JAVA_PKG_E_DEPEND is defined in java-utils.eclass. +DEPEND="${JAVA_PKG_E_DEPEND}" + +# Nothing special for RDEPEND... just the same as DEPEND. +RDEPEND="${DEPEND}" + +# Commons packages follow the same rules so do it here +if [[ ${CATEGORY} = dev-java && ${PN} = commons-* ]]; then + HOMEPAGE="http://commons.apache.org/${PN#commons-}/" + SRC_URI="mirror://apache/${PN/-///}/source/${P}-src.tar.gz" +fi + +case "${EAPI:-0}" in + 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst ;; + *) EXPORT_FUNCTIONS pkg_setup src_prepare src_compile pkg_preinst ;; +esac + +# @FUNCTION: java-pkg-2_pkg_setup +# @DESCRIPTION: +# pkg_setup initializes the Java environment + +java-pkg-2_pkg_setup() { + java-pkg_init +} + + +# @FUNCTION: java-pkg-2_src_prepare +# @DESCRIPTION: +# wrapper for java-utils-2_src_prepare + +java-pkg-2_src_prepare() { + java-utils-2_src_prepare +} + + +# @FUNCTION: java-pkg-2_src_compile +# @DESCRIPTION: +# Default src_compile for java packages +# +# @CODE +# Variables: +# EANT_BUILD_XML - controls the location of the build.xml (default: ./build.xml) +# EANT_FILTER_COMPILER - Calls java-pkg_filter-compiler with the value +# EANT_BUILD_TARGET - the ant target/targets to execute (default: jar) +# EANT_DOC_TARGET - the target to build extra docs under the doc use flag +# (default: javadoc; declare empty to disable completely) +# EANT_GENTOO_CLASSPATH - @see eant documention in java-utils-2.eclass +# EANT_EXTRA_ARGS - extra arguments to pass to eant +# EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment +# @CODE + +java-pkg-2_src_compile() { + if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then + # auto generate classpath + java-pkg_gen-cp EANT_GENTOO_CLASSPATH + + [[ "${EANT_FILTER_COMPILER}" ]] && \ + java-pkg_filter-compiler ${EANT_FILTER_COMPILER} + local antflags="${EANT_BUILD_TARGET:=jar}" + if has doc ${IUSE} && [[ -n "${EANT_DOC_TARGET=javadoc}" ]]; then + antflags="${antflags} $(use_doc ${EANT_DOC_TARGET})" + fi + local tasks + [[ ${EANT_ANT_TASKS} ]] && tasks="${ANT_TASKS} ${EANT_ANT_TASKS}" + ANT_TASKS="${tasks:-${ANT_TASKS}}" \ + eant ${antflags} -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} "${@}" + else + echo "${FUNCNAME}: ${EANT_BUILD_XML} not found so nothing to do." + fi +} + +# @FUNCTION: java-pkg-2_src_test +# @DESCRIPTION: +# src_test, not exported. + +java-pkg-2_src_test() { + [[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return + + if [[ ${EANT_TEST_TARGET} ]] || < "${EANT_BUILD_XML}" tr -d "\n" | grep -Eq "<target\b[^>]*\bname=[\"']test[\"']"; then + local opts task_re junit_re pkg + + if [[ ${EANT_TEST_JUNIT_INTO} ]]; then + java-pkg_jar-from --into "${EANT_TEST_JUNIT_INTO}" junit + fi + + if [[ ${EANT_TEST_GENTOO_CLASSPATH} ]]; then + EANT_GENTOO_CLASSPATH="${EANT_TEST_GENTOO_CLASSPATH}" + fi + + ANT_TASKS=${EANT_TEST_ANT_TASKS:-${ANT_TASKS:-${EANT_ANT_TASKS}}} + + task_re="\bdev-java/ant-junit(4)?(-[^:]+)?(:\S+)\b" + junit_re="\bdev-java/junit(-[^:]+)?(:\S+)\b" + + if [[ ${DEPEND} =~ ${task_re} ]]; then + pkg="ant-junit${BASH_REMATCH[1]}${BASH_REMATCH[3]}" + pkg="${pkg%:0}" + + if [[ ${ANT_TASKS} && "${ANT_TASKS}" != none ]]; then + ANT_TASKS="${ANT_TASKS} ${pkg}" + else + ANT_TASKS="${pkg}" + fi + elif [[ ${DEPEND} =~ ${junit_re} ]]; then + pkg="junit${BASH_REMATCH[2]}" + pkg="${pkg%:0}" + + opts="-Djunit.jar=\"$(java-pkg_getjar ${pkg} junit.jar)\"" + + if [[ ${EANT_GENTOO_CLASSPATH} ]]; then + EANT_GENTOO_CLASSPATH+=",${pkg}" + else + EANT_GENTOO_CLASSPATH="${pkg}" + fi + fi + + eant ${opts} -f "${EANT_BUILD_XML}" \ + ${EANT_EXTRA_ARGS} ${EANT_TEST_EXTRA_ARGS} ${EANT_TEST_TARGET:-test} + + else + echo "${FUNCNAME}: No test target in ${EANT_BUILD_XML}" + fi +} + +# @FUNCTION: java-pkg-2_pkg_preinst +# @DESCRIPTION: +# wrapper for java-utils-2_pkg_preinst + +java-pkg-2_pkg_preinst() { + java-utils-2_pkg_preinst +} diff -uNr a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass --- a/eclass/java-pkg-opt-2.eclass false +++ b/eclass/java-pkg-opt-2.eclass 98c447888f67a44028fc3d9dd3d0260513daf50fbc985b1b34dd7b45982a804e5b8e67e7e0781804c57d16cc3f49efb8e979e721132caed70d5645c1a606c467 @@ -0,0 +1,60 @@ +# Copyright 2004-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: java-pkg-opt-2.eclass +# @MAINTAINER: +# java@gentoo.org +# @AUTHOR: +# Thomas Matthijs <axxo@gentoo.org> +# @BLURB: Eclass for package with optional Java support +# @DESCRIPTION: +# Inherit this eclass instead of java-pkg-2 if you only need optional Java +# support. + +inherit java-utils-2 + +# @ECLASS-VARIABLE: JAVA_PKG_OPT_USE +# @DESCRIPTION: +# USE flag to control if optional Java stuff is build. Defaults to 'java'. +JAVA_PKG_OPT_USE=${JAVA_PKG_OPT_USE:-java} + +DEPEND="${JAVA_PKG_OPT_USE}? ( ${JAVA_PKG_E_DEPEND} )" +RDEPEND="${DEPEND}" + +# See java-pkg-2.eclass for JAVA_PKG_IUSE documentation +IUSE="${JAVA_PKG_IUSE} ${JAVA_PKG_OPT_USE}" + +case "${EAPI:-0}" in + 0|1) EXPORT_FUNCTIONS pkg_setup pkg_preinst ;; + *) EXPORT_FUNCTIONS pkg_setup src_prepare pkg_preinst ;; +esac + +# @FUNCTION: java-pkg-opt-2_pkg_setup +# @DESCRIPTION: +# default pkg_setup, wrapper for java-utils-2_pkg_init + +java-pkg-opt-2_pkg_setup() { + use ${JAVA_PKG_OPT_USE} && java-pkg_init +} + + +# @FUNCTION: java-pkg-opt-2_src_prepare +# @DESCRIPTION: +# default src_prepare, wrapper for java-utils-2_src_prepare + +java-pkg-opt-2_src_prepare() { + use ${JAVA_PKG_OPT_USE} && java-utils-2_src_prepare + case "${EAPI:-0}" in + [0-5]) ;; + *) use ${JAVA_PKG_OPT_USE} || eapply_user ;; + esac +} + + +# @FUNCTION: java-pkg-opt-2_pkg_preinst +# @DESCRIPTION: +# default pkg_preinst, wrapper for java-utils-2_pkg_preinst + +java-pkg-opt-2_pkg_preinst() { + use ${JAVA_PKG_OPT_USE} && java-utils-2_pkg_preinst +} diff -uNr a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass --- a/eclass/java-pkg-simple.eclass false +++ b/eclass/java-pkg-simple.eclass 2167cafa5cc0a0749141fbca1981d57c66d383d63c39df38dc83d19eee859e43a965921aa780c160fdea03954752092f0f37958d70fa9b61cdaeb136ef1ca39d @@ -0,0 +1,161 @@ +# Copyright 2004-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: java-pkg-simple.eclass +# @MAINTAINER: +# java@gentoo.org +# @AUTHOR: +# Java maintainers (java@gentoo.org) +# @BLURB: Eclass for packaging Java software with ease. +# @DESCRIPTION: +# This class is intended to build pure Java packages from Java sources +# without the use of any build instructions shipped with the sources. +# There is no support for resources besides the generated class files, +# or for generating source files, or for controlling the META-INF of +# the resulting jar, although these issues may be addressed by an +# ebuild by putting corresponding files into the target directory +# before calling the src_compile function of this eclass. + +inherit java-utils-2 + +if ! has java-pkg-2 ${INHERITED}; then + eerror "java-pkg-simple eclass can only be inherited AFTER java-pkg-2" +fi + +EXPORT_FUNCTIONS src_compile src_install + +# We are only interested in finding all java source files, wherever they may be. +S="${WORKDIR}" + +# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH +# @DEFAULT_UNSET +# @DESCRIPTION: +# Comma or space separated list of java packages to include in the +# class path. The packages will also be registered as runtime +# dependencies of this new package. Dependencies will be calculated +# transitively. See "java-config -l" for appropriate package names. +# +# @CODE +# JAVA_GENTOO_CLASSPATH="foo,bar-2" +# @CODE + +# @ECLASS-VARIABLE: JAVA_GENTOO_CLASSPATH_EXTRA +# @DEFAULT_UNSET +# @DESCRIPTION: +# Extra list of colon separated path elements to be put on the +# classpath when compiling sources. + +# @ECLASS-VARIABLE: JAVA_SRC_DIR +# @DEFAULT_UNSET +# @DESCRIPTION: +# Directories relative to ${S} which contain the sources of the +# application. The default of "" will be treated mostly as ${S} +# itself. For the generated source package (if source is listed in +# ${JAVA_PKG_IUSE}), it is important that these directories are +# actually the roots of the corresponding source trees. +# +# @CODE +# JAVA_SRC_DIR="src/java/org/gentoo" +# @CODE + +# @ECLASS-VARIABLE: JAVA_ENCODING +# @DESCRIPTION: +# The character encoding used in the source files. +: ${JAVA_ENCODING:=UTF-8} + +# @ECLASS-VARIABLE: JAVAC_ARGS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Additional arguments to be passed to javac. + +# @ECLASS-VARIABLE: JAVADOC_ARGS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Additional arguments to be passed to javadoc. + +# @ECLASS-VARIABLE: JAVA_JAR_FILENAME +# @DESCRIPTION: +# The name of the jar file to create and install. +: ${JAVA_JAR_FILENAME:=${PN}.jar} + +# @FUNCTION: java-pkg-simple_src_compile +# @DESCRIPTION: +# src_compile for simple bare source java packages. Finds all *.java +# sources in ${JAVA_SRC_DIR}, compiles them with the classpath +# calculated from ${JAVA_GENTOO_CLASSPATH}, and packages the resulting +# classes to ${JAVA_JAR_FILENAME}. +java-pkg-simple_src_compile() { + local sources=sources.lst classes=target/classes apidoc=target/api + + # auto generate classpath + java-pkg_gen-cp JAVA_GENTOO_CLASSPATH + + # gather sources + find ${JAVA_SRC_DIR:-*} -name \*.java > ${sources} + mkdir -p ${classes} || die "Could not create target directory" + + # compile + local classpath="${JAVA_GENTOO_CLASSPATH_EXTRA}" dependency + for dependency in ${JAVA_GENTOO_CLASSPATH}; do + classpath="${classpath}:$(java-pkg_getjars ${dependency})" \ + || die "getjars failed for ${dependency}" + done + while [[ $classpath = *::* ]]; do classpath="${classpath//::/:}"; done + classpath=${classpath%:} + classpath=${classpath#:} + debug-print "CLASSPATH=${classpath}" + ejavac -d ${classes} -encoding ${JAVA_ENCODING} \ + ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} \ + @${sources} + + # javadoc + if has doc ${JAVA_PKG_IUSE} && use doc; then + mkdir -p ${apidoc} + ejavadoc -d ${apidoc} \ + -encoding ${JAVA_ENCODING} -docencoding UTF-8 -charset UTF-8 \ + ${classpath:+-classpath ${classpath}} ${JAVADOC_ARGS:- -quiet} \ + @${sources} || die "javadoc failed" + fi + + # package + local jar_args="cf ${JAVA_JAR_FILENAME}" + if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then + jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF" + fi + jar ${jar_args} -C ${classes} . || die "jar failed" +} + +# @FUNCTION: java-pkg-simple_src_install +# @DESCRIPTION: +# src_install for simple single jar java packages. Simply packages the +# contents from the target directory and installs it as +# ${JAVA_JAR_FILENAME}. If the file target/META-INF/MANIFEST.MF exists, +# it is used as the manifest of the created jar. +java-pkg-simple_src_install() { + local sources=sources.lst classes=target/classes apidoc=target/api + + # main jar + java-pkg_dojar ${JAVA_JAR_FILENAME} + + # javadoc + if has doc ${JAVA_PKG_IUSE} && use doc; then + java-pkg_dojavadoc ${apidoc} + fi + + # dosrc + if has source ${JAVA_PKG_IUSE} && use source; then + local srcdirs="" + if [[ ${JAVA_SRC_DIR} ]]; then + local parent child + for parent in ${JAVA_SRC_DIR}; do + for child in ${parent}/*; do + srcdirs="${srcdirs} ${child}" + done + done + else + # take all directories actually containing any sources + srcdirs="$(cut -d/ -f1 ${sources} | sort -u)" + fi + java-pkg_dosrc ${srcdirs} + fi +} diff -uNr a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass --- a/eclass/java-utils-2.eclass false +++ b/eclass/java-utils-2.eclass 17995f676f05785dfd39508856c47363a0cba534ee0f205444e619cef1f3537f2c70288fdc640f4869e9f96245f7cc77a0c7f49c7b35f9d3be12c63188fd1101 @@ -0,0 +1,2919 @@ +# Copyright 2004-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: java-utils-2.eclass +# @MAINTAINER: +# java@gentoo.org +# @AUTHOR: +# Thomas Matthijs <axxo@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org> +# @BLURB: Base eclass for Java packages +# @DESCRIPTION: +# This eclass provides functionality which is used by java-pkg-2.eclass, +# java-pkg-opt-2.eclass and java-ant-2 eclass, as well as from ebuilds. +# +# This eclass should not be inherited this directly from an ebuild. Instead, +# you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for packages +# that have optional Java support. In addition you can inherit java-ant-2 for +# Ant-based packages. +inherit eutils versionator multilib + +IUSE="elibc_FreeBSD" + +# Make sure we use java-config-2 +export WANT_JAVA_CONFIG="2" + +# Prefix variables are only available for EAPI>=3 +has "${EAPI:-0}" 0 1 2 && ED="${D}" EPREFIX= EROOT="${ROOT}" + +# @VARIABLE: JAVA_PKG_PORTAGE_DEP +# @INTERNAL +# @DESCRIPTION: +# The version of portage we need to function properly. Previously it was +# portage with phase hooks support but now we use a version with proper env +# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps. +has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" + +# @VARIABLE: JAVA_PKG_E_DEPEND +# @INTERNAL +# @DESCRIPTION: +# This is a convience variable to be used from the other java eclasses. This is +# the version of java-config we want to use. Usually the latest stable version +# so that ebuilds can use new features without depending on specific versions. +JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0-r3 ${JAVA_PKG_PORTAGE_DEP}" +has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )" + +# @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH +# @DEFAULT_UNSET +# @DESCRIPTION: +# The version of bootclasspath the package needs to work. Translates to a proper +# dependency. The bootclasspath can then be obtained by java-ant_rewrite-bootclasspath +if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then + if [[ "${JAVA_PKG_WANT_BOOTCLASSPATH}" == "1.5" ]]; then + JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} >=dev-java/gnu-classpath-0.98-r1:0.98" + else + eerror "Unknown value of JAVA_PKG_WANT_BOOTCLASSPATH" + # since die in global scope doesn't work, this will make repoman fail + JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} BAD_JAVA_PKG_WANT_BOOTCLASSPATH" + fi +fi + +# @ECLASS-VARIABLE: JAVA_PKG_ALLOW_VM_CHANGE +# @DESCRIPTION: +# Allow this eclass to change the active VM? +# If your system VM isn't sufficient for the package, the build will fail +# instead of trying to switch to another VM. +# +# Overriding the default can be useful for testing specific VMs locally, but +# should not be used in the final ebuild. +JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"} + +# @ECLASS-VARIABLE: JAVA_PKG_FORCE_VM +# @DEFAULT_UNSET +# @DESCRIPTION: +# Explicitly set a particular VM to use. If its not valid, it'll fall back to +# whatever /etc/java-config-2/build/jdk.conf would elect to use. +# +# Should only be used for testing and debugging. +# +# Example: use sun-jdk-1.5 to emerge foo: +# @CODE +# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo +# @CODE + +# @ECLASS-VARIABLE: JAVA_PKG_WANT_BUILD_VM +# @DEFAULT_UNSET +# @DESCRIPTION: +# A list of VM handles to choose a build VM from. If the list contains the +# currently active VM use that one, otherwise step through the list till a +# usable/installed VM is found. +# +# This allows to use an explicit list of JDKs in DEPEND instead of a virtual. +# Users of this variable must make sure at least one of the listed handles is +# covered by DEPEND. +# Requires JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET to be set as well. + +# @ECLASS-VARIABLE: JAVA_PKG_WANT_SOURCE +# @DEFAULT_UNSET +# @DESCRIPTION: +# Specify a non-standard Java source version for compilation (via javac -source +# parameter or Ant equivalent via build.xml rewriting done by java-ant-2 eclass). +# Normally this is determined from the jdk version specified in DEPEND. +# See java-pkg_get-source function below. +# +# Should generally only be used for testing and debugging. +# +# Use 1.4 source to emerge baz +# @CODE +# JAVA_PKG_WANT_SOURCE=1.4 emerge baz +# @CODE + +# @ECLASS-VARIABLE: JAVA_PKG_WANT_TARGET +# @DEFAULT_UNSET +# @DESCRIPTION: +# Same as JAVA_PKG_WANT_SOURCE (see above) but for javac -target parameter, +# which affects the version of generated bytecode. +# Normally this is determined from the jre/jdk version specified in RDEPEND. +# See java-pkg_get-target function below. +# +# Should generallyonly be used for testing and debugging. +# +# emerge bar to be compatible with 1.3 +# @CODE +# JAVA_PKG_WANT_TARGET=1.3 emerge bar +# @CODE + +# @ECLASS-VARIABLE: JAVA_PKG_DEBUG +# @DEFAULT_UNSET +# @DESCRIPTION: +# A variable to be set with "yes" or "y", or ANY string of length non equal to +# zero. When set, verbosity across java eclasses is increased and extra +# logging is displayed. +# @CODE +# JAVA_PKG_DEBUG="yes" +# @CODE + +# @ECLASS-VARIABLE: JAVA_RM_FILES +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array containing a list of files to remove. If defined, this array will be +# automatically handed over to java-pkg_rm_files for processing during the +# src_prepare phase. +# +# @CODE +# JAVA_RM_FILES=( +# path/to/File1.java +# DELETEME.txt +# ) +# @CODE + +# @VARIABLE: JAVA_PKG_COMPILER_DIR +# @INTERNAL +# @DESCRIPTION: +# Directory where compiler settings are saved, without trailing slash. +# You probably shouldn't touch this variable except local testing. +JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"} + +# @VARIABLE: JAVA_PKG_COMPILERS_CONF +# @INTERNAL +# @DESCRIPTION: +# Path to file containing information about which compiler to use. +# Can be overloaded, but it should be overloaded only for local testing. +JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/compilers.conf"} + +# @ECLASS-VARIABLE: JAVA_PKG_FORCE_COMPILER +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Explicitly set a list of compilers to choose from. This is normally read from +# JAVA_PKG_COMPILERS_CONF. +# +# Useful for local testing. +# +# Use jikes and javac, in that order +# @CODE +# JAVA_PKG_FORCE_COMPILER="jikes javac" +# @CODE + +# @ECLASS-VARIABLE: JAVA_PKG_FORCE_ANT_TASKS +# @DEFAULT_UNSET +# @DESCRIPTION: +# An $IFS separated list of ant tasks. Can be set in environment before calling +# emerge/ebuild to override variables set in ebuild, mainly for testing before +# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in +# eant() call, not the dependencies specified in WANT_ANT_TASKS. +# +# @CODE +# JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \ +# ebuild foo.ebuild compile +# @CODE + +# TODO document me +JAVA_PKG_QA_VIOLATIONS=0 + +# @FUNCTION: java-pkg_doexamples +# @USAGE: [--subdir <subdir>] <file1/dir1> [<file2> ...] +# @DESCRIPTION: +# Installs given arguments to /usr/share/doc/${PF}/examples +# If you give it only one parameter and it is a directory it will install +# everything in that directory to the examples directory. +# +# @CODE +# Parameters: +# --subdir - If the examples need a certain directory structure +# $* - list of files to install +# +# Examples: +# java-pkg_doexamples demo +# java-pkg_doexamples demo/* examples/* +# @CODE +java-pkg_doexamples() { + debug-print-function ${FUNCNAME} $* + + [[ ${#} -lt 1 ]] && die "At least one argument needed" + + java-pkg_check-phase install + java-pkg_init_paths_ + + local dest=/usr/share/doc/${PF}/examples + if [[ ${1} == --subdir ]]; then + local dest=${dest}/${2} + dodir ${dest} + shift 2 + fi + + if [[ ${#} = 1 && -d ${1} ]]; then + ( # dont want to pollute calling env + insinto "${dest}" + doins -r ${1}/* + ) || die "Installing examples failed" + else + ( # dont want to pollute calling env + insinto "${dest}" + doins -r "$@" + ) || die "Installing examples failed" + fi + + # Let's make a symlink to the directory we have everything else under + dosym "${dest}" "${JAVA_PKG_SHAREPATH}/examples" || die +} + +# @FUNCTION: java-pkg_addres +# @USAGE: <jar> <dir> [<find arguments> ...] +# @DESCRIPTION: +# Adds resource files to an existing jar. +# It is important that the directory given is actually the root of the +# corresponding resource tree. The target directory as well as +# sources.lst, MANIFEST.MF, *.class, *.jar, and *.java files are +# automatically excluded. Symlinks are always followed. Additional +# arguments are passed through to find. +# +# @CODE +# java-pkg_addres ${PN}.jar resources ! -name "*.html" +# @CODE +# +# @param $1 - jar file +# @param $2 - resource tree directory +# @param $* - arguments to pass to find +java-pkg_addres() { + debug-print-function ${FUNCNAME} $* + + [[ ${#} -lt 2 ]] && die "at least two arguments needed" + + local jar=$(realpath "$1" || die "realpath $1 failed") + local dir="$2" + shift 2 + + pushd "${dir}" > /dev/null || die "pushd ${dir} failed" + find -L -type f ! -path "./target/*" ! -path "./sources.lst" ! -name "MANIFEST.MF" ! -regex ".*\.$class\|jar\|java$" "${@}" -print0 | xargs -r0 jar uf "${jar}" || die "jar failed" + popd > /dev/null || die "popd failed" +} + +# @FUNCTION: java-pkg_rm_files +# @USAGE: java-pkg_rm_files File1.java File2.java ... +# @DESCRIPTION: +# Remove unneeded files in ${S}. +# +# Every now and then, you'll run into situations whereby a file needs removing, +# be it a unit test or a regular java class. +# +# You can use this function by either: +# - calling it yourself in src_prepare() and feeding java-pkg_rm_files with +# the list of files you wish to remove. +# - defining an array in the ebuild named JAVA_RM_FILES with the list of files +# you wish to remove. +# +# Both way work and it is left to the developer's preferences. If the +# JAVA_RM_FILES array is defined, it will be automatically handed over to +# java-pkg_rm_files during the src_prepare phase. +# +# See java-utils-2_src_prepare. +# +# @CODE +# java-pkg_rm_files File1.java File2.java +# @CODE +# +# @param $* - list of files to remove. +java-pkg_rm_files() { + debug-print-function ${FUNCNAME} $* + local IFS="\n" + for filename in "$@"; do + [[ ! -f "${filename}" ]] && die "${filename} is not a regular file. Aborting." + einfo "Removing unneeded file ${filename}" + rm -f "${S}/${filename}" || die "cannot remove ${filename}" + eend $? + done +} + +# @FUNCTION: java-pkg_dojar +# @USAGE: <jar1> [<jar2> ...] +# @DESCRIPTION: +# Installs any number of jars. +# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default. +# You can use java-pkg_jarinto to change this path. +# You should never install a jar with a package version in the filename. +# Instead, use java-pkg_newjar defined below. +# +# @CODE +# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar +# @CODE +# +# @param $* - list of jars to install +java-pkg_dojar() { + debug-print-function ${FUNCNAME} $* + + [[ ${#} -lt 1 ]] && die "At least one argument needed" + + java-pkg_check-phase install + java-pkg_init_paths_ + + # Create JARDEST if it doesn't exist + dodir ${JAVA_PKG_JARDEST} + + local jar + # for each jar + for jar in "${@}"; do + local jar_basename=$(basename "${jar}") + + java-pkg_check-versioned-jar ${jar_basename} + + # check if it exists + if [[ -e "${jar}" ]] ; then + # Don't overwrite if jar has already been installed with the same + # name + local dest="${ED}${JAVA_PKG_JARDEST}/${jar_basename}" + if [[ -e "${dest}" ]]; then + ewarn "Overwriting ${dest}" + fi + + # install it into JARDEST if it's a non-symlink + if [[ ! -L "${jar}" ]] ; then + #but first check class version when in strict mode. + is-java-strict && java-pkg_verify-classes "${jar}" + + ( + insinto "${JAVA_PKG_JARDEST}" + doins "${jar}" + ) || die "failed to install ${jar}" + java-pkg_append_ JAVA_PKG_CLASSPATH "${EPREFIX}/${JAVA_PKG_JARDEST}/${jar_basename}" + debug-print "installed ${jar} to ${ED}${JAVA_PKG_JARDEST}" + # make a symlink to the original jar if it's symlink + else + # TODO use dosym, once we find something that could use it + # -nichoj + ln -s "$(readlink "${jar}")" "${ED}${JAVA_PKG_JARDEST}/${jar_basename}" + debug-print "${jar} is a symlink, linking accordingly" + fi + else + die "${jar} does not exist" + fi + done + + # Extra logging if enabled. + if [[ -n ${JAVA_PKG_DEBUG} ]]; then + einfo "Verbose logging for \"${FUNCNAME}\" function" + einfo "Jar file(s) destination: ${JAVA_PKG_JARDEST}" + einfo "Jar file(s) created: ${@}" + einfo "Complete command:" + einfo "${FUNCNAME} ${@}" + fi + + java-pkg_do_write_ +} + +# @FUNCTION: java-pkg_regjar +# @USAGE: </path/to/installed/jar> +# @DESCRIPTION: +# Records an already installed (in ${D}) jar in the package.env +# This would mostly be used if the package has make or a custom script to +# install things. +# +# WARNING: +# if you want to use shell expansion, you have to use ${D}/... as the for in +# this function will not be able to expand the path, here's an example: +# +# @CODE +# java-pkg_regjar ${D}/opt/my-java/lib/*.jar +# @CODE +# + +# TODO should we be making sure the jar is present on ${D} or wherever? +java-pkg_regjar() { + debug-print-function ${FUNCNAME} $* + + java-pkg_check-phase install + + [[ ${#} -lt 1 ]] && die "at least one argument needed" + + java-pkg_init_paths_ + + local jar jar_dir jar_file + for jar in "${@}"; do + # TODO use java-pkg_check-versioned-jar + if [[ -e "${jar}" || -e "${D}${jar}" ]]; then + [[ -d "${jar}" || -d "${D}${jar}" ]] \ + && die "Called ${FUNCNAME} on a directory $*" + + #check that class version correct when in strict mode + is-java-strict && java-pkg_verify-classes "${jar}" + + # nelchael: we should strip ${D} in this case too, here's why: + # imagine such call: + # java-pkg_regjar ${D}/opt/java/*.jar + # such call will fall into this case (-e ${jar}) and will + # record paths with ${D} in package.env + java-pkg_append_ JAVA_PKG_CLASSPATH "${jar#${D}}" + else + if [[ ${jar} = *\** ]]; then + eerror "The argument ${jar} to ${FUNCNAME}" + eerror "has * in it. If you want it to glob in" + eerror '${D} add ${D} to the argument.' + fi + debug-print "${jar} or ${D}${jar} not found" + die "${jar} does not exist" + fi + done + + java-pkg_do_write_ +} + +# @FUNCTION: java-pkg_newjar +# @USAGE: <path/to/oldname.jar> [<newname.jar>] +# @DESCRIPTION: +# Installs a jar with a new name (defaults to $PN.jar) +# +# For example, installs a versioned jar without the version +java-pkg_newjar() { + debug-print-function ${FUNCNAME} $* + + local original_jar="${1}" + local new_jar="${2:-${PN}.jar}" + local new_jar_dest="${T}/${new_jar}" + + [[ -z ${original_jar} ]] && die "Must specify a jar to install" + [[ ! -f ${original_jar} ]] \ + && die "${original_jar} does not exist or is not a file!" + + rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" + cp "${original_jar}" "${new_jar_dest}" \ + || die "Failed to copy ${original_jar} to ${new_jar_dest}" + java-pkg_dojar "${new_jar_dest}" +} + +# @FUNCTION: java-pkg_addcp +# @USAGE: <classpath> +# @DESCRIPTION: +# Add something to the package's classpath. For jars, you should use dojar, +# newjar, or regjar. This is typically used to add directories to the classpath. +# The parameters of this function are appended to JAVA_PKG_CLASSPATH +java-pkg_addcp() { + java-pkg_append_ JAVA_PKG_CLASSPATH "${@}" + java-pkg_do_write_ +} + +# @FUNCTION: java-pkg_doso +# @USAGE: <path/to/file1.so> [...] +# @DESCRIPTION: +# Installs any number of JNI libraries +# They will be installed into /usr/lib by default, but java-pkg_sointo +# can be used change this path +# +# @CODE +# Example: +# java-pkg_doso *.so +# @CODE +java-pkg_doso() { + debug-print-function ${FUNCNAME} $* + + java-pkg_check-phase install + + [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument" + + java-pkg_init_paths_ + + local lib + # for each lib + for lib in "$@" ; do + # if the lib exists... + if [[ -e "${lib}" ]] ; then + # install if it isn't a symlink + if [[ ! -L "${lib}" ]] ; then + ( + insinto "${JAVA_PKG_LIBDEST}" + insopts -m0755 + doins "${lib}" + ) || die "failed to install ${lib}" + java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" + debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" + # otherwise make a symlink to the symlink's origin + else + dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}" + debug-print "${lib} is a symlink, linking accordantly" + fi + # otherwise die + else + die "${lib} does not exist" + fi + done + + java-pkg_do_write_ +} + +# @FUNCTION: java-pkg_regso +# @USAGE: <file1.so> [...] +# @DESCRIPTION: +# Registers an already installed JNI library in package.env. +# +# @CODE +# Parameters: +# $@ - JNI libraries to register +# +# Example: +# java-pkg_regso *.so /path/*.so +# @CODE +java-pkg_regso() { + debug-print-function ${FUNCNAME} $* + + java-pkg_check-phase install + + [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument" + + java-pkg_init_paths_ + + local lib target_dir + for lib in "$@" ; do + # Check the absolute path of the lib + if [[ -e "${lib}" ]] ; then + target_dir="$(java-pkg_expand_dir_ ${lib})" + java-pkg_append_ JAVA_PKG_LIBRARY "/${target_dir#${D}}" + # Check the path of the lib relative to ${D} + elif [[ -e "${D}${lib}" ]]; then + target_dir="$(java-pkg_expand_dir_ ${D}${lib})" + java-pkg_append_ JAVA_PKG_LIBRARY "${target_dir}" + else + die "${lib} does not exist" + fi + done + + java-pkg_do_write_ +} + +# @FUNCTION: java-pkg_jarinto +# @USAGE: </path/to/install/jars/into> +# @DESCRIPTION: +# Changes the path jars are installed into via subsequent java-pkg_dojar calls. +java-pkg_jarinto() { + debug-print-function ${FUNCNAME} $* + + JAVA_PKG_JARDEST="${1}" +} + +# @FUNCTION: java-pkg_sointo +# @USAGE: </path/to/install/sofiles/into> +# @DESCRIPTION: +# Changes the path that JNI libraries are installed into via subsequent +# java-pkg_doso calls. +java-pkg_sointo() { + debug-print-function ${FUNCNAME} $* + + JAVA_PKG_LIBDEST="${1}" +} + +# @FUNCTION: java-pkg_dohtml +# @USAGE: <path/to/javadoc/documentation> [...] +# @DESCRIPTION: +# Install Javadoc HTML documentation. Usage of java-pkg_dojavadoc is preferred. +# +# @CODE +# java-pkg_dohtml dist/docs/ +# @CODE +java-pkg_dohtml() { + debug-print-function ${FUNCNAME} $* + + [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" + + # Do away with dohtml and rely on dodoc instead to do the deed. + docinto html + dodoc "$@" + + # This probably shouldn't be here but it provides + # a reasonable way to catch # docs for all of the + # old ebuilds. + java-pkg_recordjavadoc +} + +# @FUNCTION: java-pkg_dojavadoc +# @USAGE: [--symlink destination] <path/to/javadocs/root> +# @DESCRIPTION: +# Installs javadoc documentation. This should be controlled by the doc use flag. +# +# @CODE +# Parameters: +# $1: optional --symlink creates to symlink like this for html +# documentation bundles. +# $2: - The javadoc root directory. +# +# Examples: +# java-pkg_dojavadoc docs/api +# java-pkg_dojavadoc --symlink apidocs docs/api +# @CODE +java-pkg_dojavadoc() { + debug-print-function ${FUNCNAME} $* + + # For html documentation bundles that link to Javadoc + local symlink + if [[ ${1} = --symlink ]]; then + symlink=${2} + shift 2 + fi + + local dir="$1" + local dest=/usr/share/doc/${PF}/html + + # QA checks + + java-pkg_check-phase install + java-pkg_init_paths_ + + [[ -z "${dir}" ]] && die "Must specify a directory!" + [[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!" + if [[ ! -e "${dir}/index.html" ]]; then + local msg="No index.html in javadoc directory" + ewarn "${msg}" + is-java-strict && die "${msg}" + fi + + if [[ -e ${D}/${dest}/api ]]; then + eerror "${dest} already exists. Will not overwrite." + die "${dest}" + fi + + # Renaming to match our directory layout + + local dir_to_install="${dir}" + if [[ "$(basename "${dir}")" != "api" ]]; then + dir_to_install="${T}/api" + # TODO use doins + cp -r "${dir}" "${dir_to_install}" || die "cp failed" + fi + + # Actual installation + java-pkg_dohtml -r "${dir_to_install}" + + # Let's make a symlink to the directory we have everything else under + dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die + + if [[ ${symlink} ]]; then + debug-print "symlinking ${dest}/{api,${symlink}}" + dosym ${dest}/{api,${symlink}} || die + fi + + # Extra logging if enabled. + if [[ -n ${JAVA_PKG_DEBUG} ]]; then + einfo "Verbose logging for \"${FUNCNAME}\" function" + einfo "Documentation destination: ${dest}" + einfo "Directory to install: ${dir_to_install}" + einfo "Complete command:" + einfo "${FUNCNAME} ${@}" + fi +} + +# @FUNCTION: java-pkg_dosrc +# @USAGE: <path/to/sources> [...] +# @DESCRIPTION: +# Installs a zip containing the source for a package, so it can used in +# from IDEs like eclipse and netbeans. +# Ebuild needs to DEPEND on app-arch/zip to use this. It also should be controlled by USE=source. +# +# @CODE +# Example: +# java-pkg_dosrc src/* +# @CODE + +# TODO change so it the arguments it takes are the base directories containing +# source -nichoj +# +# TODO should we be able to handle multiple calls to dosrc? -nichoj +# +# TODO maybe we can take an existing zip/jar? -nichoj +# +# FIXME apparently this fails if you give it an empty directories +java-pkg_dosrc() { + debug-print-function ${FUNCNAME} $* + + [ ${#} -lt 1 ] && die "At least one argument needed" + + java-pkg_check-phase install + + [[ ${#} -lt 1 ]] && die "At least one argument needed" + + if ! [[ ${DEPEND} = *app-arch/zip* ]]; then + local msg="${FUNCNAME} called without app-arch/zip in DEPEND" + java-pkg_announce-qa-violation ${msg} + fi + + java-pkg_init_paths_ + + local zip_name="${PN}-src.zip" + local zip_path="${T}/${zip_name}" + local dir + for dir in "${@}"; do + local dir_parent=$(dirname "${dir}") + local dir_name=$(basename "${dir}") + pushd ${dir_parent} > /dev/null || die "problem entering ${dir_parent}" + zip -q -r ${zip_path} ${dir_name} -i '*.java' + local result=$? + # 12 means zip has nothing to do + if [[ ${result} != 12 && ${result} != 0 ]]; then + die "failed to zip ${dir_name}" + fi + popd >/dev/null || die + done + + # Install the zip + ( + insinto "${JAVA_PKG_SOURCESPATH}" + doins ${zip_path} + ) || die "Failed to install source" + + JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}" + + # Extra logging if enabled. + if [[ -n ${JAVA_PKG_DEBUG} ]]; then + einfo "Verbose logging for \"${FUNCNAME}\" function" + einfo "Zip filename created: ${zip_name}" + einfo "Zip file destination: ${JAVA_PKG_SOURCESPATH}" + einfo "Directories zipped: ${@}" + einfo "Complete command:" + einfo "${FUNCNAME} ${@}" + fi + + java-pkg_do_write_ +} + +# @FUNCTION: java-pkg_dolauncher +# @USAGE: <filename> [options] +# @DESCRIPTION: +# Make a wrapper script to lauch/start this package +# If necessary, the wrapper will switch to the appropriate VM. +# +# Can be called without parameters if the package installs only one jar +# that has the Main-class attribute set. The wrapper will be named ${PN}. +# +# @CODE +# Parameters: +# $1 - filename of launcher to create +# $2 - options, as follows: +# --main the.main.class.to.start +# --jar /the/jar/too/launch.jar or just <name>.jar +# --java_args 'Extra arguments to pass to java' +# --pkg_args 'Extra arguments to pass to the package' +# --pwd Directory the launcher changes to before executing java +# -into Directory to install the launcher to, instead of /usr/bin +# -pre Prepend contents of this file to the launcher +# @CODE +java-pkg_dolauncher() { + debug-print-function ${FUNCNAME} $* + + java-pkg_check-phase install + java-pkg_init_paths_ + + if [[ ${#} = 0 ]]; then + local name="${PN}" + else + local name="${1}" + shift + fi + + # TODO rename to launcher + local target="${T}/${name}" + local var_tmp="${T}/launcher_variables_tmp" + local target_dir pre + + # Process the other the rest of the arguments + while [[ -n "${1}" && -n "${2}" ]]; do + local var="${1}" value="${2}" + if [[ "${var:0:2}" == "--" ]]; then + local var=${var:2} + echo "gjl_${var}=\"${value}\"" >> "${var_tmp}" + local gjl_${var}="${value}" + elif [[ "${var}" == "-into" ]]; then + target_dir="${value}" + elif [[ "${var}" == "-pre" ]]; then + pre="${value}" + fi + shift 2 + done + + # Test if no --jar and --main arguments were given and + # in that case check if the package only installs one jar + # and use that jar. + if [[ -z "${gjl_jar}" && -z "${gjl_main}" ]]; then + local cp="${JAVA_PKG_CLASSPATH}" + if [[ "${cp/:}" = "${cp}" && "${cp%.jar}" != "${cp}" ]]; then + echo "gjl_jar=\"${JAVA_PKG_CLASSPATH}\"" >> "${var_tmp}" + else + local msg="Not enough information to create a launcher given." + msg="${msg} Please give --jar or --main argument to ${FUNCNAME}." + die "${msg}" + fi + fi + + # Write the actual script + echo "#!/bin/bash" > "${target}" + if [[ -n "${pre}" ]]; then + if [[ -f "${pre}" ]]; then + cat "${pre}" >> "${target}" + else + die "-pre specified file '${pre}' does not exist" + fi + fi + echo "gjl_package=${JAVA_PKG_NAME}" >> "${target}" + cat "${var_tmp}" >> "${target}" + rm -f "${var_tmp}" + echo "source ${EPREFIX}/usr/share/java-config-2/launcher/launcher.bash" >> "${target}" + + if [[ -n "${target_dir}" ]]; then + ( + into "${target_dir}" + dobin "${target}" + ) + local ret=$? + return ${ret} + else + dobin "${target}" + fi +} + +# @FUNCTION: java-pkg_dowar +# @DESCRIPTION: +# Install war files. +# TODO document +java-pkg_dowar() { + debug-print-function ${FUNCNAME} $* + + # Check for arguments + [[ ${#} -lt 1 ]] && die "At least one argument needed" + java-pkg_check-phase install + + java-pkg_init_paths_ + + local war + for war in $* ; do + local warpath + # TODO evaluate if we want to handle symlinks differently -nichoj + # Check for symlink + if [[ -L "${war}" ]] ; then + cp "${war}" "${T}" + warpath="${T}$(basename "${war}")" + # Check for directory + # TODO evaluate if we want to handle directories differently -nichoj + elif [[ -d "${war}" ]] ; then + echo "dowar: warning, skipping directory ${war}" + continue + else + warpath="${war}" + fi + + # Install those files like you mean it + ( + insopts -m0644 + insinto "${JAVA_PKG_WARDEST}" + doins ${warpath} + ) + done +} + +# @FUNCTION: java-pkg_recordjavadoc +# @INTERNAL +# @DESCRIPTION: +# Scan for JavaDocs, and record their existence in the package.env file + +# TODO make sure this in the proper section +java-pkg_recordjavadoc() +{ + debug-print-function ${FUNCNAME} $* + # the find statement is important + # as some packages include multiple trees of javadoc + JAVADOC_PATH="$(find ${D}/usr/share/doc/ -name allclasses-frame.html -printf '%h:')" + # remove $D - TODO: check this is ok with all cases of the above + JAVADOC_PATH="${JAVADOC_PATH//${D}}" + if [[ -n "${JAVADOC_PATH}" ]] ; then + debug-print "javadocs found in ${JAVADOC_PATH%:}" + java-pkg_do_write_ + else + debug-print "No javadocs found" + fi +} + + +# @FUNCTION: java-pkg_jar-from +# @USAGE: [--build-only] [--with-dependencies] [--virtual] [--into dir] <package> [<package.jar>] [<destination.jar>] +# @DESCRIPTION: +# Makes a symlink to a jar from a certain package +# A lot of java packages include dependencies in a lib/ directory +# You can use this function to replace these bundled dependencies. +# The dependency is recorded into package.env DEPEND line, unless "--build-only" +# is passed as the very first argument, for jars that have to be present only +# at build time and are not needed on runtime (junit testing etc). +# +# @CODE +# Example: get all jars from xerces slot 2 +# java-pkg_jar-from xerces-2 +# +# Example: get a specific jar from xerces slot 2 +# java-pkg_jar-from xerces-2 xml-apis.jar +# +# Example: get a specific jar from xerces slot 2, and name it diffrently +# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar +# +# Example: get junit.jar which is needed only for building +# java-pkg_jar-from --build-only junit junit.jar +# @CODE +# +# @CODE +# Parameters +# --build-only - makes the jar(s) not added into package.env DEPEND line. +# (assumed automatically when called inside src_test) +# --with-dependencies - get jars also from requested package's dependencies +# transitively. +# --virtual - Packages passed to this function are to be handled as virtuals +# and will not have individual jar dependencies recorded. +# --into $dir - symlink jar(s) into $dir (must exist) instead of . +# $1 - Package to get jars from, or comma-separated list of packages in +# case other parameters are not used. +# $2 - jar from package. If not specified, all jars will be used. +# $3 - When a single jar is specified, destination filename of the +# symlink. Defaults to the name of the jar. +# @CODE + +# TODO could probably be cleaned up a little +java-pkg_jar-from() { + debug-print-function ${FUNCNAME} $* + + local build_only="" + local destdir="." + local deep="" + local virtual="" + local record_jar="" + + [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" + + while [[ "${1}" == --* ]]; do + if [[ "${1}" = "--build-only" ]]; then + build_only="build" + elif [[ "${1}" = "--with-dependencies" ]]; then + deep="--with-dependencies" + elif [[ "${1}" = "--virtual" ]]; then + virtual="true" + elif [[ "${1}" = "--into" ]]; then + destdir="${2}" + shift + else + die "java-pkg_jar-from called with unknown parameter: ${1}" + fi + shift + done + + local target_pkg="${1}" target_jar="${2}" destjar="${3}" + + [[ -z ${target_pkg} ]] && die "Must specify a package" + + if [[ "${EAPI}" == "1" ]]; then + target_pkg="${target_pkg//:/-}" + fi + + # default destjar to the target jar + [[ -z "${destjar}" ]] && destjar="${target_jar}" + + local error_msg="There was a problem getting the classpath for ${target_pkg}." + local classpath + classpath="$(java-config ${deep} --classpath=${target_pkg})" + [[ $? != 0 ]] && die ${error_msg} + + # When we have commas this functions is called to bring jars from multiple + # packages. This affects recording of dependencencies performed later + # which expects one package only, so we do it here. + if [[ ${target_pkg} = *,* ]]; then + for pkg in ${target_pkg//,/ }; do + java-pkg_ensure-dep "${build_only}" "${pkg}" + [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" + done + # setting this disables further record-jar_ calls later + record_jar="true" + else + java-pkg_ensure-dep "${build_only}" "${target_pkg}" + fi + + # Record the entire virtual as a dependency so that + # no jars are missed. + if [[ -z "${build_only}" && -n "${virtual}" ]]; then + java-pkg_record-jar_ "${target_pkg}" + # setting this disables further record-jars_ calls later + record_jar="true" + fi + + pushd ${destdir} > /dev/null \ + || die "failed to change directory to ${destdir}" + + local jar + for jar in ${classpath//:/ }; do + local jar_name=$(basename "${jar}") + if [[ ! -f "${jar}" ]] ; then + debug-print "${jar} from ${target_pkg} does not exist" + die "Installation problems with jars in ${target_pkg} - is it installed?" + fi + # If no specific target jar was indicated, link it + if [[ -z "${target_jar}" ]] ; then + [[ -f "${target_jar}" ]] && rm "${target_jar}" + ln -snf "${jar}" \ + || die "Failed to make symlink from ${jar} to ${jar_name}" + if [[ -z "${record_jar}" ]]; then + if [[ -z "${build_only}" ]]; then + java-pkg_record-jar_ "${target_pkg}" "${jar}" + else + java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}" + fi + fi + # otherwise, if the current jar is the target jar, link it + elif [[ "${jar_name}" == "${target_jar}" ]] ; then + [[ -f "${destjar}" ]] && rm "${destjar}" + ln -snf "${jar}" "${destjar}" \ + || die "Failed to make symlink from ${jar} to ${destjar}" + if [[ -z "${record_jar}" ]]; then + if [[ -z "${build_only}" ]]; then + java-pkg_record-jar_ "${target_pkg}" "${jar}" + else + java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}" + fi + fi + popd > /dev/null || die + return 0 + fi + done + popd > /dev/null || die + # if no target was specified, we're ok + if [[ -z "${target_jar}" ]] ; then + return 0 + # otherwise, die bitterly + else + die "Failed to find ${target_jar:-jar} in ${target_pkg}" + fi +} + +# @FUNCTION: java-pkg_jarfrom +# @DESCRIPTION: +# See java-pkg_jar-from +java-pkg_jarfrom() { + java-pkg_jar-from "$@" +} + +# @FUNCTION: java-pkg_getjars +# @USAGE: [--build-only] [--with-dependencies] <package1>[,<package2>...] +# @DESCRIPTION: +# Get the classpath provided by any number of packages +# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'. +# The providing packages are recorded as dependencies into package.env DEPEND +# line, unless "--build-only" is passed as the very first argument, for jars +# that have to be present only at build time and are not needed on runtime +# (junit testing etc). +# +# @CODE +# Example: Get the classpath for xerces-2 and xalan, +# java-pkg_getjars xerces-2,xalan +# +# Example Return: +# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar +# +# +# Parameters: +# --build-only - makes the jar(s) not added into package.env DEPEND line. +# (assumed automatically when called inside src_test) +# --with-dependencies - get jars also from requested package's dependencies +# transitively. +# $1 - list of packages to get jars from +# (passed to java-config --classpath) +# @CODE +java-pkg_getjars() { + debug-print-function ${FUNCNAME} $* + + local build_only="" + local deep="" + + [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" + + while [[ "${1}" == --* ]]; do + if [[ "${1}" = "--build-only" ]]; then + build_only="build" + elif [[ "${1}" = "--with-dependencies" ]]; then + deep="--with-dependencies" + else + die "java-pkg_jar-from called with unknown parameter: ${1}" + fi + shift + done + + [[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*" + + + local pkgs="${1}" + + if [[ "${EAPI}" == "1" ]]; then + pkgs="${pkgs//:/-}" + fi + + jars="$(java-config ${deep} --classpath=${pkgs})" + [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed" + debug-print "${pkgs}:${jars}" + + for pkg in ${pkgs//,/ }; do + java-pkg_ensure-dep "${build_only}" "${pkg}" + done + + for pkg in ${pkgs//,/ }; do + if [[ -z "${build_only}" ]]; then + java-pkg_record-jar_ "${pkg}" + else + java-pkg_record-jar_ --build-only "${pkg}" + fi + done + + echo "${jars}" +} + +# @FUNCTION: java-pkg_getjar +# @USAGE: [--build-only] [--virtual] <package> <jarfile> +# @DESCRIPTION: +# Get the complete path of a single jar from a package +# The providing package is recorded as runtime dependency into package.env +# DEPEND line, unless "--build-only" is passed as the very first argument, for +# jars that have to be present only at build time and are not needed on runtime +# (junit testing etc). +# +# @CODE +# Example: +# java-pkg_getjar xerces-2 xml-apis.jar +# returns +# /usr/share/xerces-2/lib/xml-apis.jar +# +# Parameters: +# --build-only - makes the jar not added into package.env DEPEND line. +# --virtual - Packages passed to this function are to be handled as virtuals +# and will not have individual jar dependencies recorded. +# $1 - package to use +# $2 - jar to get +# @CODE +java-pkg_getjar() { + debug-print-function ${FUNCNAME} $* + + local build_only="" + local virtual="" + local record_jar="" + + [[ "${EBUILD_PHASE}" == "test" ]] && build_only="build" + + while [[ "${1}" == --* ]]; do + if [[ "${1}" = "--build-only" ]]; then + build_only="build" + elif [[ "${1}" == "--virtual" ]]; then + virtual="true" + else + die "java-pkg_getjar called with unknown parameter: ${1}" + fi + shift + done + + [[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*" + + local pkg="${1}" target_jar="${2}" jar + + if [[ "${EAPI}" == "1" ]]; then + pkg="${pkg//:/-}" + fi + + [[ -z ${pkg} ]] && die "Must specify package to get a jar from" + [[ -z ${target_jar} ]] && die "Must specify jar to get" + + local error_msg="Could not find classpath for ${pkg}. Are you sure its installed?" + local classpath + classpath=$(java-config --classpath=${pkg}) + [[ $? != 0 ]] && die ${error_msg} + + java-pkg_ensure-dep "${build_only}" "${pkg}" + + # Record the package(Virtual) as a dependency and then set build_only + # So that individual jars are not recorded. + if [[ -n "${virtual}" ]]; then + if [[ -z "${build_only}" ]]; then + java-pkg_record-jar_ "${pkg}" + else + java-pkg_record-jar_ --build-only "${pkg}" + fi + record_jar="true" + fi + + for jar in ${classpath//:/ }; do + if [[ ! -f "${jar}" ]] ; then + die "Installation problem with jar ${jar} in ${pkg} - is it installed?" + fi + + if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then + # Only record jars that aren't build-only + if [[ -z "${record_jar}" ]]; then + if [[ -z "${build_only}" ]]; then + java-pkg_record-jar_ "${pkg}" "${jar}" + else + java-pkg_record-jar_ --build-only "${pkg}" "${jar}" + fi + fi + echo "${jar}" + return 0 + fi + done + + die "Could not find ${target_jar} in ${pkg}" + return 1 +} + +# @FUNCTION: java-pkg_register-dependency +# @USAGE: <package>[,<package2>...] [<jarfile>] +# @DESCRIPTION: +# Registers runtime dependency on a package, list of packages, or a single jar +# from a package, into package.env DEPEND line. Can only be called in +# src_install phase. +# Intended for binary packages where you don't need to symlink the jars or get +# their classpath during build. As such, the dependencies only need to be +# specified in ebuild's RDEPEND, and should be omitted in DEPEND. +# +# @CODE +# Parameters: +# $1 - comma-separated list of packages, or a single package +# $2 - if param $1 is a single package, optionally specify the jar +# to depend on +# +# Examples: +# Record the dependency on whole xerces-2 and xalan, +# java-pkg_register-dependency xerces-2,xalan +# +# Record the dependency on ant.jar from ant-core +# java-pkg_register-dependency ant-core ant.jar +# @CODE +# +# Note: Passing both list of packages as the first parameter AND specifying the +# jar as the second is not allowed and will cause the function to die. We assume +# that there's more chance one passes such combination as a mistake, than that +# there are more packages providing identically named jar without class +# collisions. +java-pkg_register-dependency() { + debug-print-function ${FUNCNAME} $* + + java-pkg_check-phase install + + [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments" + + local pkgs="${1}" + local jar="${2}" + + [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified" + + if [[ "${EAPI}" == "1" ]]; then + pkgs="${pkgs//:/-}" + fi + + if [[ -z "${jar}" ]]; then + for pkg in ${pkgs//,/ }; do + java-pkg_ensure-dep runtime "${pkg}" + java-pkg_record-jar_ "${pkg}" + done + else + [[ ${pkgs} == *,* ]] && \ + die "${FUNCNAME} called with both package list and jar name" + java-pkg_ensure-dep runtime "${pkgs}" + java-pkg_record-jar_ "${pkgs}" "${jar}" + fi + + java-pkg_do_write_ +} + +# @FUNCTION: java-pkg_register-optional-dependency +# @USAGE: <package>[,<package2>...] [<jarfile>] +# @DESCRIPTION: +# Registers optional runtime dependency on a package, list of packages, or a +# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be +# called in src_install phase. +# Intended for packages that can use other packages when those are in classpath. +# Will be put on classpath by launcher if they are installed. Typical case is +# JDBC implementations for various databases. It's better than having USE flag +# for each implementation triggering hard dependency. +# +# @CODE +# Parameters: +# $1 - comma-separated list of packages, or a single package +# $2 - if param $1 is a single package, optionally specify the jar to depend on +# +# Example: +# Record the optional dependency on some jdbc providers +# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql +# @CODE +# +# Note: Passing both list of packages as the first parameter AND specifying the +# jar as the second is not allowed and will cause the function to die. We assume +# that there's more chance one passes such combination as a mistake, than that +# there are more packages providing identically named jar without class +# collisions. +java-pkg_register-optional-dependency() { + debug-print-function ${FUNCNAME} $* + + java-pkg_check-phase install + + [[ ${#} -gt 2 ]] && die "${FUNCNAME} takes at most two arguments" + + local pkgs="${1}" + local jar="${2}" + + [[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified" + + if [[ "${EAPI}" == "1" ]]; then + pkgs="${pkgs//:/-}" + fi + + if [[ -z "${jar}" ]]; then + for pkg in ${pkgs//,/ }; do + java-pkg_record-jar_ --optional "${pkg}" + done + else + [[ ${pkgs} == *,* ]] && \ + die "${FUNCNAME} called with both package list and jar name" + java-pkg_record-jar_ --optional "${pkgs}" "${jar}" + fi + + java-pkg_do_write_ +} + +# @FUNCTION: java-pkg_register-environment-variable +# @USAGE: <name> <value> +# @DESCRIPTION: +# Register an arbitrary environment variable into package.env. The gjl launcher +# for this package or any package depending on this will export it into +# environement before executing java command. +# Must only be called in src_install phase. +JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env" +JAVA_PKG_EXTRA_ENV_VARS="" +java-pkg_register-environment-variable() { + debug-print-function ${FUNCNAME} $* + + java-pkg_check-phase install + + [[ ${#} != 2 ]] && die "${FUNCNAME} takes two arguments" + + echo "${1}=\"${2}\"" >> ${JAVA_PKG_EXTRA_ENV} + JAVA_PKG_EXTRA_ENV_VARS="${JAVA_PKG_EXTRA_ENV_VARS} ${1}" + + java-pkg_do_write_ +} + +# @FUNCTION: java-pkg_get-bootclasspath +# @USAGE: <version> +# @DESCRIPTION: +# Returns classpath of a given bootclasspath-providing package version. +# +# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath +# of the current JDK +java-pkg_get-bootclasspath() { + local version="${1}" + + local bcp + case "${version}" in + auto) + bcp="$(java-config -g BOOTCLASSPATH)" + ;; + 1.5) + bcp="$(java-pkg_getjars --build-only gnu-classpath-0.98)" + ;; + *) + eerror "unknown parameter of java-pkg_get-bootclasspath" + die "unknown parameter of java-pkg_get-bootclasspath" + ;; + esac + + echo "${bcp}" +} + + +# This function reads stdin, and based on that input, figures out how to +# populate jars from the filesystem. +# Need to figure out a good way of making use of this, ie be able to use a +# string that was built instead of stdin +# NOTE: this isn't quite ready for primetime. +#java-pkg_populate-jars() { +# local line +# +# read line +# while [[ -n "${line}" ]]; do +# # Ignore comments +# [[ ${line%%#*} == "" ]] && continue +# +# # get rid of any spaces +# line="${line// /}" +# +# # format: path=jarinfo +# local path=${line%%=*} +# local jarinfo=${line##*=} +# +# # format: jar@package +# local jar=${jarinfo%%@*}.jar +# local package=${jarinfo##*@} +# if [[ -n ${replace_only} ]]; then +# [[ ! -f $path ]] && die "No jar exists at ${path}" +# fi +# if [[ -n ${create_parent} ]]; then +# local parent=$(dirname ${path}) +# mkdir -p "${parent}" +# fi +# java-pkg_jar-from "${package}" "${jar}" "${path}" +# +# read line +# done +#} + +# @FUNCTION: java-pkg_find-normal-jars +# @USAGE: [<path/to/directory>] +# @DESCRIPTION: +# Find the files with suffix .jar file in the given directory (default: $WORKDIR) +java-pkg_find-normal-jars() { + local dir=$1 + [[ "${dir}" ]] || dir="${WORKDIR}" + local found + for jar in $(find "${dir}" -name "*.jar" -type f); do + echo "${jar}" + found="true" + done + [[ "${found}" ]] + return $? +} + +# @FUNCTION: java-pkg_ensure-no-bundled-jars +# @DESCRIPTION: +# Try to locate bundled jar files in ${WORKDIR} and die if found. +# This function should be called after WORKDIR has been populated with symlink +# to system jar files or bundled jars removed. +java-pkg_ensure-no-bundled-jars() { + debug-print-function ${FUNCNAME} $* + + local bundled_jars=$(java-pkg_find-normal-jars) + if [[ -n ${bundled_jars} ]]; then + echo "Bundled jars found:" + local jar + for jar in ${bundled_jars}; do + echo $(pwd)${jar/./} + done + die "Bundled jars found!" + fi +} + +# @FUNCTION: java-pkg_ensure-vm-version-sufficient +# @INTERNAL +# @DESCRIPTION: +# Checks if we have a sufficient VM and dies if we don't. +java-pkg_ensure-vm-version-sufficient() { + debug-print-function ${FUNCNAME} $* + + if ! java-pkg_is-vm-version-sufficient; then + debug-print "VM is not suffient" + eerror "Current Java VM cannot build this package" + einfo "Please use java-config -S to set the correct one" + die "Active Java VM cannot build this package" + fi +} + +# @FUNCTION: java-pkg_is-vm-version-sufficient +# @INTERNAL +# @DESCRIPTION: +# @RETURN: zero - VM is sufficient; non-zero - VM is not sufficient +java-pkg_is-vm-version-sufficient() { + debug-print-function ${FUNCNAME} $* + + depend-java-query --is-sufficient "${DEPEND}" > /dev/null + return $? +} + +# @FUNCTION: java-pkg_ensure-vm-version-eq +# @INTERNAL +# @DESCRIPTION: +# Die if the current VM is not equal to the argument passed. +# +# @param $@ - Desired VM version to ensure +java-pkg_ensure-vm-version-eq() { + debug-print-function ${FUNCNAME} $* + + if ! java-pkg_is-vm-version-eq $@ ; then + debug-print "VM is not suffient" + eerror "This package requires a Java VM version = $@" + einfo "Please use java-config -S to set the correct one" + die "Active Java VM too old" + fi +} + +# @FUNCTION: java-pkg_is-vm-version-eq +# @USAGE: <version> +# @INTERNAL +# @RETURN: zero - VM versions are equal; non-zero - VM version are not equal +java-pkg_is-vm-version-eq() { + debug-print-function ${FUNCNAME} $* + + local needed_version="$@" + + [[ -z "${needed_version}" ]] && die "need an argument" + + local vm_version="$(java-pkg_get-vm-version)" + + vm_version="$(get_version_component_range 1-2 "${vm_version}")" + needed_version="$(get_version_component_range 1-2 "${needed_version}")" + + if [[ -z "${vm_version}" ]]; then + debug-print "Could not get JDK version from DEPEND" + return 1 + else + if [[ "${vm_version}" == "${needed_version}" ]]; then + debug-print "Detected a JDK(${vm_version}) = ${needed_version}" + return 0 + else + debug-print "Detected a JDK(${vm_version}) != ${needed_version}" + return 1 + fi + fi +} + +# @FUNCTION: java-pkg_ensure-vm-version-ge +# @INTERNAL +# @DESCRIPTION: +# Die if the current VM is not greater than the desired version +# +# @param $@ - VM version to compare current to +java-pkg_ensure-vm-version-ge() { + debug-print-function ${FUNCNAME} $* + + if ! java-pkg_is-vm-version-ge "$@" ; then + debug-print "vm is not suffient" + eerror "This package requires a Java VM version >= $@" + einfo "Please use java-config -S to set the correct one" + die "Active Java VM too old" + fi +} + +# @FUNCTION: java-pkg_is-vm-version-ge +# @INTERNAL +# @DESCRIPTION: +# @CODE +# Parameters: +# $@ - VM version to compare current VM to +# @CODE +# @RETURN: zero - current VM version is greater than checked version; +# non-zero - current VM version is not greater than checked version +java-pkg_is-vm-version-ge() { + debug-print-function ${FUNCNAME} $* + + local needed_version=$@ + local vm_version=$(java-pkg_get-vm-version) + if [[ -z "${vm_version}" ]]; then + debug-print "Could not get JDK version from DEPEND" + return 1 + else + if version_is_at_least "${needed_version}" "${vm_version}"; then + debug-print "Detected a JDK(${vm_version}) >= ${needed_version}" + return 0 + else + debug-print "Detected a JDK(${vm_version}) < ${needed_version}" + return 1 + fi + fi +} + +java-pkg_set-current-vm() { + export GENTOO_VM=${1} +} + +java-pkg_get-current-vm() { + echo ${GENTOO_VM} +} + +java-pkg_current-vm-matches() { + has $(java-pkg_get-current-vm) ${@} + return $? +} + +# @FUNCTION: java-pkg_get-source +# @DESCRIPTION: +# Determines what source version should be used, for passing to -source. +# Unless you want to break things you probably shouldn't set _WANT_SOURCE +# +# @RETURN: string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE +java-pkg_get-source() { + echo ${JAVA_PKG_WANT_SOURCE:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")} +} + +# @FUNCTION: java-pkg_get-target +# @DESCRIPTION: +# Determines what target version should be used, for passing to -target. +# If you don't care about lower versions, you can set _WANT_TARGET to the +# version of your JDK. +# +# @RETURN: string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET +java-pkg_get-target() { + echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")} +} + +# @FUNCTION: java-pkg_get-javac +# @DESCRIPTION: +# Returns the compiler executable +java-pkg_get-javac() { + debug-print-function ${FUNCNAME} $* + + java-pkg_init-compiler_ + local compiler="${GENTOO_COMPILER}" + + local compiler_executable + if [[ "${compiler}" = "javac" ]]; then + # nothing fancy needs to be done for javac + compiler_executable="javac" + else + # for everything else, try to determine from an env file + + local compiler_env="/usr/share/java-config-2/compiler/${compiler}" + if [[ -f ${compiler_env} ]]; then + local old_javac=${JAVAC} + unset JAVAC + # try to get value of JAVAC + compiler_executable="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${JAVAC})" + export JAVAC=${old_javac} + + if [[ -z ${compiler_executable} ]]; then + die "JAVAC is empty or undefined in ${compiler_env}" + fi + + # check that it's executable + if [[ ! -x ${compiler_executable} ]]; then + die "${compiler_executable} doesn't exist, or isn't executable" + fi + else + die "Could not find environment file for ${compiler}" + fi + fi + echo ${compiler_executable} +} + +# @FUNCTION: java-pkg_javac-args +# @DESCRIPTION: +# If an ebuild uses javac directly, instead of using ejavac, it should call this +# to know what -source/-target to use. +# +# @RETURN: string - arguments to pass to javac, complete with -target and -source +java-pkg_javac-args() { + debug-print-function ${FUNCNAME} $* + + local want_source="$(java-pkg_get-source)" + local want_target="$(java-pkg_get-target)" + + local source_str="-source ${want_source}" + local target_str="-target ${want_target}" + + debug-print "want source: ${want_source}" + debug-print "want target: ${want_target}" + + if [[ -z "${want_source}" || -z "${want_target}" ]]; then + die "Could not find valid -source/-target values for javac" + else + echo "${source_str} ${target_str}" + fi +} + +# @FUNCTION: java-pkg_get-jni-cflags +# @DESCRIPTION: +# Echos the CFLAGS for JNI compilations +java-pkg_get-jni-cflags() { + local flags="-I${JAVA_HOME}/include" + + local platform="linux" + use elibc_FreeBSD && platform="freebsd" + + # TODO do a check that the directories are valid + flags="${flags} -I${JAVA_HOME}/include/${platform}" + + echo ${flags} +} + +java-pkg_ensure-gcj() { + # was enforcing sys-devel/gcc[gcj] + die "${FUNCNAME} was removed. Use use-deps available as of EAPI 2 instead. #261562" +} + +java-pkg_ensure-test() { + # was enforcing USE=test if FEATURES=test + die "${FUNCNAME} was removed. Package mangers handle this already. #278965" +} + +# @FUNCTION: java-pkg_register-ant-task +# @USAGE: [--version x.y] [<name>] +# @DESCRIPTION: +# Register this package as ant task, so that ant will load it when no specific +# ANT_TASKS are specified. Note that even without this registering, all packages +# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks +# packages, but can be also used by other ebuilds that used to symlink their +# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards +# compatibility. +# +# @CODE +# Parameters +# --version x.y Register only for ant version x.y (otherwise for any ant +# version). Used by the ant-* packages to prevent loading of mismatched +# ant-core ant tasks after core was updated, before the tasks are updated, +# without a need for blockers. +# $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT]) +# @CODE +java-pkg_register-ant-task() { + local TASKS_DIR="tasks" + + # check for --version x.y parameters + while [[ -n "${1}" && -n "${2}" ]]; do + local var="${1#--}" + local val="${2}" + if [[ "${var}" == "version" ]]; then + TASKS_DIR="tasks-${val}" + else + die "Unknown parameter passed to java-pkg_register-ant-tasks: ${1} ${2}" + fi + shift 2 + done + + local TASK_NAME="${1:-${JAVA_PKG_NAME}}" + + dodir /usr/share/ant/${TASKS_DIR} + touch "${ED}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}" +} + +# @FUNCTION: java-pkg_ant-tasks-depend +# @INTERNAL +# @DESCRIPTION: +# Translates the WANT_ANT_TASKS variable into valid dependencies. +java-pkg_ant-tasks-depend() { + debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS} + + if [[ -n "${WANT_ANT_TASKS}" ]]; then + local DEP="" + for i in ${WANT_ANT_TASKS} + do + if [[ ${i} = ant-* ]]; then + DEP="${DEP}dev-java/${i} " + elif [[ ${i} = */*:* ]]; then + DEP="${DEP}${i} " + else + echo "Invalid atom in WANT_ANT_TASKS: ${i}" + return 1 + fi + done + echo ${DEP} + return 0 + else + return 0 + fi +} + + +# @FUNCTION: ejunit_ +# @INTERNAL +# @DESCRIPTION: +# Internal Junit wrapper function. Makes it easier to run the tests and checks for +# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner. +# @CODE +# Parameters: +# $1 - junit package (junit or junit-4) +# $2 - -cp or -classpath +# $3 - classpath; junit and recorded dependencies get appended +# $@ - the rest of the parameters are passed to java +# @CODE +ejunit_() { + debug-print-function ${FUNCNAME} $* + + local pkgs + if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then + for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do + pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//") + done + fi + + local junit=${1} + shift 1 + + local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs}) + if [[ ${1} = -cp || ${1} = -classpath ]]; then + cp="${2}:${cp}" + shift 2 + else + cp=".:${cp}" + fi + + local runner=junit.textui.TestRunner + if [[ "${junit}" == "junit-4" ]] ; then + runner=org.junit.runner.JUnitCore + fi + debug-print "Calling: java -cp \"${cp}\" -Djava.io.tmpdir=\"${T}\" -Djava.awt.headless=true ${runner} ${@}" + java -cp "${cp}" -Djava.io.tmpdir="${T}/" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed" +} + +# @FUNCTION: ejunit +# @DESCRIPTION: +# Junit wrapper function. Makes it easier to run the tests and checks for +# dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore. +# +# @CODE +# Parameters: +# $1 - -cp or -classpath +# $2 - classpath; junit and recorded dependencies get appended +# $@ - the rest of the parameters are passed to java +# +# Examples: +# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests +# ejunit org.blinkenlights.jid3.test.AllTests +# ejunit org.blinkenlights.jid3.test.FirstTest org.blinkenlights.jid3.test.SecondTest +# @CODE +ejunit() { + debug-print-function ${FUNCNAME} $* + + ejunit_ "junit" "${@}" +} + +# @FUNCTION: ejunit4 +# @DESCRIPTION: +# Junit4 wrapper function. Makes it easier to run the tests and checks for +# dev-java/junit:4 in DEPEND. Launches the tests using junit.textui.TestRunner. +# +# @CODE +# Parameters: +# $1 - -cp or -classpath +# $2 - classpath; junit and recorded dependencies get appended +# $@ - the rest of the parameters are passed to java +# +# Examples: +# ejunit4 -cp build/classes org.blinkenlights.jid3.test.AllTests +# ejunit4 org.blinkenlights.jid3.test.AllTests +# ejunit4 org.blinkenlights.jid3.test.FirstTest \ +# org.blinkenlights.jid3.test.SecondTest +# @CODE +ejunit4() { + debug-print-function ${FUNCNAME} $* + + ejunit_ "junit-4" "${@}" +} + +# @FUNCTION: java-utils-2_src_prepare +# @DESCRIPTION: +# src_prepare Searches for bundled jars +# Don't call directly, but via java-pkg-2_src_prepare! +java-utils-2_src_prepare() { + case ${EAPI:-0} in + [0-5]) + java-pkg_func-exists java_prepare && java_prepare ;; + *) + java-pkg_func-exists java_prepare && + eqawarn "java_prepare is no longer called, define src_prepare instead." + eapply_user ;; + esac + + # Check for files in JAVA_RM_FILES array. + if [[ ${JAVA_RM_FILES[@]} ]]; then + debug-print "$FUNCNAME: removing unneeded files" + java-pkg_rm_files "${JAVA_RM_FILES[@]}" + fi + + if is-java-strict; then + echo "Searching for bundled jars:" + java-pkg_find-normal-jars || echo "None found." + echo "Searching for bundled classes (no output if none found):" + find "${WORKDIR}" -name "*.class" + echo "Search done." + fi +} + +# @FUNCTION: java-utils-2_pkg_preinst +# @DESCRIPTION: +# pkg_preinst Searches for missing and unneeded dependencies +# Don't call directly, but via java-pkg-2_pkg_preinst! +java-utils-2_pkg_preinst() { + if is-java-strict; then + if [[ ! -e "${JAVA_PKG_ENV}" ]] || has ant-tasks ${INHERITED}; then + return + fi + + if has_version dev-java/java-dep-check; then + local output=$(GENTOO_VM= java-dep-check --image "${D}" "${JAVA_PKG_ENV}") + [[ ${output} ]] && ewarn "${output}" + else + eerror "Install dev-java/java-dep-check for dependency checking" + fi + fi +} + +# @FUNCTION: eant +# @USAGE: <ant_build_target(s)> +# @DESCRIPTION: +# Ant wrapper function. Will use the appropriate compiler, based on user-defined +# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS, +# variables: +# +# @CODE +# Variables: +# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the +# gentoo.classpath property. Be sure to call java-ant_rewrite-classpath in src_unpack. +# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used +# for build-time purposes, the dependency is not recorded to +# package.env! +# ANT_TASKS - used to determine ANT_TASKS before calling Ant. +# @CODE +eant() { + debug-print-function ${FUNCNAME} $* + + if [[ ${EBUILD_PHASE} = compile ]]; then + java-ant-2_src_configure + fi + + if ! has java-ant-2 ${INHERITED}; then + local msg="You should inherit java-ant-2 when using eant" + java-pkg_announce-qa-violation "${msg}" + fi + + local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore" + + java-pkg_init-compiler_ + local compiler="${GENTOO_COMPILER}" + + local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" + local build_compiler="$(source ${compiler_env} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER})" + if [[ "${compiler}" != "javac" && -z "${build_compiler}" ]]; then + die "ANT_BUILD_COMPILER undefined in ${compiler_env}" + fi + + if [[ ${compiler} != "javac" ]]; then + antflags="${antflags} -Dbuild.compiler=${build_compiler}" + # Figure out any extra stuff to put on the classpath for compilers aside + # from javac + # ANT_BUILD_COMPILER_DEPS should be something that could be passed to + # java-config -p + local build_compiler_deps="$(source ${JAVA_PKG_COMPILER_DIR}/${compiler} 1>/dev/null 2>&1; echo ${ANT_BUILD_COMPILER_DEPS})" + if [[ -n ${build_compiler_deps} ]]; then + antflags="${antflags} -lib $(java-config -p ${build_compiler_deps})" + fi + fi + + for arg in "${@}"; do + if [[ ${arg} = -lib ]]; then + if is-java-strict; then + eerror "You should not use the -lib argument to eant because it will fail" + eerror "with JAVA_PKG_STRICT. Please use for example java-pkg_jar-from" + eerror "or ant properties to make dependencies available." + eerror "For ant tasks use WANT_ANT_TASKS or ANT_TASKS from." + eerror "split ant (>=dev-java/ant-core-1.7)." + die "eant -lib is deprecated/forbidden" + else + echo "eant -lib is deprecated. Turn JAVA_PKG_STRICT on for" + echo "more info." + fi + fi + done + + # parse WANT_ANT_TASKS for atoms + local want_ant_tasks + for i in ${WANT_ANT_TASKS}; do + if [[ ${i} = */*:* ]]; then + i=${i#*/} + i=${i%:0} + want_ant_tasks+="${i/:/-} " + else + want_ant_tasks+="${i} " + fi + done + # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly + ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}" + + # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set + ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}" + + # if ant-tasks is not set by ebuild or forced, use none + ANT_TASKS="${ANT_TASKS:-none}" + + # at this point, ANT_TASKS should be "all", "none" or explicit list + if [[ "${ANT_TASKS}" == "all" ]]; then + einfo "Using all available ANT_TASKS" + elif [[ "${ANT_TASKS}" == "none" ]]; then + einfo "Disabling all optional ANT_TASKS" + else + einfo "Using following ANT_TASKS: ${ANT_TASKS}" + fi + + export ANT_TASKS + + [[ -n ${JAVA_PKG_DEBUG} ]] && antflags="${antflags} --execdebug -debug" + [[ -n ${PORTAGE_QUIET} ]] && antflags="${antflags} -q" + + local gcp="${EANT_GENTOO_CLASSPATH}" + local getjarsarg="" + + if [[ ${EBUILD_PHASE} = "test" ]]; then + antflags="${antflags} -DJunit.present=true" + getjarsarg="--with-dependencies" + + local re="\bant-junit4?([-:]\S+)?\b" + [[ ${ANT_TASKS} =~ ${re} ]] && gcp+=" ${BASH_REMATCH[0]}" + else + antflags="${antflags} -Dmaven.test.skip=true" + fi + + local cp + + for atom in ${gcp}; do + cp+=":$(java-pkg_getjars ${getjarsarg} ${atom})" + done + + [[ ${EANT_NEEDS_TOOLS} ]] && cp+=":$(java-config --tools)" + [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && cp+=":${EANT_GENTOO_CLASSPATH_EXTRA}" + + if [[ ${cp#:} ]]; then + # It seems ant does not like single quotes around ${cp} + antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\"" + fi + + [[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}" + debug-print "Calling ant (GENTOO_VM: ${GENTOO_VM}): ${antflags} ${@}" + ant ${antflags} "${@}" || die "eant failed" +} + +# @FUNCTION: ejavac +# @USAGE: <javac_arguments> +# @DESCRIPTION: +# Javac wrapper function. Will use the appropriate compiler, based on +# /etc/java-config/compilers.conf +ejavac() { + debug-print-function ${FUNCNAME} $* + + local compiler_executable + compiler_executable=$(java-pkg_get-javac) + + local javac_args + javac_args="$(java-pkg_javac-args)" + + if [[ -n ${JAVA_PKG_DEBUG} ]]; then + einfo "Verbose logging for \"${FUNCNAME}\" function" + einfo "Compiler executable: ${compiler_executable}" + einfo "Extra arguments: ${javac_args}" + einfo "Complete command:" + einfo "${compiler_executable} ${javac_args} ${@}" + fi + + ebegin "Compiling" + ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed" +} + +# @FUNCTION: ejavadoc +# @USAGE: <javadoc_arguments> +# @DESCRIPTION: +# javadoc wrapper function. Will set some flags based on the VM version +# due to strict javadoc rules in 1.8. +ejavadoc() { + debug-print-function ${FUNCNAME} $* + + local javadoc_args="" + + if java-pkg_is-vm-version-ge "1.8" ; then + javadoc_args="-Xdoclint:none" + fi + + if [[ -n ${JAVA_PKG_DEBUG} ]]; then + einfo "Verbose logging for \"${FUNCNAME}\" function" + einfo "Javadoc executable: javadoc" + einfo "Extra arguments: ${javadoc_args}" + einfo "Complete command:" + einfo "javadoc ${javadoc_args} ${@}" + fi + + ebegin "Generating JavaDoc" + javadoc ${javadoc_args} "${@}" || die "ejavadoc failed" +} + +# @FUNCTION: java-pkg_filter-compiler +# @USAGE: <compiler(s)_to_filter> +# @DESCRIPTION: +# Used to prevent the use of some compilers. Should be used in src_compile. +# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER +java-pkg_filter-compiler() { + JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@" +} + +# @FUNCTION: java-pkg_force-compiler +# @USAGE: <compiler(s)_to_force> +# @DESCRIPTION: +# Used to force the use of particular compilers. Should be used in src_compile. +# A common use of this would be to force ecj-3.1 to be used on amd64, to avoid +# OutOfMemoryErrors that may come up. +java-pkg_force-compiler() { + JAVA_PKG_FORCE_COMPILER="$@" +} + +# @FUNCTION: use_doc +# @DESCRIPTION: +# +# Helper function for getting ant to build javadocs. If the user has USE=doc, +# then 'javadoc' or the argument are returned. Otherwise, there is no return. +# +# The output of this should be passed to ant. +# @CODE +# Parameters: +# $@ - Option value to return. Defaults to 'javadoc' +# +# Examples: +# build javadocs by calling 'javadoc' target +# eant $(use_doc) +# +# build javadocs by calling 'apidoc' target +# eant $(use_doc apidoc) +# @CODE +# @RETURN string - Name of the target to create javadocs +use_doc() { + use doc && echo ${@:-javadoc} +} + + +# @FUNCTION: java-pkg_init +# @INTERNAL +# @DESCRIPTION: +# The purpose of this function, as the name might imply, is to initialize the +# Java environment. It ensures that that there aren't any environment variables +# that'll muss things up. It initializes some variables, which are used +# internally. And most importantly, it'll switch the VM if necessary. +# +# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will +# call it during each of the phases of the merge process. +java-pkg_init() { + debug-print-function ${FUNCNAME} $* + + # Don't set up build environment if installing from binary. #206024 #258423 + [[ "${MERGE_TYPE}" == "binary" ]] && return + # Also try Portage's nonstandard EMERGE_FROM for old EAPIs, if it doesn't + # work nothing is lost. + has ${EAPI:-0} 0 1 2 3 && [[ "${EMERGE_FROM}" == "binary" ]] && return + + unset JAVAC + unset JAVA_HOME + + java-config --help >/dev/null || { + eerror "" + eerror "Can't run java-config --help" + eerror "Have you upgraded python recently but haven't" + eerror "run python-updater yet?" + die "Can't run java-config --help" + } + + # People do all kinds of weird things. + # https://forums.gentoo.org/viewtopic-p-3943166.html + local silence="${SILENCE_JAVA_OPTIONS_WARNING}" + local accept="${I_WANT_GLOBAL_JAVA_OPTIONS}" + if [[ -n ${_JAVA_OPTIONS} && -z ${accept} && -z ${silence} ]]; then + ewarn "_JAVA_OPTIONS changes what java -version outputs at least for" + ewarn "sun-jdk vms and and as such break configure scripts that" + ewarn "use it (for example app-office/openoffice) so we filter it out." + ewarn "Use SILENCE_JAVA_OPTIONS_WARNING=true in the environment (use" + ewarn "make.conf for example) to silence this warning or" + ewarn "I_WANT_GLOBAL_JAVA_OPTIONS to not filter it." + fi + + if [[ -z ${accept} ]]; then + # export _JAVA_OPTIONS= doesn't work because it will show up in java + # -version output + unset _JAVA_OPTIONS + # phase hooks make this run many times without this + I_WANT_GLOBAL_JAVA_OPTIONS="true" + fi + + java-pkg_switch-vm + PATH=${JAVA_HOME}/bin:${PATH} + + # TODO we will probably want to set JAVAC and JAVACFLAGS + + # Do some QA checks + java-pkg_check-jikes + + # Can't use unset here because Portage does not save the unset + # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11 + + # When users have crazy classpaths some packages can fail to compile. + # and everything should work with empty CLASSPATH. + # This also helps prevent unexpected dependencies on random things + # from the CLASSPATH. + export CLASSPATH= + + # Unset external ANT_ stuff + export ANT_TASKS= + export ANT_OPTS= + export ANT_RESPECT_JAVA_HOME= +} + +# @FUNCTION: java-pkg-init-compiler_ +# @INTERNAL +# @DESCRIPTION: +# This function attempts to figure out what compiler should be used. It does +# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the +# COMPILERS variable defined there. +# This can be overridden by a list in JAVA_PKG_FORCE_COMPILER +# +# It will go through the list of compilers, and verify that it supports the +# target and source that are needed. If it is not suitable, then the next +# compiler is checked. When JAVA_PKG_FORCE_COMPILER is defined, this checking +# isn't done. +# +# Once the which compiler to use has been figured out, it is set to +# GENTOO_COMPILER. +# +# If you hadn't guessed, JAVA_PKG_FORCE_COMPILER is for testing only. +# +# If the user doesn't defined anything in JAVA_PKG_COMPILERS_CONF, or no +# suitable compiler was found there, then the default is to use javac provided +# by the current VM. +# +# +# @RETURN name of the compiler to use +java-pkg_init-compiler_() { + debug-print-function ${FUNCNAME} $* + + if [[ -n ${GENTOO_COMPILER} ]]; then + debug-print "GENTOO_COMPILER already set" + return + fi + + local compilers; + if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then + compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" + else + compilers=${JAVA_PKG_FORCE_COMPILER} + fi + + debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" + + # Figure out if we should announce what compiler we're using + local compiler + for compiler in ${compilers}; do + debug-print "Checking ${compiler}..." + # javac should always be alright + if [[ ${compiler} = "javac" ]]; then + debug-print "Found javac... breaking" + export GENTOO_COMPILER="javac" + break + fi + + if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then + if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then + einfo "Filtering ${compiler}" >&2 + continue + fi + fi + + # for non-javac, we need to make sure it supports the right target and + # source + local compiler_env="${JAVA_PKG_COMPILER_DIR}/${compiler}" + if [[ -f ${compiler_env} ]]; then + local desired_target="$(java-pkg_get-target)" + local desired_source="$(java-pkg_get-source)" + + + # Verify that the compiler supports target + local supported_target=$(source ${compiler_env} 1>/dev/null 2>&1; echo ${SUPPORTED_TARGET}) + if ! has ${desired_target} ${supported_target}; then + ewarn "${compiler} does not support -target ${desired_target}, skipping" + continue + fi + + # Verify that the compiler supports source + local supported_source=$(source ${compiler_env} 1>/dev/null 2>&1; echo ${SUPPORTED_SOURCE}) + if ! has ${desired_source} ${supported_source}; then + ewarn "${compiler} does not support -source ${desired_source}, skipping" + continue + fi + + # if you get here, then the compiler should be good to go + export GENTOO_COMPILER="${compiler}" + break + else + ewarn "Could not find configuration for ${compiler}, skipping" + ewarn "Perhaps it is not installed?" + continue + fi + done + + # If it hasn't been defined already, default to javac + if [[ -z ${GENTOO_COMPILER} ]]; then + if [[ -n ${compilers} ]]; then + einfo "No suitable compiler found: defaulting to JDK default for compilation" >&2 + else + # probably don't need to notify users about the default. + :;#einfo "Defaulting to javac for compilation" >&2 + fi + if java-config -g GENTOO_COMPILER 2> /dev/null; then + export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER) + else + export GENTOO_COMPILER=javac + fi + else + einfo "Using ${GENTOO_COMPILER} for compilation" >&2 + fi + +} + +# @FUNCTION: init_paths_ +# @INTERNAL +# @DESCRIPTION: +# Initializes some variables that will be used. These variables are mostly used +# to determine where things will eventually get installed. +java-pkg_init_paths_() { + debug-print-function ${FUNCNAME} $* + + local pkg_name + if [[ "${SLOT%/*}" == "0" ]] ; then + JAVA_PKG_NAME="${PN}" + else + JAVA_PKG_NAME="${PN}-${SLOT%/*}" + fi + + JAVA_PKG_SHAREPATH="/usr/share/${JAVA_PKG_NAME}" + JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" + JAVA_PKG_ENV="${ED}${JAVA_PKG_SHAREPATH}/package.env" + JAVA_PKG_VIRTUALS_PATH="/usr/share/java-config-2/virtuals" + JAVA_PKG_VIRTUAL_PROVIDER="${ED}${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" + + [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" + [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="/usr/$(get_libdir)/${JAVA_PKG_NAME}" + [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" + + # TODO maybe only print once? + debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}" + debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}" + debug-print "JAVA_PKG_JARDEST: ${JAVA_PKG_JARDEST}" + debug-print "JAVA_PKG_LIBDEST: ${JAVA_PKG_LIBDEST}" + debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}" +} + +# @FUNCTION: java-pkg_do_write_ +# @INTERNAL +# @DESCRIPTION: +# Writes the package.env out to disk. +# +# TODO change to do-write, to match everything else +java-pkg_do_write_() { + debug-print-function ${FUNCNAME} $* + java-pkg_init_paths_ + # Create directory for package.env + dodir "${JAVA_PKG_SHAREPATH}" + + # Create package.env + ( + echo "DESCRIPTION=\"${DESCRIPTION}\"" + echo "GENERATION=\"2\"" + echo "SLOT=\"${SLOT}\"" + echo "CATEGORY=\"${CATEGORY}\"" + echo "PVR=\"${PVR}\"" + + [[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" + [[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" + [[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" + [[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \ + && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\"" + [[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \ + && echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\"" + echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/$jre\|jdk$/ { p;q }')\"" # TODO cleanup ! + [[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \ + && echo "BUILD_DEPEND=\"$(sort -u "${JAVA_PKG_BUILD_DEPEND_FILE}" | tr '\n' ':')\"" + ) > "${JAVA_PKG_ENV}" + + # register target/source + local target="$(java-pkg_get-target)" + local source="$(java-pkg_get-source)" + [[ -n ${target} ]] && echo "TARGET=\"${target}\"" >> "${JAVA_PKG_ENV}" + [[ -n ${source} ]] && echo "SOURCE=\"${source}\"" >> "${JAVA_PKG_ENV}" + + # register javadoc info + [[ -n ${JAVADOC_PATH} ]] && echo "JAVADOC_PATH=\"${JAVADOC_PATH}\"" \ + >> ${JAVA_PKG_ENV} + # register source archives + [[ -n ${JAVA_SOURCES} ]] && echo "JAVA_SOURCES=\"${JAVA_SOURCES}\"" \ + >> ${JAVA_PKG_ENV} + + echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}" + [[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}" + + # extra env variables + if [[ -n "${JAVA_PKG_EXTRA_ENV_VARS}" ]]; then + cat "${JAVA_PKG_EXTRA_ENV}" >> "${JAVA_PKG_ENV}" || die + # nested echo to remove leading/trailing spaces + echo "ENV_VARS=\"$(echo ${JAVA_PKG_EXTRA_ENV_VARS})\"" \ + >> "${JAVA_PKG_ENV}" || die + fi + + # Strip unnecessary leading and trailing colons + # TODO try to cleanup if possible + sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?" +} + +# @FUNCTION: java-pkg_record-jar_ +# @INTERNAL +# @DESCRIPTION: +# Record an (optional) dependency to the package.env +# @CODE +# Parameters: +# --optional - record dependency as optional +# --build - record dependency as build_only +# $1 - package to record +# $2 - (optional) jar of package to record +# @CODE +JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend" +JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend" +JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend" + +java-pkg_record-jar_() { + debug-print-function ${FUNCNAME} $* + + local depend_file="${JAVA_PKG_DEPEND_FILE}" + case "${1}" in + "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;; + "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;; + esac + + local pkg=${1} jar=${2} append + if [[ -z "${jar}" ]]; then + append="${pkg}" + else + append="$(basename ${jar})@${pkg}" + fi + + echo "${append}" >> "${depend_file}" +} + +# @FUNCTION: java-pkg_append_ +# @INTERNAL +# @DESCRIPTION: +# Appends a value to a variable +# +# @CODE +# Parameters: +# $1 variable name to modify +# $2 value to append +# +# Examples: +# java-pkg_append_ CLASSPATH foo.jar +# @CODE +java-pkg_append_() { + debug-print-function ${FUNCNAME} $* + + local var="${1}" value="${2}" + if [[ -z "${!var}" ]] ; then + export ${var}="${value}" + else + local oldIFS=${IFS} cur haveit + IFS=':' + for cur in ${!var}; do + if [[ ${cur} == ${value} ]]; then + haveit="yes" + break + fi + done + [[ -z ${haveit} ]] && export ${var}="${!var}:${value}" + IFS=${oldIFS} + fi +} + +# @FUNCTION: java-pkg_expand_dir_ +# @INTERNAL +# @DESCRIPTION: +# Gets the full path of the file/directory's parent. +# @CODE +# Parameters: +# $1 - file/directory to find parent directory for +# @CODE +# @RETURN: path to $1's parent directory +java-pkg_expand_dir_() { + pushd "$(dirname "${1}")" >/dev/null 2>&1 || die + pwd + popd >/dev/null 2>&1 || die +} + +# @FUNCTION: java-pkg_func-exists +# @INTERNAL +# @DESCRIPTION: +# Does the indicated function exist? +# @RETURN: 0 - function is declared, 1 - function is undeclared +java-pkg_func-exists() { + declare -F ${1} > /dev/null +} + +# @FUNCTION: java-pkg_setup-vm +# @INTERNAL +# @DESCRIPTION: +# Sets up the environment for a specific VM +java-pkg_setup-vm() { + debug-print-function ${FUNCNAME} $* + + local vendor="$(java-pkg_get-vm-vendor)" + if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then + addpredict "/dev/random" + elif [[ "${vendor}" == "ibm" ]]; then + addpredict "/proc/self/maps" + addpredict "/proc/cpuinfo" + addpredict "/proc/self/coredump_filter" + elif [[ "${vendor}" == "oracle" ]]; then + addpredict "/dev/random" + addpredict "/proc/self/coredump_filter" + elif [[ "${vendor}" == icedtea* ]] && java-pkg_is-vm-version-ge "1.7" ; then + addpredict "/dev/random" + addpredict "/proc/self/coredump_filter" + elif [[ "${vendor}" == "jrockit" ]]; then + addpredict "/proc/cpuinfo" + fi +} + +# @FUNCTION: java-pkg_needs-vm +# @INTERNAL +# @DESCRIPTION: +# Does the current package depend on virtual/jdk or does it set +# JAVA_PKG_WANT_BUILD_VM? +# +# @RETURN: 0 - Package depends on virtual/jdk; 1 - Package does not depend on virtual/jdk +java-pkg_needs-vm() { + debug-print-function ${FUNCNAME} $* + + if [[ -n "$(echo ${JAVA_PKG_NV_DEPEND:-${DEPEND}} | sed -e '\:virtual/jdk:!d')" ]]; then + return 0 + fi + + [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]] && return 0 + + return 1 +} + +# @FUNCTION: java-pkg_get-current-vm +# @INTERNAL +# @RETURN - The current VM being used +java-pkg_get-current-vm() { + java-config -f +} + +# @FUNCTION: java-pkg_get-vm-vendor +# @INTERNAL +# @RETURN - The vendor of the current VM +java-pkg_get-vm-vendor() { + debug-print-function ${FUNCNAME} $* + + local vm="$(java-pkg_get-current-vm)" + vm="${vm/-*/}" + echo "${vm}" +} + +# @FUNCTION: java-pkg_get-vm-version +# @INTERNAL +# @RETURN - The version of the current VM +java-pkg_get-vm-version() { + debug-print-function ${FUNCNAME} $* + + java-config -g PROVIDES_VERSION +} + +# @FUNCTION: java-pkg_build-vm-from-handle +# @INTERNAL +# @DESCRIPTION: +# Selects a build vm from a list of vm handles. First checks for the system-vm +# beeing usable, then steps through the listed handles till a suitable vm is +# found. +# +# @RETURN - VM handle of an available JDK +java-pkg_build-vm-from-handle() { + debug-print-function ${FUNCNAME} "$*" + + local vm + vm=$(java-pkg_get-current-vm 2>/dev/null) + if [[ $? -eq 0 ]]; then + if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then + echo ${vm} + return 0 + fi + fi + + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do + if java-config-2 --select-vm=${vm} 2>/dev/null; then + echo ${vm} + return 0 + fi + done + + eerror "${FUNCNAME}: No vm found for handles: ${JAVA_PKG_WANT_BUILD_VM}" + return 1 +} + +# @FUNCTION: java-pkg_switch-vm +# @INTERNAL +# @DESCRIPTION: +# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and +# verify that the current VM is sufficient. +# Setup the environment for the VM being used. +java-pkg_switch-vm() { + debug-print-function ${FUNCNAME} $* + + if java-pkg_needs-vm; then + # Use the VM specified by JAVA_PKG_FORCE_VM + if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then + # If you're forcing the VM, I hope you know what your doing... + debug-print "JAVA_PKG_FORCE_VM used: ${JAVA_PKG_FORCE_VM}" + export GENTOO_VM="${JAVA_PKG_FORCE_VM}" + # if we're allowed to switch the vm... + elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then + # if there is an explicit list of handles to choose from + if [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]]; then + debug-print "JAVA_PKG_WANT_BUILD_VM used: ${JAVA_PKG_WANT_BUILD_VM}" + GENTOO_VM=$(java-pkg_build-vm-from-handle) + if [[ $? != 0 ]]; then + eerror "${FUNCNAME}: No VM found for handles: ${JAVA_PKG_WANT_BUILD_VM}" + die "${FUNCNAME}: Failed to determine VM for building" + fi + # JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET are required as + # they can't be deduced from handles. + if [[ -z "${JAVA_PKG_WANT_SOURCE}" ]]; then + eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_SOURCE" + die "Specify JAVA_PKG_WANT_SOURCE" + fi + if [[ -z "${JAVA_PKG_WANT_TARGET}" ]]; then + eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_TARGET" + die "Specify JAVA_PKG_WANT_TARGET" + fi + # otherwise determine a vm from dep string + else + debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}" + GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")" + if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then + eerror "Unable to determine VM for building from dependencies:" + echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}" + die "Failed to determine VM for building." + fi + fi + export GENTOO_VM + # otherwise just make sure the current VM is sufficient + else + java-pkg_ensure-vm-version-sufficient + fi + debug-print "Using: $(java-config -f)" + + java-pkg_setup-vm + + export JAVA=$(java-config --java) + export JAVAC=$(java-config --javac) + JAVACFLAGS="$(java-pkg_javac-args)" + [[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" + export JAVACFLAGS + + export JAVA_HOME="$(java-config -g JAVA_HOME)" + export JDK_HOME=${JAVA_HOME} + + #TODO If you know a better solution let us know. + java-pkg_append_ LD_LIBRARY_PATH "$(java-config -g LDPATH)" + + local tann="${T}/announced-vm" + # With the hooks we should only get here once from pkg_setup but better safe than sorry + # if people have for example modified eclasses some where + if [[ -n "${JAVA_PKG_DEBUG}" ]] || [[ ! -f "${tann}" ]] ; then + einfo "Using: $(java-config -f)" + [[ ! -f "${tann}" ]] && touch "${tann}" + fi + + else + [[ -n "${JAVA_PKG_DEBUG}" ]] && ewarn "!!! This package inherits java-pkg but doesn't depend on a JDK. -bin or broken dependency!!!" + fi +} + +# @FUNCTION: java-pkg_die +# @INTERNAL +# @DESCRIPTION: +# Enhanced die for Java packages, which displays some information that may be +# useful for debugging bugs on bugzilla. +#register_die_hook java-pkg_die +if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then + EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die" +fi + +java-pkg_die() { + echo "!!! When you file a bug report, please include the following information:" >&2 + echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2 + echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2 + echo "and of course, the output of emerge --info =${P}" >&2 +} + + +# TODO document +# List jars in the source directory, ${S} +java-pkg_jar-list() { + if [[ -n "${JAVA_PKG_DEBUG}" ]]; then + einfo "Linked Jars" + find "${S}" -type l -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," + einfo "Jars" + find "${S}" -type f -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," + einfo "Classes" + find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," + fi +} + +# @FUNCTION: java-pkg_verify-classes +# @INTERNAL +# @DESCRIPTION: +# Verify that the classes were compiled for the right source / target. Dies if +# not. +# @CODE +# $1 (optional) - the file to check, otherwise checks whole ${D} +# @CODE +java-pkg_verify-classes() { + #$(find ${D} -type f -name '*.jar' -o -name '*.class') + + local version_verify="/usr/bin/class-version-verify.py" + + if [[ ! -x "${version_verify}" ]]; then + version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py" + fi + + if [[ ! -x "${version_verify}" ]]; then + ewarn "Unable to perform class version checks as" + ewarn "class-version-verify.py is unavailable" + ewarn "Please install dev-java/javatoolkit." + return + fi + + local target=$(java-pkg_get-target) + local result + local log="${T}/class-version-verify.log" + if [[ -n "${1}" ]]; then + ${version_verify} -v -t ${target} "${1}" > "${log}" + result=$? + else + ebegin "Verifying java class versions (target: ${target})" + ${version_verify} -v -t ${target} -r "${D}" > "${log}" + result=$? + eend ${result} + fi + [[ -n ${JAVA_PKG_DEBUG} ]] && cat "${log}" + if [[ ${result} != 0 ]]; then + eerror "Incorrect bytecode version found" + [[ -n "${1}" ]] && eerror "in file: ${1}" + eerror "See ${log} for more details." + die "Incorrect bytecode found" + fi +} + +# @FUNCTION: java-pkg_ensure-dep +# @INTERNAL +# @DESCRIPTION: +# Check that a package being used in jarfrom, getjars and getjar is contained +# within DEPEND or RDEPEND with the correct SLOT. See this mail for details: +# https://archives.gentoo.org/gentoo-dev/message/dcb644f89520f4bbb61cc7bbe45fdf6e +# @CODE +# Parameters: +# $1 - empty - check both vars; "runtime" or "build" - check only +# RDEPEND, resp. DEPEND +# $2 - Package name and slot. +# @CODE +java-pkg_ensure-dep() { + debug-print-function ${FUNCNAME} $* + + local limit_to="${1}" + local target_pkg="${2}" + local dev_error="" + + # Transform into a regular expression to look for a matching package + # and SLOT. SLOTs don't have to be numeric so foo-bar could either + # mean foo-bar:0 or foo:bar. So you want to get your head around the + # line below? + # + # * The target package first has any dots escaped, e.g. foo-1.2 + # becomes foo-1\.2. + # + # * sed then looks at the component following the last - or : + # character, or the whole string if there is no - or : + # character. It uses this to build a new regexp with two + # significant branches. + # + # * The first checks for the whole target package string, optionally + # followed by a version number, and then :0. + # + # * The second checks for the first part of the target package + # string, optionally followed by a version number, followed by the + # aforementioned component, treating that as a SLOT. + # + local stripped_pkg=/$(sed -r 's/[-:]?([^-:]+)$/(\0(-[^:]+)?:0|(-[^:]+)?:\1)/' <<< "${target_pkg//./\\.}")\\b + + debug-print "Matching against: ${stripped_pkg}" + + # Uncomment the lines below once we've dealt with more of these + # otherwise we'll be tempted to turn JAVA_PKG_STRICT off while + # getting hit with a wave of bug reports. :( + + if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ $stripped_pkg ) ]]; then + dev_error="The ebuild is attempting to use ${target_pkg}, which is not " + dev_error+="declared with a SLOT in DEPEND." +# if is-java-strict; then +# die "${dev_error}" +# else + eqawarn "java-pkg_ensure-dep: ${dev_error}" +# eerror "Because you have ${target_pkg} installed," +# eerror "the package will build without problems, but please" +# eerror "report this to https://bugs.gentoo.org." +# fi + elif [[ ${limit_to} != build && ! ( "${RDEPEND}${PDEPEND}" =~ ${stripped_pkg} ) ]]; then + dev_error="The ebuild is attempting to use ${target_pkg}, which is not " + dev_error+="declared with a SLOT in [RP]DEPEND and --build-only wasn't given." +# if is-java-strict; then +# die "${dev_error}" +# else + eqawarn "java-pkg_ensure-dep: ${dev_error}" +# eerror "The package will build without problems, but may fail to run" +# eerror "if you don't have ${target_pkg} installed," +# eerror "so please report this to https://bugs.gentoo.org." +# fi + fi +} + +java-pkg_check-phase() { + local phase=${1} + local funcname=${FUNCNAME[1]} + if [[ ${EBUILD_PHASE} != ${phase} ]]; then + local msg="${funcname} used outside of src_${phase}" + java-pkg_announce-qa-violation "${msg}" + fi +} + +java-pkg_check-versioned-jar() { + local jar=${1} + + if [[ ${jar} =~ ${PV} ]]; then + java-pkg_announce-qa-violation "installing versioned jar '${jar}'" + fi +} + +java-pkg_check-jikes() { + if has jikes ${IUSE}; then + java-pkg_announce-qa-violation "deprecated USE flag 'jikes' in IUSE" + fi +} + +java-pkg_announce-qa-violation() { + local nodie + if [[ ${1} == "--nodie" ]]; then + nodie="true" + shift + fi + echo "Java QA Notice: $@" >&2 + increment-qa-violations + [[ -z "${nodie}" ]] && is-java-strict && die "${@}" +} + +increment-qa-violations() { + let "JAVA_PKG_QA_VIOLATIONS+=1" + export JAVA_PKG_QA_VIOLATIONS +} + +is-java-strict() { + [[ -n ${JAVA_PKG_STRICT} ]] + return $? +} + +# @FUNCTION: java-pkg_clean +# @DESCRIPTION: +# Java package cleaner function. This will remove all *.class and *.jar +# files, removing any bundled dependencies. +java-pkg_clean() { + if [[ -z "${JAVA_PKG_NO_CLEAN}" ]]; then + find "${@}" '(' -name '*.class' -o -name '*.jar' ')' -type f -delete -print || die + fi +} + +# @FUNCTION: java-pkg_gen-cp +# @INTERNAL +# @DESCRIPTION: +# Java package generate classpath will create a classpath based on +# special variable CP_DEPEND in the ebuild. +# +# @CODE +# Parameters: +# $1 - classpath variable either EANT_GENTOO_CLASSPATH or JAVA_GENTOO_CLASSPATH +# @CODE +java-pkg_gen-cp() { + debug-print-function ${FUNCNAME} "${@}" + + local atom + for atom in ${CP_DEPEND}; do + if [[ ${atom} =~ /(([[:alnum:]+_-]+)-[0-9]+(\.[0-9]+)*[a-z]?(_[[:alnum:]]+)*(-r[0-9]*)?|[[:alnum:]+_-]+):([[:alnum:]+_.-]+) ]]; then + atom=${BASH_REMATCH[2]:-${BASH_REMATCH[1]}} + [[ ${BASH_REMATCH[6]} != 0 ]] && atom+=-${BASH_REMATCH[6]} + local regex="(^|\s|,)${atom}($|\s|,)" + [[ ${!1} =~ ${regex} ]] || declare -g ${1}+=${!1:+,}${atom} + else + die "Invalid CP_DEPEND atom ${atom}, ensure a SLOT is included" + fi + done +} diff -uNr a/eclass/java-virtuals-2.eclass b/eclass/java-virtuals-2.eclass --- a/eclass/java-virtuals-2.eclass false +++ b/eclass/java-virtuals-2.eclass 2b6b8c40ab1938359ebda3a67b80890931ceae964689c8ed42e364f19415f03bcab0ff48775435deb3fa0a38b33a50f0709ce6656a7593eecbaa3418a11361a8 @@ -0,0 +1,54 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: java-virtuals-2.eclass +# @MAINTAINER: +# java@gentoo.org +# @AUTHOR: +# Original Author: Alistair John Bush <ali_bush@gentoo.org> +# @BLURB: Java virtuals eclass +# @DESCRIPTION: +# To provide a default (and only) src_install function for ebuilds in the +# java-virtuals category. + +inherit java-utils-2 + +DEPEND=">=dev-java/java-config-2.2.0-r3" +RDEPEND="${DEPEND}" + +S="${WORKDIR}" + +EXPORT_FUNCTIONS src_install + +# @FUNCTION: java-virtuals-2_src_install +# @DESCRIPTION: +# default src_install + +java-virtuals-2_src_install() { + java-virtuals-2_do_write +} + +# @FUNCTION: java-pkg_do_virtuals_write +# @INTERNAL +# @DESCRIPTION: +# Writes the virtual env file out to disk. + +java-virtuals-2_do_write() { + java-pkg_init_paths_ + + dodir "${JAVA_PKG_VIRTUALS_PATH}" + { + if [[ -n "${JAVA_VIRTUAL_PROVIDES}" ]]; then + echo "PROVIDERS=\"${JAVA_VIRTUAL_PROVIDES}\"" + fi + + if [[ -n "${JAVA_VIRTUAL_VM}" ]]; then + echo "VM=\"${JAVA_VIRTUAL_VM}\"" + fi + + if [[ -n "${JAVA_VIRTUAL_VM_CLASSPATH}" ]]; then + echo "VM_CLASSPATH=\"${JAVA_VIRTUAL_VM_CLASSPATH}\"" + fi + echo "MULTI_PROVIDER=\"${JAVA_VIRTUAL_MULTI=FALSE}\"" + } > "${JAVA_PKG_VIRTUAL_PROVIDER}" +} diff -uNr a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass --- a/eclass/java-vm-2.eclass false +++ b/eclass/java-vm-2.eclass 39e15eb6fba4b0419bc46ef69d87a9bdb3c7e091b1c3f30a09b24bd43f84a8a3356c5012272480a7a52cb430e5b827a7146bd37c4f7ae949be02fc93eb7cd21d @@ -0,0 +1,339 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: java-vm-2.eclass +# @MAINTAINER: +# java@gentoo.org +# @BLURB: Java Virtual Machine eclass +# @DESCRIPTION: +# This eclass provides functionality which assists with installing +# virtual machines, and ensures that they are recognized by java-config. + +case ${EAPI:-0} in + 5|6) ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +inherit multilib pax-utils prefix xdg-utils + +EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm + +RDEPEND=" + >=dev-java/java-config-2.2.0-r3 + >=app-eselect/eselect-java-0.4.0" +DEPEND="${RDEPEND}" + +export WANT_JAVA_CONFIG=2 + + +# @ECLASS-VARIABLE: JAVA_VM_CONFIG_DIR +# @INTERNAL +# @DESCRIPTION: +# Where to place the vm env file. +JAVA_VM_CONFIG_DIR="/usr/share/java-config-2/vm" + +# @ECLASS-VARIABLE: JAVA_VM_DIR +# @INTERNAL +# @DESCRIPTION: +# Base directory for vm links. +JAVA_VM_DIR="/usr/lib/jvm" + +# @ECLASS-VARIABLE: JAVA_VM_SYSTEM +# @INTERNAL +# @DESCRIPTION: +# Link for system-vm +JAVA_VM_SYSTEM="/etc/java-config-2/current-system-vm" + +# @ECLASS-VARIABLE: JAVA_VM_BUILD_ONLY +# @DESCRIPTION: +# Set to YES to mark a vm as build-only. +JAVA_VM_BUILD_ONLY="${JAVA_VM_BUILD_ONLY:-FALSE}" + + +# @FUNCTION: java-vm-2_pkg_setup +# @DESCRIPTION: +# default pkg_setup +# +# Initialize vm handle. + +java-vm-2_pkg_setup() { + if [[ "${SLOT}" != "0" ]]; then + VMHANDLE=${PN}-${SLOT} + else + VMHANDLE=${PN} + fi +} + + +# @FUNCTION: java-vm-2_pkg_postinst +# @DESCRIPTION: +# default pkg_postinst +# +# Set the generation-2 system VM, if it isn't set or the setting is +# invalid. Also update mime database. + +java-vm-2_pkg_postinst() { + # Note that we cannot rely on java-config here, as it will silently recognize + # e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due + # to the migration to icedtea-6) + if [[ ! -L "${EROOT}${JAVA_VM_SYSTEM}" ]]; then + java_set_default_vm_ + else + local current_vm_path=$(readlink "${EROOT}${JAVA_VM_SYSTEM}") + local current_vm=$(basename "${ROOT}${current_vm_path}") + if [[ ! -L "${EROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then + java_set_default_vm_ + fi + fi + + xdg_desktop_database_update +} + + +# @FUNCTION: java-vm-2_pkg_prerm +# @DESCRIPTION: +# default pkg_prerm +# +# Warn user if removing system-vm. + +java-vm-2_pkg_prerm() { + if [[ "$(GENTOO_VM="" java-config -f 2>/dev/null)" == "${VMHANDLE}" && -z "${REPLACED_BY_VERSION}" ]]; then + ewarn "It appears you are removing your system-vm!" + ewarn "Please run java-config -L to list available VMs," + ewarn "then use java-config -S to set a new system-vm!" + fi +} + + +# @FUNCTION: java-vm-2_pkg_postrm +# @DESCRIPTION: +# default pkg_postrm +# +# Update mime database. + +java-vm-2_pkg_postrm() { + xdg_desktop_database_update +} + + +# @FUNCTION: java_set_default_vm_ +# @INTERNAL +# @DESCRIPTION: +# Set system-vm. + +java_set_default_vm_() { + java-config-2 --set-system-vm="${VMHANDLE}" + + einfo " ${P} set as the default system-vm." +} + + +# @FUNCTION: get_system_arch +# @DESCRIPTION: +# Get Java specific arch name. +# +# NOTE the mips and sparc values are best guesses. Oracle uses sparcv9 +# but does OpenJDK use sparc64? We don't support OpenJDK on sparc or any +# JVM on mips though so it doesn't matter much. + +get_system_arch() { + local abi=${1-${ABI}} + + case $(get_abi_CHOST ${abi}) in + mips*l*) echo mipsel ;; + mips*) echo mips ;; + ppc64le*) echo ppc64le ;; + *) + case ${abi} in + *_fbsd) get_system_arch ${abi%_fbsd} ;; + arm64) echo aarch64 ;; + hppa) echo parisc ;; + sparc32) echo sparc ;; + sparc64) echo sparcv9 ;; + x86*) echo i386 ;; + *) echo ${abi} ;; + esac ;; + esac +} + + +# @FUNCTION: set_java_env +# @DESCRIPTION: +# Installs a vm env file. +# DEPRECATED, use java-vm_install-env instead. + +set_java_env() { + debug-print-function ${FUNCNAME} $* + + local platform="$(get_system_arch)" + local env_file="${ED}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" + + if [[ ${1} ]]; then + local source_env_file="${1}" + else + local source_env_file="${FILESDIR}/${VMHANDLE}.env" + fi + + if [[ ! -f ${source_env_file} ]]; then + die "Unable to find the env file: ${source_env_file}" + fi + + dodir ${JAVA_VM_CONFIG_DIR} + sed \ + -e "s/@P@/${P}/g" \ + -e "s/@PN@/${PN}/g" \ + -e "s/@PV@/${PV}/g" \ + -e "s/@PF@/${PF}/g" \ + -e "s/@SLOT@/${SLOT}/g" \ + -e "s/@PLATFORM@/${platform}/g" \ + -e "s/@LIBDIR@/$(get_libdir)/g" \ + -e "/^LDPATH=.*lib\\/\\\"/s|\"\$.*\$\"|\"\\1${platform}/:\\1${platform}/server/\"|" \ + < "${source_env_file}" \ + > "${env_file}" || die "sed failed" + + ( + echo "VMHANDLE=\"${VMHANDLE}\"" + echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\"" + ) >> "${env_file}" + + eprefixify ${env_file} + + [[ -n ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" >> ${env_file} + + local java_home=$(source "${env_file}"; echo ${JAVA_HOME}) + [[ -z ${java_home} ]] && die "No JAVA_HOME defined in ${env_file}" + + # Make the symlink + dodir "${JAVA_VM_DIR}" + dosym ${java_home#${EPREFIX}} ${JAVA_VM_DIR}/${VMHANDLE} +} + + +# @FUNCTION: java-vm_install-env +# @DESCRIPTION: +# +# Installs a Java VM environment file. The source can be specified but +# defaults to ${FILESDIR}/${VMHANDLE}.env.sh. +# +# Environment variables within this file will be resolved. You should +# escape the $ when referring to variables that should be resolved later +# such as ${JAVA_HOME}. Subshells may be used but avoid using double +# quotes. See icedtea-bin.env.sh for a good example. + +java-vm_install-env() { + debug-print-function ${FUNCNAME} "$*" + + local env_file="${ED}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" + local source_env_file="${1-${FILESDIR}/${VMHANDLE}.env.sh}" + + if [[ ! -f "${source_env_file}" ]]; then + die "Unable to find the env file: ${source_env_file}" + fi + + dodir "${JAVA_VM_CONFIG_DIR}" + + # Here be dragons! ;) -- Chewi + eval echo "\"$(cat <<< "$(sed 's:":\\":g' "${source_env_file}")")\"" > "${env_file}" || + die "failed to create Java env file" + + ( + echo "VMHANDLE=\"${VMHANDLE}\"" + echo "BUILD_ONLY=\"${JAVA_VM_BUILD_ONLY}\"" + [[ ${JAVA_PROVIDE} ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\"" || true + ) >> "${env_file}" || die "failed to append to Java env file" + + local java_home=$(unset JAVA_HOME; source "${env_file}"; echo ${JAVA_HOME}) + [[ -z ${java_home} ]] && die "No JAVA_HOME defined in ${env_file}" + + # Make the symlink + dodir "${JAVA_VM_DIR}" + dosym "${java_home#${EPREFIX}}" "${JAVA_VM_DIR}/${VMHANDLE}" +} + + +# @FUNCTION: java-vm_set-pax-markings +# @DESCRIPTION: +# Set PaX markings on all JDK/JRE executables to allow code-generation on +# the heap by the JIT compiler. +# +# The markings need to be set prior to the first invocation of the the freshly +# built / installed VM. Be it before creating the Class Data Sharing archive or +# generating cacerts. Otherwise a PaX enabled kernel will kill the VM. +# Bug #215225 #389751 +# +# @CODE +# Parameters: +# $1 - JDK/JRE base directory. +# +# Examples: +# java-vm_set-pax-markings "${S}" +# java-vm_set-pax-markings "${ED}"/opt/${P} +# @CODE + +java-vm_set-pax-markings() { + debug-print-function ${FUNCNAME} "$*" + [[ $# -ne 1 ]] && die "${FUNCNAME}: takes exactly one argument" + [[ ! -f "${1}"/bin/java ]] \ + && die "${FUNCNAME}: argument needs to be JDK/JRE base directory" + + local executables=( "${1}"/bin/* ) + [[ -d "${1}"/jre ]] && executables+=( "${1}"/jre/bin/* ) + + # Usually disabling MPROTECT is sufficient. + local pax_markings="m" + # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. + use x86 && pax_markings+="sp" + + pax-mark ${pax_markings} $(list-paxables "${executables[@]}") +} + + +# @FUNCTION: java-vm_revdep-mask +# @DESCRIPTION: +# Installs a revdep-rebuild control file which SEARCH_DIR_MASK set to the path +# where the VM is installed. Prevents pointless rebuilds - see bug #177925. +# Also gives a notice to the user. +# +# @CODE +# Parameters: +# $1 - Path of the VM (defaults to /opt/${P} if not set) +# +# Examples: +# java-vm_revdep-mask +# java-vm_revdep-mask /path/to/jdk/ +# +# @CODE + +java-vm_revdep-mask() { + debug-print-function ${FUNCNAME} "$*" + + local VMROOT="${1-"${EPREFIX}"/opt/${P}}" + + dodir /etc/revdep-rebuild + echo "SEARCH_DIRS_MASK=\"${VMROOT}\"" >> "${ED}/etc/revdep-rebuild/61-${VMHANDLE}" \ + || die "Failed to write revdep-rebuild mask file" +} + + +# @FUNCTION: java-vm_sandbox-predict +# @DESCRIPTION: +# Install a sandbox control file. Specified paths won't cause a sandbox +# violation if opened read write but no write takes place. See bug 388937#c1 +# +# @CODE +# Examples: +# java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +# @CODE + +java-vm_sandbox-predict() { + debug-print-function ${FUNCNAME} "$*" + [[ -z "${1}" ]] && die "${FUNCNAME} takes at least one argument" + + local path path_arr=("$@") + # subshell this to prevent IFS bleeding out dependant on bash version. + # could use local, which *should* work, but that requires a lot of testing. + path=$(IFS=":"; echo "${path_arr[*]}") + dodir /etc/sandbox.d + echo "SANDBOX_PREDICT=\"${path}\"" > "${ED}/etc/sandbox.d/20${VMHANDLE}" \ + || die "Failed to write sandbox control file" +} diff -uNr a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass --- a/eclass/kde5-functions.eclass false +++ b/eclass/kde5-functions.eclass 55ef66b2458a4df4c57c2b5b790369ab7c112ae1d073bfa10113a6b97e18f96b64eb134df1e4a5929d80ce98d22709340707c8b216e3b241f9fee6b6346f28fc @@ -0,0 +1,365 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: kde5-functions.eclass +# @MAINTAINER: +# kde@gentoo.org +# @SUPPORTED_EAPIS: 6 +# @BLURB: Common ebuild functions for packages based on KDE Frameworks 5. +# @DESCRIPTION: +# This eclass contains functions shared by the other KDE eclasses and forms +# part of their public API. +# +# This eclass should (almost) never be inherited directly by an ebuild. + +if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then +_KDE5_FUNCTIONS_ECLASS=1 + +inherit toolchain-funcs + +case ${EAPI} in + 6) inherit eapi7-ver ;; + *) die "EAPI=${EAPI:-0} is not supported" ;; +esac + +# @ECLASS-VARIABLE: KDE_BUILD_TYPE +# @DESCRIPTION: +# If PV matches "*9999*", this is automatically set to "live". +# Otherwise, this is automatically set to "release". +KDE_BUILD_TYPE="release" +if [[ ${PV} = *9999* ]]; then + KDE_BUILD_TYPE="live" +fi +export KDE_BUILD_TYPE + +case ${CATEGORY} in + kde-frameworks) + [[ ${PV} = 5.43* ]] && : ${QT_MINIMAL:=5.7.1} + [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} + ;; + kde-plasma) + [[ ${PV} = 5.11.5* ]] && : ${QT_MINIMAL:=5.7.1} + [[ ${PV} = 5.12.5* ]] && : ${QT_MINIMAL:=5.9.1} + if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then + : ${FRAMEWORKS_MINIMAL:=9999} + : ${QT_MINIMAL:=5.10.1} + fi + ;; + kde-apps) + [[ ${PV} = 17.12.3* ]] && : ${QT_MINIMAL:=5.9.1} + if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.04* ]]; then + : ${FRAMEWORKS_MINIMAL:=5.44.0} + fi + ;; +esac + +# @ECLASS-VARIABLE: QT_MINIMAL +# @DESCRIPTION: +# Minimum version of Qt to require. This affects add_qt_dep. +: ${QT_MINIMAL:=5.9.4} + +# @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL +# @DESCRIPTION: +# Minimum version of Frameworks to require. This affects add_frameworks_dep. +: ${FRAMEWORKS_MINIMAL:=5.43.0} + +# @ECLASS-VARIABLE: PLASMA_MINIMAL +# @DESCRIPTION: +# Minimum version of Plasma to require. This affects add_plasma_dep. +: ${PLASMA_MINIMAL:=5.11.5} + +# @ECLASS-VARIABLE: KDE_APPS_MINIMAL +# @DESCRIPTION: +# Minimum version of KDE Applications to require. This affects add_kdeapps_dep. +: ${KDE_APPS_MINIMAL:=14.12.0} + +# @ECLASS-VARIABLE: KDE_GCC_MINIMAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Minimum version of active GCC to require. This is checked in kde5.eclass in +# kde5_pkg_pretend and kde5_pkg_setup. + +# @ECLASS-VARIABLE: KDEBASE +# @DEFAULT_UNSET +# @DESCRIPTION: +# This gets set to a non-zero value when a package is considered a +# kdevelop ebuild. +if [[ ${KMNAME-${PN}} = kdevelop ]]; then + KDEBASE=kdevelop +fi + +debug-print "${ECLASS}: ${KDEBASE} ebuild recognized" + +# @ECLASS-VARIABLE: KDE_SCM +# @DESCRIPTION: +# SCM to use if KDE_BUILD_TYPE is determined to be "live". +# Currently, only git is supported. +: ${KDE_SCM:=git} + +case ${KDE_SCM} in + git) ;; + *) die "KDE_SCM: ${KDE_SCM} is not supported" ;; +esac + +# @FUNCTION: _check_gcc_version +# @INTERNAL +# @DESCRIPTION: +# Determine if the current GCC version is acceptable, otherwise die. +_check_gcc_version() { + if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && tc-is-gcc; then + + local version=$(gcc-version) + local major=${version%.*} + local minor=${version#*.} + local min_major=${KDE_GCC_MINIMAL%.*} + local min_minor=${KDE_GCC_MINIMAL#*.} + + debug-print "GCC version check activated" + debug-print "Version detected:" + debug-print " - Full: ${version}" + debug-print " - Major: ${major}" + debug-print " - Minor: ${minor}" + debug-print "Version required:" + debug-print " - Major: ${min_major}" + debug-print " - Minor: ${min_minor}" + + [[ ${major} -lt ${min_major} ]] || \ + ( [[ ${major} -eq ${min_major} && ${minor} -lt ${min_minor} ]] ) \ + && die "Sorry, but gcc-${KDE_GCC_MINIMAL} or later is required for this package (found ${version})." + fi +} + +# @FUNCTION: _add_category_dep +# @INTERNAL +# @DESCRIPTION: +# Implementation of add_plasma_dep, add_frameworks_dep, add_kdeapps_dep, +# and finally, add_qt_dep. +_add_category_dep() { + debug-print-function ${FUNCNAME} "$@" + + local category=${1} + local package=${2} + local use=${3} + local version=${4} + local slot=${5} + + if [[ -n ${use} ]] ; then + local use="[${use}]" + fi + + if [[ -n ${version} ]] ; then + local operator=">=" + local version="-${version}" + fi + + if [[ -n ${slot} ]] ; then + slot=":${slot}" + elif [[ ${SLOT%\/*} = 4 || ${SLOT%\/*} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then + slot=":${SLOT%\/*}" + fi + + echo " ${operator}${category}/${package}${version}${slot}${use}" +} + +# @FUNCTION: add_frameworks_dep +# @USAGE: <package name> [USE flags] [minimum version] [slot + operator] +# @DESCRIPTION: +# Create proper dependency for kde-frameworks/ dependencies. +# This takes 1 to 4 arguments. The first being the package name, the optional +# second is additional USE flags to append, and the optional third is the +# version to use instead of the automatic version (use sparingly). In addition, +# the optional fourth argument defines slot+operator instead of automatic slot +# (use even more sparingly). +# The output of this should be added directly to DEPEND/RDEPEND, and may be +# wrapped in a USE conditional (but not an || conditional without an extra set +# of parentheses). +add_frameworks_dep() { + debug-print-function ${FUNCNAME} "$@" + + if [[ $# -gt 4 ]]; then + die "${FUNCNAME} was called with too many arguments" + fi + + local version + + if [[ -n ${3} ]]; then + version=${3} + elif [[ ${CATEGORY} = kde-frameworks ]]; then + version=$(ver_cut 1-2) + elif [[ -z ${3} ]] ; then + version=${FRAMEWORKS_MINIMAL} + fi + + _add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}" +} + +# @FUNCTION: add_plasma_dep +# @USAGE: <package name> [USE flags] [minimum version] [slot + operator] +# @DESCRIPTION: +# Create proper dependency for kde-plasma/ dependencies. +# This takes 1 to 4 arguments. The first being the package name, the optional +# second is additional USE flags to append, and the optional third is the +# version to use instead of the automatic version (use sparingly). In addition, +# the optional fourth argument defines slot+operator instead of automatic slot +# (use even more sparingly). +# The output of this should be added directly to DEPEND/RDEPEND, and may be +# wrapped in a USE conditional (but not an || conditional without an extra set +# of parentheses). +add_plasma_dep() { + debug-print-function ${FUNCNAME} "$@" + + if [[ $# -gt 4 ]]; then + die "${FUNCNAME} was called with too many arguments" + fi + + local version + + if [[ -n ${3} ]]; then + version=${3} + elif [[ ${CATEGORY} = kde-plasma ]]; then + version=$(ver_cut 1-3) + elif [[ -z ${3} ]] ; then + version=${PLASMA_MINIMAL} + fi + + _add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}" +} + +# @FUNCTION: add_kdeapps_dep +# @USAGE: <package name> [USE flags] [minimum version] [slot + operator] +# @DESCRIPTION: +# Create proper dependency for kde-apps/ dependencies. +# This takes 1 to 4 arguments. The first being the package name, the optional +# second is additional USE flags to append, and the optional third is the +# version to use instead of the automatic version (use sparingly). In addition, +# the optional fourth argument defines slot+operator instead of automatic slot +# (use even more sparingly). +# The output of this should be added directly to DEPEND/RDEPEND, and may be +# wrapped in a USE conditional (but not an || conditional without an extra set +# of parentheses). +add_kdeapps_dep() { + debug-print-function ${FUNCNAME} "$@" + + if [[ $# -gt 4 ]]; then + die "${FUNCNAME} was called with too many arguments" + fi + + local version + + if [[ -n ${3} ]]; then + version=${3} + elif [[ ${CATEGORY} = kde-apps ]]; then + version=$(ver_cut 1-3) + elif [[ -z ${3} ]] ; then + version=${KDE_APPS_MINIMAL} + fi + + _add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}" +} + +# @FUNCTION: add_qt_dep +# @USAGE: <package name> [USE flags] [minimum version] [slot + operator] +# @DESCRIPTION: +# Create proper dependency for dev-qt/ dependencies. +# This takes 1 to 4 arguments. The first being the package name, the optional +# second is additional USE flags to append, and the optional third is the +# version to use instead of the automatic version (use sparingly). In addition, +# the optional fourth argument defines slot+operator instead of automatic slot +# (use even more sparingly). +# The output of this should be added directly to DEPEND/RDEPEND, and may be +# wrapped in a USE conditional (but not an || conditional without an extra set +# of parentheses). +add_qt_dep() { + debug-print-function ${FUNCNAME} "$@" + + if [[ $# -gt 4 ]]; then + die "${FUNCNAME} was called with too many arguments" + fi + + local version=${3} + local slot=${4} + + if [[ -z ${version} ]]; then + if [[ ${1} = qtwebkit && $(ver_cut 2 ${QT_MINIMAL}) -ge 9 ]]; then + version=5.9.1 # no more upstream release, need bug #624404 + else + version=${QT_MINIMAL} + fi + fi + if [[ -z ${slot} ]]; then + slot="5" + fi + + _add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}" +} + +# @FUNCTION: get_kde_version [version] +# @DESCRIPTION: +# Translates an ebuild version into a major.minor KDE release version, taking +# into account KDE's prerelease versioning scheme. +# For example, get_kde_version 17.07.80 will return "17.08". +# If the version equals 9999, "live" is returned. +# If no version is specified, ${PV} is used. +get_kde_version() { + local ver=${1:-${PV}} + local major=$(ver_cut 1 ${ver}) + local minor=$(ver_cut 2 ${ver}) + local micro=$(ver_cut 3 ${ver}) + if [[ ${ver} == 9999 ]]; then + echo live + else + (( micro < 50 )) && echo ${major}.${minor} || echo ${major}.$((minor + 1)) + fi +} + +# @FUNCTION: kde_l10n2lingua +# @USAGE: <l10n>... +# @INTERNAL +# @DESCRIPTION: +# Output KDE lingua flag name(s) (without prefix(es)) appropriate for +# given l10n(s). +kde_l10n2lingua() { + local l + for l; do + case ${l} in + ca-valencia) echo ca@valencia;; + sr-ijekavsk) echo sr@ijekavian;; + sr-Latn-ijekavsk) echo sr@ijekavianlatin;; + sr-Latn) echo sr@latin;; + uz-Cyrl) echo uz@cyrillic;; + *) echo "${l/-/_}";; + esac + done +} + +# @FUNCTION: punt_bogus_dep +# @USAGE: <prefix> <dependency> +# @DESCRIPTION: +# Removes a specified dependency from a find_package call with multiple components. +punt_bogus_dep() { + local prefix=${1} + local dep=${2} + + if [[ ! -e "CMakeLists.txt" ]]; then + return + fi + + pcregrep -Mni "(?s)find_package\s*$\s*${prefix}[^)]*?${dep}.*?$" CMakeLists.txt > "${T}/bogus${dep}" + + # pcregrep returns non-zero on no matches/error + if [[ $? != 0 ]] ; then + return + fi + + local length=$(wc -l "${T}/bogus${dep}" | cut -d " " -f 1) + local first=$(head -n 1 "${T}/bogus${dep}" | cut -d ":" -f 1) + local last=$(( ${length} + ${first} - 1)) + + sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die + + if [[ ${length} = 1 ]] ; then + sed -e "/find_package\s*(\s*${prefix}$\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}$\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die + fi +} + +fi diff -uNr a/eclass/kde5-meta-pkg.eclass b/eclass/kde5-meta-pkg.eclass --- a/eclass/kde5-meta-pkg.eclass false +++ b/eclass/kde5-meta-pkg.eclass 121832ea21344e4a02d342d6e7787523eaff9867aded56f5d4b2f78187f9d0f51f6b7358136dc555f73cfdc895309ef210ec8797f67a281a8d9c888f4da29942 @@ -0,0 +1,25 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: kde5-meta-pkg.eclass +# @MAINTAINER: +# kde@gentoo.org +# @BLURB: This eclass contains boilerplate for KDE meta packages. +# @DESCRIPTION: +# This eclass should only be used for defining meta packages bundling +# software produced by the KDE community. + +if [[ -z ${_KDE5_META_PKG_ECLASS} ]]; then +_KDE5_META_PKG_ECLASS=1 + +inherit kde5-functions + +HOMEPAGE="https://www.kde.org/" +LICENSE="metapackage" +SLOT="5" + +if [[ ${CATEGORY} = kde-apps ]]; then + RDEPEND+=" !kde-apps/${PN}:4" +fi + +fi diff -uNr a/eclass/kde5.eclass b/eclass/kde5.eclass --- a/eclass/kde5.eclass false +++ b/eclass/kde5.eclass c5c1187e8bd649a971f1a7cfdc490b84948ef71e9d04e4fbfec070a67638d49dc3e67b7dddab13a392b7cb14e92fb777f4452f04c8619e2d337bf1e9a9914b67 @@ -0,0 +1,763 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: kde5.eclass +# @MAINTAINER: +# kde@gentoo.org +# @BLURB: Support eclass for packages that follow KDE packaging conventions. +# @DESCRIPTION: +# This eclass is intended to streamline the creation of ebuilds for packages +# that follow KDE upstream packaging conventions. It's primarily intended for +# the three upstream release groups (Frameworks, Plasma, Applications) but +# is also for any package that follows similar conventions. +# +# This eclass unconditionally inherits kde5-functions.eclass and all its public +# functions and variables may be considered as part of this eclass's API. +# +# This eclass unconditionally inherits cmake-utils.eclass and all its public +# variables and helper functions (not phase functions) may be considered as part +# of this eclass's API. +# +# This eclass's phase functions are not intended to be mixed and matched, so if +# any phase functions are overridden the version here should also be called. + +if [[ -z ${_KDE5_ECLASS} ]]; then +_KDE5_ECLASS=1 + +# @ECLASS-VARIABLE: VIRTUALX_REQUIRED +# @DESCRIPTION: +# For proper description see virtualx.eclass manpage. +# Here we redefine default value to be manual, if your package needs virtualx +# for tests you should proceed with setting VIRTUALX_REQUIRED=test. +: ${VIRTUALX_REQUIRED:=manual} + +inherit cmake-utils flag-o-matic gnome2-utils kde5-functions virtualx xdg + +case ${EAPI} in + 6) inherit eapi7-ver eutils ;; +esac + +if [[ ${KDE_BUILD_TYPE} = live ]]; then + case ${KDE_SCM} in + git) inherit git-r3 ;; + esac +fi + +if [[ -v KDE_GCC_MINIMAL ]]; then + EXPORT_FUNCTIONS pkg_pretend +fi + +EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm + +# @ECLASS-VARIABLE: KDE_AUTODEPS +# @DESCRIPTION: +# If set to "false", do nothing. +# For any other value, add dependencies on dev-qt/qtcore:5, kde-frameworks/kf-env +# and kde-frameworks/extra-cmake-modules:5. Additionally, required blockers may +# be set depending on the value of CATEGORY. +: ${KDE_AUTODEPS:=true} + +# @ECLASS-VARIABLE: KDE_BLOCK_SLOT4 +# @DESCRIPTION: +# This variable only has any effect when when CATEGORY = "kde-apps" and +# KDE_AUTODEPS is also set. If set to "true", add RDEPEND block on kde-apps/${PN}:4 +: ${KDE_BLOCK_SLOT4:=true} + +# @ECLASS-VARIABLE: KDE_DEBUG +# @DESCRIPTION: +# If set to "false", add -DNDEBUG (via cmake-utils_src_configure) and -DQT_NO_DEBUG +# to CPPFLAGS. +# Otherwise, add debug to IUSE. +: ${KDE_DEBUG:=true} + +# @ECLASS-VARIABLE: KDE_DESIGNERPLUGIN +# @DESCRIPTION: +# If set to "false", do nothing. +# Otherwise, add "designer" to IUSE to toggle build of designer plugins +# and add the necessary DEPENDs. +: ${KDE_DESIGNERPLUGIN:=false} + +# @ECLASS-VARIABLE: KDE_EXAMPLES +# @DESCRIPTION: +# If set to "false", unconditionally ignore a top-level examples subdirectory. +# Otherwise, add "examples" to IUSE to toggle adding that subdirectory. +: ${KDE_EXAMPLES:=false} + +# @ECLASS-VARIABLE: KDE_HANDBOOK +# @DESCRIPTION: +# If set to "false", do nothing. +# Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and +# generate and install KDE handbook. +# If set to "optional", config with -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON +# when USE=!handbook. In case package requires KF5KDELibs4Support, see next: +# If set to "forceoptional", remove a KF5DocTools dependency from the root +# CMakeLists.txt in addition to the above. +: ${KDE_HANDBOOK:=false} + +# @ECLASS-VARIABLE: KDE_DOC_DIR +# @DESCRIPTION: +# Specifies the location of the KDE handbook if not the default. +: ${KDE_DOC_DIR:=doc} + +# @ECLASS-VARIABLE: KDE_PO_DIRS +# @DESCRIPTION: +# Specifies the possible locations of KDE l10n files if not the default. +: ${KDE_PO_DIRS:="po poqm"} + +# @ECLASS-VARIABLE: KDE_QTHELP +# @DESCRIPTION: +# If set to "false", do nothing. +# Otherwise, add "doc" to IUSE, add the appropriate dependency, generate +# and install Qt compressed help files with -DBUILD_QCH=ON when USE=doc. +if [[ ${CATEGORY} = kde-frameworks ]]; then + : ${KDE_QTHELP:=true} +fi +: ${KDE_QTHELP:=false} + +# @ECLASS-VARIABLE: KDE_TESTPATTERN +# @DESCRIPTION: +# DANGER: Only touch it if you know what you are doing. +# By default, matches autotest(s), unittest(s) and test(s) pattern inside +# cmake add_subdirectory calls. +: ${KDE_TESTPATTERN:="$auto|unit$\?tests\?"} + +# @ECLASS-VARIABLE: KDE_TEST +# @DESCRIPTION: +# If set to "false", do nothing. +# For any other value, add test to IUSE and add a dependency on dev-qt/qttest:5. +# If set to "optional", configure with -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON +# when USE=!test. +# If set to "forceoptional", remove a Qt5Test dependency and comment test +# subdirs from the root CMakeLists.txt in addition to the above. +# If set to "forceoptional-recursive", remove Qt5Test dependencies and make +# test subdirs according to KDE_TESTPATTERN from *any* CMakeLists.txt in ${S} +# and below conditional on BUILD_TESTING. This is always meant as a short-term +# fix and creates ${T}/${P}-tests-optional.patch to refine and submit upstream. +if [[ ${CATEGORY} = kde-frameworks ]]; then + : ${KDE_TEST:=true} +fi +: ${KDE_TEST:=false} + +# @ECLASS-VARIABLE: KDE_SELINUX_MODULE +# @DESCRIPTION: +# If set to "none", do nothing. +# For any other value, add selinux to IUSE, and depending on that useflag +# add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND. +: ${KDE_SELINUX_MODULE:=none} + +# @ECLASS-VARIABLE: KDE_SUBSLOT +# @DESCRIPTION: +# If set to "false", do nothing. +# If set to "true", add a subslot to the package, where subslot is either +# defined as major.minor version for kde-*/ categories or ${PV} if other. +# For any other value, that value will be used as subslot. +: ${KDE_SUBSLOT:=false} + +# @ECLASS-VARIABLE: KDE_UNRELEASED +# @INTERNAL +# @DESCRIPTION +# An array of $CATEGORY-$PV pairs of packages that are unreleased upstream. +# Any package matching this will have fetch restriction enabled, and receive +# a proper error message via pkg_nofetch. +KDE_UNRELEASED=( ) + +if [[ ${KDEBASE} = kdevelop ]]; then + HOMEPAGE="https://www.kdevelop.org/" +elif [[ ${KMNAME} = kdepim ]]; then + HOMEPAGE="https://www.kde.org/applications/office/kontact/" +else + HOMEPAGE="https://www.kde.org/" +fi + +LICENSE="GPL-2" + +SLOT=5 + +if [[ ${CATEGORY} = kde-frameworks ]]; then + KDE_SUBSLOT=true +fi + +case ${KDE_SUBSLOT} in + false) ;; + true) + case ${CATEGORY} in + kde-frameworks | \ + kde-plasma | \ + kde-apps) + SLOT+="/$(ver_cut 1-2)" + ;; + *) + SLOT+="/${PV}" + ;; + esac + ;; + *) + SLOT+="/${KDE_SUBSLOT}" + ;; +esac + +case ${KDE_AUTODEPS} in + false) ;; + *) + DEPEND+=" $(add_frameworks_dep extra-cmake-modules)" + RDEPEND+=" >=kde-frameworks/kf-env-4" + COMMONDEPEND+=" $(add_qt_dep qtcore)" + + # all packages need breeze/oxygen icons for basic iconset, bug #564838 + if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then + RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )" + fi + + if [[ ${CATEGORY} = kde-apps ]]; then + [[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4" + RDEPEND+=" + !kde-apps/kde-l10n + !<kde-apps/kde4-l10n-16.12.0:4 + !kde-apps/kdepim-l10n:5 + " + fi + ;; +esac + +case ${KDE_DEBUG} in + false) ;; + *) + IUSE+=" debug" + ;; +esac + +case ${KDE_DESIGNERPLUGIN} in + false) ;; + *) + IUSE+=" designer" + DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" +esac + +case ${KDE_EXAMPLES} in + false) ;; + *) + IUSE+=" examples" + ;; +esac + +case ${KDE_HANDBOOK} in + false) ;; + *) + IUSE+=" +handbook" + DEPEND+=" handbook? ( $(add_frameworks_dep kdoctools) )" + ;; +esac + +case ${KDE_QTHELP} in + false) ;; + *) + IUSE+=" doc" + COMMONDEPEND+=" doc? ( $(add_qt_dep qt-docs) )" + DEPEND+=" doc? ( + $(add_qt_dep qthelp) + >=app-doc/doxygen-1.8.13-r1 + )" + ;; +esac + +case ${KDE_TEST} in + false) ;; + *) + IUSE+=" test" + DEPEND+=" test? ( $(add_qt_dep qttest) )" + ;; +esac + +case ${KDE_SELINUX_MODULE} in + none) ;; + *) + IUSE+=" selinux" + RDEPEND+=" selinux? ( sec-policy/selinux-${KDE_SELINUX_MODULE} )" + ;; +esac + +DEPEND+=" ${COMMONDEPEND} dev-util/desktop-file-utils" +RDEPEND+=" ${COMMONDEPEND}" +unset COMMONDEPEND + +if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then + S=${WORKDIR}/${KMNAME}-${PV} +fi + +if [[ -n ${KDEBASE} && ${KDEBASE} = kdevelop && ${KDE_BUILD_TYPE} = release ]]; then + if [[ -n ${KMNAME} ]]; then + S=${WORKDIR}/${KMNAME}-${PV} + else + S=${WORKDIR}/${P} + fi +fi + +_kde_is_unreleased() { + local pair + for pair in "${KDE_UNRELEASED[@]}" ; do + if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then + return 0 + fi + done + + return 1 +} + +# Determine fetch location for released tarballs +_calculate_src_uri() { + debug-print-function ${FUNCNAME} "$@" + + local _kmname + + if [[ -n ${KMNAME} ]]; then + _kmname=${KMNAME} + else + _kmname=${PN} + fi + + case ${PN} in + kdelibs4support | \ + khtml | \ + kjs | \ + kjsembed | \ + kmediaplayer | \ + kross) + _kmname="portingAids/${_kmname}" + ;; + esac + + DEPEND+=" app-arch/xz-utils" + + case ${CATEGORY} in + kde-apps) + case ${PV} in + ??.?.[6-9]? | ??.??.[6-9]? ) + SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" + RESTRICT+=" mirror" + ;; + *) + SRC_URI="mirror://kde/stable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;; + esac + ;; + kde-frameworks) + SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;; + kde-plasma) + local plasmapv=$(ver_cut 1-3) + + case ${PV} in + 5.?.[6-9]? | 5.??.[6-9]? ) + # Plasma 5 beta releases + SRC_URI="mirror://kde/unstable/plasma/${plasmapv}/${_kmname}-${PV}.tar.xz" + RESTRICT+=" mirror" + ;; + *) + # Plasma 5 stable releases + SRC_URI="mirror://kde/stable/plasma/${plasmapv}/${_kmname}-${PV}.tar.xz" ;; + esac + ;; + esac + + if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then + local _kdebase + case ${PN} in + kdevelop-pg-qt) + _kdebase=${PN} ;; + *) + _kdebase=${KDEBASE} ;; + esac + case ${PV} in + *.*.[6-9]? ) + SRC_URI="mirror://kde/unstable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz" + RESTRICT+=" mirror" + ;; + *) + SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz" ;; + esac + unset _kdebase + fi + + if _kde_is_unreleased ; then + RESTRICT+=" fetch" + fi +} + +# Determine fetch location for live sources +_calculate_live_repo() { + debug-print-function ${FUNCNAME} "$@" + + SRC_URI="" + + case ${KDE_SCM} in + git) + # @ECLASS-VARIABLE: EGIT_MIRROR + # @DESCRIPTION: + # This variable allows easy overriding of default kde mirror service + # (anongit) with anything else you might want to use. + EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org} + + local _kmname + + # @ECLASS-VARIABLE: EGIT_REPONAME + # @DESCRIPTION: + # This variable allows overriding of default repository + # name. Specify only if this differ from PN and KMNAME. + if [[ -n ${EGIT_REPONAME} ]]; then + # the repository and kmname different + _kmname=${EGIT_REPONAME} + elif [[ -n ${KMNAME} ]]; then + _kmname=${KMNAME} + else + _kmname=${PN} + fi + + if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then + EGIT_BRANCH="Applications/$(ver_cut 1-2)" + fi + + if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then + EGIT_BRANCH="Plasma/$(ver_cut 1-2)" + fi + + EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}" + ;; + esac +} + +case ${KDE_BUILD_TYPE} in + live) _calculate_live_repo ;; + *) _calculate_src_uri ;; +esac + +debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" + +# @FUNCTION: kde5_pkg_pretend +# @DESCRIPTION: +# Checks if the active compiler meets the minimum version requirements. +# phase function is only exported if KDE_GCC_MINIMAL is defined. +kde5_pkg_pretend() { + debug-print-function ${FUNCNAME} "$@" + _check_gcc_version +} + +# @FUNCTION: kde5_pkg_setup +# @DESCRIPTION: +# Checks if the active compiler meets the minimum version requirements. +kde5_pkg_setup() { + debug-print-function ${FUNCNAME} "$@" + _check_gcc_version +} + +# @FUNCTION: kde5_pkg_nofetch +# @DESCRIPTION: +# Intended for use in the KDE overlay. If this package matches something in +# KDE_UNRELEASED, display a giant warning that the package has not yet been +# released upstream and should not be used. +kde5_pkg_nofetch() { + if ! _kde_is_unreleased ; then + return + fi + + eerror " _ _ _ _ ____ _____ _ _____ _ ____ _____ ____ " + eerror "| | | | \ | | _ \| ____| | | ____| / \ / ___|| ____| _ \ " + eerror "| | | | \| | |_) | _| | | | _| / _ \ \___ \| _| | | | |" + eerror "| |_| | |\ | _ <| |___| |___| |___ / ___ \ ___) | |___| |_| |" + eerror " \___/|_| \_|_| \_\_____|_____|_____/_/ \_\____/|_____|____/ " + eerror " " + eerror " ____ _ ____ _ __ _ ____ _____ " + eerror "| _ \ / \ / ___| |/ / / \ / ___| ____|" + eerror "| |_) / _ \| | | ' / / _ \| | _| _| " + eerror "| __/ ___ \ |___| . \ / ___ \ |_| | |___ " + eerror "|_| /_/ \_\____|_|\_\/_/ \_\____|_____|" + eerror + eerror "${CATEGORY}/${P} has not been released to the public yet" + eerror "and is only available to packagers right now." + eerror "" + eerror "This is not a bug. Please do not file bugs or contact upstream about this." + eerror "" + eerror "Please consult the upstream release schedule to see when this " + eerror "package is scheduled to be released:" + eerror "https://community.kde.org/Schedules" +} + +# @FUNCTION: kde5_src_unpack +# @DESCRIPTION: +# Unpack the sources, automatically handling both release and live ebuilds. +kde5_src_unpack() { + debug-print-function ${FUNCNAME} "$@" + + if [[ ${KDE_BUILD_TYPE} = live ]]; then + case ${KDE_SCM} in + git) + git-r3_src_unpack + ;; + esac + else + default + fi +} + +# @FUNCTION: kde5_src_prepare +# @DESCRIPTION: +# Wrapper for cmake-utils_src_prepare with lots of extra logic for magic +# handling of linguas, tests, handbook etc. +kde5_src_prepare() { + debug-print-function ${FUNCNAME} "$@" + + cmake-utils_src_prepare + + # only build examples when required + if ! use_if_iuse examples || ! use examples ; then + cmake_comment_add_subdirectory examples + fi + + # only enable handbook when required + if ! use_if_iuse handbook ; then + cmake_comment_add_subdirectory ${KDE_DOC_DIR} + + if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then + punt_bogus_dep KF5 DocTools + sed -i -e "/kdoctools_install/ s/^/#DONT/" CMakeLists.txt || die + fi + fi + + # drop translations when nls is not wanted + if in_iuse nls && ! use nls ; then + local po + for po in ${KDE_PO_DIRS}; do + if [[ -d ${po} ]] ; then + rm -r ${po} || die + fi + done + fi + + # enable only the requested translations when required + if [[ -v LINGUAS ]] ; then + local po + for po in ${KDE_PO_DIRS}; do + if [[ -d ${po} ]] ; then + pushd ${po} > /dev/null || die + local lang + for lang in *; do + if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then + case ${lang} in + cmake_modules | \ + CMakeLists.txt | \ + ${PN}.pot) ;; + *) rm -r ${lang} || die ;; + esac + if [[ -e CMakeLists.txt ]] ; then + cmake_comment_add_subdirectory ${lang} + sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \ + -i CMakeLists.txt || die + fi + fi + done + popd > /dev/null || die + fi + done + fi + + if [[ ${KDE_BUILD_TYPE} = release && ${CATEGORY} != kde-apps ]] ; then + if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && -v LINGUAS ]] ; then + pushd ${KDE_DOC_DIR} > /dev/null || die + local lang + for lang in *; do + if ! has ${lang} ${LINGUAS} ; then + cmake_comment_add_subdirectory ${lang} + fi + done + popd > /dev/null || die + fi + fi + + # only build unit tests when required + if ! use_if_iuse test ; then + if [[ ${KDE_TEST} = forceoptional ]] ; then + punt_bogus_dep Qt5 Test + # if forceoptional, also cover non-kde categories + cmake_comment_add_subdirectory autotests test tests + elif [[ ${KDE_TEST} = forceoptional-recursive ]] ; then + punt_bogus_dep Qt5 Test + local f pf="${T}/${P}"-tests-optional.patch + touch ${pf} || die "Failed to touch patch file" + for f in $(find . -type f -name "CMakeLists.txt" -exec \ + grep -l "^\s*add_subdirectory\s*$\s*.*${KDE_TESTPATTERN}\s*)\s*$" {} \;); do + cp ${f} ${f}.old || die "Failed to prepare patch origfile" + pushd ${f%/*} > /dev/null || die + punt_bogus_dep Qt5 Test + sed -i CMakeLists.txt -e \ + "/^#/! s/add_subdirectory\s*$\s*.*${KDE_TESTPATTERN}\s*)\s*$/if(BUILD_TESTING)\n&\nendif()/" \ + || die + popd > /dev/null || die + diff -Naur ${f}.old ${f} 1>>${pf} + rm ${f}.old || die "Failed to clean up" + done + einfo "Build system was modified by KDE_TEST=forceoptional-recursive." + einfo "Unified diff file ready for pickup in:" + einfo " ${pf}" + einfo "Push it upstream to make this message go away." + elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then + cmake_comment_add_subdirectory autotests test tests + fi + fi + + # in frameworks, tests = manual tests so never build them + if [[ ${CATEGORY} = kde-frameworks ]] && [[ ${PN} != extra-cmake-modules ]]; then + cmake_comment_add_subdirectory tests + fi +} + +# @FUNCTION: kde5_src_configure +# @DESCRIPTION: +# Wrapper for cmake-utils_src_configure with extra logic for magic handling of +# handbook, tests etc. +kde5_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + # we rely on cmake-utils.eclass to append -DNDEBUG too + if ! use_if_iuse debug; then + append-cppflags -DQT_NO_DEBUG + fi + + local cmakeargs + + if in_iuse test && ! use test ; then + cmakeargs+=( -DBUILD_TESTING=OFF ) + + if [[ ${KDE_TEST} = optional ]] ; then + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON ) + fi + fi + + if ! use_if_iuse handbook && [[ ${KDE_HANDBOOK} = optional ]] ; then + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON ) + fi + + if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON ) + fi + + if [[ ${KDE_QTHELP} != false ]]; then + cmakeargs+=( -DBUILD_QCH=$(usex doc) ) + fi + + # install mkspecs in the same directory as qt stuff + cmakeargs+=(-DKDE_INSTALL_USE_QT_SYS_PATHS=ON) + + # allow the ebuild to override what we set here + mycmakeargs=("${cmakeargs[@]}" "${mycmakeargs[@]}") + + cmake-utils_src_configure +} + +# @FUNCTION: kde5_src_compile +# @DESCRIPTION: +# Wrapper for cmake-utils_src_compile. Currently doesn't do anything extra, but +# is included as part of the API just in case it's needed in the future. +kde5_src_compile() { + debug-print-function ${FUNCNAME} "$@" + + cmake-utils_src_compile "$@" +} + +# @FUNCTION: kde5_src_test +# @DESCRIPTION: +# Wrapper for cmake-utils_src_test with extra logic for magic handling of dbus +# and virtualx. +kde5_src_test() { + debug-print-function ${FUNCNAME} "$@" + + _test_runner() { + if [[ -n "${VIRTUALDBUS_TEST}" ]]; then + export $(dbus-launch) + fi + + cmake-utils_src_test + } + + # When run as normal user during ebuild development with the ebuild command, the + # kde tests tend to access the session DBUS. This however is not possible in a real + # emerge or on the tinderbox. + # > make sure it does not happen, so bad tests can be recognized and disabled + unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID + + if [[ ${VIRTUALX_REQUIRED} = always || ${VIRTUALX_REQUIRED} = test ]]; then + virtx _test_runner + else + _test_runner + fi + + if [[ -n "${DBUS_SESSION_BUS_PID}" ]] ; then + kill ${DBUS_SESSION_BUS_PID} + fi +} + +# @FUNCTION: kde5_src_install +# @DESCRIPTION: +# Wrapper for cmake-utils_src_install with extra logic to avoid compressing +# certain types of files. For example, khelpcenter is not able to read +# compressed handbooks. +kde5_src_install() { + debug-print-function ${FUNCNAME} "$@" + + cmake-utils_src_install + + # We don't want QCH and tags files to be compressed, because then + # cmake can't find the tags and qthelp viewers can't find the docs + local p=$(best_version dev-qt/qtcore:5) + local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev) + if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then + docompress -x /usr/share/doc/qt-${pv} + fi + + # We don't want /usr/share/doc/HTML to be compressed, + # because then khelpcenter can't find the docs + if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then + docompress -x /usr/share/doc/HTML + fi +} + +# @FUNCTION: kde5_pkg_preinst +# @DESCRIPTION: +# Sets up environment variables required in kde5_pkg_postinst. +kde5_pkg_preinst() { + debug-print-function ${FUNCNAME} "$@" + + gnome2_icon_savelist + xdg_pkg_preinst +} + +# @FUNCTION: kde5_pkg_postinst +# @DESCRIPTION: +# Updates the various XDG caches (icon, desktop, mime) if necessary. +kde5_pkg_postinst() { + debug-print-function ${FUNCNAME} "$@" + + if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then + gnome2_icon_cache_update + fi + xdg_pkg_postinst + + if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then + if [[ ${KDE_BUILD_TYPE} = live ]]; then + echo + einfo "WARNING! This is an experimental live ebuild of ${CATEGORY}/${PN}" + einfo "Use it at your own risk." + einfo "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!" + fi + fi +} + +# @FUNCTION: kde5_pkg_postrm +# @DESCRIPTION: +# Updates the various XDG caches (icon, desktop, mime) if necessary. +kde5_pkg_postrm() { + debug-print-function ${FUNCNAME} "$@" + + if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then + gnome2_icon_cache_update + fi + xdg_pkg_postrm +} + +fi diff -uNr a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass --- a/eclass/kernel-2.eclass false +++ b/eclass/kernel-2.eclass e4c35a5e87eead9fbcf3b026b49c33decf3cd329164fa7a878c0a27ea90f30f8d4d90aeccc7f9a9d67caacda7477e88e1f885327802352259af4e61599c79a3c @@ -0,0 +1,1644 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: kernel-2.eclass +# @MAINTAINER: +# Gentoo Kernel project <kernel@gentoo.org> +# @AUTHOR: +# John Mylchreest <johnm@gentoo.org> +# Mike Pagano <mpagano@gentoo.org> +# <so many, many others, please add yourself> +# @BLURB: Eclass for kernel packages +# @DESCRIPTION: +# This is the kernel.eclass rewrite for a clean base regarding the 2.6 +# series of kernel with back-compatibility for 2.4 +# Please direct your bugs to the current eclass maintainer :) +# added functionality: +# unipatch - a flexible, singular method to extract, add and remove patches. + +# @ECLASS-VARIABLE: K_USEPV +# @DEFAULT_UNSET +# @DESCRIPTION: +# When setting the EXTRAVERSION variable, it should +# add PV to the end. +# this is useful for things like wolk. IE: +# EXTRAVERSION would be something like : -wolk-4.19-r1 + +# @ECLASS-VARIABLE: K_NOSETEXTRAVERSION +# @DEFAULT_UNSET +# @DESCRIPTION: +# if this is set then EXTRAVERSION will not be +# automatically set within the kernel Makefile + +# @ECLASS-VARIABLE: K_NOUSENAME +# @DEFAULT_UNSET +# @DESCRIPTION: +# if this is set then EXTRAVERSION will not include the +# first part of ${PN} in EXTRAVERSION + +# @ECLASS-VARIABLE: K_NOUSEPR +# @DEFAULT_UNSET +# @DESCRIPTION: +# if this is set then EXTRAVERSION will not include the +# anything based on ${PR}. + +# @ECLASS-VARIABLE: K_PREPATCHED +# @DEFAULT_UNSET +# @DESCRIPTION: +# if the patchset is prepatched (ie: mm-sources, +# ck-sources, ac-sources) it will use PR (ie: -r5) as +# the patchset version for +# and not use it as a true package revision + +# @ECLASS-VARIABLE: K_EXTRAEINFO +# @DEFAULT_UNSET +# @DESCRIPTION: +# this is a new-line seperated list of einfo displays in +# postinst and can be used to carry additional postinst +# messages + +# @ECLASS-VARIABLE: K_EXTRAELOG +# @DEFAULT_UNSET +# @DESCRIPTION: +# same as K_EXTRAEINFO except using elog instead of einfo + +# @ECLASS-VARIABLE: K_EXTRAEWARN +# @DEFAULT_UNSET +# @DESCRIPTION: +# same as K_EXTRAEINFO except using ewarn instead of einfo + +# @ECLASS-VARIABLE: K_SYMLINK +# @DEFAULT_UNSET +# @DESCRIPTION: +# if this is set, then forcably create symlink anyway + +# @ECLASS-VARIABLE: K_BASE_VER +# @DEFAULT_UNSET +# @DESCRIPTION: +# for git-sources, declare the base version this patch is +# based off of. + +# @ECLASS-VARIABLE: K_DEFCONFIG +# @DEFAULT_UNSET +# @DESCRIPTION: +# Allow specifying a different defconfig target. +# If length zero, defaults to "defconfig". + +# @ECLASS-VARIABLE: K_WANT_GENPATCHES +# @DEFAULT_UNSET +# @DESCRIPTION: +# Apply genpatches to kernel source. Provide any +# combination of "base", "extras" or "experimental". + +# @ECLASS-VARIABLE: K_EXP_GENPATCHES_PULL +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set, we pull "experimental" regardless of the USE FLAG +# but expect the ebuild maintainer to use K_EXP_GENPATCHES_LIST. + +# @ECLASS-VARIABLE: K_EXP_GENPATCHES_NOUSE +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set, no USE flag will be provided for "experimental"; +# as a result the user cannot choose to apply those patches. + +# @ECLASS-VARIABLE: K_EXP_GENPATCHES_LIST +# @DEFAULT_UNSET +# @DESCRIPTION: +# A list of patches to pick from "experimental" to apply when +# the USE flag is unset and K_EXP_GENPATCHES_PULL is set. + +# @ECLASS-VARIABLE: K_FROM_GIT +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set, this variable signals that the kernel sources derives +# from a git tree and special handling will be applied so that +# any patches that are applied will actually apply. + +# @ECLASS-VARIABLE: K_GENPATCHES_VER +# @DEFAULT_UNSET +# @DESCRIPTION: +# The version of the genpatches tarball(s) to apply. +# A value of "5" would apply genpatches-2.6.12-5 to +# my-sources-2.6.12.ebuild + +# @ECLASS-VARIABLE: K_SECURITY_UNSUPPORTED +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set, this kernel is unsupported by Gentoo Security +# to the current eclass maintainer :) + +# @ECLASS-VARIABLE: K_DEBLOB_AVAILABLE +# @DEFAULT_UNSET +# @DESCRIPTION: +# A value of "0" will disable all of the optional deblob +# code. If empty, will be set to "1" if deblobbing is +# possible. Test ONLY for "1". + +# @ECLASS-VARIABLE: K_DEBLOB_TAG +# @DEFAULT_UNSET +# @DESCRIPTION: +# This will be the version of deblob script. It's a upstream SVN tag +# such asw -gnu or -gnu1. + +# @ECLASS-VARIABLE: K_PREDEBLOBBED +# @DEFAULT_UNSET +# @DESCRIPTION: +# This kernel was already deblobbed elsewhere. +# If false, either optional deblobbing will be available +# or the license will note the inclusion of linux-firmware code. + +# @ECLASS-VARIABLE: K_LONGTERM +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set, the eclass will search for the kernel source +# in the long term directories on the upstream servers +# as the location has been changed by upstream + +# @ECLASS-VARIABLE: H_SUPPORTEDARCH +# @DEFAULT_UNSET +# @DESCRIPTION: +# this should be a space separated list of ARCH's which +# can be supported by the headers ebuild + +# @ECLASS-VARIABLE: UNIPATCH_LIST +# @DEFAULT_UNSET +# @DESCRIPTION: +# space delimetered list of patches to be applied to the kernel + +# @ECLASS-VARIABLE: UNIPATCH_EXCLUDE +# @DEFAULT_UNSET +# @DESCRIPTION: +# An addition var to support exlusion based completely +# on "<passedstring>*" and not "<passedno#>_*" +# this should _NOT_ be used from the ebuild as this is +# reserved for end users passing excludes from the cli + +# @ECLASS-VARIABLE: UNIPATCH_DOCS +# @DEFAULT_UNSET +# @DESCRIPTION: +# space delimemeted list of docs to be installed to +# the doc dir + +# @ECLASS-VARIABLE: UNIPATCH_STRICTORDER +# @DEFAULT_UNSET +# @DESCRIPTION: +# if this is set places patches into directories of +# order, so they are applied in the order passed +# Changing any other variable in this eclass is not supported; you can request +# for additional variables to be added by contacting the current maintainer. +# If you do change them, there is a chance that we will not fix resulting bugs; +# that of course does not mean we're not willing to help. + +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit eutils toolchain-funcs versionator multilib python-any-r1 +case ${EAPI:-0} in + 0|1) + EXPORT_FUNCTIONS src_{unpack,compile,install,test} \ + pkg_{setup,preinst,postinst,postrm} ;; + 2|3|4|5|6) + EXPORT_FUNCTIONS src_{unpack,prepare,compile,install,test} \ + pkg_{setup,preinst,postinst,postrm} ;; + *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; +esac + +# Added by Daniel Ostrow <dostrow@gentoo.org> +# This is an ugly hack to get around an issue with a 32-bit userland on ppc64. +# I will remove it when I come up with something more reasonable. +[[ ${PROFILE_ARCH} == "ppc64" ]] && CHOST="powerpc64-${CHOST#*-}" + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then + export CTARGET=${CATEGORY/cross-} +fi + +HOMEPAGE="https://www.kernel.org/ https://www.gentoo.org/ ${HOMEPAGE}" +: ${LICENSE:="GPL-2"} + +has "${EAPI:-0}" 0 1 2 && ED=${D} EPREFIX= EROOT=${ROOT} + +# This is the latest KV_PATCH of the deblob tool available from the +# libre-sources upstream. If you bump this, you MUST regenerate the Manifests +# for ALL kernel-2 consumer packages where deblob is available. +: ${DEBLOB_MAX_VERSION:=38} + +# No need to run scanelf/strip on kernel sources/headers (bug #134453). +RESTRICT="binchecks strip" + +# set LINUX_HOSTCFLAGS if not already set +: ${LINUX_HOSTCFLAGS:="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"} + + +# @FUNCTION: debug-print-kernel2-variables +# @USAGE: +# @DESCRIPTION: +# this function exists only to help debug kernel-2.eclass +# if you are adding new functionality in, put a call to it +# at the start of src_unpack, or during SRC_URI/dep generation. + +debug-print-kernel2-variables() { + for v in PVR CKV OKV KV KV_FULL KV_MAJOR KV_MINOR KV_PATCH RELEASETYPE \ + RELEASE UNIPATCH_LIST_DEFAULT UNIPATCH_LIST_GENPATCHES \ + UNIPATCH_LIST S KERNEL_URI K_WANT_GENPATCHES ; do + debug-print "${v}: ${!v}" + done +} + +# @FUNCTION: handle_genpatches +# @USAGE: [--set-unipatch-list] +# @DESCRIPTION: +# add genpatches to list of patches to apply if wanted + +handle_genpatches() { + local tarball want_unipatch_list + [[ -z ${K_WANT_GENPATCHES} || -z ${K_GENPATCHES_VER} ]] && return 1 + + if [[ -n ${1} ]]; then + # set UNIPATCH_LIST_GENPATCHES only on explicit request + # since that requires 'use' call which can be used only in phase + # functions, while the function is also called in global scope + if [[ ${1} == --set-unipatch-list ]]; then + want_unipatch_list=1 + else + die "Usage: ${FUNCNAME} [--set-unipatch-list]" + fi + fi + + debug-print "Inside handle_genpatches" + local OKV_ARRAY + IFS="." read -r -a OKV_ARRAY <<<"${OKV}" + + # for > 3.0 kernels, handle genpatches tarball name + # genpatches for 3.0 and 3.0.1 might be named + # genpatches-3.0-1.base.tar.xz and genpatches-3.0-2.base.tar.xz + # respectively. Handle this. + + for i in ${K_WANT_GENPATCHES} ; do + if [[ ${KV_MAJOR} -ge 3 ]]; then + if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then + tarball="genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.xz" + else + tarball="genpatches-${KV_MAJOR}.${KV_PATCH}-${K_GENPATCHES_VER}.${i}.tar.xz" + fi + else + tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.xz" + fi + + local use_cond_start="" use_cond_end="" + + if [[ "${i}" == "experimental" && -z ${K_EXP_GENPATCHES_PULL} && -z ${K_EXP_GENPATCHES_NOUSE} ]] ; then + use_cond_start="experimental? ( " + use_cond_end=" )" + + if [[ -n ${want_unipatch_list} ]] && use experimental ; then + UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" + debug-print "genpatches tarball: $tarball" + fi + elif [[ -n ${want_unipatch_list} ]]; then + UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" + debug-print "genpatches tarball: $tarball" + fi + GENPATCHES_URI+=" ${use_cond_start}mirror://gentoo/${tarball}${use_cond_end}" + done +} + +# @FUNCTION: detect_version +# @USAGE: +# @DESCRIPTION: +# this function will detect and set +# - OKV: Original Kernel Version (2.6.0/2.6.0-test11) +# - KV: Kernel Version (2.6.0-gentoo/2.6.0-test11-gentoo-r1) +# - EXTRAVERSION: The additional version appended to OKV (-gentoo/-gentoo-r1) +detect_version() { + + # We've already run, so nothing to do here. + [[ -n ${KV_FULL} ]] && return 0 + + # CKV is used as a comparison kernel version, which is used when + # PV doesnt reflect the genuine kernel version. + # this gets set to the portage style versioning. ie: + # CKV=2.6.11_rc4 + CKV=${CKV:-${PV}} + OKV=${OKV:-${CKV}} + OKV=${OKV/_beta/-test} + OKV=${OKV/_rc/-rc} + OKV=${OKV/-r*} + OKV=${OKV/_p*} + + KV_MAJOR=$(get_version_component_range 1 ${OKV}) + # handle if OKV is X.Y or X.Y.Z (e.g. 3.0 or 3.0.1) + local OKV_ARRAY + IFS="." read -r -a OKV_ARRAY <<<"${OKV}" + + # if KV_MAJOR >= 3, then we have no more KV_MINOR + #if [[ ${KV_MAJOR} -lt 3 ]]; then + if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then + KV_MINOR=$(get_version_component_range 2 ${OKV}) + KV_PATCH=$(get_version_component_range 3 ${OKV}) + if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then + KV_EXTRA=$(get_version_component_range 4- ${OKV}) + KV_EXTRA=${KV_EXTRA/[-_]*} + else + KV_PATCH=$(get_version_component_range 3- ${OKV}) + fi + else + KV_PATCH=$(get_version_component_range 2 ${OKV}) + KV_EXTRA=$(get_version_component_range 3- ${OKV}) + KV_EXTRA=${KV_EXTRA/[-_]*} + fi + + debug-print "KV_EXTRA is ${KV_EXTRA}" + + KV_PATCH=${KV_PATCH/[-_]*} + + local v n=0 missing + #if [[ ${KV_MAJOR} -lt 3 ]]; then + if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then + for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do + [[ -z ${!v} ]] && n=1 && missing="${missing}${v} "; + done + else + for v in CKV OKV KV_{MAJOR,PATCH} ; do + [[ -z ${!v} ]] && n=1 && missing="${missing}${v} "; + done + fi + + [[ $n -eq 1 ]] && \ + eerror "Missing variables: ${missing}" && \ + die "Failed to extract kernel version (try explicit CKV in ebuild)!" + unset v n missing + +# if [[ ${KV_MAJOR} -ge 3 ]]; then + if [[ ${#OKV_ARRAY[@]} -lt 3 ]]; then + KV_PATCH_ARR=(${KV_PATCH//\./ }) + + # at this point 031412, Linus is putting all 3.x kernels in a + # 3.x directory, may need to revisit when 4.x is released + KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x" + + [[ -n "${K_LONGTERM}" ]] && + KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_PATCH_ARR}" + else + #KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.0" + #KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}" + if [[ ${KV_MAJOR} -ge 3 ]]; then + KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x" + else + KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}" + fi + + [[ -n "${K_LONGTERM}" ]] && + #KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm" + KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" + fi + + debug-print "KERNEL_BASE_URI is ${KERNEL_BASE_URI}" + + if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then + # handle non genpatch using sources correctly + if [[ -z ${K_WANT_GENPATCHES} && -z ${K_GENPATCHES_VER} && ${KV_PATCH} -gt 0 ]]; then + KERNEL_URI="${KERNEL_BASE_URI}/patch-${OKV}.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.xz" + fi + KERNEL_URI="${KERNEL_URI} ${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz" + else + KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + fi + + RELEASE=${CKV/${OKV}} + RELEASE=${RELEASE/_beta} + RELEASE=${RELEASE/_rc/-rc} + RELEASE=${RELEASE/_pre/-pre} + # We cannot trivally call kernel_is here, because it calls us to detect the + # version + #kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-git} + [ $(($KV_MAJOR * 1000 + ${KV_MINOR:-0})) -ge 2006 ] && RELEASE=${RELEASE/-pre/-git} + RELEASETYPE=${RELEASE//[0-9]} + + # Now we know that RELEASE is the -rc/-git + # and RELEASETYPE is the same but with its numerics stripped + # we can work on better sorting EXTRAVERSION. + # first of all, we add the release + EXTRAVERSION="${RELEASE}" + debug-print "0 EXTRAVERSION:${EXTRAVERSION}" + [[ -n ${KV_EXTRA} ]] && [[ ${KV_MAJOR} -lt 3 ]] && EXTRAVERSION=".${KV_EXTRA}${EXTRAVERSION}" + + debug-print "1 EXTRAVERSION:${EXTRAVERSION}" + if [[ -n "${K_NOUSEPR}" ]]; then + # Don't add anything based on PR to EXTRAVERSION + debug-print "1.0 EXTRAVERSION:${EXTRAVERSION}" + elif [[ -n ${K_PREPATCHED} ]]; then + debug-print "1.1 EXTRAVERSION:${EXTRAVERSION}" + EXTRAVERSION="${EXTRAVERSION}-${PN/-*}${PR/r}" + elif [[ "${ETYPE}" = "sources" ]]; then + debug-print "1.2 EXTRAVERSION:${EXTRAVERSION}" + # For some sources we want to use the PV in the extra version + # This is because upstream releases with a completely different + # versioning scheme. + case ${PN/-*} in + wolk) K_USEPV=1;; + vserver) K_USEPV=1;; + esac + + [[ -z "${K_NOUSENAME}" ]] && EXTRAVERSION="${EXTRAVERSION}-${PN/-*}" + [[ -n "${K_USEPV}" ]] && EXTRAVERSION="${EXTRAVERSION}-${PV//_/-}" + [[ -n "${PR//r0}" ]] && EXTRAVERSION="${EXTRAVERSION}-${PR}" + fi + debug-print "2 EXTRAVERSION:${EXTRAVERSION}" + + # The only messing around which should actually effect this is for KV_EXTRA + # since this has to limit OKV to MAJ.MIN.PAT and strip EXTRA off else + # KV_FULL evaluates to MAJ.MIN.PAT.EXT.EXT after EXTRAVERSION + + if [[ -n ${KV_EXTRA} ]]; then + if [[ -n ${KV_MINOR} ]]; then + OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" + else + OKV="${KV_MAJOR}.${KV_PATCH}" + fi + KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.xz" + fi + + # We need to set this using OKV, but we need to set it before we do any + # messing around with OKV based on RELEASETYPE + KV_FULL=${OKV}${EXTRAVERSION} + + # we will set this for backwards compatibility. + S="${WORKDIR}"/linux-${KV_FULL} + KV=${KV_FULL} + + # -rc-git pulls can be achieved by specifying CKV + # for example: + # CKV="2.6.11_rc3_pre2" + # will pull: + # linux-2.6.10.tar.xz & patch-2.6.11-rc3.xz & patch-2.6.11-rc3-git2.xz + + if [[ ${KV_MAJOR}${KV_MINOR} -eq 26 ]]; then + + if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then + OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))" + KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz" + fi + + if [[ ${RELEASETYPE} == -git ]]; then + KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.xz" + fi + + if [[ ${RELEASETYPE} == -rc-git ]]; then + OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))" + KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.xz + ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.xz ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.xz" + fi + else + KV_PATCH_ARR=(${KV_PATCH//\./ }) + + # the different majorminor versions have different patch start versions + OKV_DICT=(["2"]="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" ["3"]="2.6.39" ["4"]="3.19") + + if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then + + OKV=${K_BASE_VER:-$OKV_DICT["${KV_MAJOR}"]} + + # as of 12/5/2017, the rc patch is no longer offered as a compressed + # file, and no longer is it mirrored on kernel.org + if [[ ${KV_MAJOR} -ge 4 ]] && [[ ${KV_PATCH} -ge 12 ]]; then + KERNEL_URI="https://git.kernel.org/torvalds/p/v${KV_FULL}/v${OKV} -> patch-${KV_FULL}.patch + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.patch" + else + KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz" + fi + fi + + if [[ ${RELEASETYPE} == -git ]]; then + KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.xz" + fi + + if [[ ${RELEASETYPE} == -rc-git ]]; then + OKV=${K_BASE_VER:-$OKV_DICT["${KV_MAJOR}"]} + KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.xz + ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.xz ${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.xz" + fi + + + fi + + debug-print-kernel2-variables + + handle_genpatches +} + +# @FUNCTION: kernel_is +# @USAGE: <conditional version | version> +# @DESCRIPTION: +# user for comparing kernel versions +# or just identifying a version +# e.g kernel_is 2 4 +# e.g kernel_is ge 4.8.11 +# Note: duplicated in linux-info.eclass +kernel_is() { + # ALL of these should be set before we can safely continue this function. + # some of the sources have in the past had only one set. + local v n=0 + for v in OKV KV_{MAJOR,MINOR,PATCH} ; do [[ -z ${!v} ]] && n=1 ; done + [[ $n -eq 1 ]] && detect_version + unset v n + + # Now we can continue + local operator test value + + case ${1#-} in + lt) operator="-lt"; shift;; + gt) operator="-gt"; shift;; + le) operator="-le"; shift;; + ge) operator="-ge"; shift;; + eq) operator="-eq"; shift;; + *) operator="-eq";; + esac + [[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many parameters" + + : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH )) + : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} )) + [ ${test} ${operator} ${value} ] +} + +# @FUNCTION: kernel_is_2_4 +# @USAGE: +# @DESCRIPTION: +# return true if kernel is version 2.4 +kernel_is_2_4() { + kernel_is 2 4 +} + +# @FUNCTION: kernel_is_2_6 +# @USAGE: +# @DESCRIPTION: +# return true if kernel is version 2.6 +kernel_is_2_6() { + kernel_is 2 6 || kernel_is 2 5 +} + +# Capture the sources type and set DEPENDs +if [[ ${ETYPE} == sources ]]; then + DEPEND="!build? ( + sys-apps/sed + >=sys-devel/binutils-2.11.90.0.31 + )" + RDEPEND="!build? ( + >=sys-libs/ncurses-5.2 + sys-devel/make + dev-lang/perl + sys-devel/bc + virtual/libelf + )" + + SLOT="${PVR}" + DESCRIPTION="Sources based on the Linux Kernel." + IUSE="symlink build" + + # Bug #266157, deblob for libre support + if [[ -z ${K_PREDEBLOBBED} ]] ; then + # Bug #359865, force a call to detect_version if needed + kernel_is ge 2 6 27 && \ + [[ -z "${K_DEBLOB_AVAILABLE}" ]] && \ + kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \ + K_DEBLOB_AVAILABLE=1 + if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then + IUSE="${IUSE} deblob" + + # Reflect that kernels contain firmware blobs unless otherwise + # stripped + LICENSE="${LICENSE} !deblob? ( linux-firmware )" + + DEPEND+=" deblob? ( ${PYTHON_DEPS} )" + + if [[ -n KV_MINOR ]]; then + DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" + else + DEBLOB_PV="${KV_MAJOR}.${KV_PATCH}" + fi + + if [[ ${KV_MAJOR} -ge 3 ]]; then + DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}" + fi + + # deblob svn tag, default is -gnu, to change, use K_DEBLOB_TAG in ebuild + K_DEBLOB_TAG=${K_DEBLOB_TAG:--gnu} + DEBLOB_A="deblob-${DEBLOB_PV}" + DEBLOB_CHECK_A="deblob-check-${DEBLOB_PV}" + DEBLOB_HOMEPAGE="http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags" + DEBLOB_URI_PATH="${DEBLOB_PV}${K_DEBLOB_TAG}" + if ! has "${EAPI:-0}" 0 1 ; then + DEBLOB_CHECK_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/deblob-check -> ${DEBLOB_CHECK_A}" + else + DEBLOB_CHECK_URI="mirror://gentoo/${DEBLOB_CHECK_A}" + fi + + DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}" + HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}" + + KERNEL_URI="${KERNEL_URI} + deblob? ( + ${DEBLOB_URI} + ${DEBLOB_CHECK_URI} + )" + else + # We have no way to deblob older kernels, so just mark them as + # tainted with non-libre materials. + LICENSE="${LICENSE} linux-firmware" + fi + fi + +elif [[ ${ETYPE} == headers ]]; then + DESCRIPTION="Linux system headers" + IUSE="headers-only" + + # Since we should NOT honour KBUILD_OUTPUT in headers + # lets unset it here. + unset KBUILD_OUTPUT + + SLOT="0" +fi + +# Cross-compile support functions + +# @FUNCTION: kernel_header_destdir +# @USAGE: +# @DESCRIPTION: +# return header destination directory +kernel_header_destdir() { + [[ ${CTARGET} == ${CHOST} ]] \ + && echo /usr/include \ + || echo /usr/${CTARGET}/usr/include +} + +# @FUNCTION: cross_pre_c_headers +# @USAGE: +# @DESCRIPTION: +# set use if necessary for cross compile support +cross_pre_c_headers() { + use headers-only && [[ ${CHOST} != ${CTARGET} ]] +} + +# @FUNCTION: env_setup_xmakeopts +# @USAGE: +# @DESCRIPTION: +# set the ARCH/CROSS_COMPILE when cross compiling + +env_setup_xmakeopts() { + # Kernel ARCH != portage ARCH + export KARCH=$(tc-arch-kernel) + + # When cross-compiling, we need to set the ARCH/CROSS_COMPILE + # variables properly or bad things happen ! + xmakeopts="ARCH=${KARCH}" + if [[ ${CTARGET} != ${CHOST} ]] && ! cross_pre_c_headers ; then + xmakeopts="${xmakeopts} CROSS_COMPILE=${CTARGET}-" + elif type -p ${CHOST}-ar > /dev/null ; then + xmakeopts="${xmakeopts} CROSS_COMPILE=${CHOST}-" + fi + export xmakeopts +} + +# @FUNCTION: unpack_2_4 +# @USAGE: +# @DESCRIPTION: +# unpack and generate .config for 2.4 kernels + +unpack_2_4() { + # this file is required for other things to build properly, + # so we autogenerate it + make -s mrproper ${xmakeopts} || die "make mrproper failed" + make -s symlinks ${xmakeopts} || die "make symlinks failed" + make -s include/linux/version.h ${xmakeopts} || die "make include/linux/version.h failed" + echo ">>> version.h compiled successfully." +} + +# @FUNCTION: unpack_2_6 +# @USAGE: +# @DESCRIPTION: +# unpack and generate .config for 2.6 kernels + +unpack_2_6() { + # this file is required for other things to build properly, so we + # autogenerate it ... generate a .config to keep version.h build from + # spitting out an annoying warning + make -s mrproper ${xmakeopts} 2>/dev/null \ + || die "make mrproper failed" + + # quick fix for bug #132152 which triggers when it cannot include linux + # headers (ie, we have not installed it yet) + if ! make -s defconfig ${xmakeopts} &>/dev/null 2>&1 ; then + touch .config + eerror "make defconfig failed." + eerror "assuming you dont have any headers installed yet and continuing" + fi + + make -s include/linux/version.h ${xmakeopts} 2>/dev/null \ + || die "make include/linux/version.h failed" + rm -f .config >/dev/null +} + +# @FUNCTION: universal_unpack +# @USAGE: +# @DESCRIPTION: +# unpack kernel sources + +universal_unpack() { + debug-print "Inside universal_unpack" + + local OKV_ARRAY + IFS="." read -r -a OKV_ARRAY <<<"${OKV}" + + cd "${WORKDIR}" + if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then + unpack linux-${KV_MAJOR}.${KV_MINOR}.tar.xz + else + unpack linux-${OKV}.tar.xz + fi + + if [[ -d "linux" ]]; then + debug-print "Moving linux to linux-${KV_FULL}" + mv linux linux-${KV_FULL} \ + || die "Unable to move source tree to ${KV_FULL}." + elif [[ "${OKV}" != "${KV_FULL}" ]]; then + if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]] && + [[ "${ETYPE}" = "sources" ]]; then + debug-print "moving linux-${KV_MAJOR}.${KV_MINOR} to linux-${KV_FULL} " + mv linux-${KV_MAJOR}.${KV_MINOR} linux-${KV_FULL} \ + || die "Unable to move source tree to ${KV_FULL}." + else + debug-print "moving linux-${OKV} to linux-${KV_FULL} " + mv linux-${OKV} linux-${KV_FULL} \ + || die "Unable to move source tree to ${KV_FULL}." + fi + elif [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then + mv linux-${KV_MAJOR}.${KV_MINOR} linux-${KV_FULL} \ + || die "Unable to move source tree to ${KV_FULL}." + fi + cd "${S}" + + # remove all backup files + find . -iname "*~" -exec rm {} \; 2> /dev/null + +} + +# @FUNCTION: unpack_set_extraversion +# @USAGE: +# @DESCRIPTION: +# handle EXTRAVERSION + +unpack_set_extraversion() { + cd "${S}" + sed -i -e "s:^$EXTRAVERSION =$.*:\1 ${EXTRAVERSION}:" Makefile + cd "${OLDPWD}" +} + +# @FUNCTION: unpack_fix_install_path +# @USAGE: +# @DESCRIPTION: +# Should be done after patches have been applied +# Otherwise patches that modify the same area of Makefile will fail + +unpack_fix_install_path() { + cd "${S}" + sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' Makefile +} + +# Compile Functions + +# @FUNCTION: compile_headers +# @USAGE: +# @DESCRIPTION: +# header compilation + +compile_headers() { + env_setup_xmakeopts + + # if we couldnt obtain HOSTCFLAGS from the Makefile, + # then set it to something sane + local HOSTCFLAGS=$(getfilevar HOSTCFLAGS "${S}"/Makefile) + HOSTCFLAGS=${HOSTCFLAGS:--Wall -Wstrict-prototypes -O2 -fomit-frame-pointer} + + if kernel_is 2 4; then + yes "" | make oldconfig ${xmakeopts} + echo ">>> make oldconfig complete" + make dep ${xmakeopts} + elif kernel_is 2 6; then + # 2.6.18 introduces headers_install which means we dont need any + # of this crap anymore :D + kernel_is ge 2 6 18 && return 0 + + # autoconf.h isnt generated unless it already exists. plus, we have + # no guarantee that any headers are installed on the system... + [[ -f ${EROOT}usr/include/linux/autoconf.h ]] \ + || touch include/linux/autoconf.h + + # if K_DEFCONFIG isn't set, force to "defconfig" + # needed by mips + if [[ -z ${K_DEFCONFIG} ]]; then + if kernel_is ge 2 6 16 ; then + case ${CTARGET} in + powerpc64*) K_DEFCONFIG="ppc64_defconfig";; + powerpc*) K_DEFCONFIG="pmac32_defconfig";; + *) K_DEFCONFIG="defconfig";; + esac + else + K_DEFCONFIG="defconfig" + fi + fi + + # if there arent any installed headers, then there also isnt an asm + # symlink in /usr/include/, and make defconfig will fail, so we have + # to force an include path with $S. + HOSTCFLAGS="${HOSTCFLAGS} -I${S}/include/" + ln -sf asm-${KARCH} "${S}"/include/asm || die + cross_pre_c_headers && return 0 + + make ${K_DEFCONFIG} HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "defconfig failed (${K_DEFCONFIG})" + if compile_headers_tweak_config ; then + yes "" | make oldconfig HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "2nd oldconfig failed" + fi + make prepare HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "prepare failed" + make prepare-all HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "prepare failed" + fi +} + +# @FUNCTION: compile_headers_tweak_config +# @USAGE: +# @DESCRIPTION: +# some targets can be very very picky, so let's finesse the +# .config based upon any info we may have + +compile_headers_tweak_config() { + case ${CTARGET} in + sh*) + sed -i '/CONFIG_CPU_SH/d' .config || die + echo "CONFIG_CPU_SH${CTARGET:2:1}=y" >> .config + return 0;; + esac + + # no changes, so lets do nothing + return 1 +} + +# install functions + +# @FUNCTION: install_universal +# @USAGE: +# @DESCRIPTION: +# Fix permissions in tarball + +install_universal() { + cd "${WORKDIR}" + chown -R 0:0 * >& /dev/null + chmod -R a+r-w+X,u+w * + cd ${OLDPWD} +} + +# @FUNCTION: install_headers +# @USAGE: +# @DESCRIPTION: +# Install headers + +install_headers() { + local ddir=$(kernel_header_destdir) + + # 2.6.18 introduces headers_install which means we dont need any + # of this crap anymore :D + if kernel_is ge 2 6 18 ; then + env_setup_xmakeopts + emake headers_install INSTALL_HDR_PATH="${ED}"${ddir}/.. ${xmakeopts} || die + + # let other packages install some of these headers + rm -rf "${ED}"${ddir}/scsi || die #glibc/uclibc/etc... + return 0 + fi + + # Do not use "linux/*" as that can cause problems with very long + # $S values where the cmdline to cp is too long + pushd "${S}" >/dev/null + dodir ${ddir}/linux + cp -pPR "${S}"/include/linux "${ED}"${ddir}/ || die + rm -rf "${ED}"${ddir}/linux/modules || die + + dodir ${ddir}/asm + cp -pPR "${S}"/include/asm/* "${ED}"${ddir}/asm || die + + if kernel_is 2 6 ; then + dodir ${ddir}/asm-generic + cp -pPR "${S}"/include/asm-generic/* "${ED}"${ddir}/asm-generic || die + fi + + # clean up + find "${D}" -name '*.orig' -exec rm -f {} \; + + popd >/dev/null +} + +# @FUNCTION: install_sources +# @USAGE: +# @DESCRIPTION: +# Install sources + +install_sources() { + local file + + cd "${S}" + dodir /usr/src + echo ">>> Copying sources ..." + + file="$(find ${WORKDIR} -iname "docs" -type d)" + if [[ -n ${file} ]]; then + for file in $(find ${file} -type f); do + echo "${file//*docs\/}" >> "${S}"/patches.txt + echo "===================================================" >> "${S}"/patches.txt + cat ${file} >> "${S}"/patches.txt + echo "===================================================" >> "${S}"/patches.txt + echo "" >> "${S}"/patches.txt + done + fi + + mv "${WORKDIR}"/linux* "${ED}"usr/src || die + + if [[ -n "${UNIPATCH_DOCS}" ]] ; then + for i in ${UNIPATCH_DOCS}; do + dodoc "${T}"/${i} + done + fi +} + +# @FUNCTION: preinst_headers +# @USAGE: +# @DESCRIPTION: +# Headers preinst steps + +preinst_headers() { + local ddir=$(kernel_header_destdir) + [[ -L ${EPREFIX}${ddir}/linux ]] && { rm "${EPREFIX}"${ddir}/linux || die; } + [[ -L ${EPREFIX}${ddir}/asm ]] && { rm "${EPREFIX}"${ddir}/asm || die; } +} + +# @FUNCTION: postinst_sources +# @USAGE: +# @DESCRIPTION: +# Sources post installation function. +# see inline comments + +postinst_sources() { + local MAKELINK=0 + + # if we have USE=symlink, then force K_SYMLINK=1 + use symlink && K_SYMLINK=1 + + # We do support security on a deblobbed kernel, bug #555878. + # If some particular kernel version doesn't have security + # supported because of USE=deblob or otherwise, one can still + # set K_SECURITY_UNSUPPORTED on a per ebuild basis. + #[[ $K_DEBLOB_AVAILABLE == 1 ]] && \ + # use deblob && \ + # K_SECURITY_UNSUPPORTED=deblob + + # if we are to forcably symlink, delete it if it already exists first. + if [[ ${K_SYMLINK} > 0 ]]; then + [[ -h ${EROOT}usr/src/linux ]] && { rm "${EROOT}"usr/src/linux || die; } + MAKELINK=1 + fi + + # if the link doesnt exist, lets create it + [[ ! -h ${EROOT}usr/src/linux ]] && MAKELINK=1 + + if [[ ${MAKELINK} == 1 ]]; then + ln -sf linux-${KV_FULL} "${EROOT}"usr/src/linux || die + fi + + # Don't forget to make directory for sysfs + [[ ! -d ${EROOT}sys ]] && kernel_is 2 6 && { mkdir "${EROOT}"sys || die ; } + + echo + elog "If you are upgrading from a previous kernel, you may be interested" + elog "in the following document:" + elog " - General upgrade guide: https://wiki.gentoo.org/wiki/Kernel/Upgrade" + echo + + # if K_EXTRAEINFO is set then lets display it now + if [[ -n ${K_EXTRAEINFO} ]]; then + echo ${K_EXTRAEINFO} | fmt | + while read -s ELINE; do einfo "${ELINE}"; done + fi + + # if K_EXTRAELOG is set then lets display it now + if [[ -n ${K_EXTRAELOG} ]]; then + echo ${K_EXTRAELOG} | fmt | + while read -s ELINE; do elog "${ELINE}"; done + fi + + # if K_EXTRAEWARN is set then lets display it now + if [[ -n ${K_EXTRAEWARN} ]]; then + echo ${K_EXTRAEWARN} | fmt | + while read -s ELINE; do ewarn "${ELINE}"; done + fi + + # optionally display security unsupported message + # Start with why + if [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then + ewarn "${PN} is UNSUPPORTED by Gentoo Security." + fi + # And now the general message. + if [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then + ewarn "This means that it is likely to be vulnerable to recent security issues." + echo + ewarn "Upstream kernel developers recommend always running the latest " + ewarn "release of any current long term supported Linux kernel version." + ewarn "To see a list of these versions, their most current release and " + ewarn "long term support status, please go to https://www.kernel.org ." + echo + ewarn "For specific information on why this kernel is unsupported, please read:" + ewarn "https://wiki.gentoo.org/wiki/Project:Kernel_Security" + fi + + # warn sparc users that they need to do cross-compiling with >= 2.6.25(bug #214765) + KV_MAJOR=$(get_version_component_range 1 ${OKV}) + KV_MINOR=$(get_version_component_range 2 ${OKV}) + KV_PATCH=$(get_version_component_range 3 ${OKV}) + if [[ "$(tc-arch)" = "sparc" ]]; then + if [[ $(gcc-major-version) -lt 4 && $(gcc-minor-version) -lt 4 ]]; then + if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]] ; then + echo + elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that" + elog "you now need to do" + elog " make CROSS_COMPILE=sparc64-unknown-linux-gnu-" + elog "instead of just" + elog " make" + elog "to compile the kernel. For more information please browse to" + elog "https://bugs.gentoo.org/show_bug.cgi?id=214765" + echo + fi + fi + fi +} + +# pkg_setup functions + +# @FUNCTION: setup_headers +# @USAGE: +# @DESCRIPTION: +# Determine if ${PN} supports arch + +setup_headers() { + [[ -z ${H_SUPPORTEDARCH} ]] && H_SUPPORTEDARCH=${PN/-*/} + for i in ${H_SUPPORTEDARCH}; do + [[ $(tc-arch) == "${i}" ]] && H_ACCEPT_ARCH="yes" + done + + if [[ ${H_ACCEPT_ARCH} != "yes" ]]; then + echo + eerror "This version of ${PN} does not support $(tc-arch)." + eerror "Please merge the appropriate sources, in most cases" + eerror "(but not all) this will be called $(tc-arch)-headers." + die "Package unsupported for $(tc-arch)" + fi +} + +# @FUNCTION: unipatch +# @USAGE: <list of patches to apply> +# @DESCRIPTION: +# Universal function that will apply patches to source + +unipatch() { + local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE + local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG + + # set to a standard locale to ensure sorts are ordered properly. + myLC_ALL="${LC_ALL}" + myLANG="${LANG}" + LC_ALL="C" + LANG="" + + [ -z "${KPATCH_DIR}" ] && KPATCH_DIR="${WORKDIR}/patches/" + [ ! -d ${KPATCH_DIR} ] && mkdir -p ${KPATCH_DIR} + + # We're gonna need it when doing patches with a predefined patchlevel + eshopts_push -s extglob + + # This function will unpack all passed tarballs, add any passed patches, + # and remove any passed patchnumbers + # usage can be either via an env var or by params + # although due to the nature we pass this within this eclass + # it shall be by param only. + # -z "${UNIPATCH_LIST}" ] && UNIPATCH_LIST="${@}" + UNIPATCH_LIST="${@}" + + #unpack any passed tarballs + for i in ${UNIPATCH_LIST}; do + if echo ${i} | grep -qs -e "\.tar" -e "\.tbz" -e "\.tgz" ; then + if [ -n "${UNIPATCH_STRICTORDER}" ]; then + unset z + STRICT_COUNT=$((10#${STRICT_COUNT} + 1)) + for((y=0; y<$((6 - ${#STRICT_COUNT})); y++)); + do z="${z}0"; + done + PATCH_ORDER="${z}${STRICT_COUNT}" + + mkdir -p "${KPATCH_DIR}/${PATCH_ORDER}" + pushd "${KPATCH_DIR}/${PATCH_ORDER}" >/dev/null + unpack ${i##*/} + popd >/dev/null + else + pushd "${KPATCH_DIR}" >/dev/null + unpack ${i##*/} + popd >/dev/null + fi + + [[ ${i} == *:* ]] && echo ">>> Strict patch levels not currently supported for tarballed patchsets" + else + extention=${i/*./} + extention=${extention/:*/} + PIPE_CMD="" + case ${extention} in + xz) PIPE_CMD="xz -dc";; + lzma) PIPE_CMD="lzma -dc";; + bz2) PIPE_CMD="bzip2 -dc";; + patch*) PIPE_CMD="cat";; + diff) PIPE_CMD="cat";; + gz|Z|z) PIPE_CMD="gzip -dc";; + ZIP|zip) PIPE_CMD="unzip -p";; + *) UNIPATCH_DROP="${UNIPATCH_DROP} ${i/:*/}";; + esac + + PATCH_LEVEL=${i/*([^:])?(:)} + i=${i/:*/} + x=${i/*\//} + x=${x/\.${extention}/} + + if [ -n "${PIPE_CMD}" ]; then + if [ ! -r "${i}" ]; then + echo + eerror "FATAL: unable to locate:" + eerror "${i}" + eerror "for read-only. The file either has incorrect permissions" + eerror "or does not exist." + die Unable to locate ${i} + fi + + if [ -n "${UNIPATCH_STRICTORDER}" ]; then + unset z + STRICT_COUNT=$((10#${STRICT_COUNT} + 1)) + for((y=0; y<$((6 - ${#STRICT_COUNT})); y++)); + do z="${z}0"; + done + PATCH_ORDER="${z}${STRICT_COUNT}" + + mkdir -p ${KPATCH_DIR}/${PATCH_ORDER}/ + $(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${PATCH_ORDER}/${x}.patch${PATCH_LEVEL}) || die "uncompressing patch failed" + else + $(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${x}.patch${PATCH_LEVEL}) || die "uncompressing patch failed" + fi + fi + fi + + # If experimental was not chosen by the user, drop experimental patches not in K_EXP_GENPATCHES_LIST. + if [[ "${i}" == *"genpatches-"*".experimental."* && -n ${K_EXP_GENPATCHES_PULL} ]] ; then + if [[ -z ${K_EXP_GENPATCHES_NOUSE} ]] && use experimental; then + continue + fi + + local j + for j in ${KPATCH_DIR}/*/50*_*.patch*; do + for k in ${K_EXP_GENPATCHES_LIST} ; do + [[ "$(basename ${j})" == ${k}* ]] && continue 2 + done + UNIPATCH_DROP+=" $(basename ${j})" + done + else + UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" + debug-print "genpatches tarball: $tarball" + + # check gcc version < 4.9.X uses patch 5000 and = 4.9.X uses patch 5010 + if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -ne 9 ]]; then + # drop 5000_enable-additional-cpu-optimizations-for-gcc-4.9.patch + if [[ $UNIPATCH_DROP != *"5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"* ]]; then + UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch" + fi + else + if [[ $UNIPATCH_DROP != *"5000_enable-additional-cpu-optimizations-for-gcc.patch"* ]]; then + #drop 5000_enable-additional-cpu-optimizations-for-gcc.patch + UNIPATCH_DROP+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch" + fi + fi + fi + done + + #populate KPATCH_DIRS so we know where to look to remove the excludes + x=${KPATCH_DIR} + KPATCH_DIR="" + for i in $(find ${x} -type d | sort -n); do + KPATCH_DIR="${KPATCH_DIR} ${i}" + done + + # do not apply fbcondecor patch to sparc/sparc64 as it breaks boot + # bug #272676 + if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then + if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.28 ]]; then + UNIPATCH_DROP="${UNIPATCH_DROP} *_fbcondecor-0.9.6.patch" + echo + ewarn "fbcondecor currently prevents sparc/sparc64 from booting" + ewarn "for kernel versions >= 2.6.29. Removing fbcondecor patch." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=272676 for details" + echo + fi + fi + + #so now lets get rid of the patchno's we want to exclude + UNIPATCH_DROP="${UNIPATCH_EXCLUDE} ${UNIPATCH_DROP}" + for i in ${UNIPATCH_DROP}; do + ebegin "Excluding Patch #${i}" + for x in ${KPATCH_DIR}; do rm -f ${x}/${i}* 2>/dev/null; done + eend $? + done + + # and now, finally, we patch it :) + for x in ${KPATCH_DIR}; do + for i in $(find ${x} -maxdepth 1 -iname "*.patch*" -or -iname "*.diff*" | sort -n); do + STDERR_T="${T}/${i/*\//}" + STDERR_T="${STDERR_T/.patch*/.err}" + + [ -z ${i/*.patch*/} ] && PATCH_DEPTH=${i/*.patch/} + #[ -z ${i/*.diff*/} ] && PATCH_DEPTH=${i/*.diff/} + + if [ -z "${PATCH_DEPTH}" ]; then PATCH_DEPTH=0; fi + + #################################################################### + # IMPORTANT: This is temporary code to support Linux git 3.15_rc1! # + # # + # The patch contains a removal of a symlink, followed by addition # + # of a file with the same name as the symlink in the same # + # location; this causes the dry-run to fail, filed bug #507656. # + # # + # https://bugs.gentoo.org/show_bug.cgi?id=507656 # + #################################################################### + if [[ -n ${K_FROM_GIT} ]] ; then + if [[ ${KV_MAJOR} -gt 3 || ( ${KV_MAJOR} -eq 3 && ${KV_PATCH} -gt 15 ) && + ${RELEASETYPE} == -rc ]] ; then + ebegin "Applying ${i/*\//} (-p1)" + if [ $(patch -p1 --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -le 2 ]; then + eend 0 + rm ${STDERR_T} || die + break + else + eend 1 + eerror "Failed to apply patch ${i/*\//}" + eerror "Please attach ${STDERR_T} to any bug you may post." + eshopts_pop + die "Failed to apply ${i/*\//} on patch depth 1." + fi + fi + fi + #################################################################### + + while [ ${PATCH_DEPTH} -lt 5 ]; do + echo "Attempting Dry-run:" >> ${STDERR_T} + echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i}" >> ${STDERR_T} + echo "=======================================================" >> ${STDERR_T} + if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then + ebegin "Applying ${i/*\//} (-p${PATCH_DEPTH})" + echo "Attempting patch:" > ${STDERR_T} + echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i}" >> ${STDERR_T} + echo "=======================================================" >> ${STDERR_T} + if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then + eend 0 + rm ${STDERR_T} || die + break + else + eend 1 + eerror "Failed to apply patch ${i/*\//}" + eerror "Please attach ${STDERR_T} to any bug you may post." + eshopts_pop + die "Failed to apply ${i/*\//} on patch depth ${PATCH_DEPTH}." + fi + else + PATCH_DEPTH=$((${PATCH_DEPTH} + 1)) + fi + done + if [ ${PATCH_DEPTH} -eq 5 ]; then + eerror "Failed to dry-run patch ${i/*\//}" + eerror "Please attach ${STDERR_T} to any bug you may post." + eshopts_pop + die "Unable to dry-run patch on any patch depth lower than 5." + fi + done + done + + # When genpatches is used, we want to install 0000_README which documents + # the patches that were used; such that the user can see them, bug #301478. + if [[ ! -z ${K_WANT_GENPATCHES} ]] ; then + UNIPATCH_DOCS="${UNIPATCH_DOCS} 0000_README" + fi + + # When files listed in UNIPATCH_DOCS are found in KPATCH_DIR's, we copy it + # to the temporary directory and remember them in UNIPATCH_DOCS to install + # them during the install phase. + local tmp + for x in ${KPATCH_DIR}; do + for i in ${UNIPATCH_DOCS}; do + if [[ -f ${x}/${i} ]] ; then + tmp="${tmp} ${i}" + cp -f "${x}/${i}" "${T}"/ || die + fi + done + done + UNIPATCH_DOCS="${tmp}" + + # clean up KPATCH_DIR's - fixes bug #53610 + for x in ${KPATCH_DIR}; do rm -Rf ${x}; done + + LC_ALL="${myLC_ALL}" + LANG="${myLANG}" + eshopts_pop +} + +# @FUNCTION: getfilevar +# @USAGE: <variable> <configfile> +# @DESCRIPTION: +# pulled from linux-info + +getfilevar() { + local workingdir basefname basedname xarch=$(tc-arch-kernel) + + if [[ -z ${1} ]] && [[ ! -f ${2} ]]; then + echo -e "\n" + eerror "getfilevar requires 2 variables, with the second a valid file." + eerror " getfilevar <VARIABLE> <CONFIGFILE>" + else + workingdir=${PWD} + basefname=$(basename ${2}) + basedname=$(dirname ${2}) + unset ARCH + + cd ${basedname} + echo -e "include ${basefname}\ne:\n\t@echo \$(${1})" | \ + make ${BUILD_FIXES} -s -f - e 2>/dev/null + cd ${workingdir} + + ARCH=${xarch} + fi +} + +# @FUNCTION: detect_arch +# @USAGE: +# @DESCRIPTION: +# This function sets ARCH_URI and ARCH_PATCH +# with the neccessary info for the arch sepecific compatibility +# patchsets. + +detect_arch() { + + local ALL_ARCH LOOP_ARCH LOOP_ARCH_L COMPAT_URI i TC_ARCH_KERNEL + + # COMPAT_URI is the contents of ${ARCH}_URI + # ARCH_URI is the URI for all the ${ARCH}_URI patches + # ARCH_PATCH is ARCH_URI broken into files for UNIPATCH + + ARCH_URI="" + ARCH_PATCH="" + TC_ARCH_KERNEL="" + ALL_ARCH="ALPHA AMD64 ARM HPPA IA64 M68K MIPS PPC PPC64 S390 SH SPARC X86" + + for LOOP_ARCH in ${ALL_ARCH}; do + COMPAT_URI="${LOOP_ARCH}_URI" + COMPAT_URI="${!COMPAT_URI}" + + declare -l LOOP_ARCH_L=${LOOP_ARCH} + + [[ -n ${COMPAT_URI} ]] && \ + ARCH_URI="${ARCH_URI} ${LOOP_ARCH_L}? ( ${COMPAT_URI} )" + + declare -u TC_ARCH_KERNEL=$(tc-arch-kernel) + if [[ ${LOOP_ARCH} == ${TC_ARCH_KERNEL} ]]; then + for i in ${COMPAT_URI}; do + ARCH_PATCH="${ARCH_PATCH} ${DISTDIR}/${i/*\//}" + done + fi + + done +} + +# @FUNCTION: headers___fix +# @USAGE: +# @DESCRIPTION: +# Voodoo to partially fix broken upstream headers. +# note: do not put inline/asm/volatile together (breaks "inline asm volatile") + +headers___fix() { + sed -i \ + -e '/^\#define.*_TYPES_H/{:loop n; bloop}' \ + -e 's:\<$[us]\(8\|16\|32\|64$\)\>:__\1:g' \ + -e "s/$[[:space:]]$inline$[[:space:](]$/\1__inline__\2/g" \ + -e "s/$[[:space:]]$asm$[[:space:](]$/\1__asm__\2/g" \ + -e "s/$[[:space:]]$volatile$[[:space:](]$/\1__volatile__\2/g" \ + "$@" +} + +# @FUNCTION: kernel-2_src_unpack +# @USAGE: +# @DESCRIPTION: +# unpack sources, handle genpatches, deblob + +kernel-2_src_unpack() { + universal_unpack + debug-print "Doing unipatch" + + # request UNIPATCH_LIST_GENPATCHES in phase since it calls 'use' + handle_genpatches --set-unipatch-list + [[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_DEFAULT} || -n ${UNIPATCH_LIST_GENPATCHES} ]] && \ + unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}" + + debug-print "Doing premake" + + # allow ebuilds to massage the source tree after patching but before + # we run misc `make` functions below + [[ $(type -t kernel-2_hook_premake) == "function" ]] && kernel-2_hook_premake + + case ${EAPI:-0} in + 0|1) kernel-2_src_prepare ;; + esac + + debug-print "Doing unpack_set_extraversion" + + [[ -z ${K_NOSETEXTRAVERSION} ]] && unpack_set_extraversion + unpack_fix_install_path + + # Setup xmakeopts and cd into sourcetree. + env_setup_xmakeopts + cd "${S}" + + # We dont need a version.h for anything other than headers + # at least, I should hope we dont. If this causes problems + # take out the if/fi block and inform me please. + # unpack_2_6 should now be 2.6.17 safe anyways + if [[ ${ETYPE} == headers ]]; then + kernel_is 2 4 && unpack_2_4 + kernel_is 2 6 && unpack_2_6 + fi + + if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then + cp "${DISTDIR}/${DEBLOB_A}" "${T}" || die "cp ${DEBLOB_A} failed" + cp "${DISTDIR}/${DEBLOB_CHECK_A}" "${T}/deblob-check" || die "cp ${DEBLOB_CHECK_A} failed" + chmod +x "${T}/${DEBLOB_A}" "${T}/deblob-check" || die "chmod deblob scripts failed" + fi + + # fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox + # only do this for kernel < 2.6.27 since this file does not exist in later + # kernels + if [[ -n ${KV_MINOR} && ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]] ; then + sed -i \ + -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ + "${S}"/arch/ppc/Makefile + else + sed -i \ + -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ + "${S}"/arch/powerpc/Makefile + fi +} + +# @FUNCTION: kernel-2_src_prepare +# @USAGE: +# @DESCRIPTION: +# Apply any user patches + +kernel-2_src_prepare() { + + debug-print "Applying any user patches" + + # apply any user patches + case ${EAPI:-0} in + 0|1|2|3|4|5) epatch_user ;; + 6) eapply_user ;; + esac +} + +# @FUNCTION: kernel-2_src_compile +# @USAGE: +# @DESCRIPTION: +# conpile headers or run deblob script + +kernel-2_src_compile() { + cd "${S}" + [[ ${ETYPE} == headers ]] && compile_headers + + if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then + echo ">>> Running deblob script ..." + python_setup + sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!" + fi +} + +# @FUNCTION: kernel-2_src_test +# @USAGE: +# @DESCRIPTION: +# if you leave it to the default src_test, it will run make to +# find whether test/check targets are present; since "make test" +# actually produces a few support files, they are installed even +# though the package is binchecks-restricted. +# +# Avoid this altogether by making the function moot. +kernel-2_src_test() { :; } + +# @FUNCTION: kernel-2_pkg_preinst +# @DESCRIPTION: +# if ETYPE = headers, call preinst_headers + +kernel-2_pkg_preinst() { + [[ ${ETYPE} == headers ]] && preinst_headers +} + +# @FUNCTION: kernel-2_src_install +# @USAGE: +# @DESCRIPTION: +# Install headers or sources dependant on ETYPE + +kernel-2_src_install() { + install_universal + [[ ${ETYPE} == headers ]] && install_headers + [[ ${ETYPE} == sources ]] && install_sources +} + +# @FUNCTION: kernel-2_pkg_postinst +# @USAGE: +# @DESCRIPTION: +# call postinst_sources for ETYPE = sources + +kernel-2_pkg_postinst() { + [[ ${ETYPE} == sources ]] && postinst_sources +} + +# @FUNCTION: kernel-2_pkg_setup +# @USAGE: +# @DESCRIPTION: +# check for supported kernel version, die if ETYPE is unknown, call setup_headers +# if necessary + +kernel-2_pkg_setup() { + if kernel_is 2 4; then + if [[ $(gcc-major-version) -ge 4 ]] ; then + echo + ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with linux-2.4!" + ewarn "Either switch to another gcc-version (via gcc-config) or use a" + ewarn "newer kernel that supports gcc-4." + echo + ewarn "Also be aware that bugreports about gcc-4 not working" + ewarn "with linux-2.4 based ebuilds will be closed as INVALID!" + echo + fi + fi + + ABI="${KERNEL_ABI}" + if [[ ${ETYPE} != sources ]] && [[ ${ETYPE} != headers ]]; then + eerror "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\"" + die "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\"" + fi + + [[ ${ETYPE} == headers ]] && setup_headers + [[ ${ETYPE} == sources ]] && echo ">>> Preparing to unpack ..." +} + +# @FUNCTION: kernel-2_pkg_postrm +# @USAGE: +# @DESCRIPTION: +# Notify the user that after a depclean, there may be sources +# left behind that need to be manually cleaned + +kernel-2_pkg_postrm() { + # This warning only makes sense for kernel sources. + [[ ${ETYPE} == headers ]] && return 0 + + # If there isn't anything left behind, then don't complain. + [[ -e ${EROOT}usr/src/linux-${KV_FULL} ]] || return 0 + echo + ewarn "Note: Even though you have successfully unmerged " + ewarn "your kernel package, directories in kernel source location: " + ewarn "${EROOT}usr/src/linux-${KV_FULL}" + ewarn "with modified files will remain behind. By design, package managers" + ewarn "will not remove these modified files and the directories they reside in." + echo + ewarn "For more detailed kernel removal instructions, please see: " + ewarn "https://wiki.gentoo.org/wiki/Kernel/Removal" + echo +} diff -uNr a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass --- a/eclass/kodi-addon.eclass false +++ b/eclass/kodi-addon.eclass 55b4326ee69ef2dce0acc5945494811113d17e6a5538d1b8c6f4c639a64bd5561b4593f6ce06c1535bcf1266d1121ca97b1904d2516430550fc3e19cc1d49763 @@ -0,0 +1,30 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: kodi-addon.eclass +# @MAINTAINER: +# candrews@gentoo.org +# @BLURB: Helper for correct building and (importantly) installing Kodi addon packages. +# @DESCRIPTION: +# Provides a src_configure function for correct CMake configuration + +inherit multilib cmake-utils + +case "${EAPI:-0}" in + 4|5|6) + EXPORT_FUNCTIONS src_configure + ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +# @FUNCTION: kodi-addon_src_configure +# @DESCRIPTION: +# Configure handling for Kodi addons +kodi-addon_src_configure() { + + mycmakeargs+=( + -DCMAKE_INSTALL_LIBDIR=$(get_libdir)/kodi + ) + + cmake-utils_src_configure +} diff -uNr a/eclass/l10n.eclass b/eclass/l10n.eclass --- a/eclass/l10n.eclass false +++ b/eclass/l10n.eclass ff340dee57455155f23fee10c26cfff0a9b1a37ea2147e0f0a801b2c377b3bfa5feb1874062b513e895417e4e42f2cf84b7816685388e427a2f8a3ec9b1bc7cc @@ -0,0 +1,122 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: l10n.eclass +# @MAINTAINER: +# Ulrich Müller <ulm@gentoo.org> +# @AUTHOR: +# Ben de Groot <yngwin@gentoo.org> +# @BLURB: convenience functions to handle localizations +# @DESCRIPTION: +# The l10n (localization) eclass offers a number of functions to more +# conveniently handle localizations (translations) offered by packages. +# These are meant to prevent code duplication for such boring tasks as +# determining the cross-section between the user's set LINGUAS and what +# is offered by the package. + +# @ECLASS-VARIABLE: PLOCALES +# @DEFAULT_UNSET +# @DESCRIPTION: +# Variable listing the locales for which localizations are offered by +# the package. +# +# Example: PLOCALES="cy de el_GR en_US pt_BR vi zh_CN" + +# @ECLASS-VARIABLE: PLOCALE_BACKUP +# @DEFAULT_UNSET +# @DESCRIPTION: +# In some cases the package fails when none of the offered PLOCALES are +# selected by the user. In that case this variable should be set to a +# default locale (usually 'en' or 'en_US') as backup. +# +# Example: PLOCALE_BACKUP="en_US" + +# @FUNCTION: l10n_for_each_locale_do +# @USAGE: <function> +# @DESCRIPTION: +# Convenience function for processing localizations. The parameter should +# be a function (defined in the consuming eclass or ebuild) which takes +# an individual localization as (last) parameter. +# +# Example: l10n_for_each_locale_do install_locale +l10n_for_each_locale_do() { + local locs x + locs=$(l10n_get_locales) + for x in ${locs}; do + "${@}" ${x} || die "failed to process enabled ${x} locale" + done +} + +# @FUNCTION: l10n_for_each_disabled_locale_do +# @USAGE: <function> +# @DESCRIPTION: +# Complementary to l10n_for_each_locale_do, this function will process +# locales that are disabled. This could be used for example to remove +# locales from a Makefile, to prevent them from being built needlessly. +l10n_for_each_disabled_locale_do() { + local locs x + locs=$(l10n_get_locales disabled) + for x in ${locs}; do + "${@}" ${x} || die "failed to process disabled ${x} locale" + done +} + +# @FUNCTION: l10n_find_plocales_changes +# @USAGE: <translations dir> <filename pre pattern> <filename post pattern> +# @DESCRIPTION: +# Ebuild maintenance helper function to find changes in package offered +# locales when doing a version bump. This could be added for example to +# src_prepare +# +# Example: l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts' +l10n_find_plocales_changes() { + [[ $# -ne 3 ]] && die "Exactly 3 arguments are needed!" + ebegin "Looking in ${1} for new locales" + pushd "${1}" >/dev/null || die "Cannot access ${1}" + local current= x= + for x in ${2}*${3} ; do + x=${x#"${2}"} + x=${x%"${3}"} + current+="${x} " + done + popd >/dev/null + # RHS will be sorted with single spaces so ensure the LHS is too + # before attempting to compare them for equality. See bug #513242. + # Run them both through the same sorting algorithm so we don't have + # to worry about them being the same. + if [[ "$(printf '%s\n' ${PLOCALES} | LC_ALL=C sort)" != "$(printf '%s\n' ${current} | LC_ALL=C sort)" ]] ; then + eend 1 "There are changes in locales! This ebuild should be updated to:" + eerror "PLOCALES=\"${current%[[:space:]]}\"" + return 1 + else + eend 0 + fi +} + +# @FUNCTION: l10n_get_locales +# @USAGE: [disabled] +# @DESCRIPTION: +# Determine which LINGUAS the user has enabled that are offered by the +# package, as listed in PLOCALES, and return them. In case no locales +# are selected, fall back on PLOCALE_BACKUP. When the disabled argument +# is given, return the disabled locales instead of the enabled ones. +l10n_get_locales() { + local loc locs + if [[ -z ${LINGUAS+set} ]]; then + # enable all if unset + locs=${PLOCALES} + else + for loc in ${LINGUAS}; do + has ${loc} ${PLOCALES} && locs+="${loc} " + done + fi + [[ -z ${locs} ]] && locs=${PLOCALE_BACKUP} + if [[ ${1} == disabled ]]; then + local disabled_locs + for loc in ${PLOCALES}; do + has ${loc} ${locs} || disabled_locs+="${loc} " + done + locs=${disabled_locs} + fi + printf "%s" "${locs}" +} diff -uNr a/eclass/latex-package.eclass b/eclass/latex-package.eclass --- a/eclass/latex-package.eclass false +++ b/eclass/latex-package.eclass 0f35d4ba43011e6be3bef76169079c9a6857990ad696bf7f95b8bde47531c093c57f87b26fc7cf3d38bef23a92da937ffbac7250c324e6236bcef37b43ffd528 @@ -0,0 +1,249 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: latex-package.eclass +# @MAINTAINER: +# TeX team <tex@gentoo.org> +# @AUTHOR: +# Matthew Turk <satai@gentoo.org> +# Martin Ehmsen <ehmsen@gentoo.org> +# @BLURB: An eclass for easy installation of LaTeX packages +# @DESCRIPTION: +# This eClass is designed to be easy to use and implement. The vast majority of +# LaTeX packages will only need to define SRC_URI (and sometimes S) for a +# successful installation. If fonts need to be installed, then the variable +# SUPPLIER must also be defined. +# +# However, those packages that contain subdirectories must process each +# subdirectory individually. For example, a package that contains directories +# DIR1 and DIR2 must call latex-package_src_compile() and +# latex-package_src_install() in each directory, as shown here: +# +# src_compile() { +# cd ${S} +# cd DIR1 +# latex-package_src_compile +# cd .. +# cd DIR2 +# latex-package_src_compile +# } +# +# src_install() { +# cd ${S} +# cd DIR1 +# latex-package_src_install +# cd .. +# cd DIR2 +# latex-package_src_install +# } +# +# The eClass automatically takes care of rehashing TeX's cache (ls-lR) after +# installation and after removal, as well as creating final documentation from +# TeX files that come with the source. Note that we break TeX layout standards +# by placing documentation in /usr/share/doc/${PN} +# +# For examples of basic installations, check out dev-tex/aastex and +# dev-tex/leaflet . +# +# NOTE: The CTAN "directory grab" function creates files with different MD5 +# signatures EVERY TIME. For this reason, if you are grabbing from the CTAN, +# you must either grab each file individually, or find a place to mirror an +# archive of them. (iBiblio) +# +# It inherits base and eutils in EAPI 5 and earlier. + +case ${EAPI:-0} in + 0|1|2|3|4|5) inherit base eutils ;; + 6) ;; + *) die "Unknown EAPI ${EAPI} for ${ECLASS}" ;; +esac + +RDEPEND="virtual/latex-base" +DEPEND="${RDEPEND} + >=sys-apps/texinfo-4.2-r5" +HOMEPAGE="http://www.tug.org/" +TEXMF="/usr/share/texmf-site" + +# @ECLASS-VARIABLE: SUPPLIER +# @DESCRIPTION: +# This refers to the font supplier; it should be overridden (see eclass +# DESCRIPTION above) +SUPPLIER="misc" + +# @ECLASS-VARIABLE: LATEX_DOC_ARGUMENTS +# @DESCRIPTION: +# When compiling documentation (.tex/.dtx), this variable will be passed +# to pdflatex as additional argument (e.g. -shell-escape). This variable +# must be set after inherit, as it gets automatically cleared otherwise. +LATEX_DOC_ARGUMENTS="" + +# Kept for backwards compatibility +latex-package_has_tetex_3() { + case ${EAPI:-0} in + 0|1|2|3|4|5) return 0 ;; + *) die "${FUNCNAME} no longer supported in EAPI ${EAPI}" ;; + esac +} + +# @FUNCTION: latex-package_src_doinstall +# @USAGE: [ module ] +# @DESCRIPTION: +# [module] can be one or more of: sh, sty, cls, fd, clo, def, cfg, dvi, ps, pdf, +# tex, dtx, tfm, vf, afm, pfb, ttf, bst, styles, doc, fonts, bin, or all. +# If [module] is not given, all is assumed. +# It installs the files found in the current directory to the standard locations +# for a TeX installation +latex-package_src_doinstall() { + debug-print function $FUNCNAME $* + + # Avoid generating font cache outside of the sandbox + export VARTEXFONTS="${T}/fonts" + + # This actually follows the directions for a "single-user" system + # at http://www.ctan.org/installationadvice/ modified for gentoo. + [ -z "$1" ] && latex-package_src_install all + + while [ "$1" ]; do + case $1 in + "sh") + for i in `find . -maxdepth 1 -type f -name "*.${1}"` + do + dobin $i || die "dobin $i failed" + done + ;; + "sty" | "cls" | "fd" | "clo" | "def" | "cfg") + for i in `find . -maxdepth 1 -type f -name "*.${1}"` + do + insinto ${TEXMF}/tex/latex/${PN} + doins $i || die "doins $i failed" + done + ;; + "dvi" | "ps" | "pdf") + for i in `find . -maxdepth 1 -type f -name "*.${1}"` + do + insinto /usr/share/doc/${PF} + doins $i || die "doins $i failed" + dosym /usr/share/doc/${PF}/$(basename ${i}) ${TEXMF}/doc/latex/${PN}/${i} + case "${EAPI:-0}" in + 0|1|2|3) ;; + *) + # prevent compression of symlink target + docompress -x /usr/share/doc/${PF}/$(basename ${i}) + ;; + esac + done + ;; + "tex" | "dtx") + if ! in_iuse doc || use doc ; then + for i in `find . -maxdepth 1 -type f -name "*.${1}"` + do + [ -n "${LATEX_PACKAGE_SKIP}" ] && has ${i##*/} ${LATEX_PACKAGE_SKIP} && continue + einfo "Making documentation: $i" + if pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode $i ; then + pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode $i || die + else + einfo "pdflatex failed, trying texi2dvi" + texi2dvi -q -c --language=latex $i || die + fi + done + fi + ;; + "tfm" | "vf" | "afm") + for i in `find . -maxdepth 1 -type f -name "*.${1}"` + do + insinto ${TEXMF}/fonts/${1}/${SUPPLIER}/${PN} + doins $i || die "doins $i failed" + done + ;; + "pfb") + for i in `find . -maxdepth 1 -type f -name "*.pfb"` + do + insinto ${TEXMF}/fonts/type1/${SUPPLIER}/${PN} + doins $i || die "doins $i failed" + done + ;; + "ttf") + for i in `find . -maxdepth 1 -type f -name "*.ttf"` + do + insinto ${TEXMF}/fonts/truetype/${SUPPLIER}/${PN} + doins $i || die "doins $i failed" + done + ;; + "bst") + for i in `find . -maxdepth 1 -type f -name "*.bst"` + do + insinto ${TEXMF}/bibtex/bst/${PN} + doins $i || die "doins $i failed" + done + ;; + "styles") + latex-package_src_doinstall sty cls fd clo def cfg bst + ;; + "doc") + latex-package_src_doinstall tex dtx dvi ps pdf + ;; + "fonts") + latex-package_src_doinstall tfm vf afm pfb ttf + ;; + "bin") + latex-package_src_doinstall sh + ;; + "all") + latex-package_src_doinstall styles fonts bin doc + ;; + esac + shift + done +} + +# @FUNCTION: latex-package_src_compile +# @DESCRIPTION: +# Calls latex for each *.ins in the current directory in order to generate the +# relevant files that will be installed +latex-package_src_compile() { + debug-print function $FUNCNAME $* + for i in `find \`pwd\` -maxdepth 1 -type f -name "*.ins"` + do + einfo "Extracting from $i" + latex --halt-on-error --interaction=nonstopmode $i || die + done +} + +# @FUNCTION: latex-package_src_install +# @DESCRIPTION: +# Installs the package +latex-package_src_install() { + debug-print function $FUNCNAME $* + latex-package_src_doinstall all + if [ -n "${DOCS}" ] ; then + dodoc ${DOCS} + fi +} + +# @FUNCTION: latex-package_pkg_postinst +# @DESCRIPTION: +# Calls latex-package_rehash to ensure the TeX installation is consistent with +# the kpathsea database +latex-package_pkg_postinst() { + debug-print function $FUNCNAME $* + latex-package_rehash +} + +# @FUNCTION: latex-package_pkg_postrm +# @DESCRIPTION: +# Calls latex-package_rehash to ensure the TeX installation is consistent with +# the kpathsea database +latex-package_pkg_postrm() { + debug-print function $FUNCNAME $* + latex-package_rehash +} + +# @FUNCTION: latex-package_rehash +# @DESCRIPTION: +# Rehashes the kpathsea database, according to the current TeX installation +latex-package_rehash() { + debug-print function $FUNCNAME $* + texmf-update +} + +EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm diff -uNr a/eclass/leechcraft.eclass b/eclass/leechcraft.eclass --- a/eclass/leechcraft.eclass false +++ b/eclass/leechcraft.eclass 3b05ba590f89cd40ae365ce2044b29471c9d1d1a9e377522061c235912e9735e756fc1af574ac67e7fa9a24413d5dc1a9997ae289b6b15147e9852623a6b4dd4 @@ -0,0 +1,55 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @ECLASS: leechcraft.eclass +# @MAINTAINER: +# 0xd34df00d@gmail.com +# @AUTHOR: +# 0xd34df00d@gmail.com +# NightNord@niifaq.ru +# @BLURB: Common functions and setup utilities for the LeechCraft app +# @DESCRIPTION: +# The leechcraft eclass contains a common set of functions and steps +# needed to build LeechCraft core or its plugins. +# +# Though this eclass seems to be small at the moment, it seems like a +# good idea to make all plugins inherit from it, since all plugins +# have mostly the same configuring/build process. +# +# Thanks for original eclass to Andrian Nord <NightNord@niifaq.ru>. +# +# Only EAPI >=6 is supported + +case ${EAPI:-0} in + 6) ;; + *) die "EAPI not supported, bug ebuild mantainer" ;; +esac + +inherit cmake-utils + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/0xd34df00d/leechcraft.git" + + inherit git-r3 +else + DEPEND="app-arch/xz-utils" + SRC_URI="https://dist.leechcraft.org/LeechCraft/${PV}/leechcraft-${PV}.tar.xz" + S="${WORKDIR}/leechcraft-${PV}" +fi + +HOMEPAGE="https://leechcraft.org/" +LICENSE="Boost-1.0" + +# @ECLASS-VARIABLE: LEECHCRAFT_PLUGIN_CATEGORY +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this to the category of the plugin, if any. +: ${LEECHCRAFT_PLUGIN_CATEGORY:=} + +if [[ "${LEECHCRAFT_PLUGIN_CATEGORY}" ]]; then + CMAKE_USE_DIR="${S}"/src/plugins/${LEECHCRAFT_PLUGIN_CATEGORY}/${PN#lc-} +elif [[ ${PN} != lc-core ]]; then + CMAKE_USE_DIR="${S}"/src/plugins/${PN#lc-} +else + CMAKE_USE_DIR="${S}"/src +fi diff -uNr a/eclass/libtool.eclass b/eclass/libtool.eclass --- a/eclass/libtool.eclass false +++ b/eclass/libtool.eclass 2766d86a1f8202d6f409179833451c6f655830d053b7e306681dfabe77d9a6a3da672f87e1f455df9ea27b9cf0040baf8cb4562ff68d5b493c72bffc046e3b9c @@ -0,0 +1,44 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: libtool.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: quickly update bundled libtool code +# @DESCRIPTION: +# This eclass patches ltmain.sh distributed with libtoolized packages with the +# relink and portage patch among others +# +# Note, this eclass does not require libtool as it only applies patches to +# generated libtool files. We do not run the libtoolize program because that +# requires a regeneration of the main autotool files in order to work properly. + +if [[ -z ${_LIBTOOL_ECLASS} ]]; then +_LIBTOOL_ECLASS=1 + +DEPEND=">=app-portage/elt-patches-20170422" + +inherit toolchain-funcs + +# @FUNCTION: elibtoolize +# @USAGE: [dirs] [--portage] [--reverse-deps] [--patch-only] [--remove-internal-dep=xxx] [--shallow] [--no-uclibc] +# @DESCRIPTION: +# Apply a smorgasbord of patches to bundled libtool files. This function +# should always be safe to run. If no directories are specified, then +# ${S} will be searched for appropriate files. +# +# If the --shallow option is used, then only ${S}/ltmain.sh will be patched. +# +# The other options should be avoided in general unless you know what's going on. +elibtoolize() { + type -P eltpatch &>/dev/null || die "eltpatch not found; is app-portage/elt-patches installed?" + + ELT_LOGDIR=${T} \ + LD=$(tc-getLD) \ + eltpatch "${@}" || die "eltpatch failed" +} + +uclibctoolize() { die "Use elibtoolize"; } +darwintoolize() { die "Use elibtoolize"; } + +fi diff -uNr a/eclass/linux-info.eclass b/eclass/linux-info.eclass --- a/eclass/linux-info.eclass false +++ b/eclass/linux-info.eclass 57a07729e39a4cee4ae375be675dedf5b6f2f0d04fdb3f6702d86e3daba4b0fc9dce887a2d05f864dbf84ed98a5ba0c844530dc3def146864bdb51d66d9e6a45 @@ -0,0 +1,921 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: linux-info.eclass +# @MAINTAINER: +# kernel@gentoo.org +# @AUTHOR: +# Original author: John Mylchreest <johnm@gentoo.org> +# @BLURB: eclass used for accessing kernel related information +# @DESCRIPTION: +# This eclass is used as a central eclass for accessing kernel +# related information for source or binary already installed. +# It is vital for linux-mod.eclass to function correctly, and is split +# out so that any ebuild behaviour "templates" are abstracted out +# using additional eclasses. +# +# "kernel config" in this file means: +# The .config of the currently installed sources is used as the first +# preference, with a fall-back to bundled config (/proc/config.gz) if available. +# +# Before using any of the config-handling functions in this eclass, you must +# ensure that one of the following functions has been called (in order of +# preference), otherwise you will get bugs like #364041): +# linux-info_pkg_setup +# linux-info_get_any_version +# get_version +# get_running_version + +# A Couple of env vars are available to effect usage of this eclass +# These are as follows: + +# @ECLASS-VARIABLE: KERNEL_DIR +# @DESCRIPTION: +# A string containing the directory of the target kernel sources. The default value is +# "/usr/src/linux" + +# @ECLASS-VARIABLE: CONFIG_CHECK +# @DESCRIPTION: +# A string containing a list of .config options to check for before +# proceeding with the install. +# +# e.g.: CONFIG_CHECK="MTRR" +# +# You can also check that an option doesn't exist by +# prepending it with an exclamation mark (!). +# +# e.g.: CONFIG_CHECK="!MTRR" +# +# To simply warn about a missing option, prepend a '~'. +# It may be combined with '!'. +# +# In general, most checks should be non-fatal. The only time fatal checks should +# be used is for building kernel modules or cases that a compile will fail +# without the option. +# +# This is to allow usage of binary kernels, and minimal systems without kernel +# sources. + +# @ECLASS-VARIABLE: ERROR_<CFG> +# @DESCRIPTION: +# A string containing the error message to display when the check against CONFIG_CHECK +# fails. <CFG> should reference the appropriate option used in CONFIG_CHECK. +# +# e.g.: ERROR_MTRR="MTRR exists in the .config but shouldn't!!" + +# @ECLASS-VARIABLE: KBUILD_OUTPUT +# @DESCRIPTION: +# A string passed on commandline, or set from the kernel makefile. It contains the directory +# which is to be used as the kernel object directory. + +# There are also a couple of variables which are set by this, and shouldn't be +# set by hand. These are as follows: + +# @ECLASS-VARIABLE: KV_FULL +# @DESCRIPTION: +# A read-only variable. It's a string containing the full kernel version. ie: 2.6.9-gentoo-johnm-r1 + +# @ECLASS-VARIABLE: KV_MAJOR +# @DESCRIPTION: +# A read-only variable. It's an integer containing the kernel major version. ie: 2 + +# @ECLASS-VARIABLE: KV_MINOR +# @DESCRIPTION: +# A read-only variable. It's an integer containing the kernel minor version. ie: 6 + +# @ECLASS-VARIABLE: KV_PATCH +# @DESCRIPTION: +# A read-only variable. It's an integer containing the kernel patch version. ie: 9 + +# @ECLASS-VARIABLE: KV_EXTRA +# @DESCRIPTION: +# A read-only variable. It's a string containing the kernel EXTRAVERSION. ie: -gentoo + +# @ECLASS-VARIABLE: KV_LOCAL +# @DESCRIPTION: +# A read-only variable. It's a string containing the kernel LOCALVERSION concatenation. ie: -johnm + +# @ECLASS-VARIABLE: KV_DIR +# @DESCRIPTION: +# A read-only variable. It's a string containing the kernel source directory, will be null if +# KERNEL_DIR is invalid. + +# @ECLASS-VARIABLE: KV_OUT_DIR +# @DESCRIPTION: +# A read-only variable. It's a string containing the kernel object directory, will be KV_DIR unless +# KBUILD_OUTPUT is used. This should be used for referencing .config. + +# And to ensure all the weirdness with crosscompile +inherit toolchain-funcs versionator + +EXPORT_FUNCTIONS pkg_setup + +# Overwritable environment Var's +# --------------------------------------- +KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}" + + +# Bug fixes +# fix to bug #75034 +case ${ARCH} in + ppc) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; + ppc64) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; +esac + +# @FUNCTION: set_arch_to_kernel +# @DESCRIPTION: +# Set the env ARCH to match what the kernel expects. +set_arch_to_kernel() { export ARCH=$(tc-arch-kernel); } +# @FUNCTION: set_arch_to_portage +# @DESCRIPTION: +# Set the env ARCH to match what portage expects. +set_arch_to_portage() { export ARCH=$(tc-arch); } + +# qeinfo "Message" +# ------------------- +# qeinfo is a quiet einfo call when EBUILD_PHASE +# should not have visible output. +qout() { + local outputmsg type + type=${1} + shift + outputmsg="${@}" + case "${EBUILD_PHASE}" in + depend) unset outputmsg;; + clean) unset outputmsg;; + preinst) unset outputmsg;; + esac + [ -n "${outputmsg}" ] && ${type} "${outputmsg}" +} + +qeinfo() { qout einfo "${@}" ; } +qewarn() { qout ewarn "${@}" ; } +qeerror() { qout eerror "${@}" ; } + +# File Functions +# --------------------------------------- + +# @FUNCTION: getfilevar +# @USAGE: variable configfile +# @RETURN: the value of the variable +# @DESCRIPTION: +# It detects the value of the variable defined in the file configfile. This is +# done by including the configfile, and printing the variable with Make. +# It WILL break if your makefile has missing dependencies! +getfilevar() { + local ERROR basefname basedname myARCH="${ARCH}" M="${S}" + ERROR=0 + + [ -z "${1}" ] && ERROR=1 + [ ! -f "${2}" ] && ERROR=1 + + if [ "${ERROR}" = 1 ] + then + echo -e "\n" + eerror "getfilevar requires 2 variables, with the second a valid file." + eerror " getfilevar <VARIABLE> <CONFIGFILE>" + else + basefname="$(basename ${2})" + basedname="$(dirname ${2})" + unset ARCH + + # We use nonfatal because we want the caller to take care of things #373151 + [[ ${EAPI:-0} == [0123] ]] && nonfatal() { "$@"; } + case ${EBUILD_PHASE_FUNC} in + pkg_info|pkg_nofetch|pkg_pretend) M="${T}" ;; + esac + echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \ + nonfatal emake -C "${basedname}" M="${M}" ${BUILD_FIXES} -s -f - 2>/dev/null + + ARCH=${myARCH} + fi +} + +# @FUNCTION: getfilevar_noexec +# @USAGE: variable configfile +# @RETURN: the value of the variable +# @DESCRIPTION: +# It detects the value of the variable defined in the file configfile. +# This is done with sed matching an expression only. If the variable is defined, +# you will run into problems. See getfilevar for those cases. +getfilevar_noexec() { + local ERROR basefname basedname mycat myARCH="${ARCH}" + ERROR=0 + mycat='cat' + + [ -z "${1}" ] && ERROR=1 + [ ! -f "${2}" ] && ERROR=1 + [ "${2%.gz}" != "${2}" ] && mycat='zcat' + + if [ "${ERROR}" = 1 ] + then + echo -e "\n" + eerror "getfilevar_noexec requires 2 variables, with the second a valid file." + eerror " getfilevar_noexec <VARIABLE> <CONFIGFILE>" + else + ${mycat} "${2}" | \ + sed -n \ + -e "/^[[:space:]]*${1}[[:space:]]*:\\?=[[:space:]]*$.*$\$/{ + s,^[^=]*[[:space:]]*=[[:space:]]*,,g ; + s,[[:space:]]*\$,,g ; + p + }" + fi +} + +# @ECLASS-VARIABLE: _LINUX_CONFIG_EXISTS_DONE +# @INTERNAL +# @DESCRIPTION: +# This is only set if one of the linux_config_*exists functions has been called. +# We use it for a QA warning that the check for a config has not been performed, +# as linux_chkconfig* in non-legacy mode WILL return an undefined value if no +# config is available at all. +_LINUX_CONFIG_EXISTS_DONE= + +linux_config_qa_check() { + local f="$1" + if [ -z "${_LINUX_CONFIG_EXISTS_DONE}" ]; then + ewarn "QA: You called $f before any linux_config_exists!" + ewarn "QA: The return value of $f will NOT guaranteed later!" + fi +} + +# @FUNCTION: linux_config_src_exists +# @RETURN: true or false +# @DESCRIPTION: +# It returns true if .config exists in a build directory otherwise false +linux_config_src_exists() { + export _LINUX_CONFIG_EXISTS_DONE=1 + [[ -n ${KV_OUT_DIR} && -s ${KV_OUT_DIR}/.config ]] +} + +# @FUNCTION: linux_config_bin_exists +# @RETURN: true or false +# @DESCRIPTION: +# It returns true if .config exists in /proc, otherwise false +linux_config_bin_exists() { + export _LINUX_CONFIG_EXISTS_DONE=1 + [[ -s /proc/config.gz ]] +} + +# @FUNCTION: linux_config_exists +# @RETURN: true or false +# @DESCRIPTION: +# It returns true if .config exists otherwise false +# +# This function MUST be checked before using any of the linux_chkconfig_* +# functions. +linux_config_exists() { + linux_config_src_exists || linux_config_bin_exists +} + +# @FUNCTION: linux_config_path +# @DESCRIPTION: +# Echo the name of the config file to use. If none are found, +# then return false. +linux_config_path() { + if linux_config_src_exists; then + echo "${KV_OUT_DIR}/.config" + elif linux_config_bin_exists; then + echo "/proc/config.gz" + else + return 1 + fi +} + +# @FUNCTION: require_configured_kernel +# @DESCRIPTION: +# This function verifies that the current kernel is configured (it checks against the existence of .config) +# otherwise it dies. +require_configured_kernel() { + if ! linux_config_src_exists; then + qeerror "Could not find a usable .config in the kernel source directory." + qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources." + qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that" + qeerror "it points to the necessary object directory so that it might find .config." + die "Kernel not configured; no .config found in ${KV_OUT_DIR}" + fi +} + +# @FUNCTION: linux_chkconfig_present +# @USAGE: option +# @RETURN: true or false +# @DESCRIPTION: +# It checks that CONFIG_<option>=y or CONFIG_<option>=m is present in the current kernel .config +# If linux_config_exists returns false, the results of this are UNDEFINED. You +# MUST call linux_config_exists first. +linux_chkconfig_present() { + linux_config_qa_check linux_chkconfig_present + [[ $(getfilevar_noexec "CONFIG_$1" "$(linux_config_path)") == [my] ]] +} + +# @FUNCTION: linux_chkconfig_module +# @USAGE: option +# @RETURN: true or false +# @DESCRIPTION: +# It checks that CONFIG_<option>=m is present in the current kernel .config +# If linux_config_exists returns false, the results of this are UNDEFINED. You +# MUST call linux_config_exists first. +linux_chkconfig_module() { + linux_config_qa_check linux_chkconfig_module + [[ $(getfilevar_noexec "CONFIG_$1" "$(linux_config_path)") == m ]] +} + +# @FUNCTION: linux_chkconfig_builtin +# @USAGE: option +# @RETURN: true or false +# @DESCRIPTION: +# It checks that CONFIG_<option>=y is present in the current kernel .config +# If linux_config_exists returns false, the results of this are UNDEFINED. You +# MUST call linux_config_exists first. +linux_chkconfig_builtin() { + linux_config_qa_check linux_chkconfig_builtin + [[ $(getfilevar_noexec "CONFIG_$1" "$(linux_config_path)") == y ]] +} + +# @FUNCTION: linux_chkconfig_string +# @USAGE: option +# @RETURN: CONFIG_<option> +# @DESCRIPTION: +# It prints the CONFIG_<option> value of the current kernel .config (it requires a configured kernel). +# If linux_config_exists returns false, the results of this are UNDEFINED. You +# MUST call linux_config_exists first. +linux_chkconfig_string() { + linux_config_qa_check linux_chkconfig_string + getfilevar_noexec "CONFIG_$1" "$(linux_config_path)" +} + +# Versioning Functions +# --------------------------------------- + +# @FUNCTION: kernel_is +# @USAGE: [-lt -gt -le -ge -eq] major_number [minor_number patch_number] +# @RETURN: true or false +# @DESCRIPTION: +# It returns true when the current kernel version satisfies the comparison against the passed version. +# -eq is the default comparison. +# +# @CODE +# For Example where KV = 2.6.9 +# kernel_is 2 4 returns false +# kernel_is 2 returns true +# kernel_is 2 6 returns true +# kernel_is 2 6 8 returns false +# kernel_is 2 6 9 returns true +# @CODE + +# Note: duplicated in kernel-2.eclass +kernel_is() { + # if we haven't determined the version yet, we need to. + linux-info_get_any_version + + # Now we can continue + local operator test value + + case ${1#-} in + lt) operator="-lt"; shift;; + gt) operator="-gt"; shift;; + le) operator="-le"; shift;; + ge) operator="-ge"; shift;; + eq) operator="-eq"; shift;; + *) operator="-eq";; + esac + [[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many parameters" + + : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH )) + : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} )) + [ ${test} ${operator} ${value} ] +} + +get_localversion() { + local lv_list i x + + # ignore files with ~ in it. + for i in $(ls ${1}/localversion* 2>/dev/null); do + [[ -n ${i//*~*} ]] && lv_list="${lv_list} ${i}" + done + + for i in ${lv_list}; do + x="${x}$(<${i})" + done + x=${x/ /} + echo ${x} +} + +# Check if the Makefile is valid for direct parsing. +# Check status results: +# - PASS, use 'getfilevar' to extract values +# - FAIL, use 'getfilevar_noexec' to extract values +# The check may fail if: +# - make is not present +# - corruption exists in the kernel makefile +get_makefile_extract_function() { + local a='' b='' mkfunc='getfilevar' + a="$(getfilevar VERSION ${KERNEL_MAKEFILE})" + b="$(getfilevar_noexec VERSION ${KERNEL_MAKEFILE})" + [[ "${a}" != "${b}" ]] && mkfunc='getfilevar_noexec' + echo "${mkfunc}" +} + +# internal variable, so we know to only print the warning once +get_version_warning_done= + +# @FUNCTION: get_version +# @DESCRIPTION: +# It gets the version of the kernel inside KERNEL_DIR and populates the KV_FULL variable +# (if KV_FULL is already set it does nothing). +# +# The kernel version variables (KV_MAJOR, KV_MINOR, KV_PATCH, KV_EXTRA and KV_LOCAL) are also set. +# +# The KV_DIR is set using the KERNEL_DIR env var, the KV_DIR_OUT is set using a valid +# KBUILD_OUTPUT (in a decreasing priority list, we look for the env var, makefile var or the +# symlink /lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build). +get_version() { + local tmplocal + + # no need to execute this twice assuming KV_FULL is populated. + # we can force by unsetting KV_FULL + [ -n "${KV_FULL}" ] && return 0 + + # if we dont know KV_FULL, then we need too. + # make sure KV_DIR isnt set since we need to work it out via KERNEL_DIR + unset KV_DIR + + # KV_DIR will contain the full path to the sources directory we should use + [ -z "${get_version_warning_done}" ] && \ + qeinfo "Determining the location of the kernel source code" + [ -d "${KERNEL_DIR}" ] && KV_DIR="${KERNEL_DIR}" + + if [ -z "${KV_DIR}" ] + then + if [ -z "${get_version_warning_done}" ]; then + get_version_warning_done=1 + qewarn "Unable to find kernel sources at ${KERNEL_DIR}" + #qeinfo "This package requires Linux sources." + if [ "${KERNEL_DIR}" == "/usr/src/linux" ] ; then + qeinfo "Please make sure that ${KERNEL_DIR} points at your running kernel, " + qeinfo "(or the kernel you wish to build against)." + qeinfo "Alternatively, set the KERNEL_DIR environment variable to the kernel sources location" + else + qeinfo "Please ensure that the KERNEL_DIR environment variable points at full Linux sources of the kernel you wish to compile against." + fi + fi + return 1 + fi + + # See if the kernel dir is actually an output dir. #454294 + if [ -z "${KBUILD_OUTPUT}" -a -L "${KERNEL_DIR}/source" ]; then + KBUILD_OUTPUT=${KERNEL_DIR} + KERNEL_DIR=$(readlink -f "${KERNEL_DIR}/source") + KV_DIR=${KERNEL_DIR} + fi + + if [ -z "${get_version_warning_done}" ]; then + qeinfo "Found kernel source directory:" + qeinfo " ${KV_DIR}" + fi + + if [ ! -s "${KV_DIR}/Makefile" ] + then + if [ -z "${get_version_warning_done}" ]; then + get_version_warning_done=1 + qeerror "Could not find a Makefile in the kernel source directory." + qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources" + fi + return 1 + fi + + # OK so now we know our sources directory, but they might be using + # KBUILD_OUTPUT, and we need this for .config and localversions-* + # so we better find it eh? + # do we pass KBUILD_OUTPUT on the CLI? + local OUTPUT_DIR=${KBUILD_OUTPUT} + + # keep track of it + KERNEL_MAKEFILE="${KV_DIR}/Makefile" + + if [[ -z ${OUTPUT_DIR} ]]; then + # Decide the function used to extract makefile variables. + local mkfunc=$(get_makefile_extract_function "${KERNEL_MAKEFILE}") + + # And if we didn't pass it, we can take a nosey in the Makefile. + OUTPUT_DIR=$(${mkfunc} KBUILD_OUTPUT "${KERNEL_MAKEFILE}") + fi + + # And contrary to existing functions I feel we shouldn't trust the + # directory name to find version information as this seems insane. + # So we parse ${KERNEL_MAKEFILE}. We should be able to trust that + # the Makefile is simple enough to use the noexec extract function. + # This has been true for every release thus far, and it's faster + # than using make to evaluate the Makefile every time. + KV_MAJOR=$(getfilevar_noexec VERSION "${KERNEL_MAKEFILE}") + KV_MINOR=$(getfilevar_noexec PATCHLEVEL "${KERNEL_MAKEFILE}") + KV_PATCH=$(getfilevar_noexec SUBLEVEL "${KERNEL_MAKEFILE}") + KV_EXTRA=$(getfilevar_noexec EXTRAVERSION "${KERNEL_MAKEFILE}") + + if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ] + then + if [ -z "${get_version_warning_done}" ]; then + get_version_warning_done=1 + qeerror "Could not detect kernel version." + qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources." + fi + return 1 + fi + + # and in newer versions we can also pull LOCALVERSION if it is set. + # but before we do this, we need to find if we use a different object directory. + # This *WILL* break if the user is using localversions, but we assume it was + # caught before this if they are. + if [[ -z ${OUTPUT_DIR} ]] ; then + # Try to locate a kernel that is most relevant for us. + for OUTPUT_DIR in "${SYSROOT}" "${ROOT}" "" ; do + OUTPUT_DIR+="/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build" + if [[ -e ${OUTPUT_DIR} ]] ; then + break + fi + done + fi + + [ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}" + if [ -n "${KV_OUT_DIR}" ]; + then + qeinfo "Found kernel object directory:" + qeinfo " ${KV_OUT_DIR}" + fi + # and if we STILL have not got it, then we better just set it to KV_DIR + KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}" + + # Grab the kernel release from the output directory. + # TODO: we MUST detect kernel.release being out of date, and 'return 1' from + # this function. + if [ -s "${KV_OUT_DIR}"/include/config/kernel.release ]; then + KV_LOCAL=$(<"${KV_OUT_DIR}"/include/config/kernel.release) + elif [ -s "${KV_OUT_DIR}"/.kernelrelease ]; then + KV_LOCAL=$(<"${KV_OUT_DIR}"/.kernelrelease) + else + KV_LOCAL= + fi + + # KV_LOCAL currently contains the full release; discard the first bits. + tmplocal=${KV_LOCAL#${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}} + + # If the updated local version was not changed, the tree is not prepared. + # Clear out KV_LOCAL in that case. + # TODO: this does not detect a change in the localversion part between + # kernel.release and the value that would be generated. + if [ "$KV_LOCAL" = "$tmplocal" ]; then + KV_LOCAL= + else + KV_LOCAL=$tmplocal + fi + + # And we should set KV_FULL to the full expanded version + KV_FULL="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}${KV_LOCAL}" + + qeinfo "Found sources for kernel version:" + qeinfo " ${KV_FULL}" + + return 0 +} + +# @FUNCTION: get_running_version +# @DESCRIPTION: +# It gets the version of the current running kernel and the result is the same as get_version() if the +# function can find the sources. +get_running_version() { + KV_FULL=$(uname -r) + + if [[ -f ${ROOT}/lib/modules/${KV_FULL}/source/Makefile && -f ${ROOT}/lib/modules/${KV_FULL}/build/Makefile ]]; then + KERNEL_DIR=$(readlink -f ${ROOT}/lib/modules/${KV_FULL}/source) + KBUILD_OUTPUT=$(readlink -f ${ROOT}/lib/modules/${KV_FULL}/build) + unset KV_FULL + get_version + return $? + elif [[ -f ${ROOT}/lib/modules/${KV_FULL}/source/Makefile ]]; then + KERNEL_DIR=$(readlink -f ${ROOT}/lib/modules/${KV_FULL}/source) + unset KV_FULL + get_version + return $? + elif [[ -f ${ROOT}/lib/modules/${KV_FULL}/build/Makefile ]]; then + KERNEL_DIR=$(readlink -f ${ROOT}/lib/modules/${KV_FULL}/build) + unset KV_FULL + get_version + return $? + else + # This handles a variety of weird kernel versions. Make sure to update + # tests/linux-info_get_running_version.sh if you want to change this. + local kv_full=${KV_FULL//[-+_]*} + KV_MAJOR=$(get_version_component_range 1 ${kv_full}) + KV_MINOR=$(get_version_component_range 2 ${kv_full}) + KV_PATCH=$(get_version_component_range 3 ${kv_full}) + KV_EXTRA="${KV_FULL#${KV_MAJOR}.${KV_MINOR}${KV_PATCH:+.${KV_PATCH}}}" + : ${KV_PATCH:=0} + fi + return 0 +} + +# This next function is named with the eclass prefix to avoid conflicts with +# some old versionator-like eclass functions. + +# @FUNCTION: linux-info_get_any_version +# @DESCRIPTION: +# This attempts to find the version of the sources, and otherwise falls back to +# the version of the running kernel. +linux-info_get_any_version() { + get_version + if [[ $? -ne 0 ]]; then + ewarn "Unable to calculate Linux Kernel version for build, attempting to use running version" + get_running_version + fi +} + + +# ebuild check functions +# --------------------------------------- + +# @FUNCTION: check_kernel_built +# @DESCRIPTION: +# This function verifies that the current kernel sources have been already prepared otherwise it dies. +check_kernel_built() { + # if we haven't determined the version yet, we need to + require_configured_kernel + get_version + + local versionh_path + if kernel_is -ge 3 7; then + versionh_path="include/generated/uapi/linux/version.h" + else + versionh_path="include/linux/version.h" + fi + + if [ ! -f "${KV_OUT_DIR}/${versionh_path}" ] + then + eerror "These sources have not yet been prepared." + eerror "We cannot build against an unprepared tree." + eerror "To resolve this, please type the following:" + eerror + eerror "# cd ${KV_DIR}" + eerror "# make oldconfig" + eerror "# make modules_prepare" + eerror + eerror "Then please try merging this module again." + die "Kernel sources need compiling first" + fi +} + +# @FUNCTION: check_modules_supported +# @DESCRIPTION: +# This function verifies that the current kernel support modules (it checks CONFIG_MODULES=y) otherwise it dies. +check_modules_supported() { + # if we haven't determined the version yet, we need too. + require_configured_kernel + get_version + + if ! linux_chkconfig_builtin "MODULES"; then + eerror "These sources do not support loading external modules." + eerror "to be able to use this module please enable \"Loadable modules support\"" + eerror "in your kernel, recompile and then try merging this module again." + die "No support for external modules in ${KV_FULL} config" + fi +} + +# @FUNCTION: check_extra_config +# @DESCRIPTION: +# It checks the kernel config options specified by CONFIG_CHECK. It dies only when a required config option (i.e. +# the prefix ~ is not used) doesn't satisfy the directive. +check_extra_config() { + local config negate die error reworkmodulenames + local soft_errors_count=0 hard_errors_count=0 config_required=0 + # store the value of the QA check, because otherwise we won't catch usages + # after if check_extra_config is called AND other direct calls are done + # later. + local old_LINUX_CONFIG_EXISTS_DONE="${_LINUX_CONFIG_EXISTS_DONE}" + + # if we haven't determined the version yet, we need to + linux-info_get_any_version + + # Determine if we really need a .config. The only time when we don't need + # one is when all of the CONFIG_CHECK options are prefixed with "~". + for config in ${CONFIG_CHECK}; do + if [[ "${config:0:1}" != "~" ]]; then + config_required=1 + break + fi + done + + if [[ ${config_required} == 0 ]]; then + # In the case where we don't require a .config, we can now bail out + # if the user has no .config as there is nothing to do. Otherwise + # code later will cause a failure due to missing .config. + if ! linux_config_exists; then + ewarn "Unable to check for the following kernel config options due" + ewarn "to absence of any configured kernel sources or compiled" + ewarn "config:" + for config in ${CONFIG_CHECK}; do + config=${config#\~} + config=${config#\!} + local_error="ERROR_${config}" + msg="${!local_error}" + if [[ -z ${msg} ]]; then + local_error="WARNING_${config}" + msg="${!local_error}" + fi + ewarn " - ${config}${msg:+ - }${msg}" + done + ewarn "You're on your own to make sure they are set if needed." + export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}" + return 0 + fi + else + require_configured_kernel + fi + + einfo "Checking for suitable kernel configuration options..." + + for config in ${CONFIG_CHECK} + do + # if we specify any fatal, ensure we honor them + die=1 + error=0 + negate=0 + reworkmodulenames=0 + + if [[ ${config:0:1} == "~" ]]; then + die=0 + config=${config:1} + elif [[ ${config:0:1} == "@" ]]; then + die=0 + reworkmodulenames=1 + config=${config:1} + fi + if [[ ${config:0:1} == "!" ]]; then + negate=1 + config=${config:1} + fi + + if [[ ${negate} == 1 ]]; then + linux_chkconfig_present ${config} && error=2 + elif [[ ${reworkmodulenames} == 1 ]]; then + local temp_config="${config//*:}" i n + config="${config//:*}" + if linux_chkconfig_present ${config}; then + for i in ${MODULE_NAMES}; do + n="${i//${temp_config}}" + [[ -z ${n//\(*} ]] && \ + MODULE_IGNORE="${MODULE_IGNORE} ${temp_config}" + done + error=2 + fi + else + linux_chkconfig_present ${config} || error=1 + fi + + if [[ ${error} > 0 ]]; then + local report_func="eerror" local_error + local_error="ERROR_${config}" + local_error="${!local_error}" + + if [[ -z "${local_error}" ]]; then + # using old, deprecated format. + local_error="${config}_ERROR" + local_error="${!local_error}" + fi + if [[ ${die} == 0 && -z "${local_error}" ]]; then + #soft errors can be warnings + local_error="WARNING_${config}" + local_error="${!local_error}" + if [[ -n "${local_error}" ]] ; then + report_func="ewarn" + fi + fi + + if [[ -z "${local_error}" ]]; then + [[ ${error} == 1 ]] \ + && local_error="is not set when it should be." \ + || local_error="should not be set. But it is." + local_error="CONFIG_${config}:\t ${local_error}" + fi + if [[ ${die} == 0 ]]; then + ${report_func} " ${local_error}" + soft_errors_count=$[soft_errors_count + 1] + else + ${report_func} " ${local_error}" + hard_errors_count=$[hard_errors_count + 1] + fi + fi + done + + if [[ ${hard_errors_count} > 0 ]]; then + eerror "Please check to make sure these options are set correctly." + eerror "Failure to do so may cause unexpected problems." + eerror "Once you have satisfied these options, please try merging" + eerror "this package again." + export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}" + die "Incorrect kernel configuration options" + elif [[ ${soft_errors_count} > 0 ]]; then + ewarn "Please check to make sure these options are set correctly." + ewarn "Failure to do so may cause unexpected problems." + else + eend 0 + fi + export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}" +} + +check_zlibinflate() { + # if we haven't determined the version yet, we need to + require_configured_kernel + get_version + + # although I restructured this code - I really really really dont support it! + + # bug #27882 - zlib routines are only linked into the kernel + # if something compiled into the kernel calls them + # + # plus, for the cloop module, it appears that there's no way + # to get cloop.o to include a static zlib if CONFIG_MODVERSIONS + # is on + + local INFLATE + local DEFLATE + + einfo "Determining the usability of ZLIB_INFLATE support in your kernel" + + ebegin "checking ZLIB_INFLATE" + linux_chkconfig_builtin CONFIG_ZLIB_INFLATE + eend $? + [ "$?" != 0 ] && die + + ebegin "checking ZLIB_DEFLATE" + linux_chkconfig_builtin CONFIG_ZLIB_DEFLATE + eend $? + [ "$?" != 0 ] && die + + local LINENO_START + local LINENO_END + local SYMBOLS + local x + + LINENO_END="$(grep -n 'CONFIG_ZLIB_INFLATE y' ${KV_DIR}/lib/Config.in | cut -d : -f 1)" + LINENO_START="$(head -n $LINENO_END ${KV_DIR}/lib/Config.in | grep -n 'if \[' | tail -n 1 | cut -d : -f 1)" + (( LINENO_AMOUNT = $LINENO_END - $LINENO_START )) + (( LINENO_END = $LINENO_END - 1 )) + SYMBOLS="$(head -n $LINENO_END ${KV_DIR}/lib/Config.in | tail -n $LINENO_AMOUNT | sed -e 's/^.*$CONFIG_[^\" ]*$.*/\1/g;')" + + # okay, now we have a list of symbols + # we need to check each one in turn, to see whether it is set or not + for x in $SYMBOLS ; do + if [ "${!x}" = "y" ]; then + # we have a winner! + einfo "${x} ensures zlib is linked into your kernel - excellent" + return 0 + fi + done + + eerror + eerror "This kernel module requires ZLIB library support." + eerror "You have enabled zlib support in your kernel, but haven't enabled" + eerror "enabled any option that will ensure that zlib is linked into your" + eerror "kernel." + eerror + eerror "Please ensure that you enable at least one of these options:" + eerror + + for x in $SYMBOLS ; do + eerror " * $x" + done + + eerror + eerror "Please remember to recompile and install your kernel, and reboot" + eerror "into your new kernel before attempting to load this kernel module." + + die "Kernel doesn't include zlib support" +} + +################################ +# Default pkg_setup +# Also used when inheriting linux-mod to force a get_version call +# @FUNCTION: linux-info_pkg_setup +# @DESCRIPTION: +# Force a get_version() call when inherited from linux-mod.eclass and then check if the kernel is configured +# to support the options specified in CONFIG_CHECK (if not null) +linux-info_pkg_setup() { + linux-info_get_any_version + + if kernel_is 2 4; then + if [ "$( gcc-major-version )" -eq "4" ] ; then + echo + ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with" + ewarn "linux-2.4 (or modules building against a linux-2.4 kernel)!" + echo + ewarn "Either switch to another gcc-version (via gcc-config) or use a" + ewarn "newer kernel that supports gcc-4." + echo + ewarn "Also be aware that bugreports about gcc-4 not working" + ewarn "with linux-2.4 based ebuilds will be closed as INVALID!" + echo + fi + fi + + [ -n "${CONFIG_CHECK}" ] && check_extra_config; +} diff -uNr a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass --- a/eclass/linux-mod.eclass false +++ b/eclass/linux-mod.eclass 3b8961b3a165110da05d3d5b71f7e9cb860a01b2868bac6f385ba8063e98afae645f59eac278bcd73534aa335d33658b2192d061287dfc6be4ef335d4413a41a @@ -0,0 +1,758 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: linux-mod.eclass +# @MAINTAINER: +# kernel@gentoo.org +# @AUTHOR: +# John Mylchreest <johnm@gentoo.org>, +# Stefan Schweizer <genstef@gentoo.org> +# @BLURB: It provides the functionality required to install external modules against a kernel source tree. +# @DESCRIPTION: +# This eclass is used to interface with linux-info.eclass in such a way +# to provide the functionality and initial functions +# required to install external modules against a kernel source +# tree. + +# A Couple of env vars are available to effect usage of this eclass +# These are as follows: + +# @ECLASS-VARIABLE: MODULES_OPTIONAL_USE +# @DESCRIPTION: +# A string containing the USE flag to use for making this eclass optional +# The recommended non-empty value is 'modules' + +# @ECLASS-VARIABLE: MODULES_OPTIONAL_USE_IUSE_DEFAULT +# @DESCRIPTION: +# A boolean to control the IUSE default state for the MODULES_OPTIONAL_USE USE +# flag. Default value is unset (false). True represented by 1 or 'on', other +# values including unset treated as false. + +# @ECLASS-VARIABLE: KERNEL_DIR +# @DESCRIPTION: +# A string containing the directory of the target kernel sources. The default value is +# "/usr/src/linux" + +# @ECLASS-VARIABLE: ECONF_PARAMS +# @DESCRIPTION: +# It's a string containing the parameters to pass to econf. +# If this is not set, then econf isn't run. + +# @ECLASS-VARIABLE: BUILD_PARAMS +# @DESCRIPTION: +# It's a string with the parameters to pass to emake. + +# @ECLASS-VARIABLE: BUILD_TARGETS +# @DESCRIPTION: +# It's a string with the build targets to pass to make. The default value is "clean module" + +# @ECLASS-VARIABLE: MODULE_NAMES +# @DESCRIPTION: +# It's a string containing the modules to be built automatically using the default +# src_compile/src_install. It will only make ${BUILD_TARGETS} once in any directory. +# +# The structure of each MODULE_NAMES entry is as follows: +# +# modulename(libdir:srcdir:objdir) +# +# where: +# +# modulename = name of the module file excluding the .ko +# libdir = place in system modules directory where module is installed (by default it's misc) +# srcdir = place for ebuild to cd to before running make (by default it's ${S}) +# objdir = place the .ko and objects are located after make runs (by default it's set to srcdir) +# +# To get an idea of how these variables are used, here's a few lines +# of code from around line 540 in this eclass: +# +# einfo "Installing ${modulename} module" +# cd ${objdir} || die "${objdir} does not exist" +# insinto /lib/modules/${KV_FULL}/${libdir} +# doins ${modulename}.${KV_OBJ} || die "doins ${modulename}.${KV_OBJ} failed" +# +# For example: +# MODULE_NAMES="module_pci(pci:${S}/pci:${S}) module_usb(usb:${S}/usb:${S})" +# +# what this would do is +# +# cd "${S}"/pci +# make ${BUILD_PARAMS} ${BUILD_TARGETS} +# cd "${S}" +# insinto /lib/modules/${KV_FULL}/pci +# doins module_pci.${KV_OBJ} +# +# cd "${S}"/usb +# make ${BUILD_PARAMS} ${BUILD_TARGETS} +# cd "${S}" +# insinto /lib/modules/${KV_FULL}/usb +# doins module_usb.${KV_OBJ} + +# There is also support for automated modprobe.d file generation. +# This can be explicitly enabled by setting any of the following variables. + +# @ECLASS-VARIABLE: MODULESD_<modulename>_ENABLED +# @DESCRIPTION: +# This is used to disable the modprobe.d file generation otherwise the file will be +# always generated (unless no MODULESD_<modulename>_* variable is provided). Set to "no" to disable +# the generation of the file and the installation of the documentation. + +# @ECLASS-VARIABLE: MODULESD_<modulename>_EXAMPLES +# @DESCRIPTION: +# This is a bash array containing a list of examples which should +# be used. If you want us to try and take a guess set this to "guess". +# +# For each array_component it's added an options line in the modprobe.d file +# +# options array_component +# +# where array_component is "<modulename> options" (see modprobe.conf(5)) + +# @ECLASS-VARIABLE: MODULESD_<modulename>_ALIASES +# @DESCRIPTION: +# This is a bash array containing a list of associated aliases. +# +# For each array_component it's added an alias line in the modprobe.d file +# +# alias array_component +# +# where array_component is "wildcard <modulename>" (see modprobe.conf(5)) + +# @ECLASS-VARIABLE: MODULESD_<modulename>_ADDITIONS +# @DESCRIPTION: +# This is a bash array containing a list of additional things to +# add to the bottom of the file. This can be absolutely anything. +# Each entry is a new line. + +# @ECLASS-VARIABLE: MODULESD_<modulename>_DOCS +# @DESCRIPTION: +# This is a string list which contains the full path to any associated +# documents for <modulename>. These files are installed in the live tree. + +# @ECLASS-VARIABLE: KV_OBJ +# @DESCRIPTION: +# It's a read-only variable. It contains the extension of the kernel modules. + +inherit eutils linux-info multilib +EXPORT_FUNCTIONS pkg_setup pkg_preinst pkg_postinst src_install src_compile pkg_postrm + +case ${MODULES_OPTIONAL_USE_IUSE_DEFAULT:-n} in + [nNfF]*|[oO][fF]*|0|-) _modules_optional_use_iuse_default='' ;; + *) _modules_optional_use_iuse_default='+' ;; +esac + +[[ -n "${_modules_optional_use_iuse_default}" ]] && case ${EAPI:-0} in + 0) die "EAPI=${EAPI} is not supported with MODULES_OPTIONAL_USE_IUSE_DEFAULT due to lack of IUSE defaults" ;; +esac + +IUSE="kernel_linux ${MODULES_OPTIONAL_USE:+${_modules_optional_use_iuse_default}}${MODULES_OPTIONAL_USE}" +SLOT="0" +RDEPEND="${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (} kernel_linux? ( virtual/modutils ) ${MODULES_OPTIONAL_USE:+)}" +DEPEND="${RDEPEND} + ${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (} + sys-apps/sed + kernel_linux? ( virtual/linux-sources ) + ${MODULES_OPTIONAL_USE:+)}" + +# eclass utilities +# ---------------------------------- + +check_vermagic() { + debug-print-function ${FUNCNAME} $* + + local curr_gcc_ver=$(gcc -dumpversion) + local tmpfile old_chost old_gcc_ver result=0 + [ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return + + tmpfile=`find "${KV_DIR}/" -iname "*.o.cmd" -exec grep usr/lib/gcc {} \; -quit` + tmpfile=${tmpfile//*usr/lib} + tmpfile=${tmpfile//\/include*} + old_chost=${tmpfile//*gcc\/} + old_chost=${old_chost//\/*} + old_gcc_ver=${tmpfile//*\/} + + if [[ -z ${old_gcc_ver} || -z ${old_chost} ]]; then + ewarn "" + ewarn "Unable to detect what version of GCC was used to compile" + ewarn "the kernel. Build will continue, but you may experience problems." + elif [[ ${curr_gcc_ver} != ${old_gcc_ver} ]]; then + ewarn "" + ewarn "The version of GCC you are using (${curr_gcc_ver}) does" + ewarn "not match the version of GCC used to compile the" + ewarn "kernel (${old_gcc_ver})." + result=1 + elif [[ ${CHOST} != ${old_chost} ]]; then + ewarn "" + ewarn "The current CHOST (${CHOST}) does not match the chost" + ewarn "used when compiling the kernel (${old_chost})." + result=1 + fi + + if [[ ${result} -gt 0 ]]; then + ewarn "" + ewarn "Build will not continue, because you will experience problems." + ewarn "To fix this either change the version of GCC you wish to use" + ewarn "to match the kernel, or recompile the kernel first." + die "GCC Version Mismatch." + fi +} + +# @FUNCTION: use_m +# @RETURN: true or false +# @DESCRIPTION: +# It checks if the kernel version is greater than 2.6.5. +use_m() { + debug-print-function ${FUNCNAME} $* + + # if we haven't determined the version yet, we need too. + get_version; + + # if the kernel version is greater than 2.6.6 then we should use + # M= instead of SUBDIRS= + [ ${KV_MAJOR} -eq 3 ] && return 0 + [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \ + return 0 || return 1 +} + +# @FUNCTION: convert_to_m +# @USAGE: /path/to/the/file +# @DESCRIPTION: +# It converts a file (e.g. a makefile) to use M= instead of SUBDIRS= +convert_to_m() { + debug-print-function ${FUNCNAME} $* + + if use_m + then + [ ! -f "${1}" ] && \ + die "convert_to_m() requires a filename as an argument" + ebegin "Converting ${1/${WORKDIR}\//} to use M= instead of SUBDIRS=" + sed -i 's:SUBDIRS=:M=:g' "${1}" + eend $? + fi +} + +# internal function +# +# FUNCTION: update_depmod +# DESCRIPTION: +# It updates the modules.dep file for the current kernel. +update_depmod() { + debug-print-function ${FUNCNAME} $* + + # if we haven't determined the version yet, we need too. + get_version; + + ebegin "Updating module dependencies for ${KV_FULL}" + if [ -r "${KV_OUT_DIR}"/System.map ] + then + depmod -ae -F "${KV_OUT_DIR}"/System.map -b "${ROOT}" ${KV_FULL} + eend $? + else + ewarn + ewarn "${KV_OUT_DIR}/System.map not found." + ewarn "You must manually update the kernel module dependencies using depmod." + eend 1 + ewarn + fi +} + +# internal function +# +# FUNCTION: move_old_moduledb +# DESCRIPTION: +# It updates the location of the database used by the module-rebuild utility. +move_old_moduledb() { + debug-print-function ${FUNCNAME} $* + + local OLDDIR="${ROOT}"/usr/share/module-rebuild/ + local NEWDIR="${ROOT}"/var/lib/module-rebuild/ + + if [[ -f "${OLDDIR}"/moduledb ]]; then + [[ ! -d "${NEWDIR}" ]] && mkdir -p "${NEWDIR}" + [[ ! -f "${NEWDIR}"/moduledb ]] && \ + mv "${OLDDIR}"/moduledb "${NEWDIR}"/moduledb + rm -f "${OLDDIR}"/* + rmdir "${OLDDIR}" + fi +} + +# internal function +# +# FUNCTION: update_moduledb +# DESCRIPTION: +# It adds the package to the /var/lib/module-rebuild/moduledb database used by the module-rebuild utility. +update_moduledb() { + debug-print-function ${FUNCNAME} $* + + local MODULEDB_DIR="${ROOT}"/var/lib/module-rebuild/ + move_old_moduledb + + if [[ ! -f "${MODULEDB_DIR}"/moduledb ]]; then + [[ ! -d "${MODULEDB_DIR}" ]] && mkdir -p "${MODULEDB_DIR}" + touch "${MODULEDB_DIR}"/moduledb + fi + + if ! grep -qs ${CATEGORY}/${PN}-${PVR} "${MODULEDB_DIR}"/moduledb ; then + einfo "Adding module to moduledb." + echo "a:1:${CATEGORY}/${PN}-${PVR}" >> "${MODULEDB_DIR}"/moduledb + fi +} + +# internal function +# +# FUNCTION: remove_moduledb +# DESCRIPTION: +# It removes the package from the /var/lib/module-rebuild/moduledb database used by +# the module-rebuild utility. +remove_moduledb() { + debug-print-function ${FUNCNAME} $* + + local MODULEDB_DIR="${ROOT}"/var/lib/module-rebuild/ + move_old_moduledb + + if grep -qs ${CATEGORY}/${PN}-${PVR} "${MODULEDB_DIR}"/moduledb ; then + einfo "Removing ${CATEGORY}/${PN}-${PVR} from moduledb." + sed -i -e "/.*${CATEGORY}\/${PN}-${PVR}.*/d" "${MODULEDB_DIR}"/moduledb + fi +} + +# @FUNCTION: set_kvobj +# @DESCRIPTION: +# It sets the KV_OBJ variable. +set_kvobj() { + debug-print-function ${FUNCNAME} $* + + if kernel_is ge 2 6 + then + KV_OBJ="ko" + else + KV_OBJ="o" + fi + # Do we really need to know this? + # Lets silence it. + # einfo "Using KV_OBJ=${KV_OBJ}" +} + +get-KERNEL_CC() { + debug-print-function ${FUNCNAME} $* + + if [[ -n ${KERNEL_CC} ]] ; then + echo "${KERNEL_CC}" + return + fi + + local kernel_cc + if [ -n "${KERNEL_ABI}" ]; then + # In future, an arch might want to define CC_$ABI + #kernel_cc="$(get_abi_CC)" + #[ -z "${kernel_cc}" ] && + kernel_cc="$(tc-getCC $(ABI=${KERNEL_ABI} get_abi_CHOST))" + else + kernel_cc=$(tc-getCC) + fi + echo "${kernel_cc}" +} + +# internal function +# +# FUNCTION: +# USAGE: /path/to/the/modulename_without_extension +# RETURN: A file in /etc/modprobe.d +# DESCRIPTION: +# This function will generate and install the neccessary modprobe.d file from the +# information contained in the modules exported parms. +# (see the variables MODULESD_<modulename>_ENABLED, MODULESD_<modulename>_EXAMPLES, +# MODULESD_<modulename>_ALIASES, MODULESD_<modulename>_ADDITION and MODULESD_<modulename>_DOCS). +# +# At the end the documentation specified with MODULESD_<modulename>_DOCS is installed. +generate_modulesd() { + debug-print-function ${FUNCNAME} $* + [ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return + + local currm_path currm currm_t t myIFS myVAR + local module_docs module_enabled module_aliases \ + module_additions module_examples module_modinfo module_opts + + for currm_path in ${@} + do + currm=${currm_path//*\/} + currm=$(echo ${currm} | tr '[:lower:]' '[:upper:]') + currm_t=${currm} + while [[ -z ${currm_t//*-*} ]]; do + currm_t=${currm_t/-/_} + done + + module_docs="$(eval echo \${MODULESD_${currm_t}_DOCS})" + module_enabled="$(eval echo \${MODULESD_${currm_t}_ENABLED})" + module_aliases="$(eval echo \${#MODULESD_${currm_t}_ALIASES[*]})" + module_additions="$(eval echo \${#MODULESD_${currm_t}_ADDITIONS[*]})" + module_examples="$(eval echo \${#MODULESD_${currm_t}_EXAMPLES[*]})" + + [[ ${module_aliases} -eq 0 ]] && unset module_aliases + [[ ${module_additions} -eq 0 ]] && unset module_additions + [[ ${module_examples} -eq 0 ]] && unset module_examples + + # If we specify we dont want it, then lets exit, otherwise we assume + # that if its set, we do want it. + [[ ${module_enabled} == no ]] && return 0 + + # unset any unwanted variables. + for t in ${!module_*} + do + [[ -z ${!t} ]] && unset ${t} + done + + [[ -z ${!module_*} ]] && return 0 + + # OK so now if we have got this far, then we know we want to continue + # and generate the modprobe.d file. + module_modinfo="$(modinfo -p ${currm_path}.${KV_OBJ})" + module_config="${T}/modulesd-${currm}" + + ebegin "Preparing file for modprobe.d" + #----------------------------------------------------------------------- + echo "# modprobe.d configuration file for ${currm}" >> "${module_config}" + #----------------------------------------------------------------------- + [[ -n ${module_docs} ]] && \ + echo "# For more information please read:" >> "${module_config}" + for t in ${module_docs} + do + echo "# ${t//*\/}" >> "${module_config}" + done + echo >> "${module_config}" + + #----------------------------------------------------------------------- + if [[ ${module_aliases} -gt 0 ]] + then + echo "# Internal Aliases - Do not edit" >> "${module_config}" + echo "# ------------------------------" >> "${module_config}" + + for((t=0; t<${module_aliases}; t++)) + do + echo "alias $(eval echo \${MODULESD_${currm}_ALIASES[$t]})" \ + >> "${module_config}" + done + echo '' >> "${module_config}" + fi + + #----------------------------------------------------------------------- + if [[ -n ${module_modinfo} ]] + then + echo >> "${module_config}" + echo "# Configurable module parameters" >> "${module_config}" + echo "# ------------------------------" >> "${module_config}" + myIFS="${IFS}" + IFS="$(echo -en "\n\b")" + + for t in ${module_modinfo} + do + myVAR="$(echo ${t#*:} | grep -o "[^ ]*[0-9][ =][^ ]*" | tail -1 | grep -o "[0-9]")" + if [[ -n ${myVAR} ]] + then + module_opts="${module_opts} ${t%%:*}:${myVAR}" + fi + echo -e "# ${t%%:*}:\t${t#*:}" >> "${module_config}" + done + IFS="${myIFS}" + echo '' >> "${module_config}" + fi + + #----------------------------------------------------------------------- + if [[ $(eval echo \${MODULESD_${currm}_ALIASES[0]}) == guess ]] + then + # So lets do some guesswork eh? + if [[ -n ${module_opts} ]] + then + echo "# For Example..." >> "${module_config}" + echo "# --------------" >> "${module_config}" + for t in ${module_opts} + do + echo "# options ${currm} ${t//:*}=${t//*:}" >> "${module_config}" + done + echo '' >> "${module_config}" + fi + elif [[ ${module_examples} -gt 0 ]] + then + echo "# For Example..." >> "${module_config}" + echo "# --------------" >> "${module_config}" + for((t=0; t<${module_examples}; t++)) + do + echo "options $(eval echo \${MODULESD_${currm}_EXAMPLES[$t]})" \ + >> "${module_config}" + done + echo '' >> "${module_config}" + fi + + #----------------------------------------------------------------------- + if [[ ${module_additions} -gt 0 ]] + then + for((t=0; t<${module_additions}; t++)) + do + echo "$(eval echo \${MODULESD_${currm}_ADDITIONS[$t]})" \ + >> "${module_config}" + done + echo '' >> "${module_config}" + fi + + #----------------------------------------------------------------------- + + # then we install it + insinto /etc/modprobe.d + newins "${module_config}" "${currm_path//*\/}.conf" + + # and install any documentation we might have. + [[ -n ${module_docs} ]] && dodoc ${module_docs} + done + eend 0 + return 0 +} + +# internal function +# +# FUNCTION: find_module_params +# USAGE: A string "NAME(LIBDIR:SRCDIR:OBJDIR)" +# RETURN: The string "modulename:NAME libdir:LIBDIR srcdir:SRCDIR objdir:OBJDIR" +# DESCRIPTION: +# Analyze the specification NAME(LIBDIR:SRCDIR:OBJDIR) of one module as described in MODULE_NAMES. +find_module_params() { + debug-print-function ${FUNCNAME} $* + + local matched_offset=0 matched_opts=0 test="${@}" temp_var result + local i=0 y=0 z=0 + + for((i=0; i<=${#test}; i++)) + do + case ${test:${i}:1} in + $) matched_offset[0]=${i};; + \:) matched_opts=$((${matched_opts} + 1)); + matched_offset[${matched_opts}]="${i}";; + $) matched_opts=$((${matched_opts} + 1)); + matched_offset[${matched_opts}]="${i}";; + esac + done + + for((i=0; i<=${matched_opts}; i++)) + do + # i = offset were working on + # y = last offset + # z = current offset - last offset + # temp_var = temporary name + case ${i} in + 0) tempvar=${test:0:${matched_offset[0]}};; + *) y=$((${matched_offset[$((${i} - 1))]} + 1)) + z=$((${matched_offset[${i}]} - ${matched_offset[$((${i} - 1))]})); + z=$((${z} - 1)) + tempvar=${test:${y}:${z}};; + esac + + case ${i} in + 0) result="${result} modulename:${tempvar}";; + 1) result="${result} libdir:${tempvar}";; + 2) result="${result} srcdir:${tempvar}";; + 3) result="${result} objdir:${tempvar}";; + esac + done + + echo ${result} +} + +# default ebuild functions +# -------------------------------- + +# @FUNCTION: linux-mod_pkg_setup +# @DESCRIPTION: +# It checks the CONFIG_CHECK options (see linux-info.eclass(5)), verifies that the kernel is +# configured, verifies that the sources are prepared, verifies that the modules support is builtin +# in the kernel and sets the object extension KV_OBJ. +linux-mod_pkg_setup() { + debug-print-function ${FUNCNAME} $* + [ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return + + local is_bin="${MERGE_TYPE}" + + # If we are installing a binpkg, take a different path. + # use MERGE_TYPE if available (eapi>=4); else use non-PMS EMERGE_FROM (eapi<4) + if has ${EAPI} 0 1 2 3; then + is_bin=${EMERGE_FROM} + fi + + if [[ ${is_bin} == binary ]]; then + linux-mod_pkg_setup_binary + return + fi + + # External modules use kernel symbols (bug #591832) + CONFIG_CHECK+=" !TRIM_UNUSED_KSYMS" + + linux-info_pkg_setup; + require_configured_kernel + check_kernel_built; + strip_modulenames; + [[ -n ${MODULE_NAMES} ]] && check_modules_supported + set_kvobj; + # Commented out with permission from johnm until a fixed version for arches + # who intentionally use different kernel and userland compilers can be + # introduced - Jason Wever <weeve@gentoo.org>, 23 Oct 2005 + #check_vermagic; +} + +# @FUNCTION: linux-mod_pkg_setup_binary +# @DESCRIPTION: +# Perform all kernel option checks non-fatally, as the .config and +# /proc/config.gz might not be present. Do not do anything that requires kernel +# sources. +linux-mod_pkg_setup_binary() { + debug-print-function ${FUNCNAME} $* + local new_CONFIG_CHECK + # ~ needs always to be quoted, else bash expands it. + for config in $CONFIG_CHECK ; do + optional='~' + [[ ${config:0:1} == "~" ]] && optional='' + new_CONFIG_CHECK="${new_CONFIG_CHECK} ${optional}${config}" + done + CONFIG_CHECK="${new_CONFIG_CHECK}" + linux-info_pkg_setup; +} + +strip_modulenames() { + debug-print-function ${FUNCNAME} $* + + local i + for i in ${MODULE_IGNORE}; do + MODULE_NAMES=${MODULE_NAMES//${i}(*} + done +} + +# @FUNCTION: linux-mod_src_compile +# @DESCRIPTION: +# It compiles all the modules specified in MODULE_NAMES. For each module the econf command is +# executed only if ECONF_PARAMS is defined, the name of the target is specified by BUILD_TARGETS +# while the options are in BUILD_PARAMS (all the modules share these variables). The compilation +# happens inside ${srcdir}. +# +# Look at the description of these variables for more details. +linux-mod_src_compile() { + debug-print-function ${FUNCNAME} $* + [ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return + + local modulename libdir srcdir objdir i n myABI="${ABI}" + set_arch_to_kernel + ABI="${KERNEL_ABI}" + + BUILD_TARGETS=${BUILD_TARGETS:-clean module} + strip_modulenames; + cd "${S}" + touch Module.symvers + for i in ${MODULE_NAMES} + do + unset libdir srcdir objdir + for n in $(find_module_params ${i}) + do + eval ${n/:*}=${n/*:/} + done + libdir=${libdir:-misc} + srcdir=${srcdir:-${S}} + objdir=${objdir:-${srcdir}} + + if [ ! -f "${srcdir}/.built" ]; + then + cd "${srcdir}" + ln -s "${S}"/Module.symvers Module.symvers + einfo "Preparing ${modulename} module" + if [[ -n ${ECONF_PARAMS} ]] + then + econf ${ECONF_PARAMS} || \ + die "Unable to run econf ${ECONF_PARAMS}" + fi + + # This looks messy, but it is needed to handle multiple variables + # being passed in the BUILD_* stuff where the variables also have + # spaces that must be preserved. If don't do this, then the stuff + # inside the variables gets used as targets for Make, which then + # fails. + eval "emake HOSTCC=\"$(tc-getBUILD_CC)\" \ + CROSS_COMPILE=${CHOST}- \ + LDFLAGS=\"$(get_abi_LDFLAGS)\" \ + ${BUILD_FIXES} \ + ${BUILD_PARAMS} \ + ${BUILD_TARGETS} " \ + || die "Unable to emake HOSTCC="$(tc-getBUILD_CC)" CROSS_COMPILE=${CHOST}- LDFLAGS="$(get_abi_LDFLAGS)" ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}" + cd "${OLDPWD}" + touch "${srcdir}"/.built + fi + done + + set_arch_to_portage + ABI="${myABI}" +} + +# @FUNCTION: linux-mod_src_install +# @DESCRIPTION: +# It install the modules specified in MODULES_NAME. The modules should be inside the ${objdir} +# directory and they are installed inside /lib/modules/${KV_FULL}/${libdir}. +# +# The modprobe.d configuration file is automatically generated if the +# MODULESD_<modulename>_* variables are defined. The only way to stop this process is by +# setting MODULESD_<modulename>_ENABLED=no. At the end the documentation specified via +# MODULESD_<modulename>_DOCS is also installed. +# +# Look at the description of these variables for more details. +linux-mod_src_install() { + debug-print-function ${FUNCNAME} $* + [ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return + + local modulename libdir srcdir objdir i n + + strip_modulenames; + for i in ${MODULE_NAMES} + do + unset libdir srcdir objdir + for n in $(find_module_params ${i}) + do + eval ${n/:*}=${n/*:/} + done + libdir=${libdir:-misc} + srcdir=${srcdir:-${S}} + objdir=${objdir:-${srcdir}} + + einfo "Installing ${modulename} module" + cd "${objdir}" || die "${objdir} does not exist" + insinto /lib/modules/${KV_FULL}/${libdir} + doins ${modulename}.${KV_OBJ} || die "doins ${modulename}.${KV_OBJ} failed" + cd "${OLDPWD}" + + generate_modulesd "${objdir}/${modulename}" + done +} + +# @FUNCTION: linux-mod_pkg_preinst +# @DESCRIPTION: +# It checks what to do after having merged the package. +linux-mod_pkg_preinst() { + debug-print-function ${FUNCNAME} $* + [ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return + + [ -d "${D}lib/modules" ] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false + [ -d "${D}lib/modules" ] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false +} + +# @FUNCTION: linux-mod_pkg_postinst +# @DESCRIPTION: +# It executes /sbin/depmod and adds the package to the /var/lib/module-rebuild/moduledb +# database (if ${D}/lib/modules is created)" +linux-mod_pkg_postinst() { + debug-print-function ${FUNCNAME} $* + [ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return + + ${UPDATE_DEPMOD} && update_depmod; + ${UPDATE_MODULEDB} && update_moduledb; +} + +# @FUNCTION: linux-mod_pkg_postrm +# @DESCRIPTION: +# It removes the package from the /var/lib/module-rebuild/moduledb database but it doens't +# call /sbin/depmod because the modules are still installed. +linux-mod_pkg_postrm() { + debug-print-function ${FUNCNAME} $* + [ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return + remove_moduledb; +} diff -uNr a/eclass/llvm.eclass b/eclass/llvm.eclass --- a/eclass/llvm.eclass false +++ b/eclass/llvm.eclass 7ebc478ad471a8b6a137ef4daddde48dafb063bef30a13c47a8ea6d70919544c8f8c487aeda1cde67a63e292c508f059d65f8027d29e06bfca822c2627328076 @@ -0,0 +1,173 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: llvm.eclass +# @MAINTAINER: +# Michał Górny <mgorny@gentoo.org> +# @AUTHOR: +# Michał Górny <mgorny@gentoo.org> +# @BLURB: Utility functions to build against slotted LLVM +# @DESCRIPTION: +# The llvm.eclass provides utility functions that can be used to build +# against specific version of slotted LLVM (with fallback to :0 for old +# versions). +# +# This eclass does not generate dependency strings. You need to write +# a proper dependency string yourself to guarantee that appropriate +# version of LLVM is installed. +# +# Example use for a package supporting LLVM 3.8 to 5: +# @CODE +# inherit cmake-utils llvm +# +# RDEPEND=" +# <sys-devel/llvm-6_rc:= +# || ( +# sys-devel/llvm:5 +# sys-devel/llvm:4 +# >=sys-devel/llvm-3.8:0 +# ) +# " +# +# LLVM_MAX_SLOT=5 +# +# # only if you need to define one explicitly +# pkg_setup() { +# llvm_pkg_setup +# do-something-else +# } +# @CODE +# +# Example for a package needing LLVM+clang w/ a specific target: +# @CODE +# inherit cmake-utils llvm +# +# # note: do not use := on both clang and llvm, it can match different +# # slots then. clang pulls llvm in, so we can skip the latter. +# RDEPEND=" +# >=sys-devel/clang-4:=[llvm_targets_AMDGPU(+)] +# " +# +# llvm_check_deps() { +# has_version "sys-devel/clang:${LLVM_SLOT}[llvm_targets_AMDGPU(+)]" +# } +# @CODE + +case "${EAPI:-0}" in + 0|1|2|3|4|5) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 6) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +EXPORT_FUNCTIONS pkg_setup + +if [[ ! ${_LLVM_ECLASS} ]]; then + +# @ECLASS-VARIABLE: LLVM_MAX_SLOT +# @DEFAULT_UNSET +# @DESCRIPTION: +# Highest LLVM slot supported by the package. Needs to be set before +# llvm_pkg_setup is called. If unset, no upper bound is assumed. + +# @ECLASS-VARIABLE: _LLVM_KNOWN_SLOTS +# @INTERNAL +# @DESCRIPTION: +# Correct values of LLVM slots, newest first. +declare -g -r _LLVM_KNOWN_SLOTS=( 7 6 5 4 ) + +# @FUNCTION: get_llvm_prefix +# @USAGE: [<max_slot>] +# @DESCRIPTION: +# Find the newest LLVM install that is acceptable for the package, +# and print an absolute path to it. +# +# If <max_slot> is specified, then only LLVM versions that are not newer +# than <max_slot> will be considered. Otherwise, all LLVM versions would +# be considered acceptable. The function does not support specifying +# minimal supported version -- the developer must ensure that a version +# new enough is installed via providing appropriate dependencies. +# +# If llvm_check_deps() function is defined within the ebuild, it will +# be called to verify whether a particular slot is accepable. Within +# the function scope, LLVM_SLOT will be defined to the SLOT value +# (0, 4, 5...). The function should return a true status if the slot +# is acceptable, false otherwise. If llvm_check_deps() is not defined, +# the function defaults to checking whether sys-devel/llvm:${LLVM_SLOT} +# is installed. +get_llvm_prefix() { + debug-print-function ${FUNCNAME} "${@}" + + local max_slot=${1} + local slot + for slot in "${_LLVM_KNOWN_SLOTS[@]}"; do + # skip higher slots + if [[ -n ${max_slot} ]]; then + if [[ ${max_slot} == ${slot} ]]; then + max_slot= + else + continue + fi + fi + + if declare -f llvm_check_deps >/dev/null; then + local LLVM_SLOT=${slot} + llvm_check_deps || continue + else + # check if LLVM package is installed + has_version "sys-devel/llvm:${slot}" || continue + fi + + echo "${EPREFIX}/usr/lib/llvm/${slot}" + return + done + + # max_slot should have been unset in the iteration + if [[ -n ${max_slot} ]]; then + die "${FUNCNAME}: invalid max_slot=${max_slot}" + fi + + # fallback to :0 + # assume it's always <= 4 (the lower max_slot allowed) + if has_version "sys-devel/llvm:0"; then + echo "${EPREFIX}/usr" + return + fi + + die "No LLVM slot${1:+ <= ${1}} found installed!" +} + +# @FUNCTION: llvm_pkg_setup +# @DESCRIPTION: +# Prepend the appropriate executable directory for the newest +# acceptable LLVM slot to the PATH. For path determination logic, +# please see the get_llvm_prefix documentation. +# +# The highest acceptable LLVM slot can be set in LLVM_MAX_SLOT variable. +# If it is unset or empty, any slot is acceptable. +# +# The PATH manipulation is only done for source builds. The function +# is a no-op when installing a binary package. +# +# If any other behavior is desired, the contents of the function +# should be inlined into the ebuild and modified as necessary. +llvm_pkg_setup() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ ${MERGE_TYPE} != binary ]]; then + local llvm_prefix=$(get_llvm_prefix "${LLVM_MAX_SLOT}") + + # do not prepend /usr/bin, it's not necessary and breaks other + # prepends, https://bugs.gentoo.org/622866 + if [[ ${llvm_prefix} != ${EPREFIX}/usr ]]; then + export PATH=${llvm_prefix}/bin:${PATH} + fi + fi +} + +_LLVM_ECLASS=1 +fi diff -uNr a/eclass/ltprune.eclass b/eclass/ltprune.eclass --- a/eclass/ltprune.eclass false +++ b/eclass/ltprune.eclass 85fa5d167b9de0814c7332db75af43531e8e78126340877d8c418916508ef6ca706c09a9512ae078830a71c59aeff8e7cfa430e822d75299efa3ed7d78c1d2f3 @@ -0,0 +1,174 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ltprune.eclass +# @MAINTAINER: +# Michał Górny <mgorny@gentoo.org> +# @BLURB: Smart .la file pruning +# @DESCRIPTION: +# A function to locate and remove unnecessary .la files. +# +# Discouraged. Whenever possible, please use much simpler: +# @CODE +# find "${D}" -name '*.la' -delete || die +# @CODE + +if [[ -z ${_LTPRUNE_ECLASS} ]]; then + +case ${EAPI:-0} in + 0|1|2|3|4|5|6) + ;; + *) + die "${ECLASS}: banned in EAPI=${EAPI}; use 'find' instead";; +esac + +inherit toolchain-funcs + +# @FUNCTION: prune_libtool_files +# @USAGE: [--all|--modules] +# @DESCRIPTION: +# Locate unnecessary libtool files (.la) and libtool static archives +# (.a) and remove them from installation image. +# +# By default, .la files are removed whenever the static linkage can +# either be performed using pkg-config or doesn't introduce additional +# flags. +# +# If '--modules' argument is passed, .la files for modules (plugins) are +# removed as well. This is usually useful when the package installs +# plugins and the plugin loader does not use .la files. +# +# If '--all' argument is passed, all .la files are removed without +# performing any heuristic on them. You shouldn't ever use that, +# and instead report a bug in the algorithm instead. +# +# The .a files are only removed whenever corresponding .la files state +# that they should not be linked to, i.e. whenever these files +# correspond to plugins. +# +# Note: if your package installs both static libraries and .pc files +# which use variable substitution for -l flags, you need to add +# pkg-config to your DEPEND. +prune_libtool_files() { + debug-print-function ${FUNCNAME} "$@" + + local removing_all removing_modules opt + for opt; do + case "${opt}" in + --all) + removing_all=1 + removing_modules=1 + ;; + --modules) + removing_modules=1 + ;; + *) + die "Invalid argument to ${FUNCNAME}(): ${opt}" + esac + done + + local f + local queue=() + while IFS= read -r -d '' f; do # for all .la files + local archivefile=${f/%.la/.a} + + # The following check is done by libtool itself. + # It helps us avoid removing random files which match '*.la', + # see bug #468380. + if ! sed -n -e '/^# Generated by .*libtool/q0;4q1' "${f}"; then + continue + fi + + [[ ${f} != ${archivefile} ]] || die 'regex sanity check failed' + local reason= pkgconfig_scanned= + local snotlink=$(sed -n -e 's:^shouldnotlink=::p' "${f}") + + if [[ ${snotlink} == yes ]]; then + + # Remove static libs we're not supposed to link against. + if [[ -f ${archivefile} ]]; then + einfo "Removing unnecessary ${archivefile#${D%/}} (static plugin)" + queue+=( "${archivefile}" ) + fi + + # The .la file may be used by a module loader, so avoid removing it + # unless explicitly requested. + if [[ ${removing_modules} ]]; then + reason='module' + fi + + else + + # Remove .la files when: + # - user explicitly wants us to remove all .la files, + # - respective static archive doesn't exist, + # - they are covered by a .pc file already, + # - they don't provide any new information (no libs & no flags). + + if [[ ${removing_all} ]]; then + reason='requested' + elif [[ ! -f ${archivefile} ]]; then + reason='no static archive' + elif [[ ! $(sed -nre \ + "s/^(dependency_libs|inherited_linker_flags)='(.*)'$/\2/p" \ + "${f}") ]]; then + reason='no libs & flags' + else + if [[ ! ${pkgconfig_scanned} ]]; then + # Create a list of all .pc-covered libs. + local pc_libs=() + if [[ ! ${removing_all} ]]; then + local pc + local tf=${T}/prune-lt-files.pc + local pkgconf=$(tc-getPKG_CONFIG) + + while IFS= read -r -d '' pc; do # for all .pc files + local arg libs + + # Use pkg-config if available (and works), + # fallback to sed. + if ${pkgconf} --exists "${pc}" &>/dev/null; then + sed -e '/^Requires:/d' "${pc}" > "${tf}" + libs=$(${pkgconf} --libs "${tf}") + else + libs=$(sed -ne 's/^Libs://p' "${pc}") + fi + + for arg in ${libs}; do + if [[ ${arg} == -l* ]]; then + if [[ ${arg} == '*$*' ]]; then + eerror "${FUNCNAME}: variable substitution likely failed in ${pc}" + eerror "(arg: ${arg})" + eerror "Most likely, you need to add virtual/pkgconfig to DEPEND." + die "${FUNCNAME}: unsubstituted variable found in .pc" + fi + + pc_libs+=( lib${arg#-l}.la ) + fi + done + done < <(find "${D}" -type f -name '*.pc' -print0) + + rm -f "${tf}" + fi + + pkgconfig_scanned=1 + fi # pkgconfig_scanned + + has "${f##*/}" "${pc_libs[@]}" && reason='covered by .pc' + fi # removal due to .pc + + fi # shouldnotlink==no + + if [[ ${reason} ]]; then + einfo "Removing unnecessary ${f#${D%/}} (${reason})" + queue+=( "${f}" ) + fi + done < <(find "${D}" -xtype f -name '*.la' -print0) + + if [[ ${queue[@]} ]]; then + rm -f "${queue[@]}" + fi +} + +_LTPRUNE_ECLASS=1 +fi #_LTPRUNE_ECLASS diff -uNr a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass --- a/eclass/mate-desktop.org.eclass false +++ b/eclass/mate-desktop.org.eclass 53d58591f8a6301363c5b59fd512956b993a7e5b0013c9fbf115710b79a8a3ea452141ba8c6a39ed318734ff9c54c49b749a27d0ecc9f295cf3b2d604d03c5b8 @@ -0,0 +1,60 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: mate-desktop.org.eclass +# @MAINTAINER: +# mate@gentoo.org +# @AUTHOR: +# Authors: NP-Hardass <NP-Hardass@gentoo.org> based upon the gnome.org eclass. +# @BLURB: Helper eclass for mate-desktop.org hosted archives +# @DESCRIPTION: +# Provide a default SRC_URI and EGIT_REPO_URI for MATE packages as well as +# exporting some useful values like the MATE_BRANCH + +# EAPIs < 6 are banned. +case "${EAPI:-0}" in + 6) ;; + *) die "EAPI=${EAPI:-0} is not supported" ;; +esac + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 +fi + +inherit versionator + +# @ECLASS-VARIABLE: MATE_TARBALL_SUFFIX +# @INTERNAL +# @DESCRIPTION: +# All projects hosted on mate-desktop.org provide tarballs as tar.xz. +# Undefined in live ebuilds. +[[ ${PV} != 9999 ]] && : ${MATE_TARBALL_SUFFIX:="xz"} + +# @ECLASS-VARIABLE: MATE_DESKTOP_ORG_PN +# @DESCRIPTION: +# Name of the package as hosted on mate-desktop.org. +# Leave unset if package name matches PN. +: ${MATE_DESKTOP_ORG_PN:=$PN} + +# @ECLASS-VARIABLE: MATE_DESKTOP_ORG_PV +# @DESCRIPTION: +# Package version string as listed on mate-desktop.org. +# Leave unset if package version string matches PV. +: ${MATE_DESKTOP_ORG_PV:=$PV} + +# @ECLASS-VARIABLE: MATE_BRANCH +# @DESCRIPTION: +# Major and minor numbers of the version number, unless live. +# If live ebuild, will be set to '9999'. +: ${MATE_BRANCH:=$(get_version_component_range 1-2)} + +# Set SRC_URI or EGIT_REPO_URI based on whether live +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/mate-desktop/${MATE_DESKTOP_ORG_PN}.git" + SRC_URI="" +else + SRC_URI="https://pub.mate-desktop.org/releases/${MATE_BRANCH}/${MATE_DESKTOP_ORG_PN}-${MATE_DESKTOP_ORG_PV}.tar.${MATE_TARBALL_SUFFIX}" +fi + +# Set HOMEPAGE for all ebuilds +HOMEPAGE="https://mate-desktop.org" diff -uNr a/eclass/mate.eclass b/eclass/mate.eclass --- a/eclass/mate.eclass false +++ b/eclass/mate.eclass 223c0e4ea307d98eeb5abf7229169014f84ad27a8005b477afe946c2cb0597a00b1dc4df6d7b36c959e74f53a40aa25063554baae9fd414e30173975cbcfa35b @@ -0,0 +1,150 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: mate.eclass +# @MAINTAINER: +# mate@gentoo.org +# @AUTHOR: +# Authors: NP-Hardass <NP-Hardass@gentoo.org> based upon the gnome2 +# and autotools-utils eclasses +# @BLURB: Provides phases for MATE based packages. +# @DESCRIPTION: +# Exports portage base functions used by ebuilds written for packages using the +# MATE framework. Occassionally acts as a wrapper to gnome2 due to the +# fact that MATE is a GNOME fork. For additional functions, see gnome2-utils.eclass. + +# Check EAPI only +case "${EAPI:-0}" in + 6) ;; + *) die "EAPI=${EAPI:-0} is not supported" ;; +esac + +# Inherit happens below after declaration of GNOME2_LA_PUNT + +# @ECLASS-VARIABLE: MATE_LA_PUNT +# @DESCRIPTION: +# Available values for MATE_LA_PUNT: +# - "no": will not clean any .la files +# - "yes": will run prune_libtool_files --modules +# - If it is not set, it will run prune_libtool_files +# MATE_LA_PUNT is a stub to GNOME2_LA_PUNT +GNOME2_LA_PUNT=${MATE_LA_PUNT:-""} + +inherit gnome2 autotools mate-desktop.org + +case "${EAPI:-0}" in + 6) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;; + *) die "EAPI=${EAPI:-0} is not supported" ;; +esac + +# Autotools requires our MATE m4 files +DEPEND=">=mate-base/mate-common-${MATE_BRANCH}" + +# @FUNCTION: mate_py_cond_func_wrap +# @DESCRIPTION: +# Wraps a function for conditional python use, to run for each +# python implementation in the build directory. +# This function should only be used if the ebuild also inherits the +# python-r1 eclass +mate_py_cond_func_wrap() { + if [[ ! ${_PYTHON_R1} ]]; then + die "This function requires the inheritence of the python-r1 eclass" + fi + if use python; then + python_foreach_impl run_in_build_dir "$@" + else + $@ + fi +} + +# @ECLASS-VARIABLE: MATE_FORCE_AUTORECONF +# @DESCRIPTION: +# Available values for MATE_FORCE_AUTORECONF: +# - true: will always run eautoreconf +# - false: will default to automatic detect +# - If it is not set, it will default to false +: ${MATE_FORCE_AUTORECONF:="false"} + +# @FUNCTION: ematedocize +# @DESCRIPTION: +# A wrapper around mate-doc-common +ematedocize() { + ebegin "Running mate-doc-common --copy" + mate-doc-common --copy || die + eend $? +} + +# @FUNCTION: want_mate_doc +# @DESCRIPTION: +# Returns true/false based on whether eautoreconf should call +# ematedocize +want_mate_doc() { + grep -q USE_COMMON_DOC_BUILD autogen.sh +} + +# @FUNCTION: mate_src_prepare +# @DESCRIPTION: +# Call gnome2_src_prepare to handle environment setup and patching, then +# call eautoreconf if necessary +mate_src_prepare() { + debug-print-function ${FUNCNAME} "$@" + + local force_autoreconf=${MATE_FORCE_AUTORECONF} + [[ ${PV} == 9999 ]] && force_autoreconf="true" + + gen_chksum() { + find '(' -name 'Makefile.am' \ + -o -name 'configure.ac' \ + -o -name 'configure.in' ')' \ + -exec cksum {} + | sort -k2 + } + + local chksum=$(gen_chksum) + + gnome2_src_prepare "$@" + + if [[ "${force_autoreconf}" == "true" ]] || [[ ${chksum} != $(gen_chksum) ]]; then + want_mate_doc && ematedocize + AT_NOELIBTOOLIZE="yes" eautoreconf # gnome2_src_prepare calls elibtoolize + fi +} + +# @FUNCTION: mate_src_configure +# @DESCRIPTION: +# MATE specific configure handling +# Stub to gnome2_src_configure() +mate_src_configure() { + gnome2_src_configure "$@" +} + +# @FUNCTION: mate_src_install +# @DESCRIPTION: +# MATE specific install. Stub to gnome2_src_install +mate_src_install() { + gnome2_src_install "$@" +} + +# @FUNCTION: mate_pkg_preinst +# @DESCRIPTION: +# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst +# Stub to gnome2_pkg_preinst +mate_pkg_preinst() { + gnome2_pkg_preinst "$@" +} + +# @FUNCTION: mate_pkg_postinst +# @DESCRIPTION: +# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime +# database updates. +# Stub to gnome2_pkg_postinst +mate_pkg_postinst() { + gnome2_pkg_postinst "$@" +} + +# @FUNCTION: mate_pkg_postrm +# @DESCRIPTION: +# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates. +# Stub to gnome2_pkg_postrm +mate_pkg_postrm() { + gnome2_pkg_postrm "$@" +} diff -uNr a/eclass/mercurial.eclass b/eclass/mercurial.eclass --- a/eclass/mercurial.eclass false +++ b/eclass/mercurial.eclass 79d737ac4be1fddd3ea1c88fe5431e3b73d33d8f90ddebac7d7903704b0f93fd3304b8d18e83b37f95cdfdf38d508e64ca05022cc63f6b7e570549f5a8ce88e9 @@ -0,0 +1,201 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: mercurial.eclass +# @MAINTAINER: +# Christoph Junghans <junghans@gentoo.org> +# @AUTHOR: +# Next gen author: Krzysztof Pawlik <nelchael@gentoo.org> +# Original author: Aron Griffis <agriffis@gentoo.org> +# @BLURB: This eclass provides generic mercurial fetching functions +# @DESCRIPTION: +# This eclass provides generic mercurial fetching functions. To fetch sources +# from mercurial repository just set EHG_REPO_URI to correct repository URI. If +# you need to share single repository between several ebuilds set EHG_PROJECT to +# project name in all of them. + +inherit eutils + +EXPORT_FUNCTIONS src_unpack + +DEPEND="dev-vcs/mercurial" + +# @ECLASS-VARIABLE: EHG_REPO_URI +# @DESCRIPTION: +# Mercurial repository URI. + +# @ECLASS-VARIABLE: EHG_REVISION +# @DESCRIPTION: +# Create working directory for specified revision, defaults to default. +# +# EHG_REVISION is passed as a value for --updaterev parameter, so it can be more +# than just a revision, please consult `hg help revisions' for more details. +: ${EHG_REVISION:="default"} + +# @ECLASS-VARIABLE: EHG_STORE_DIR +# @DESCRIPTION: +# Mercurial sources store directory. Users may override this in /etc/portage/make.conf +[[ -z "${EHG_STORE_DIR}" ]] && EHG_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/hg-src" + +# @ECLASS-VARIABLE: EHG_PROJECT +# @DESCRIPTION: +# Project name. +# +# This variable default to $PN, but can be changed to allow repository sharing +# between several ebuilds. +[[ -z "${EHG_PROJECT}" ]] && EHG_PROJECT="${PN}" + +# @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR +# @DESCRIPTION: +# The directory to check the hg sources out to. +# +# EHG_CHECKOUT_DIR=${S} + +# @ECLASS-VARIABLE: EHG_QUIET +# @DESCRIPTION: +# Suppress some extra noise from mercurial, set it to 'ON' to be quiet. +: ${EHG_QUIET:="OFF"} +[[ "${EHG_QUIET}" == "ON" ]] && EHG_QUIET_CMD_OPT="--quiet" + +# @ECLASS-VARIABLE: EHG_CONFIG +# @DESCRIPTION: +# Extra config option to hand to hg clone/pull + +# @ECLASS-VARIABLE: EHG_CLONE_CMD +# @DESCRIPTION: +# Command used to perform initial repository clone. +[[ -z "${EHG_CLONE_CMD}" ]] && EHG_CLONE_CMD="hg clone ${EHG_CONFIG:+--config ${EHG_CONFIG}} ${EHG_QUIET_CMD_OPT} --pull --noupdate" + +# @ECLASS-VARIABLE: EHG_PULL_CMD +# @DESCRIPTION: +# Command used to update repository. +[[ -z "${EHG_PULL_CMD}" ]] && EHG_PULL_CMD="hg pull ${EHG_CONFIG:+--config ${EHG_CONFIG}} ${EHG_QUIET_CMD_OPT}" + +# @ECLASS-VARIABLE: EHG_OFFLINE +# @DESCRIPTION: +# Set this variable to a non-empty value to disable the automatic updating of +# a mercurial source tree. This is intended to be set outside the ebuild by +# users. +EHG_OFFLINE="${EHG_OFFLINE:-${EVCS_OFFLINE}}" + +# @FUNCTION: mercurial_fetch +# @USAGE: [repository_uri] [module] [sourcedir] +# @DESCRIPTION: +# Clone or update repository. +# +# If repository URI is not passed it defaults to EHG_REPO_URI, if module is +# empty it defaults to basename of EHG_REPO_URI, sourcedir defaults to +# EHG_CHECKOUT_DIR, which defaults to S. + +mercurial_fetch() { + debug-print-function ${FUNCNAME} "${@}" + + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + + EHG_REPO_URI=${1-${EHG_REPO_URI}} + [[ -z "${EHG_REPO_URI}" ]] && die "EHG_REPO_URI is empty" + + local module="${2-$(basename "${EHG_REPO_URI}")}" + local sourcedir="${3:-${EHG_CHECKOUT_DIR:-${S}}}" + + # Should be set but blank to prevent using $HOME/.hgrc + export HGRCPATH= + + # Check ${EHG_STORE_DIR} directory: + addwrite "$(dirname "${EHG_STORE_DIR}")" || die "addwrite failed" + if [[ ! -d "${EHG_STORE_DIR}" ]]; then + mkdir -p "${EHG_STORE_DIR}" || die "failed to create ${EHG_STORE_DIR}" + chmod -f g+rw "${EHG_STORE_DIR}" || \ + die "failed to chown ${EHG_STORE_DIR}" + fi + + # Create project directory: + mkdir -p "${EHG_STORE_DIR}/${EHG_PROJECT}" || \ + die "failed to create ${EHG_STORE_DIR}/${EHG_PROJECT}" + chmod -f g+rw "${EHG_STORE_DIR}/${EHG_PROJECT}" || \ + echo "Warning: failed to chmod g+rw ${EHG_PROJECT}" + pushd "${EHG_STORE_DIR}/${EHG_PROJECT}" > /dev/null || \ + die "failed to cd to ${EHG_STORE_DIR}/${EHG_PROJECT}" + + # Clone/update repository: + if [[ ! -d "${module}" ]]; then + einfo "Cloning ${EHG_REPO_URI} to ${EHG_STORE_DIR}/${EHG_PROJECT}/${module}" + ${EHG_CLONE_CMD} "${EHG_REPO_URI}" "${module}" || { + rm -rf "${module}" + die "failed to clone ${EHG_REPO_URI}" + } + elif [[ -z "${EHG_OFFLINE}" ]]; then + einfo "Updating ${EHG_STORE_DIR}/${EHG_PROJECT}/${module} from ${EHG_REPO_URI}" + pushd "${module}" > /dev/null || die "failed to cd to ${module}" + ${EHG_PULL_CMD} "${EHG_REPO_URI}" || die "update failed" + popd > /dev/null || die + fi + popd > /dev/null || die + + # Checkout working copy: + einfo "Creating working directory in ${sourcedir} (target revision: ${EHG_REVISION})" + mkdir -p "${sourcedir}" || die "failed to create ${sourcedir}" + hg clone \ + ${EHG_QUIET_CMD_OPT} \ + --updaterev="${EHG_REVISION}" \ + ${EHG_CONFIG:+--config ${EHG_CONFIG}} \ + "${EHG_STORE_DIR}/${EHG_PROJECT}/${module}" \ + "${sourcedir}" || die "hg clone failed" + # An exact revision helps a lot for testing purposes, so have some output... + # id num branch + # fd6e32d61721 6276 default + local HG_REVDATA=($(hg identify -b -i "${sourcedir}")) + export HG_REV_ID=${HG_REVDATA[0]} + local HG_REV_BRANCH=${HG_REVDATA[1]} + einfo "Work directory: ${sourcedir} global id: ${HG_REV_ID} (was ${EHG_REVISION} branch: ${HG_REV_BRANCH}" +} + +# @FUNCTION: mercurial_bootstrap +# @INTERNAL +# @DESCRIPTION: +# Internal function that runs bootstrap command on unpacked source. +mercurial_bootstrap() { + debug-print-function ${FUNCNAME} "$@" + + # @ECLASS-VARIABLE: EHG_BOOTSTRAP + # @DESCRIPTION: + # Command to be executed after checkout and clone of the specified + # repository. + if [[ ${EHG_BOOTSTRAP} ]]; then + pushd "${S}" > /dev/null + einfo "Starting bootstrap" + + if [[ -f ${EHG_BOOTSTRAP} ]]; then + # we have file in the repo which we should execute + debug-print "${FUNCNAME}: bootstraping with file \"${EHG_BOOTSTRAP}\"" + + if [[ -x ${EHG_BOOTSTRAP} ]]; then + eval "./${EHG_BOOTSTRAP}" \ + || die "${FUNCNAME}: bootstrap script failed" + else + eerror "\"${EHG_BOOTSTRAP}\" is not executable." + eerror "Report upstream, or bug ebuild maintainer to remove bootstrap command." + die "\"${EHG_BOOTSTRAP}\" is not executable" + fi + else + # we execute some system command + debug-print "${FUNCNAME}: bootstraping with commands \"${EHG_BOOTSTRAP}\"" + + eval "${EHG_BOOTSTRAP}" \ + || die "${FUNCNAME}: bootstrap commands failed" + fi + + einfo "Bootstrap finished" + popd > /dev/null + fi +} + +# @FUNCTION: mercurial_src_unpack +# @DESCRIPTION: +# The mercurial src_unpack function, which will be exported. +function mercurial_src_unpack { + debug-print-function ${FUNCNAME} "$@" + + mercurial_fetch + mercurial_bootstrap +} diff -uNr a/eclass/meson.eclass b/eclass/meson.eclass --- a/eclass/meson.eclass false +++ b/eclass/meson.eclass f9261dea810ae0cca5f474da02fd189ecf0afe46081df05b5120503e645d0db65b4d5352cd3b6bdc84da0e446def42576c53e9f86e1678b321d220db46d6db8f @@ -0,0 +1,267 @@ +# Copyright 2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: meson.eclass +# @MAINTAINER: +# William Hubbs <williamh@gentoo.org> +# Mike Gilbert <floppym@gentoo.org> +# @BLURB: common ebuild functions for meson-based packages +# @DESCRIPTION: +# This eclass contains the default phase functions for packages which +# use the meson build system. +# +# @EXAMPLE: +# Typical ebuild using meson.eclass: +# +# @CODE +# EAPI=6 +# +# inherit meson +# +# ... +# +# src_configure() { +# local emesonargs=( +# -Dqt4=$(usex qt4 true false) +# -Dthreads=$(usex threads true false) +# -Dtiff=$(usex tiff true false) +# ) +# meson_src_configure +# } +# +# ... +# +# @CODE + +case ${EAPI:-0} in + 6) ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +if [[ ${__MESON_AUTO_DEPEND+set} == "set" ]] ; then + # See if we were included already, but someone changed the value + # of MESON_AUTO_DEPEND on us. We could reload the entire + # eclass at that point, but that adds overhead, and it's trivial + # to re-order inherit in eclasses/ebuilds instead. #409611 + if [[ ${__MESON_AUTO_DEPEND} != ${MESON_AUTO_DEPEND} ]] ; then + die "MESON_AUTO_DEPEND changed value between inherits; please inherit meson.eclass first! ${__MESON_AUTO_DEPEND} -> ${MESON_AUTO_DEPEND}" + fi +fi + +if [[ -z ${_MESON_ECLASS} ]]; then + +inherit ninja-utils python-utils-r1 toolchain-funcs + +fi + +EXPORT_FUNCTIONS src_configure src_compile src_test src_install + +if [[ -z ${_MESON_ECLASS} ]]; then +_MESON_ECLASS=1 + +MESON_DEPEND=">=dev-util/meson-0.40.0 + >=dev-util/ninja-1.7.2" + +# @ECLASS-VARIABLE: MESON_AUTO_DEPEND +# @DESCRIPTION: +# Set to 'no' to disable automatically adding to DEPEND. This lets +# ebuilds form conditional depends by using ${MESON_DEPEND} in +# their own DEPEND string. +: ${MESON_AUTO_DEPEND:=yes} +if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then + DEPEND=${MESON_DEPEND} +fi +__MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass + +# @ECLASS-VARIABLE: BUILD_DIR +# @DEFAULT_UNSET +# @DESCRIPTION: +# Build directory, location where all generated files should be placed. +# If this isn't set, it defaults to ${WORKDIR}/${P}-build. + +# @ECLASS-VARIABLE: EMESON_SOURCE +# @DEFAULT_UNSET +# @DESCRIPTION: +# The location of the source files for the project; this is the source +# directory to pass to meson. +# If this isn't set, it defaults to ${S} + +# @VARIABLE: emesonargs +# @DEFAULT_UNSET +# @DESCRIPTION: +# Optional meson arguments as Bash array; this should be defined before +# calling meson_src_configure. + + +read -d '' __MESON_ARRAY_PARSER <<"EOF" +import shlex +import sys + +# See http://mesonbuild.com/Syntax.html#strings +def quote(str): + escaped = str.replace("\\\\", "\\\\\\\\").replace("'", "\\\\'") + return "'{}'".format(escaped) + +print("[{}]".format( + ", ".join([quote(x) for x in shlex.split(" ".join(sys.argv[1:]))]))) +EOF + +# @FUNCTION: _meson_env_array +# @INTERNAL +# @DESCRIPTION: +# Parses the command line flags and converts them into an array suitable for +# use in a cross file. +# +# Input: --single-quote=\' --double-quote=\" --dollar=\$ --backtick=\` +# --backslash=\\ --full-word-double="Hello World" +# --full-word-single='Hello World' +# --full-word-backslash=Hello\ World +# --simple --unicode-8=© --unicode-16=𐐷 --unicode-32=𐤅 +# +# Output: ['--single-quote=\'', '--double-quote="', '--dollar=$', +# '--backtick=`', '--backslash=\\', '--full-word-double=Hello World', +# '--full-word-single=Hello World', +# '--full-word-backslash=Hello World', '--simple', '--unicode-8=©', +# '--unicode-16=𐐷', '--unicode-32=𐤅'] +# +_meson_env_array() { + python -c "${__MESON_ARRAY_PARSER}" "$@" +} + +# @FUNCTION: _meson_create_cross_file +# @INTERNAL +# @DESCRIPTION: +# Creates a cross file. meson uses this to define settings for +# cross-compilers. This function is called from meson_src_configure. +_meson_create_cross_file() { + # Reference: http://mesonbuild.com/Cross-compilation.html + + # system roughly corresponds to uname -s (lowercase) + local system=unknown + case ${CHOST} in + *-aix*) system=aix ;; + *-cygwin*) system=cygwin ;; + *-darwin*) system=darwin ;; + *-freebsd*) system=freebsd ;; + *-linux*) system=linux ;; + mingw*|*-mingw*) system=windows ;; + *-solaris*) system=sunos ;; + esac + + local cpu_family=$(tc-arch) + case ${cpu_family} in + amd64) cpu_family=x86_64 ;; + arm64) cpu_family=aarch64 ;; + esac + + # This may require adjustment based on CFLAGS + local cpu=${CHOST%%-*} + + cat > "${T}/meson.${CHOST}.${ABI}" <<-EOF + [binaries] + ar = $(_meson_env_array "$(tc-getAR)") + c = $(_meson_env_array "$(tc-getCC)") + cpp = $(_meson_env_array "$(tc-getCXX)") + fortran = $(_meson_env_array "$(tc-getFC)") + llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)' + objc = $(_meson_env_array "$(tc-getPROG OBJC cc)") + objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)") + pkgconfig = '$(tc-getPKG_CONFIG)' + strip = $(_meson_env_array "$(tc-getSTRIP)") + + [properties] + c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}") + c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}") + cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}") + cpp_link_args = $(_meson_env_array "${CXXFLAGS} ${LDFLAGS}") + fortran_args = $(_meson_env_array "${FCFLAGS}") + fortran_link_args = $(_meson_env_array "${FCFLAGS} ${LDFLAGS}") + objc_args = $(_meson_env_array "${OBJCFLAGS} ${CPPFLAGS}") + objc_link_args = $(_meson_env_array "${OBJCFLAGS} ${LDFLAGS}") + objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}") + objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}") + + [host_machine] + system = '${system}' + cpu_family = '${cpu_family}' + cpu = '${cpu}' + endian = '$(tc-endian)' + EOF +} + +# @FUNCTION: meson_use +# @USAGE: <USE flag> [option name] +# @DESCRIPTION: +# Given a USE flag and meson project option, outputs a string like: +# +# -Doption=true +# -Doption=false +# +# If the project option is unspecified, it defaults to the USE flag. +meson_use() { + usex "$1" "-D${2-$1}=true" "-D${2-$1}=false" +} + +# @FUNCTION: meson_src_configure +# @DESCRIPTION: +# This is the meson_src_configure function. +meson_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + # Common args + local mesonargs=( + --buildtype plain + --libdir "$(get_libdir)" + --localstatedir "${EPREFIX}/var/lib" + --prefix "${EPREFIX}/usr" + --sysconfdir "${EPREFIX}/etc" + --wrap-mode nodownload + ) + + if tc-is-cross-compiler || [[ ${ABI} != ${DEFAULT_ABI-${ABI}} ]]; then + _meson_create_cross_file || die "unable to write meson cross file" + mesonargs+=( --cross-file "${T}/meson.${CHOST}.${ABI}" ) + fi + + # https://bugs.gentoo.org/625396 + python_export_utf8_locale + + # Append additional arguments from ebuild + mesonargs+=("${emesonargs[@]}") + + BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}" + set -- meson "${mesonargs[@]}" "$@" \ + "${EMESON_SOURCE:-${S}}" "${BUILD_DIR}" + echo "$@" + tc-env_build "$@" || die +} + +# @FUNCTION: meson_src_compile +# @DESCRIPTION: +# This is the meson_src_compile function. +meson_src_compile() { + debug-print-function ${FUNCNAME} "$@" + + eninja -C "${BUILD_DIR}" +} + +# @FUNCTION: meson_src_test +# @DESCRIPTION: +# This is the meson_src_test function. +meson_src_test() { + debug-print-function ${FUNCNAME} "$@" + + eninja -C "${BUILD_DIR}" test +} + +# @FUNCTION: meson_src_install +# @DESCRIPTION: +# This is the meson_src_install function. +meson_src_install() { + debug-print-function ${FUNCNAME} "$@" + + DESTDIR="${D}" eninja -C "${BUILD_DIR}" install + einstalldocs +} + +fi diff -uNr a/eclass/mono-env.eclass b/eclass/mono-env.eclass --- a/eclass/mono-env.eclass false +++ b/eclass/mono-env.eclass 92b6c5ab638aeaa5ad8ea115ecfc5c8748d4631bdc7e658c92e9ebf519b8f5fc99bfc481fe3751ed664115c9901aab6d3a6634f151b927061945a32cebd613f5 @@ -0,0 +1,44 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: mono-env.eclass +# @MAINTAINER: +# dotnet@gentoo.org +# @BLURB: Set environment variables commonly used by dotnet packages. +# @DESCRIPTION: +# Set environment variables commonly used by dotnet packages. + +SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2" + +EXPORT_FUNCTIONS pkg_setup + +if [[ ! ${_MONO_ENV} ]]; then + +mono-env_pkg_setup() { + # >=mono-0.92 versions using mcs -pkg:foo-sharp require shared memory, so we set the + # shared dir to ${T} so that ${T}/.wapi can be used during the install process. + export MONO_SHARED_DIR="${T}" + + # export more variables as needed by other dotnet packages + export MONO_REGISTRY_PATH="${T}/registry" + export XDG_DATA_HOME="${T}/data" + + # Building mono, nant and many other dotnet packages is known to fail if LC_ALL + # variable is not set to C. To prevent this all mono related packages will be + # build with LC_ALL=C (see bugs #146424, #149817) + export LC_ALL=C + + # Monodevelop-using applications need this to be set or they will try to create config + # files in the user's ~ dir. + export XDG_CONFIG_HOME="${T}" + + # Fix bug 83020: + # "Access Violations Arise When Emerging Mono-Related Packages with MONO_AOT_CACHE" + unset MONO_AOT_CACHE + + # mono libs can live on /usr/lib as they are not arch specific + QA_MULTILIB_PATHS="usr/lib/" +} + +_MONO_ENV=1 +fi diff -uNr a/eclass/mono.eclass b/eclass/mono.eclass --- a/eclass/mono.eclass false +++ b/eclass/mono.eclass f288b52b311f6f4abef6bc3cc513ec8a1987dcf3952f4b9f0c73f2e23b1e43c04e36297ece18232487c6ad7cd53b9d7495f904498791a48284e9aea095507d36 @@ -0,0 +1,80 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: mono.eclass +# @MAINTAINER: +# dotnet@gentoo.org +# @BLURB: common settings and functions for mono and dotnet related packages +# @DESCRIPTION: +# The mono eclass contains common environment settings that are useful for +# dotnet packages. Currently, it provides no functions, just exports +# MONO_SHARED_DIR and sets LC_ALL in order to prevent errors during compilation +# of dotnet packages. + +inherit multilib + +# >=mono-0.92 versions using mcs -pkg:foo-sharp require shared memory, so we set the +# shared dir to ${T} so that ${T}/.wapi can be used during the install process. +export MONO_SHARED_DIR="${T}" + +# Building mono, nant and many other dotnet packages is known to fail if LC_ALL +# variable is not set to C. To prevent this all mono related packages will be +# build with LC_ALL=C (see bugs #146424, #149817) +export LC_ALL=C + +# Monodevelop-using applications need this to be set or they will try to create config +# files in the user's ~ dir. + +export XDG_CONFIG_HOME="${T}" + +# Fix bug 83020: +# "Access Violations Arise When Emerging Mono-Related Packages with MONO_AOT_CACHE" + +unset MONO_AOT_CACHE + +egacinstall() { + use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}" + gacutil -i "${1}" \ + -root "${ED}"/usr/$(get_libdir) \ + -gacdir /usr/$(get_libdir) \ + -package ${2:-${GACPN:-${PN}}} \ + || die "installing ${1} into the Global Assembly Cache failed" +} + +mono_multilib_comply() { + use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}" + local dir finddirs=() mv_command=${mv_command:-mv} + if [[ -d "${ED}/usr/lib" && "$(get_libdir)" != "lib" ]] + then + if ! [[ -d "${ED}"/usr/"$(get_libdir)" ]] + then + mkdir "${ED}"/usr/"$(get_libdir)" || die "Couldn't mkdir ${ED}/usr/$(get_libdir)" + fi + ${mv_command} "${ED}"/usr/lib/* "${ED}"/usr/"$(get_libdir)"/ || die "Moving files into correct libdir failed" + rm -rf "${ED}"/usr/lib + for dir in "${ED}"/usr/"$(get_libdir)"/pkgconfig "${ED}"/usr/share/pkgconfig + do + + if [[ -d "${dir}" && "$(find "${dir}" -name '*.pc')" != "" ]] + then + pushd "${dir}" &> /dev/null + sed -i -r -e 's:/(lib)([^a-zA-Z0-9]|$):/'"$(get_libdir)"'\2:g' \ + *.pc \ + || die "Sedding some sense into pkgconfig files failed." + popd "${dir}" &> /dev/null + fi + done + if [[ -d "${ED}/usr/bin" ]] + then + for exe in "${ED}/usr/bin"/* + do + if [[ "$(file "${exe}")" == *"shell script text"* ]] + then + sed -r -i -e ":/lib(/|$): s:/lib(/|$):/$(get_libdir)\1:" \ + "${exe}" || die "Sedding some sense into ${exe} failed" + fi + done + fi + + fi +} diff -uNr a/eclass/mount-boot.eclass b/eclass/mount-boot.eclass --- a/eclass/mount-boot.eclass false +++ b/eclass/mount-boot.eclass 76a7f9cf32e35b3315d30703a8668145f9e1b56dcd1f83377d0ced647d447fcaf560e919ced6ca627fb0d11afde5706f6cf37b53e1ce71954d675947fc08106d @@ -0,0 +1,156 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: mount-boot.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: functions for packages that install files into /boot +# @DESCRIPTION: +# This eclass is really only useful for bootloaders. +# +# If the live system has a separate /boot partition configured, then this +# function tries to ensure that it's mounted in rw mode, exiting with an +# error if it can't. It does nothing if /boot isn't a separate partition. + +EXPORT_FUNCTIONS pkg_pretend pkg_preinst pkg_postinst pkg_prerm pkg_postrm + +# @FUNCTION: mount-boot_disabled +# @INTERNAL +# @DESCRIPTION: +# Detect whether the current environment/build settings are such that we do not +# want to mess with any mounts. +mount-boot_is_disabled() { + # Since this eclass only deals with /boot, skip things when ROOT is active. + if [[ "${ROOT:-/}" != "/" ]] ; then + return 0 + fi + + # If we're only building a package, then there's no need to check things. + if [[ "${MERGE_TYPE}" == "buildonly" ]] ; then + return 0 + fi + + # The user wants us to leave things be. + if [[ -n ${DONT_MOUNT_BOOT} ]] ; then + return 0 + fi + + # OK, we want to handle things ourselves. + return 1 +} + +# @FUNCTION: mount-boot_check_status +# @INTERNAL +# @DESCRIPTION: +# Figure out what kind of work we need to do in order to have /boot be sane. +# Return values are: +# 0 - Do nothing at all! +# 1 - It's mounted, but is currently ro, so need to remount rw. +# 2 - It's not mounted, so need to mount it rw. +mount-boot_check_status() { + # Get out fast if possible. + mount-boot_is_disabled && return 0 + + # note that /dev/BOOT is in the Gentoo default /etc/fstab file + local fstabstate=$(awk '!/^#|^[[:blank:]]+#|^\/dev\/BOOT/ {print $2}' /etc/fstab | egrep "^/boot$" ) + local procstate=$(awk '$2 ~ /^\/boot$/ {print $2}' /proc/mounts) + local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts | sed -n '/\/boot .*,ro,/p') + + if [ -n "${fstabstate}" ] && [ -n "${procstate}" ] ; then + if [ -n "${proc_ro}" ] ; then + echo + einfo "Your boot partition, detected as being mounted at /boot, is read-only." + einfo "It will be remounted in read-write mode temporarily." + return 1 + else + echo + einfo "Your boot partition was detected as being mounted at /boot." + einfo "Files will be installed there for ${PN} to function correctly." + return 0 + fi + elif [ -n "${fstabstate}" ] && [ -z "${procstate}" ] ; then + echo + einfo "Your boot partition was not mounted at /boot, so it will be automounted for you." + einfo "Files will be installed there for ${PN} to function correctly." + return 2 + else + echo + einfo "Assuming you do not have a separate /boot partition." + return 0 + fi +} + +mount-boot_pkg_pretend() { + # Get out fast if possible. + mount-boot_is_disabled && return 0 + + elog "To avoid automounting and auto(un)installing with /boot," + elog "just export the DONT_MOUNT_BOOT variable." + mount-boot_check_status +} + +mount-boot_mount_boot_partition() { + mount-boot_check_status + case $? in + 0) # Nothing to do. + ;; + 1) # Remount it rw. + mount -o remount,rw /boot + if [ $? -ne 0 ] ; then + echo + eerror "Unable to remount in rw mode. Please do it manually!" + die "Can't remount in rw mode. Please do it manually!" + fi + touch /boot/.e.remount + ;; + 2) # Mount it rw. + mount /boot -o rw + if [ $? -ne 0 ] ; then + echo + eerror "Cannot automatically mount your /boot partition." + eerror "Your boot partition has to be mounted rw before the installation" + eerror "can continue. ${PN} needs to install important files there." + die "Please mount your /boot partition manually!" + fi + touch /boot/.e.mount + ;; + esac +} + +mount-boot_pkg_preinst() { + # Handle older EAPIs. + case ${EAPI:-0} in + [0-3]) mount-boot_pkg_pretend ;; + esac + + mount-boot_mount_boot_partition +} + +mount-boot_pkg_prerm() { + touch "${ROOT}"/boot/.keep 2>/dev/null + mount-boot_mount_boot_partition + touch "${ROOT}"/boot/.keep 2>/dev/null +} + +mount-boot_umount_boot_partition() { + # Get out fast if possible. + mount-boot_is_disabled && return 0 + + if [ -e /boot/.e.remount ] ; then + einfo "Automatically remounting /boot as ro as it was previously." + rm -f /boot/.e.remount + mount -o remount,ro /boot + elif [ -e /boot/.e.mount ] ; then + einfo "Automatically unmounting /boot as it was previously." + rm -f /boot/.e.mount + umount /boot + fi +} + +mount-boot_pkg_postinst() { + mount-boot_umount_boot_partition +} + +mount-boot_pkg_postrm() { + mount-boot_umount_boot_partition +} diff -uNr a/eclass/mozconfig-v6.45.eclass b/eclass/mozconfig-v6.45.eclass --- a/eclass/mozconfig-v6.45.eclass false +++ b/eclass/mozconfig-v6.45.eclass b501f04884a358f80a7ed7bffa20777e865ac9761efdcda6f33b0af456c2ae500ad13692c9025498ae1fabef599d523a0e58fb5e427e187d2d44316ca17d0fc4 @@ -0,0 +1,409 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @ECLASS: mozconfig-v6.45.eclass +# @MAINTAINER: +# mozilla team <mozilla@gentoo.org> +# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6 +# @DESCRIPTION: +# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey) +# to provide a single common place for the common mozilla engine compoments. +# +# The eclass provides all common dependencies as well as common use flags. +# +# Some use flags which may be optional in particular mozilla packages can be +# supported through setting eclass variables. +# +# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v4, +# and so ebuilds inheriting this eclass do not need to inherit that. + +case ${EAPI} in + 0|1|2|3|4) + die "EAPI=${EAPI} not supported" + ;; + 5) + inherit multilib + ;; +esac + +inherit flag-o-matic toolchain-funcs mozcoreconf-v4 + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild needs to provide +# optional necko-wifi support via IUSE="wifi". Currently this would include +# ebuilds for firefox, and potentially seamonkey. +# +# Leave the variable UNSET if necko-wifi support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild needs to provide +# optional necko-wifi support via IUSE="jit". Currently this would include +# ebuilds for firefox, and potentially seamonkey. +# +# Leave the variable UNSET if optional jit support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional gtk3 support via IUSE="gtk3". Currently this would include +# ebuilds for firefox, but thunderbird and seamonkey could follow in the future. +# +# Leave the variable UNSET if gtk3 support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional qt5 support via IUSE="qt5". Currently this would include +# ebuilds for firefox, but thunderbird and seamonkey could follow in the future. +# +# Leave the variable UNSET if qt5 support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# use-flags common among all mozilla ebuilds +IUSE="${IUSE} dbus debug ffmpeg +gstreamer +jemalloc3 neon pulseaudio selinux startup-notification system-cairo + system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx" + +# some notes on deps: +# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14 +# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau +# media-libs/libcanberra is dlopen'ed rather than linked + +RDEPEND=">=app-text/hunspell-1.2:= + dev-libs/atk + dev-libs/expat + >=x11-libs/cairo-1.10[X] + >=x11-libs/gtk+-2.18:2 + x11-libs/gdk-pixbuf + >=x11-libs/pango-1.22.0 + >=media-libs/libpng-1.6.19:0=[apng] + >=media-libs/mesa-10.2:* + media-libs/fontconfig + >=media-libs/freetype-2.4.10 + media-libs/libcanberra:*[pulseaudio?] + kernel_linux? ( media-libs/alsa-lib ) + pulseaudio? ( media-sound/pulseaudio ) + virtual/freedesktop-icon-theme + dbus? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 ) + startup-notification? ( >=x11-libs/startup-notification-0.8 ) + >=dev-libs/glib-2.26:2 + >=sys-libs/zlib-1.2.3 + >=virtual/libffi-3.0.10 + ffmpeg? ( virtual/ffmpeg ) + gstreamer? ( + >=media-libs/gstreamer-1.4.5:1.0 + >=media-libs/gst-plugins-base-1.4.5:1.0 + >=media-libs/gst-plugins-good-1.4.5:1.0 + >=media-plugins/gst-plugins-libav-1.4.5:1.0 + ) + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXt + system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) + system-icu? ( >=dev-libs/icu-51.1:= ) + system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) + system-libevent? ( >=dev-libs/libevent-2.0:0= ) + system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) + system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) +" + +if [[ ${PV/45.0*/} == "" ]]; then + RDEPEND+=" + system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )" +else + # 45.1.0 and above bumped the libvpx requirement + RDEPEND+=" + system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )" +fi + +if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then + IUSE+=" +gtk3" + else + IUSE+=" gtk3" + fi + RDEPEND+=" + gtk3? ( >=x11-libs/gtk+-3.4.0:3 )" +fi +if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then + inherit qmake-utils + if [[ ${MOZCONFIG_OPTIONAL_QT5} = "enabled" ]]; then + IUSE+=" +qt5" + else + IUSE+=" qt5" + fi + RDEPEND+=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtdeclarative:5 + )" +fi +if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then + IUSE+=" +wifi" + else + IUSE+=" wifi" + fi + RDEPEND+=" + wifi? ( + kernel_linux? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 + net-misc/networkmanager ) + )" +fi +if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then + IUSE+=" +jit" + else + IUSE+=" jit" + fi +fi + +DEPEND="app-arch/zip + app-arch/unzip + >=sys-devel/binutils-2.16.1 + ${RDEPEND}" + +RDEPEND+=" + selinux? ( sec-policy/selinux-mozilla )" + +# force system-icu if system-harfbuzz is set to avoid any potential ABI issues +REQUIRED_USE=" + system-harfbuzz? ( system-icu )" + +# only one of gtk3 or qt5 should be permitted to be selected, since only one will be used. +[[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]] && [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]] && \ + REQUIRED_USE+=" ?? ( gtk3 qt5 )" + +# @FUNCTION: mozconfig_config +# @DESCRIPTION: +# Set common configure options for mozilla packages. +# Call this within src_configure() phase, after mozconfig_init +# +# Example: +# +# inherit mozconfig-v5.33 +# +# src_configure() { +# mozconfig_init +# mozconfig_config +# # ... misc ebuild-unique settings via calls to +# # ... mozconfig_{annotate,use_with,use_enable} +# mozconfig_final +# } + +mozconfig_config() { + # Migrated from mozcoreconf-v3 + mozconfig_annotate 'more disable_update_strip' \ + --disable-pedantic \ + --disable-installer \ + --disable-strip-libs + + if [[ ${PN} != seamonkey ]]; then + mozconfig_annotate 'basic_profile' \ + --disable-profilelocking \ + --enable-single-profile \ + --disable-profilesharing + fi + + # Migrated from mozcoreconf-2 + mozconfig_annotate 'system_libs' \ + --with-system-zlib \ + --enable-pango \ + --enable-svg \ + --with-system-bz2 + + if has bindist ${IUSE}; then + mozconfig_use_enable !bindist official-branding + if [[ ${PN} == firefox ]] && use bindist ; then + mozconfig_annotate '' --with-branding=browser/branding/aurora + fi + fi + + mozconfig_use_enable debug + mozconfig_use_enable debug tests + + if ! use debug ; then + mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols + else + mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols + fi + + mozconfig_use_enable startup-notification + + if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then + # wifi pulls in dbus so manage both here + mozconfig_use_enable wifi necko-wifi + if use kernel_linux && use wifi && ! use dbus; then + echo "Enabling dbus support due to wifi request" + mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus + else + mozconfig_use_enable dbus + fi + else + mozconfig_use_enable dbus + mozconfig_annotate 'disabled' --disable-necko-wifi + fi + + # These are forced-on for webm support + mozconfig_annotate 'required' --enable-ogg + mozconfig_annotate 'required' --enable-wave + + if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then + mozconfig_use_enable jit ion + fi + + # These are enabled by default in all mozilla applications + mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr + mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr + mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) + if use system-libevent; then + mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr + fi + mozconfig_annotate '' --prefix="${EPREFIX}"/usr + mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate 'Gentoo default' --enable-system-hunspell + mozconfig_annotate '' --disable-gnomeui + mozconfig_annotate '' --enable-gio + mozconfig_annotate '' --disable-crashreporter + mozconfig_annotate 'Gentoo default' --with-system-png + mozconfig_annotate '' --enable-system-ffi + mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold + mozconfig_annotate 'Gentoo default' --disable-skia + mozconfig_annotate '' --disable-gconf + mozconfig_annotate '' --with-intl-api + + # default toolkit is cairo-gtk2, optional use flags can change this + local toolkit="cairo-gtk2" + local toolkit_comment="" + if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then + if use gtk3; then + toolkit="cairo-gtk3" + toolkit_comment="gtk3 use flag" + fi + fi + if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then + if use qt5; then + toolkit="cairo-qt" + toolkit_comment="qt5 use flag" + # need to specify these vars because the qt5 versions are not found otherwise, + # and setting --with-qtdir overrides the pkg-config include dirs + local i + for i in qmake moc rcc; do + echo "export HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \ + >> "${S}"/.mozconfig || die + done + echo 'unset QTDIR' >> "${S}"/.mozconfig || die + mozconfig_annotate '+qt5' --disable-gio + fi + fi + mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit} + + # Use jemalloc unless libc is not glibc >= 2.4 + # at this time the minimum glibc in the tree is 2.9 so we should be safe. + if use elibc_glibc && use jemalloc3; then + # We must force-enable jemalloc 3 via .mozconfig + echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die + mozconfig_annotate '' --enable-jemalloc + mozconfig_annotate '' --enable-replace-malloc + fi + + mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" + mozconfig_annotate '' --build="${CTARGET:-${CHOST}}" + + use ffmpeg || mozconfig_annotate '-ffmpeg' --disable-ffmpeg + if use gstreamer ; then + use ffmpeg && einfo "${PN} will not use ffmpeg unless gstreamer:1.0 is not available at runtime" + mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0 + else + mozconfig_annotate '' --disable-gstreamer + fi + mozconfig_use_enable pulseaudio + + mozconfig_use_enable system-cairo + mozconfig_use_enable system-sqlite + mozconfig_use_with system-jpeg + mozconfig_use_with system-icu + mozconfig_use_with system-libvpx + mozconfig_use_with system-harfbuzz + mozconfig_use_with system-harfbuzz system-graphite2 + + # Modifications to better support ARM, bug 553364 + if use neon ; then + mozconfig_annotate '' --with-fpu=neon + mozconfig_annotate '' --with-thumb=yes + mozconfig_annotate '' --with-thumb-interwork=no + fi + if [[ ${CHOST} == armv* ]] ; then + mozconfig_annotate '' --with-float-abi=hard + mozconfig_annotate '' --enable-skia + + if ! use system-libvpx ; then + sed -i -e "s|softfp|hard|" \ + "${S}"/media/libvpx/moz.build + fi + fi +} + +# @FUNCTION: mozconfig_install_prefs +# @DESCRIPTION: +# Set preferences into the prefs.js file specified as a parameter to +# the function. This sets both some common prefs to all mozilla +# packages, and any prefs that may relate to the use flags administered +# by mozconfig_config(). +# +# Call this within src_install() phase, after copying the template +# prefs file (if any) from ${FILESDIR} +# +# Example: +# +# inherit mozconfig-v6.46 +# +# src_install() { +# cp "${FILESDIR}"/gentoo-default-prefs.js \ +# "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ +# || die +# +# mozconfig_install_prefs \ +# "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" +# +# ... +# } + +mozconfig_install_prefs() { + local prefs_file="${1}" + + einfo "Adding prefs from mozconfig to ${prefs_file}" + + # set dictionary path, to use system hunspell + echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \ + >>"${prefs_file}" || die + + # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it + if use system-harfbuzz ; then + echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \ + >>"${prefs_file}" || die + fi +} diff -uNr a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass --- a/eclass/mozconfig-v6.52.eclass false +++ b/eclass/mozconfig-v6.52.eclass 857f4c541e9db7d9bb625cbc83bd3a23242c76875f03c48f2efa6bfbb499724db768edf355c3dee62df4c4059570a2b35f11ab541e12dc6715461af08afac9d7 @@ -0,0 +1,390 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @ECLASS: mozconfig-v6.52.eclass +# @MAINTAINER: +# mozilla team <mozilla@gentoo.org> +# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6 +# @DESCRIPTION: +# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey) +# to provide a single common place for the common mozilla engine compoments. +# +# The eclass provides all common dependencies as well as common use flags. +# +# Some use flags which may be optional in particular mozilla packages can be +# supported through setting eclass variables. +# +# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3, +# and so ebuilds inheriting this eclass do not need to inherit that. + +case ${EAPI} in + 0|1|2|3|4) + die "EAPI=${EAPI} not supported" + ;; + 5) + inherit multilib + ;; +esac + +inherit flag-o-matic toolchain-funcs mozcoreconf-v5 + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild needs to provide +# optional necko-wifi support via IUSE="wifi". Currently this would include +# ebuilds for firefox, and potentially seamonkey. +# +# Leave the variable UNSET if necko-wifi support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild needs to provide +# deterministic jit support via IUSE="jit". The upstream default will be used +# otherwise, which is generally to enable jit unless support for the platform +# is missing. +# +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional gtk3 support via IUSE="force-gtk3". Currently this would include +# thunderbird and seamonkey in the future, once support is ready for testing. +# +# Leave the variable UNSET if gtk3 support should not be optionally available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. +# If gtk+:3 is to be the standard toolkit, do not use this and instead use +# MOZCONFIG_OPTIONAL_GTK2ONLY. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional gtk2-only support via IUSE="gtk2". +# +# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both +# variables cannot be set at the same time and this variable will be ignored if +# MOZCONFIG_OPTIONAL_GTK3 is set. +# +# Leave the variable UNSET if gtk2-only support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional qt5 support via IUSE="qt5". Currently this would include +# ebuilds for firefox, but thunderbird and seamonkey could follow in the future. +# +# Leave the variable UNSET if qt5 support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# use-flags common among all mozilla ebuilds +IUSE="${IUSE} dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo + system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx" + +# some notes on deps: +# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14 +# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau + +RDEPEND=">=app-text/hunspell-1.2:= + dev-libs/atk + dev-libs/expat + >=x11-libs/cairo-1.10[X] + >=x11-libs/gtk+-2.18:2 + x11-libs/gdk-pixbuf + >=x11-libs/pango-1.22.0 + >=media-libs/libpng-1.6.25:0=[apng] + >=media-libs/mesa-10.2:* + media-libs/fontconfig + >=media-libs/freetype-2.4.10 + kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) + pulseaudio? ( || ( media-sound/pulseaudio + >=media-sound/apulse-0.1.9 ) ) + virtual/freedesktop-icon-theme + dbus? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 ) + startup-notification? ( >=x11-libs/startup-notification-0.8 ) + >=dev-libs/glib-2.26:2 + >=sys-libs/zlib-1.2.3 + >=virtual/libffi-3.0.10 + virtual/ffmpeg + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXt + system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) + system-icu? ( >=dev-libs/icu-58.1:= ) + system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) + system-libevent? ( >=dev-libs/libevent-2.0:0= ) + system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) + system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) + system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) +" + +if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then + MOZCONFIG_OPTIONAL_GTK2ONLY= + if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then + IUSE+=" +force-gtk3" + else + IUSE+=" force-gtk3" + fi + RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )" +elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then + IUSE+=" +gtk2" + else + IUSE+=" gtk2" + fi + RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )" +fi +if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then + IUSE+=" +wifi" + else + IUSE+=" wifi" + fi + RDEPEND+=" + wifi? ( + kernel_linux? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 + net-misc/networkmanager ) + )" +fi + +DEPEND="app-arch/zip + app-arch/unzip + >=sys-devel/binutils-2.16.1 + sys-apps/findutils + pulseaudio? ( media-sound/pulseaudio ) + ${RDEPEND}" + +RDEPEND+=" + pulseaudio? ( || ( media-sound/pulseaudio + >=media-sound/apulse-0.1.9 ) ) + selinux? ( sec-policy/selinux-mozilla )" + +# @FUNCTION: mozconfig_config +# @DESCRIPTION: +# Set common configure options for mozilla packages. +# Call this within src_configure() phase, after mozconfig_init +# +# Example: +# +# inherit mozconfig-v6.46 +# +# src_configure() { +# mozconfig_init +# mozconfig_config +# # ... misc ebuild-unique settings via calls to +# # ... mozconfig_{annotate,use_with,use_enable} +# mozconfig_final +# } + +mozconfig_config() { + # Migrated from mozcoreconf-2 + mozconfig_annotate 'system_libs' \ + --with-system-zlib \ + --with-system-bz2 + + if has bindist ${IUSE}; then + mozconfig_use_enable !bindist official-branding + if [[ ${PN} == firefox ]] && use bindist ; then + mozconfig_annotate '' --with-branding=browser/branding/aurora + fi + fi + + # Enable position independent executables + mozconfig_annotate 'enabled by Gentoo' --enable-pie + mozconfig_use_enable debug + mozconfig_use_enable debug tests + + if ! use debug ; then + mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols + else + mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols + fi + + mozconfig_use_enable startup-notification + + if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then + # wifi pulls in dbus so manage both here + mozconfig_use_enable wifi necko-wifi + if use kernel_linux && use wifi && ! use dbus; then + echo "Enabling dbus support due to wifi request" + mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus + else + mozconfig_use_enable dbus + fi + else + mozconfig_use_enable dbus + mozconfig_annotate 'disabled' --disable-necko-wifi + fi + + if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then + mozconfig_use_enable jit ion + fi + + # These are enabled by default in all mozilla applications + mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr + mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr + mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir) + if use system-libevent; then + mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr + fi + mozconfig_annotate '' --prefix="${EPREFIX}"/usr + mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate 'Gentoo default' --enable-system-hunspell + mozconfig_annotate '' --disable-gnomeui + mozconfig_annotate '' --enable-gio + mozconfig_annotate '' --disable-crashreporter + mozconfig_annotate 'Gentoo default' --with-system-png + mozconfig_annotate '' --enable-system-ffi + mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold + mozconfig_annotate '' --disable-gconf + mozconfig_annotate '' --with-intl-api + + # skia has no support for big-endian platforms + if [[ $(tc-endian) == "big" ]]; then + mozconfig_annotate 'big endian target' --disable-skia + else + mozconfig_annotate '' --enable-skia + fi + + # default toolkit is cairo-gtk2, optional use flags can change this + local toolkit="cairo-gtk2" + local toolkit_comment="" + if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then + if use force-gtk3; then + toolkit="cairo-gtk3" + toolkit_comment="force-gtk3 use flag" + fi + fi + if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then + if ! use gtk2 ; then + toolkit="cairo-gtk3" + else + toolkit_comment="gtk2 use flag" + fi + fi + if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then + if use qt5; then + toolkit="cairo-qt" + toolkit_comment="qt5 use flag" + # need to specify these vars because the qt5 versions are not found otherwise, + # and setting --with-qtdir overrides the pkg-config include dirs + local i + for i in qmake moc rcc; do + echo "export HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \ + >> "${S}"/.mozconfig || die + done + echo 'unset QTDIR' >> "${S}"/.mozconfig || die + mozconfig_annotate '+qt5' --disable-gio + fi + fi + mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit} + + # Use jemalloc unless libc is not glibc >= 2.4 + # at this time the minimum glibc in the tree is 2.9 so we should be safe. + if use elibc_glibc && use jemalloc; then + # We must force-enable jemalloc 4 via .mozconfig + echo "export MOZ_JEMALLOC4=1" >> "${S}"/.mozconfig || die + mozconfig_annotate '' --enable-replace-malloc + fi + + # Instead of the standard --build= and --host=, mozilla uses --host instead + # of --build, and --target intstead of --host. + # Note, mozilla also has --build but it does not do what you think it does. + # Set both --target and --host as mozilla uses python to guess values otherwise + mozconfig_annotate '' --target="${CHOST}" + mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" + + mozconfig_use_enable pulseaudio + # force the deprecated alsa sound code if pulseaudio is disabled + if use kernel_linux && ! use pulseaudio ; then + mozconfig_annotate '-pulseaudio' --enable-alsa + fi + + mozconfig_use_enable system-cairo + mozconfig_use_enable system-sqlite + mozconfig_use_with system-jpeg + mozconfig_use_with system-icu + mozconfig_use_with system-libvpx + mozconfig_use_with system-harfbuzz + mozconfig_use_with system-harfbuzz system-graphite2 + + # Modifications to better support ARM, bug 553364 + if use neon ; then + mozconfig_annotate '' --with-fpu=neon + mozconfig_annotate '' --with-thumb=yes + mozconfig_annotate '' --with-thumb-interwork=no + fi + if [[ ${CHOST} == armv* ]] ; then + mozconfig_annotate '' --with-float-abi=hard + if ! use system-libvpx ; then + sed -i -e "s|softfp|hard|" \ + "${S}"/media/libvpx/moz.build + fi + fi +} + +# @FUNCTION: mozconfig_install_prefs +# @DESCRIPTION: +# Set preferences into the prefs.js file specified as a parameter to +# the function. This sets both some common prefs to all mozilla +# packages, and any prefs that may relate to the use flags administered +# by mozconfig_config(). +# +# Call this within src_install() phase, after copying the template +# prefs file (if any) from ${FILESDIR} +# +# Example: +# +# inherit mozconfig-v6.46 +# +# src_install() { +# cp "${FILESDIR}"/gentoo-default-prefs.js \ +# "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ +# || die +# +# mozconfig_install_prefs \ +# "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" +# +# ... +# } + +mozconfig_install_prefs() { + local prefs_file="${1}" + + einfo "Adding prefs from mozconfig to ${prefs_file}" + + # set dictionary path, to use system hunspell + echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \ + >>"${prefs_file}" || die + + # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it + if use system-harfbuzz ; then + echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \ + >>"${prefs_file}" || die + fi + + # force cairo as the canvas renderer on platforms without skia support + if [[ $(tc-endian) == "big" ]] ; then + echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \ + >>"${prefs_file}" || die + echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \ + >>"${prefs_file}" || die + fi +} diff -uNr a/eclass/mozconfig-v6.58.eclass b/eclass/mozconfig-v6.58.eclass --- a/eclass/mozconfig-v6.58.eclass false +++ b/eclass/mozconfig-v6.58.eclass c36d7de77f467f6c07e1193a6e770fb866cc7537d09d02b6cc8ef794cb0921ed43a9833155876ce1664c837669f03945668ed2f5fca7a5df7a8555e8c83cc2eb @@ -0,0 +1,395 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @ECLASS: mozconfig-v6.58.eclass +# @MAINTAINER: +# mozilla team <mozilla@gentoo.org> +# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6 +# @DESCRIPTION: +# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey) +# to provide a single common place for the common mozilla engine compoments. +# +# The eclass provides all common dependencies as well as common use flags. +# +# Some use flags which may be optional in particular mozilla packages can be +# supported through setting eclass variables. +# +# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3, +# and so ebuilds inheriting this eclass do not need to inherit that. + +case ${EAPI} in + 0|1|2|3|4) + die "EAPI=${EAPI} not supported" + ;; + 5) + inherit multilib + ;; +esac + +inherit flag-o-matic toolchain-funcs mozcoreconf-v5 + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild needs to provide +# optional necko-wifi support via IUSE="wifi". Currently this would include +# ebuilds for firefox, and potentially seamonkey. +# +# Leave the variable UNSET if necko-wifi support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild needs to provide +# deterministic jit support via IUSE="jit". The upstream default will be used +# otherwise, which is generally to enable jit unless support for the platform +# is missing. +# +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional gtk3 support via IUSE="force-gtk3". Currently this would include +# thunderbird and seamonkey in the future, once support is ready for testing. +# +# Leave the variable UNSET if gtk3 support should not be optionally available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. +# If gtk+:3 is to be the standard toolkit, do not use this and instead use +# MOZCONFIG_OPTIONAL_GTK2ONLY. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional gtk2-only support via IUSE="gtk2". +# +# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both +# variables cannot be set at the same time and this variable will be ignored if +# MOZCONFIG_OPTIONAL_GTK3 is set. +# +# Leave the variable UNSET if gtk2-only support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional qt5 support via IUSE="qt5". Currently this would include +# ebuilds for firefox, but thunderbird and seamonkey could follow in the future. +# +# Leave the variable UNSET if qt5 support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# use-flags common among all mozilla ebuilds +IUSE="${IUSE} dbus debug neon pulseaudio selinux startup-notification system-harfbuzz + system-icu system-jpeg system-libevent system-sqlite system-libvpx" + +# some notes on deps: +# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14 +# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau + +RDEPEND=">=app-text/hunspell-1.5.4:= + dev-libs/atk + dev-libs/expat + >=x11-libs/cairo-1.10[X] + >=x11-libs/gtk+-2.18:2 + x11-libs/gdk-pixbuf + >=x11-libs/pango-1.22.0 + >=media-libs/libpng-1.6.34:0=[apng] + >=media-libs/mesa-10.2:* + media-libs/fontconfig + >=media-libs/freetype-2.4.10 + kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) + virtual/freedesktop-icon-theme + dbus? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 ) + startup-notification? ( >=x11-libs/startup-notification-0.8 ) + >=x11-libs/pixman-0.19.2 + >=dev-libs/glib-2.26:2 + >=sys-libs/zlib-1.2.3 + >=virtual/libffi-3.0.10 + virtual/ffmpeg + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXt + system-icu? ( >=dev-libs/icu-59.1:= ) + system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) + system-libevent? ( >=dev-libs/libevent-2.0:0= ) + system-sqlite? ( >=dev-db/sqlite-3.20.1:3[secure-delete,debug=] ) + system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) + system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) +" + +if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then + MOZCONFIG_OPTIONAL_GTK2ONLY= + if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then + IUSE+=" +force-gtk3" + else + IUSE+=" force-gtk3" + fi + RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )" +elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then + IUSE+=" +gtk2" + else + IUSE+=" gtk2" + fi + RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )" +else + # no gtk3 related dep set by optional use flags, force it + RDEPEND+=" >=x11-libs/gtk+-3.4.0:3" +fi +if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then + IUSE+=" +wifi" + else + IUSE+=" wifi" + fi + RDEPEND+=" + wifi? ( + kernel_linux? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 + net-misc/networkmanager ) + )" +fi + +DEPEND="app-arch/zip + app-arch/unzip + >=sys-devel/binutils-2.16.1 + sys-apps/findutils + pulseaudio? ( media-sound/pulseaudio ) + || ( + ( >=dev-lang/rust-1.21.0 >=dev-util/cargo-0.22.0 ) + >=dev-lang/rust-1.21.0[extended] + ( >=dev-lang/rust-bin-1.21.0 >=dev-util/cargo-0.22.0 ) + ) + ${RDEPEND}" + +RDEPEND+=" + pulseaudio? ( || ( media-sound/pulseaudio + >=media-sound/apulse-0.1.9 ) ) + selinux? ( sec-policy/selinux-mozilla )" + +# @FUNCTION: mozconfig_config +# @DESCRIPTION: +# Set common configure options for mozilla packages. +# Call this within src_configure() phase, after mozconfig_init +# +# Example: +# +# inherit mozconfig-v6.46 +# +# src_configure() { +# mozconfig_init +# mozconfig_config +# # ... misc ebuild-unique settings via calls to +# # ... mozconfig_{annotate,use_with,use_enable} +# mozconfig_final +# } + +mozconfig_config() { + # Migrated from mozcoreconf-2 + mozconfig_annotate 'system_libs' \ + --with-system-zlib \ + --with-system-bz2 + + # Stylo is only broken on x86 builds + use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo + + # Must pass release in order to properly select linker + mozconfig_annotate 'Enable by Gentoo' --enable-release + + # Must pass --enable-gold if using ld.gold + if tc-ld-is-gold ; then + mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold + else + mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold + fi + + if has bindist ${IUSE}; then + mozconfig_use_enable !bindist official-branding + if [[ ${PN} == firefox ]] && use bindist ; then + mozconfig_annotate '' --with-branding=browser/branding/aurora + fi + fi + + # Enable position independent executables + mozconfig_annotate 'enabled by Gentoo' --enable-pie + mozconfig_use_enable debug + mozconfig_use_enable debug tests + + if ! use debug ; then + mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols + else + mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols + fi + + mozconfig_use_enable startup-notification + + if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then + # wifi pulls in dbus so manage both here + mozconfig_use_enable wifi necko-wifi + if use kernel_linux && use wifi && ! use dbus; then + echo "Enabling dbus support due to wifi request" + mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus + else + mozconfig_use_enable dbus + fi + else + mozconfig_use_enable dbus + mozconfig_annotate 'disabled' --disable-necko-wifi + fi + + if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then + mozconfig_use_enable jit ion + fi + + # These are enabled by default in all mozilla applications + mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr + mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr + mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir) + if use system-libevent; then + mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr + fi + mozconfig_annotate '' --prefix="${EPREFIX}"/usr + mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate 'Gentoo default' --enable-system-hunspell + mozconfig_annotate '' --disable-crashreporter + mozconfig_annotate 'Gentoo default' --with-system-png + mozconfig_annotate '' --enable-system-ffi + mozconfig_annotate '' --disable-gconf + mozconfig_annotate '' --with-intl-api + + # skia has no support for big-endian platforms + if [[ $(tc-endian) == "big" ]]; then + mozconfig_annotate 'big endian target' --disable-skia + else + mozconfig_annotate '' --enable-skia + fi + + # default toolkit is cairo-gtk3, optional use flags can change this + local toolkit="cairo-gtk3" + local toolkit_comment="" + if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then + if ! use force-gtk3; then + toolkit="cairo-gtk2" + toolkit_comment="force-gtk3 use flag" + fi + fi + if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then + if use gtk2 ; then + toolkit="cairo-gtk2" + else + toolkit_comment="gtk2 use flag" + fi + fi + if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then + if use qt5; then + toolkit="cairo-qt" + toolkit_comment="qt5 use flag" + # need to specify these vars because the qt5 versions are not found otherwise, + # and setting --with-qtdir overrides the pkg-config include dirs + local i + for i in qmake moc rcc; do + echo "export HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \ + >> "${S}"/.mozconfig || die + done + echo 'unset QTDIR' >> "${S}"/.mozconfig || die + mozconfig_annotate '+qt5' --disable-gio + fi + fi + mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit} + + # Instead of the standard --build= and --host=, mozilla uses --host instead + # of --build, and --target intstead of --host. + # Note, mozilla also has --build but it does not do what you think it does. + # Set both --target and --host as mozilla uses python to guess values otherwise + mozconfig_annotate '' --target="${CHOST}" + mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" + + mozconfig_use_enable pulseaudio + # force the deprecated alsa sound code if pulseaudio is disabled + if use kernel_linux && ! use pulseaudio ; then + mozconfig_annotate '-pulseaudio' --enable-alsa + fi + + # For testing purpose only + mozconfig_annotate 'Sandbox' --enable-content-sandbox + + mozconfig_use_enable system-sqlite + mozconfig_use_with system-jpeg + mozconfig_use_with system-icu + mozconfig_use_with system-libvpx + mozconfig_use_with system-harfbuzz + mozconfig_use_with system-harfbuzz system-graphite2 + + # Modifications to better support ARM, bug 553364 + if use neon ; then + mozconfig_annotate '' --with-fpu=neon + mozconfig_annotate '' --with-thumb=yes + mozconfig_annotate '' --with-thumb-interwork=no + fi + if [[ ${CHOST} == armv* ]] ; then + mozconfig_annotate '' --with-float-abi=hard + if ! use system-libvpx ; then + sed -i -e "s|softfp|hard|" \ + "${S}"/media/libvpx/moz.build + fi + fi +} + +# @FUNCTION: mozconfig_install_prefs +# @DESCRIPTION: +# Set preferences into the prefs.js file specified as a parameter to +# the function. This sets both some common prefs to all mozilla +# packages, and any prefs that may relate to the use flags administered +# by mozconfig_config(). +# +# Call this within src_install() phase, after copying the template +# prefs file (if any) from ${FILESDIR} +# +# Example: +# +# inherit mozconfig-v6.46 +# +# src_install() { +# cp "${FILESDIR}"/gentoo-default-prefs.js \ +# "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ +# || die +# +# mozconfig_install_prefs \ +# "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" +# +# ... +# } + +mozconfig_install_prefs() { + local prefs_file="${1}" + + einfo "Adding prefs from mozconfig to ${prefs_file}" + + # set dictionary path, to use system hunspell + echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \ + >>"${prefs_file}" || die + + # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it + if use system-harfbuzz ; then + echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \ + >>"${prefs_file}" || die + fi + + # force cairo as the canvas renderer on platforms without skia support + if [[ $(tc-endian) == "big" ]] ; then + echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \ + >>"${prefs_file}" || die + echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \ + >>"${prefs_file}" || die + fi +} diff -uNr a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass --- a/eclass/mozconfig-v6.60.eclass false +++ b/eclass/mozconfig-v6.60.eclass 8e8346172ef1ccb880d535a5dc91754501c685434c105ba7a0dbe6e8a5a9f4a71f7d867b384707a6de9e51acb5fff767fd091f954dd0dca0988fbe064480469c @@ -0,0 +1,399 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @ECLASS: mozconfig-v6.58.eclass +# @MAINTAINER: +# mozilla team <mozilla@gentoo.org> +# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6 +# @DESCRIPTION: +# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey) +# to provide a single common place for the common mozilla engine compoments. +# +# The eclass provides all common dependencies as well as common use flags. +# +# Some use flags which may be optional in particular mozilla packages can be +# supported through setting eclass variables. +# +# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3, +# and so ebuilds inheriting this eclass do not need to inherit that. + +case ${EAPI} in + 0|1|2|3|4) + die "EAPI=${EAPI} not supported" + ;; + 5) + inherit multilib + ;; +esac + +inherit flag-o-matic toolchain-funcs mozcoreconf-v6 + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild needs to provide +# optional necko-wifi support via IUSE="wifi". Currently this would include +# ebuilds for firefox, and potentially seamonkey. +# +# Leave the variable UNSET if necko-wifi support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild needs to provide +# deterministic jit support via IUSE="jit". The upstream default will be used +# otherwise, which is generally to enable jit unless support for the platform +# is missing. +# +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional gtk3 support via IUSE="force-gtk3". Currently this would include +# thunderbird and seamonkey in the future, once support is ready for testing. +# +# Leave the variable UNSET if gtk3 support should not be optionally available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. +# If gtk+:3 is to be the standard toolkit, do not use this and instead use +# MOZCONFIG_OPTIONAL_GTK2ONLY. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional gtk2-only support via IUSE="gtk2". +# +# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both +# variables cannot be set at the same time and this variable will be ignored if +# MOZCONFIG_OPTIONAL_GTK3 is set. +# +# Leave the variable UNSET if gtk2-only support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DESCRIPTION: +# Set this variable before the inherit line, when an ebuild can provide +# optional qt5 support via IUSE="qt5". Currently this would include +# ebuilds for firefox, but thunderbird and seamonkey could follow in the future. +# +# Leave the variable UNSET if qt5 support should not be available. +# Set the variable to "enabled" if the use flag should be enabled by default. +# Set the variable to any value if the use flag should exist but not be default-enabled. + +# use-flags common among all mozilla ebuilds +IUSE="${IUSE} dbus debug neon pulseaudio selinux startup-notification system-harfbuzz + system-icu system-jpeg system-libevent system-sqlite system-libvpx" + +# some notes on deps: +# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14 +# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau + +RDEPEND=">=app-text/hunspell-1.5.4:= + dev-libs/atk + dev-libs/expat + >=x11-libs/cairo-1.10[X] + >=x11-libs/gtk+-2.18:2 + x11-libs/gdk-pixbuf + >=x11-libs/pango-1.22.0 + >=media-libs/libpng-1.6.34:0=[apng] + >=media-libs/mesa-10.2:* + media-libs/fontconfig + >=media-libs/freetype-2.4.10 + kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) + virtual/freedesktop-icon-theme + dbus? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 ) + startup-notification? ( >=x11-libs/startup-notification-0.8 ) + >=x11-libs/pixman-0.19.2 + >=dev-libs/glib-2.26:2 + >=sys-libs/zlib-1.2.3 + >=virtual/libffi-3.0.10 + virtual/ffmpeg + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXt + system-icu? ( >=dev-libs/icu-59.1:= ) + system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) + system-libevent? ( >=dev-libs/libevent-2.0:0= ) + system-sqlite? ( >=dev-db/sqlite-3.20.1:3[secure-delete,debug=] ) + system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) + system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) +" + +if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then + MOZCONFIG_OPTIONAL_GTK2ONLY= + if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then + IUSE+=" +force-gtk3" + else + IUSE+=" force-gtk3" + fi + RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )" +elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then + IUSE+=" +gtk2" + else + IUSE+=" gtk2" + fi + RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )" +else + # no gtk3 related dep set by optional use flags, force it + RDEPEND+=" >=x11-libs/gtk+-3.4.0:3" +fi +if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then + if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then + IUSE+=" +wifi" + else + IUSE+=" wifi" + fi + RDEPEND+=" + wifi? ( + kernel_linux? ( >=sys-apps/dbus-0.60 + >=dev-libs/dbus-glib-0.72 + net-misc/networkmanager ) + )" +fi + +DEPEND="app-arch/zip + app-arch/unzip + >=sys-devel/binutils-2.16.1 + sys-apps/findutils + pulseaudio? ( media-sound/pulseaudio ) + elibc_glibc? ( || ( + ( >=dev-lang/rust-1.24.0[-extended(-)] >=dev-util/cargo-0.25.0 ) + >=dev-lang/rust-1.24.0[extended] + ( >=dev-lang/rust-bin-1.24.0 >=dev-util/cargo-0.25.0 ) + ) ) + elibc_musl? ( || ( >=dev-lang/rust-1.24.0 + >=dev-util/cargo-0.25.0 + ) ) + ${RDEPEND}" + +RDEPEND+=" + pulseaudio? ( || ( media-sound/pulseaudio + >=media-sound/apulse-0.1.9 ) ) + selinux? ( sec-policy/selinux-mozilla )" + +# @FUNCTION: mozconfig_config +# @DESCRIPTION: +# Set common configure options for mozilla packages. +# Call this within src_configure() phase, after mozconfig_init +# +# Example: +# +# inherit mozconfig-v6.46 +# +# src_configure() { +# mozconfig_init +# mozconfig_config +# # ... misc ebuild-unique settings via calls to +# # ... mozconfig_{annotate,use_with,use_enable} +# mozconfig_final +# } + +mozconfig_config() { + # Migrated from mozcoreconf-2 + mozconfig_annotate 'system_libs' \ + --with-system-zlib \ + --with-system-bz2 + + # Stylo is only broken on x86 builds + use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo + + # Must pass release in order to properly select linker + mozconfig_annotate 'Enable by Gentoo' --enable-release + + # Must pass --enable-gold if using ld.gold + if tc-ld-is-gold ; then + mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold + else + mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold + fi + + if has bindist ${IUSE}; then + mozconfig_use_enable !bindist official-branding + if [[ ${PN} == firefox ]] && use bindist ; then + mozconfig_annotate '' --with-branding=browser/branding/aurora + fi + fi + + # Enable position independent executables + mozconfig_annotate 'enabled by Gentoo' --enable-pie + mozconfig_use_enable debug + mozconfig_use_enable debug tests + + if ! use debug ; then + mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols + else + mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols + fi + + mozconfig_use_enable startup-notification + + if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then + # wifi pulls in dbus so manage both here + mozconfig_use_enable wifi necko-wifi + if use kernel_linux && use wifi && ! use dbus; then + echo "Enabling dbus support due to wifi request" + mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus + else + mozconfig_use_enable dbus + fi + else + mozconfig_use_enable dbus + mozconfig_annotate 'disabled' --disable-necko-wifi + fi + + if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then + mozconfig_use_enable jit ion + fi + + # These are enabled by default in all mozilla applications + mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr + mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr + mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir) + if use system-libevent; then + mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr + fi + mozconfig_annotate '' --prefix="${EPREFIX}"/usr + mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate 'Gentoo default' --enable-system-hunspell + mozconfig_annotate '' --disable-crashreporter + mozconfig_annotate 'Gentoo default' --with-system-png + mozconfig_annotate '' --enable-system-ffi + mozconfig_annotate '' --disable-gconf + mozconfig_annotate '' --with-intl-api + mozconfig_annotate '' --enable-system-pixman + + # skia has no support for big-endian platforms + if [[ $(tc-endian) == "big" ]]; then + mozconfig_annotate 'big endian target' --disable-skia + else + mozconfig_annotate '' --enable-skia + fi + + # default toolkit is cairo-gtk3, optional use flags can change this + local toolkit="cairo-gtk3" + local toolkit_comment="" + if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then + if ! use force-gtk3; then + toolkit="cairo-gtk2" + toolkit_comment="force-gtk3 use flag" + fi + fi + if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then + if use gtk2 ; then + toolkit="cairo-gtk2" + else + toolkit_comment="gtk2 use flag" + fi + fi + if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then + if use qt5; then + toolkit="cairo-qt" + toolkit_comment="qt5 use flag" + # need to specify these vars because the qt5 versions are not found otherwise, + # and setting --with-qtdir overrides the pkg-config include dirs + local i + for i in qmake moc rcc; do + echo "export HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \ + >> "${S}"/.mozconfig || die + done + echo 'unset QTDIR' >> "${S}"/.mozconfig || die + mozconfig_annotate '+qt5' --disable-gio + fi + fi + mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit} + + # Instead of the standard --build= and --host=, mozilla uses --host instead + # of --build, and --target intstead of --host. + # Note, mozilla also has --build but it does not do what you think it does. + # Set both --target and --host as mozilla uses python to guess values otherwise + mozconfig_annotate '' --target="${CHOST}" + mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" + + mozconfig_use_enable pulseaudio + # force the deprecated alsa sound code if pulseaudio is disabled + if use kernel_linux && ! use pulseaudio ; then + mozconfig_annotate '-pulseaudio' --enable-alsa + fi + + # For testing purpose only + mozconfig_annotate 'Sandbox' --enable-content-sandbox + + mozconfig_use_enable system-sqlite + mozconfig_use_with system-jpeg + mozconfig_use_with system-icu + mozconfig_use_with system-libvpx + mozconfig_use_with system-harfbuzz + mozconfig_use_with system-harfbuzz system-graphite2 + + # Modifications to better support ARM, bug 553364 + if use neon ; then + mozconfig_annotate '' --with-fpu=neon + mozconfig_annotate '' --with-thumb=yes + mozconfig_annotate '' --with-thumb-interwork=no + fi + if [[ ${CHOST} == armv* ]] ; then + mozconfig_annotate '' --with-float-abi=hard + if ! use system-libvpx ; then + sed -i -e "s|softfp|hard|" \ + "${S}"/media/libvpx/moz.build + fi + fi +} + +# @FUNCTION: mozconfig_install_prefs +# @DESCRIPTION: +# Set preferences into the prefs.js file specified as a parameter to +# the function. This sets both some common prefs to all mozilla +# packages, and any prefs that may relate to the use flags administered +# by mozconfig_config(). +# +# Call this within src_install() phase, after copying the template +# prefs file (if any) from ${FILESDIR} +# +# Example: +# +# inherit mozconfig-v6.46 +# +# src_install() { +# cp "${FILESDIR}"/gentoo-default-prefs.js \ +# "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ +# || die +# +# mozconfig_install_prefs \ +# "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" +# +# ... +# } + +mozconfig_install_prefs() { + local prefs_file="${1}" + + einfo "Adding prefs from mozconfig to ${prefs_file}" + + # set dictionary path, to use system hunspell + echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \ + >>"${prefs_file}" || die + + # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it + if use system-harfbuzz ; then + echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \ + >>"${prefs_file}" || die + fi + + # force cairo as the canvas renderer on platforms without skia support + if [[ $(tc-endian) == "big" ]] ; then + echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \ + >>"${prefs_file}" || die + echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \ + >>"${prefs_file}" || die + fi +} diff -uNr a/eclass/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass --- a/eclass/mozcoreconf-v4.eclass false +++ b/eclass/mozcoreconf-v4.eclass 72799733a832083b451ea56b70f2e2fa0860d716d9c0bae45d112c1dd926ac430a6522b3e9cce6995c0b654b590bbd47b77b5206e54e271c57a6c2df92153559 @@ -0,0 +1,261 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @ECLASS: mozcoreconf-v4.eclass +# @MAINTAINER: +# Mozilla team <mozilla@gentoo.org> +# @BLURB: core options and configuration functions for mozilla +# @DESCRIPTION: +# +# inherit mozconfig-v6.* or above for mozilla configuration support + +# @ECLASS-VARIABLE: MOZILLA_FIVE_HOME +# @DESCRIPTION: +# This is an eclass-generated variable that defines the rpath that the mozilla +# product will be installed in. Read-only + +if [[ ! ${_MOZCORECONF} ]]; then + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE='ncurses,sqlite,ssl,threads' + +inherit multilib toolchain-funcs flag-o-matic python-any-r1 versionator + +IUSE="${IUSE} custom-cflags custom-optimization" + +DEPEND="virtual/pkgconfig + ${PYTHON_DEPS}" + +# @FUNCTION: mozconfig_annotate +# @DESCRIPTION: +# add an annotated line to .mozconfig +# +# Example: +# mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc +# => ac_add_options --enable-js-ultrasparc # building on ultrasparc +mozconfig_annotate() { + declare reason=$1 x ; shift + [[ $# -gt 0 ]] || die "mozconfig_annotate missing flags for ${reason}\!" + for x in ${*}; do + echo "ac_add_options ${x} # ${reason}" >>.mozconfig + done +} + +# @FUNCTION: mozconfig_use_enable +# @DESCRIPTION: +# add a line to .mozconfig based on a USE-flag +# +# Example: +# mozconfig_use_enable truetype freetype2 +# => ac_add_options --enable-freetype2 # +truetype +mozconfig_use_enable() { + declare flag=$(use_enable "$@") + mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}" +} + +# @FUNCTION mozconfig_use_with +# @DESCRIPTION +# add a line to .mozconfig based on a USE-flag +# +# Example: +# mozconfig_use_with kerberos gss-api /usr/$(get_libdir) +# => ac_add_options --with-gss-api=/usr/lib # +kerberos +mozconfig_use_with() { + declare flag=$(use_with "$@") + mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}" +} + +# @FUNCTION mozconfig_use_extension +# @DESCRIPTION +# enable or disable an extension based on a USE-flag +# +# Example: +# mozconfig_use_extension gnome gnomevfs +# => ac_add_options --enable-extensions=gnomevfs +mozconfig_use_extension() { + declare minus=$(use $1 || echo -) + mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2} +} + +moz_pkgsetup() { + # Ensure we use C locale when building + export LANG="C" + export LC_ALL="C" + export LC_MESSAGES="C" + export LC_CTYPE="C" + + # Ensure we use correct toolchain + export HOST_CC="$(tc-getBUILD_CC)" + export HOST_CXX="$(tc-getBUILD_CXX)" + tc-export CC CXX LD PKG_CONFIG + + # Ensure that we have a sane build enviroment + export MOZILLA_CLIENT=1 + export BUILD_OPT=1 + export NO_STATIC_LIB=1 + export USE_PTHREADS=1 + export ALDFLAGS=${LDFLAGS} + # ensure MOZCONFIG is not defined + unset MOZCONFIG + + # set MOZILLA_FIVE_HOME + export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + + # nested configure scripts in mozilla products generate unrecognized options + # false positives when toplevel configure passes downwards. + export QA_CONFIGURE_OPTIONS=".*" + + if [[ $(gcc-major-version) -eq 3 ]]; then + ewarn "Unsupported compiler detected, DO NOT file bugs for" + ewarn "outdated compilers. Bugs opened with gcc-3 will be closed" + ewarn "invalid." + fi + + python-any-r1_pkg_setup +} + +# @FUNCTION: mozconfig_init +# @DESCRIPTION: +# Initialize mozilla configuration and populate with core settings. +# This should be called in src_configure before any other mozconfig_* functions. +mozconfig_init() { + declare enable_optimize pango_version myext x + declare XUL=$([[ ${PN} == xulrunner ]] && echo true || echo false) + declare FF=$([[ ${PN} == firefox ]] && echo true || echo false) + declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false) + declare TB=$([[ ${PN} == thunderbird ]] && echo true || echo false) + + #################################### + # + # Setup the initial .mozconfig + # See http://www.mozilla.org/build/configure-build.html + # + #################################### + + case ${PN} in + *xulrunner) + cp xulrunner/config/mozconfig .mozconfig \ + || die "cp xulrunner/config/mozconfig failed" ;; + *firefox) + cp browser/config/mozconfig .mozconfig \ + || die "cp browser/config/mozconfig failed" ;; + seamonkey) + # Must create the initial mozconfig to enable application + : >.mozconfig || die "initial mozconfig creation failed" + mozconfig_annotate "" --enable-application=suite ;; + *thunderbird) + # Must create the initial mozconfig to enable application + : >.mozconfig || die "initial mozconfig creation failed" + mozconfig_annotate "" --enable-application=mail ;; + esac + + #################################### + # + # CFLAGS setup and ARCH support + # + #################################### + + # Set optimization level + if [[ ${ARCH} == hppa ]]; then + mozconfig_annotate "more than -O0 causes a segfault on hppa" --enable-optimize=-O0 + elif [[ ${ARCH} == x86 ]]; then + mozconfig_annotate "less then -O2 causes a segfault on x86" --enable-optimize=-O2 + elif use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then + # Set optimization level based on CFLAGS + if is-flag -O0; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O0 + elif [[ ${ARCH} == ppc ]] && has_version '>=sys-libs/glibc-2.8'; then + mozconfig_annotate "more than -O1 segfaults on ppc with glibc-2.8" --enable-optimize=-O1 + elif is-flag -O4; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O4 + elif is-flag -O3; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O3 + elif is-flag -O1; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O1 + elif is-flag -Os; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-Os + else + mozconfig_annotate "Gentoo's default optimization" --enable-optimize=-O2 + fi + else + # Enable Mozilla's default + mozconfig_annotate "mozilla default" --enable-optimize + fi + + # Strip optimization so it does not end up in compile string + filter-flags '-O*' + + # Strip over-aggressive CFLAGS + use custom-cflags || strip-flags + + # Additional ARCH support + case "${ARCH}" in + alpha) + # Historically we have needed to add -fPIC manually for 64-bit. + # Additionally, alpha should *always* build with -mieee for correct math + # operation + append-flags -fPIC -mieee + ;; + + ia64) + # Historically we have needed to add this manually for 64-bit + append-flags -fPIC + ;; + + ppc64) + append-flags -fPIC -mminimal-toc + ;; + esac + + # We need to append flags for gcc-6 support + if [[ $(gcc-major-version) -ge 6 ]]; then + append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 + fi + + # Use the MOZILLA_FIVE_HOME for the rpath + append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags + # Set MOZILLA_FIVE_HOME in mozconfig + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + + #################################### + # + # mozconfig setup + # + #################################### + + mozconfig_annotate disable_update_strip \ + --disable-updater \ + --disable-strip \ + --disable-install-strip + + # jemalloc won't build with older glibc + ! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate "we have old glibc" --disable-jemalloc +} + +# @FUNCTION: mozconfig_final +# @DESCRIPTION: +# Display a table describing all configuration options paired +# with reasons, then clean up extensions list. +# This should be called in src_configure at the end of all other mozconfig_* functions. +mozconfig_final() { + declare ac opt hash reason + echo + echo "==========================================================" + echo "Building ${PF} with the following configuration" + grep ^ac_add_options .mozconfig | while read ac opt hash reason; do + [[ -z ${hash} || ${hash} == \# ]] \ + || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}" + printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}" + done + echo "==========================================================" + echo + + # Resolve multiple --enable-extensions down to one + declare exts=$(sed -n 's/^ac_add_options --enable-extensions=$[^ ]*$.*/\1/p' \ + .mozconfig | xargs) + sed -i '/^ac_add_options --enable-extensions/d' .mozconfig + echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig +} + +_MOZCORECONF=1 +fi diff -uNr a/eclass/mozcoreconf-v5.eclass b/eclass/mozcoreconf-v5.eclass --- a/eclass/mozcoreconf-v5.eclass false +++ b/eclass/mozcoreconf-v5.eclass 86e646dca08fd8b486fb35d2b71a792ac7791d5e6f13f7d929dc8555dd5f4565c9d8456de387eccae0940a4c91ef8a96ba941b426adf95f5b97c28bd8e53f809 @@ -0,0 +1,277 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @ECLASS: mozcoreconf-v5.eclass +# @MAINTAINER: +# Mozilla team <mozilla@gentoo.org> +# @BLURB: core options and configuration functions for mozilla +# @DESCRIPTION: +# +# inherit mozconfig-v6.* or above for mozilla configuration support + +# @ECLASS-VARIABLE: MOZILLA_FIVE_HOME +# @DESCRIPTION: +# This is an eclass-generated variable that defines the rpath that the mozilla +# product will be installed in. Read-only + +if [[ ! ${_MOZCORECONF} ]]; then + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE='ncurses,sqlite,ssl,threads' + +inherit multilib toolchain-funcs flag-o-matic python-any-r1 versionator + +IUSE="${IUSE} custom-cflags custom-optimization" + +DEPEND="virtual/pkgconfig + ${PYTHON_DEPS}" + +# @FUNCTION: mozconfig_annotate +# @DESCRIPTION: +# add an annotated line to .mozconfig +# +# Example: +# mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc +# => ac_add_options --enable-js-ultrasparc # building on ultrasparc +mozconfig_annotate() { + declare reason=$1 x ; shift + [[ $# -gt 0 ]] || die "mozconfig_annotate missing flags for ${reason}\!" + for x in ${*}; do + echo "ac_add_options ${x} # ${reason}" >>.mozconfig + done +} + +# @FUNCTION: mozconfig_use_enable +# @DESCRIPTION: +# add a line to .mozconfig based on a USE-flag +# +# Example: +# mozconfig_use_enable truetype freetype2 +# => ac_add_options --enable-freetype2 # +truetype +mozconfig_use_enable() { + declare flag=$(use_enable "$@") + mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}" +} + +# @FUNCTION mozconfig_use_with +# @DESCRIPTION +# add a line to .mozconfig based on a USE-flag +# +# Example: +# mozconfig_use_with kerberos gss-api /usr/$(get_libdir) +# => ac_add_options --with-gss-api=/usr/lib # +kerberos +mozconfig_use_with() { + declare flag=$(use_with "$@") + mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}" +} + +# @FUNCTION mozconfig_use_extension +# @DESCRIPTION +# enable or disable an extension based on a USE-flag +# +# Example: +# mozconfig_use_extension gnome gnomevfs +# => ac_add_options --enable-extensions=gnomevfs +mozconfig_use_extension() { + declare minus=$(use $1 || echo -) + mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2} +} + +moz_pkgsetup() { + # Ensure we use C locale when building + export LANG="C" + export LC_ALL="C" + export LC_MESSAGES="C" + export LC_CTYPE="C" + + # Ensure we use correct toolchain + export HOST_CC="$(tc-getBUILD_CC)" + export HOST_CXX="$(tc-getBUILD_CXX)" + tc-export CC CXX LD PKG_CONFIG + + # Ensure that we have a sane build enviroment + export MOZILLA_CLIENT=1 + export BUILD_OPT=1 + export NO_STATIC_LIB=1 + export USE_PTHREADS=1 + export ALDFLAGS=${LDFLAGS} + # ensure MOZCONFIG is not defined + unset MOZCONFIG + + # set MOZILLA_FIVE_HOME + export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + + # nested configure scripts in mozilla products generate unrecognized options + # false positives when toplevel configure passes downwards. + export QA_CONFIGURE_OPTIONS=".*" + + if [[ $(gcc-major-version) -eq 3 ]]; then + ewarn "Unsupported compiler detected, DO NOT file bugs for" + ewarn "outdated compilers. Bugs opened with gcc-3 will be closed" + ewarn "invalid." + fi + + python-any-r1_pkg_setup +} + +# @FUNCTION: mozconfig_init +# @DESCRIPTION: +# Initialize mozilla configuration and populate with core settings. +# This should be called in src_configure before any other mozconfig_* functions. +mozconfig_init() { + declare enable_optimize pango_version myext x + declare XUL=$([[ ${PN} == xulrunner ]] && echo true || echo false) + declare FF=$([[ ${PN} == firefox ]] && echo true || echo false) + declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false) + declare TB=$([[ ${PN} == thunderbird ]] && echo true || echo false) + + #################################### + # + # Setup the initial .mozconfig + # See http://www.mozilla.org/build/configure-build.html + # + #################################### + + case ${PN} in + *xulrunner) + cp xulrunner/config/mozconfig .mozconfig \ + || die "cp xulrunner/config/mozconfig failed" ;; + *firefox) + cp browser/config/mozconfig .mozconfig \ + || die "cp browser/config/mozconfig failed" ;; + seamonkey) + # Must create the initial mozconfig to enable application + : >.mozconfig || die "initial mozconfig creation failed" + mozconfig_annotate "" --enable-application=suite ;; + *thunderbird) + # Must create the initial mozconfig to enable application + : >.mozconfig || die "initial mozconfig creation failed" + mozconfig_annotate "" --enable-application=mail ;; + esac + + #################################### + # + # CFLAGS setup and ARCH support + # + #################################### + + # Set optimization level + if [[ $(gcc-major-version) -ge 7 ]]; then + mozconfig_annotate "Workaround known breakage" --enable-optimize=-O2 + elif [[ ${ARCH} == hppa ]]; then + mozconfig_annotate "more than -O0 causes a segfault on hppa" --enable-optimize=-O0 + elif [[ ${ARCH} == x86 ]]; then + mozconfig_annotate "less then -O2 causes a segfault on x86" --enable-optimize=-O2 + elif use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then + # Set optimization level based on CFLAGS + if is-flag -O0; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O0 + elif [[ ${ARCH} == ppc ]] && has_version '>=sys-libs/glibc-2.8'; then + mozconfig_annotate "more than -O1 segfaults on ppc with glibc-2.8" --enable-optimize=-O1 + elif is-flag -O4; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O4 + elif is-flag -O3; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O3 + elif is-flag -O1; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O1 + elif is-flag -Os; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-Os + else + mozconfig_annotate "Gentoo's default optimization" --enable-optimize=-O2 + fi + else + # Enable Mozilla's default + mozconfig_annotate "mozilla default" --enable-optimize + fi + + # Strip optimization so it does not end up in compile string + filter-flags '-O*' + + # Strip over-aggressive CFLAGS + use custom-cflags || strip-flags + + # Additional ARCH support + case "${ARCH}" in + arm) + # Reduce the memory requirements for linking + append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads + ;; + alpha) + # Historically we have needed to add -fPIC manually for 64-bit. + # Additionally, alpha should *always* build with -mieee for correct math + # operation + append-flags -fPIC -mieee + ;; + ia64) + # Historically we have needed to add this manually for 64-bit + append-flags -fPIC + ;; + ppc64) + append-flags -fPIC -mminimal-toc + # Reduce the memory requirements for linking + append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads + ;; + esac + + # We need to append flags for gcc-6 support + if [[ $(gcc-major-version) -ge 6 ]]; then + append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 + fi + + # Use the MOZILLA_FIVE_HOME for the rpath + append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags + # Set MOZILLA_FIVE_HOME in mozconfig + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + + #################################### + # + # mozconfig setup + # + #################################### + + mozconfig_annotate disable_update_strip \ + --disable-updater \ + --disable-strip \ + --disable-install-strip + + # jemalloc won't build with older glibc + ! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate "we have old glibc" --disable-jemalloc +} + +# @FUNCTION: mozconfig_final +# @DESCRIPTION: +# Apply EXTRA_ECONF values to .mozconfig +# Display a table describing all configuration options paired +# with reasons, then clean up extensions list. +# This should be called in src_configure at the end of all other mozconfig_* functions. +mozconfig_final() { + declare ac opt hash reason + + # Apply EXTRA_ECONF entries to .mozconfig + if [[ -n ${EXTRA_ECONF} ]]; then + IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!} + for opt in "${ac[@]}"; do + mozconfig_annotate "EXTRA_ECONF" --${opt#--} + done + fi + + echo + echo "==========================================================" + echo "Building ${PF} with the following configuration" + grep ^ac_add_options .mozconfig | while read ac opt hash reason; do + [[ -z ${hash} || ${hash} == \# ]] \ + || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}" + printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}" + done + echo "==========================================================" + echo + + # Resolve multiple --enable-extensions down to one + declare exts=$(sed -n 's/^ac_add_options --enable-extensions=$[^ ]*$.*/\1/p' \ + .mozconfig | xargs) + sed -i '/^ac_add_options --enable-extensions/d' .mozconfig + echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig +} + +_MOZCORECONF=1 +fi diff -uNr a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass --- a/eclass/mozcoreconf-v6.eclass false +++ b/eclass/mozcoreconf-v6.eclass 367acb5468b912d72cbf174950789afab6c853f83a5049592016a10f8ba87181678d3d02c8f62fb407ba88cfc556ccba0dd6b332ce2f44aa3335caf3ec061e55 @@ -0,0 +1,277 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @ECLASS: mozcoreconf-v5.eclass +# @MAINTAINER: +# Mozilla team <mozilla@gentoo.org> +# @BLURB: core options and configuration functions for mozilla +# @DESCRIPTION: +# +# inherit mozconfig-v6.* or above for mozilla configuration support + +# @ECLASS-VARIABLE: MOZILLA_FIVE_HOME +# @DESCRIPTION: +# This is an eclass-generated variable that defines the rpath that the mozilla +# product will be installed in. Read-only + +if [[ ! ${_MOZCORECONF} ]]; then + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE='ncurses,sqlite,ssl,threads' + +inherit multilib toolchain-funcs flag-o-matic python-any-r1 versionator + +IUSE="${IUSE} custom-cflags custom-optimization" + +DEPEND="virtual/pkgconfig + ${PYTHON_DEPS}" + +# @FUNCTION: mozconfig_annotate +# @DESCRIPTION: +# add an annotated line to .mozconfig +# +# Example: +# mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc +# => ac_add_options --enable-js-ultrasparc # building on ultrasparc +mozconfig_annotate() { + declare reason=$1 x ; shift + [[ $# -gt 0 ]] || die "mozconfig_annotate missing flags for ${reason}\!" + for x in ${*}; do + echo "ac_add_options ${x} # ${reason}" >>.mozconfig + done +} + +# @FUNCTION: mozconfig_use_enable +# @DESCRIPTION: +# add a line to .mozconfig based on a USE-flag +# +# Example: +# mozconfig_use_enable truetype freetype2 +# => ac_add_options --enable-freetype2 # +truetype +mozconfig_use_enable() { + declare flag=$(use_enable "$@") + mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}" +} + +# @FUNCTION mozconfig_use_with +# @DESCRIPTION +# add a line to .mozconfig based on a USE-flag +# +# Example: +# mozconfig_use_with kerberos gss-api /usr/$(get_libdir) +# => ac_add_options --with-gss-api=/usr/lib # +kerberos +mozconfig_use_with() { + declare flag=$(use_with "$@") + mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}" +} + +# @FUNCTION mozconfig_use_extension +# @DESCRIPTION +# enable or disable an extension based on a USE-flag +# +# Example: +# mozconfig_use_extension gnome gnomevfs +# => ac_add_options --enable-extensions=gnomevfs +mozconfig_use_extension() { + declare minus=$(use $1 || echo -) + mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2} +} + +moz_pkgsetup() { + # Ensure we use C locale when building + export LANG="C" + export LC_ALL="C" + export LC_MESSAGES="C" + export LC_CTYPE="C" + + # Ensure we use correct toolchain + export HOST_CC="$(tc-getBUILD_CC)" + export HOST_CXX="$(tc-getBUILD_CXX)" + tc-export CC CXX LD PKG_CONFIG AR RANLIB + + # Ensure that we have a sane build enviroment + export MOZILLA_CLIENT=1 + export BUILD_OPT=1 + export NO_STATIC_LIB=1 + export USE_PTHREADS=1 + export ALDFLAGS=${LDFLAGS} + # ensure MOZCONFIG is not defined + unset MOZCONFIG + + # set MOZILLA_FIVE_HOME + export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + + # nested configure scripts in mozilla products generate unrecognized options + # false positives when toplevel configure passes downwards. + export QA_CONFIGURE_OPTIONS=".*" + + if [[ $(gcc-major-version) -eq 3 ]]; then + ewarn "Unsupported compiler detected, DO NOT file bugs for" + ewarn "outdated compilers. Bugs opened with gcc-3 will be closed" + ewarn "invalid." + fi + + python-any-r1_pkg_setup +} + +# @FUNCTION: mozconfig_init +# @DESCRIPTION: +# Initialize mozilla configuration and populate with core settings. +# This should be called in src_configure before any other mozconfig_* functions. +mozconfig_init() { + declare enable_optimize pango_version myext x + declare XUL=$([[ ${PN} == xulrunner ]] && echo true || echo false) + declare FF=$([[ ${PN} == firefox ]] && echo true || echo false) + declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false) + declare TB=$([[ ${PN} == thunderbird ]] && echo true || echo false) + + #################################### + # + # Setup the initial .mozconfig + # See http://www.mozilla.org/build/configure-build.html + # + #################################### + + case ${PN} in + *xulrunner) + cp xulrunner/config/mozconfig .mozconfig \ + || die "cp xulrunner/config/mozconfig failed" ;; + *firefox) + cp browser/config/mozconfig .mozconfig \ + || die "cp browser/config/mozconfig failed" ;; + seamonkey) + # Must create the initial mozconfig to enable application + : >.mozconfig || die "initial mozconfig creation failed" + mozconfig_annotate "" --enable-application=suite ;; + *thunderbird) + # Must create the initial mozconfig to enable application + : >.mozconfig || die "initial mozconfig creation failed" + mozconfig_annotate "" --enable-application=mail ;; + esac + + #################################### + # + # CFLAGS setup and ARCH support + # + #################################### + + # Set optimization level + if [[ $(gcc-major-version) -ge 7 ]]; then + mozconfig_annotate "Workaround known breakage" --enable-optimize=-O2 + elif [[ ${ARCH} == hppa ]]; then + mozconfig_annotate "more than -O0 causes a segfault on hppa" --enable-optimize=-O0 + elif [[ ${ARCH} == x86 ]]; then + mozconfig_annotate "less than -O2 causes a segfault on x86" --enable-optimize=-O2 + elif [[ ${ARCH} == arm ]] && [[ $(gcc-major-version) -ge 6 ]]; then + mozconfig_annotate "less than -O2 causes a breakage on arm with gcc-6" --enable-optimize=-O2 + elif use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then + # Set optimization level based on CFLAGS + if is-flag -O0; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O0 + elif [[ ${ARCH} == ppc ]] && has_version '>=sys-libs/glibc-2.8'; then + mozconfig_annotate "more than -O1 segfaults on ppc with glibc-2.8" --enable-optimize=-O1 + elif is-flag -O4; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O4 + elif is-flag -O3; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O3 + elif is-flag -O1; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-O1 + elif is-flag -Os; then + mozconfig_annotate "from CFLAGS" --enable-optimize=-Os + else + mozconfig_annotate "Gentoo's default optimization" --enable-optimize=-O2 + fi + else + # Enable Mozilla's default + mozconfig_annotate "mozilla default" --enable-optimize + fi + + # Strip optimization so it does not end up in compile string + filter-flags '-O*' + + # Strip over-aggressive CFLAGS + use custom-cflags || strip-flags + + # Additional ARCH support + case "${ARCH}" in + arm) + # Reduce the memory requirements for linking + append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads + ;; + alpha) + # Historically we have needed to add -fPIC manually for 64-bit. + # Additionally, alpha should *always* build with -mieee for correct math + # operation + append-flags -fPIC -mieee + ;; + ia64) + # Historically we have needed to add this manually for 64-bit + append-flags -fPIC + ;; + ppc64) + append-flags -fPIC -mminimal-toc + # Reduce the memory requirements for linking + append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads + ;; + esac + + # We need to append flags for gcc-6 support + if [[ $(gcc-major-version) -ge 6 ]]; then + append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns -fno-schedule-insns2 + fi + + # Use the MOZILLA_FIVE_HOME for the rpath + append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags + + #################################### + # + # mozconfig setup + # + #################################### + + mozconfig_annotate disable_update_strip \ + --disable-updater \ + --disable-strip \ + --disable-install-strip + + # jemalloc won't build with older glibc + ! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate "we have old glibc" --disable-jemalloc +} + +# @FUNCTION: mozconfig_final +# @DESCRIPTION: +# Apply EXTRA_ECONF values to .mozconfig +# Display a table describing all configuration options paired +# with reasons, then clean up extensions list. +# This should be called in src_configure at the end of all other mozconfig_* functions. +mozconfig_final() { + declare ac opt hash reason + + # Apply EXTRA_ECONF entries to .mozconfig + if [[ -n ${EXTRA_ECONF} ]]; then + IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!} + for opt in "${ac[@]}"; do + mozconfig_annotate "EXTRA_ECONF" --${opt#--} + done + fi + + echo + echo "==========================================================" + echo "Building ${PF} with the following configuration" + grep ^ac_add_options .mozconfig | while read ac opt hash reason; do + [[ -z ${hash} || ${hash} == \# ]] \ + || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}" + printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}" + done + echo "==========================================================" + echo + + # Resolve multiple --enable-extensions down to one + declare exts=$(sed -n 's/^ac_add_options --enable-extensions=$[^ ]*$.*/\1/p' \ + .mozconfig | xargs) + sed -i '/^ac_add_options --enable-extensions/d' .mozconfig + echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig +} + +_MOZCORECONF=1 +fi diff -uNr a/eclass/mozextension.eclass b/eclass/mozextension.eclass --- a/eclass/mozextension.eclass false +++ b/eclass/mozextension.eclass e0656e035b265a46e7fc1abeca198966679ba8a7898007698a3d50928b6e55d2fde5ff8e612c745d3d4c73562f53ec9775de024ad5b85651d77bfb6002f4f6aa @@ -0,0 +1,95 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @ECLASS: mozextension.eclass +# @MAINTAINER: +# Mozilla team <mozilla@gentoo.org> +# @BLURB: Install extensions for use in mozilla products. +# +if [[ ! ${_MOZEXTENSION} ]]; then + +# @ECLASS-VARIABLE: MOZEXTENSION_TARGET +# @DESCRIPTION: +# This variable allows the installation path for xpi_install +# to be overridden from the default app-global extensions path. +# Default is empty, which installs to predetermined hard-coded +# paths specified in the eclass. +: ${MOZEXTENSION_TARGET:=""} + +inherit eutils + +DEPEND="app-arch/unzip" + +mozversion_extension_location() { + case ${PN} in + firefox|firefox-bin|palemoon) + if [[ $(get_version_component_range 1) -ge 21 ]] ; then + return 0 + fi + ;; + esac + + return 1 +} + +xpi_unpack() { + local xpi xpiname srcdir + + # Not gonna use ${A} as we are looking for a specific option being passed to function + # You must specify which xpi to use + [[ -z "$*" ]] && die "Nothing passed to the $FUNCNAME command. please pass which xpi to unpack" + + for xpi in "$@"; do + einfo "Unpacking ${xpi} to ${PWD}" + xpiname=$(basename ${xpi%.*}) + + if [[ "${xpi:0:2}" != "./" ]] && [[ "${xpi:0:1}" != "/" ]] ; then + srcdir="${DISTDIR}/" + fi + + [[ -s "${srcdir}${xpi}" ]] || die "${xpi} does not exist" + + case "${xpi##*.}" in + ZIP|zip|jar|xpi) + mkdir "${WORKDIR}/${xpiname}" && \ + unzip -qo "${srcdir}${xpi}" -d "${WORKDIR}/${xpiname}" || die "failed to unpack ${xpi}" + ;; + *) + einfo "unpack ${xpi}: file format not recognized. Ignoring." + ;; + esac + done +} + + +xpi_install() { + local emid + + # You must tell xpi_install which xpi to use + [[ ${#} -ne 1 ]] && die "$FUNCNAME takes exactly one argument, please specify an xpi to unpack" + + x="${1}" + #cd ${x} + # determine id for extension + if [[ -f "${x}"/install.rdf ]]; then + emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]$[^\"<>]*$[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \ + || die "failed to determine extension id from install.rdf" + elif [[ -f "${x}"/manifest.json ]]; then + emid="$( sed -n 's/.*"id": "$.*$",/\1/p' "${x}"/manifest.json )" \ + || die "failed to determine extension id from manifest.json" + else + die "failed to determine extension id" + fi + + if [[ -n ${MOZEXTENSION_TARGET} ]]; then + insinto "${MOZILLA_FIVE_HOME}"/${MOZEXTENSION_TARGET%/}/${emid} + elif $(mozversion_extension_location) ; then + insinto "${MOZILLA_FIVE_HOME}"/browser/extensions/${emid} + else + insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid} + fi + doins -r "${x}"/* || die "failed to copy extension" +} + +_MOZEXTENSION=1 +fi diff -uNr a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass --- a/eclass/mozlinguas-v2.eclass false +++ b/eclass/mozlinguas-v2.eclass aff86453dacc4f705a4b7f622301992ae98e254d3fcfbcab8ca5fe6f6901f6c7bcecb399c441b375a544c188bb15abc574ac821e8cc1dbc3ecf9bc3be7aad4c8 @@ -0,0 +1,375 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: mozlinguas-v2.eclass +# @MAINTAINER: +# mozilla@gentoo.org +# @AUTHOR: +# Nirbheek Chauhan <nirbheek@gentoo.org> +# Ian Stakenvicius <axs@gentoo.org> +# @BLURB: Handle language packs for mozilla products +# @DESCRIPTION: +# Sets IUSE according to MOZ_LANGS (language packs available). Also exports +# src_unpack, src_compile and src_install for use in ebuilds, and provides +# supporting functions for langpack generation and installation. + +inherit mozextension + +case "${EAPI:-0}" in + 0|1) + die "EAPI ${EAPI:-0} does not support the '->' SRC_URI operator";; + 2|3|4|5|6) + EXPORT_FUNCTIONS src_unpack src_compile src_install;; + *) + die "EAPI ${EAPI} is not supported, contact eclass maintainers";; +esac + +# @ECLASS-VARIABLE: MOZ_LANGS +# @DESCRIPTION: +# Array containing the list of language pack xpis available for +# this release. The list can be updated with scripts/get_langs.sh from the +# mozilla overlay. +: ${MOZ_LANGS:=()} + +# @ECLASS-VARIABLE: MOZ_PV +# @DESCRIPTION: +# Ebuild package version converted to equivalent upstream version. +# Defaults to ${PV}, and should be overridden for alphas, betas, and RCs +: ${MOZ_PV:="${PV}"} + +# @ECLASS-VARIABLE: MOZ_PN +# @DESCRIPTION: +# Ebuild package name converted to equivalent upstream name. +# Defaults to ${PN}, and should be overridden for binary ebuilds. +: ${MOZ_PN:="${PN}"} + +# @ECLASS-VARIABLE: MOZ_P +# @DESCRIPTION: +# Ebuild package name + version converted to upstream equivalent. +# Defaults to ${MOZ_PN}-${MOZ_PV} +: ${MOZ_P:="${MOZ_PN}-${MOZ_PV}"} + +# @ECLASS-VARIABLE: MOZ_FTP_URI +# @DESCRIPTION: +# The ftp URI prefix for the release tarballs and language packs. +: ${MOZ_FTP_URI:=""} + +# @ECLASS-VARIABLE: MOZ_HTTP_URI +# @DESCRIPTION: +# The http URI prefix for the release tarballs and language packs. +: ${MOZ_HTTP_URI:=""} + +# @ECLASS-VARIABLE: MOZ_LANGPACK_HTTP_URI +# @DESCRIPTION: +# An alternative http URI if it differs from official mozilla URI. +# Defaults to whatever MOZ_HTTP_URI was set to. +: ${MOZ_LANGPACK_HTTP_URI:=${MOZ_HTTP_URI}} + +# @ECLASS-VARIABLE: MOZ_LANGPACK_PREFIX +# @DESCRIPTION: +# The relative path till the lang code in the langpack file URI. +# Defaults to ${MOZ_PV}/linux-i686/xpi/ +: ${MOZ_LANGPACK_PREFIX:="${MOZ_PV}/linux-i686/xpi/"} + +# @ECLASS-VARIABLE: MOZ_LANGPACK_SUFFIX +# @DESCRIPTION: +# The suffix after the lang code in the langpack file URI. +# Defaults to '.xpi' +: ${MOZ_LANGPACK_SUFFIX:=".xpi"} + +# @ECLASS-VARIABLE: MOZ_LANGPACK_UNOFFICIAL +# @DESCRIPTION: +# The status of the langpack, used to differentiate within +# Manifests and on Gentoo mirrors as to when the langpacks are +# generated officially by Mozilla or if they were generated +# unofficially by others (ie the Gentoo mozilla team). When +# this var is set, the distfile will have a .unofficial.xpi +# suffix. +: ${MOZ_LANGPACK_UNOFFICIAL:=""} + +# @ECLASS-VARIABLE: MOZ_GENERATE_LANGPACKS +# @DESCRIPTION: +# This flag specifies whether or not the langpacks should be +# generated directly during the build process, rather than +# being downloaded and installed from upstream pre-built +# extensions. Primarily it supports pre-release builds. +# Defaults to empty. +: ${MOZ_GENERATE_LANGPACKS:=""} + +# @ECLASS-VARIABLE: MOZ_L10N_SOURCEDIR +# @DESCRIPTION: +# The path that l10n sources can be found at, once unpacked. +# Defaults to ${WORKDIR}/l10n-sources +: ${MOZ_L10N_SOURCEDIR:="${WORKDIR}/l10n-sources"} + +# @ECLASS-VARIABLE: MOZ_L10N_URI_PREFIX +# @DESCRIPTION: +# The full URI prefix of the distfile for each l10n locale. The +# AB_CD and MOZ_L10N_URI_SUFFIX will be appended to this to complete the +# SRC_URI when MOZ_GENERATE_LANGPACKS is set. If empty, nothing will +# be added to SRC_URI. +# Defaults to empty. +: ${MOZ_L10N_URI_PREFIX:=""} + +# @ECLASS-VARIABLE: MOZ_L10N_URI_SUFFIX +# @DESCRIPTION: +# The suffix of l10n source distfiles. +# Defaults to '.tar.xz' +: ${MOZ_L10N_URI_SUFFIX:=".tar.xz"} + +# @ECLASS-VARIABLE: MOZ_FORCE_UPSTREAM_L10N +# @DESCRIPTION: +# Set this to use upstream langpaks even if the package normally +# shouldn't (ie it is an alpha or beta package) +: ${MOZ_FORCE_UPSTREAM_L10N:=""} + + +# @ECLASS-VARIABLE: MOZ_TOO_REGIONALIZED_FOR_L10N +# @INTERNAL +# @DESCRIPTION: +# Upstream identifiers that should not contain region subtags in L10N +MOZ_TOO_REGIONALIZED_FOR_L10N=( fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO nn-NO pa-IN sv-SE ) + +# Add l10n_* to IUSE according to available language packs +# No language packs for alphas and betas +if ! [[ -n ${MOZ_GENERATE_LANGPACKS} ]] ; then + if ! [[ ${PV} =~ alpha|beta ]] || { [[ ${PN} == seamonkey ]] && ! [[ ${PV} =~ alpha ]] ; } || [[ -n ${MOZ_FORCE_UPSTREAM_L10N} ]] ; then + [[ -z ${MOZ_FTP_URI} ]] && [[ -z ${MOZ_LANGPACK_HTTP_URI} ]] && die "No URI set to download langpacks, please set one of MOZ_{FTP,HTTP_LANGPACK}_URI" + for x in "${MOZ_LANGS[@]}" ; do + # en and en_US are handled internally + if [[ ${x} == en ]] || [[ ${x} == en-US ]]; then + continue + fi + # strip region subtag if $x is in the list + if has ${x} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then + xflag=${x%%-*} + else + xflag=${x} + fi + SRC_URI+=" l10n_${xflag/[_@]/-}? (" + [[ -n ${MOZ_FTP_URI} ]] && SRC_URI+=" + ${MOZ_FTP_URI}/${MOZ_LANGPACK_PREFIX}${x}${MOZ_LANGPACK_SUFFIX} -> ${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}.xpi" + [[ -n ${MOZ_LANGPACK_HTTP_URI} ]] && SRC_URI+=" + ${MOZ_LANGPACK_HTTP_URI}/${MOZ_LANGPACK_PREFIX}${x}${MOZ_LANGPACK_SUFFIX} -> ${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}.xpi" + SRC_URI+=" )" + IUSE+=" l10n_${xflag/[_@]/-}" + # We used to do some magic if specific/generic locales were missing, but + # we stopped doing that due to bug 325195. + done + fi +else + for x in "${MOZ_LANGS[@]}" ; do + # en and en_US are handled internally + if [[ ${x} == en ]] || [[ ${x} == en-US ]]; then + continue + fi + # strip region subtag if $x is in the list + if has ${x} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then + xflag=${x%%-*} + else + xflag=${x} + fi +# Do NOT grab l10n sources from hg tip at this time, since it is a moving target +# if [[ ${PV} =~ alpha ]]; then +# # Please note that this URI is not deterministic - digest breakage could occur +# SRC_URI+=" l10n_${xflag/[_@]/-}? ( http://hg.mozilla.org/releases/l10n/mozilla-aurora/ach/archive/tip.tar.bz2 -> ${MOZ_P}-l10n-${x}.tar.bz2 )" +# elif [[ ${PV} =~ beta ]] && ! [[ ${PN} == seamonkey ]]; then +# # Please note that this URI is not deterministic - digest breakage could occur +# SRC_URI+=" l10n_${xflag/[_@]/-}? ( http://hg.mozilla.org/releases/l10n/mozilla-beta/ach/archive/tip.tar.bz2 -> ${MOZ_P}-l10n-${x}.tar.bz2 )" +# elif [[ -n ${MOZ_L10N_URI_PREFIX} ]]; then + if [[ -n ${MOZ_L10N_URI_PREFIX} ]]; then + SRC_URI+=" l10n_${xflag/[_@]/-}? ( ${MOZ_L10N_URI_PREFIX}${x}${MOZ_L10N_URI_SUFFIX} )" + fi + IUSE+=" l10n_${xflag/[_@]/-}" + done +fi +unset x xflag + +# @FUNCTION: mozlinguas_export +# @INTERNAL +# @DESCRIPTION: +# Generate the list of language packs called "mozlinguas" +# This list is used to unpack and install the xpi language packs +mozlinguas_export() { + if [[ ${PN} == seamonkey ]] ; then + [[ ${PV} =~ alpha ]] && ! [[ -n ${MOZ_GENERATE_LANGPACKS} ]] && return + else + [[ ${PV} =~ alpha|beta ]] && ! [[ -n ${MOZ_GENERATE_LANGPACKS} ]] && return + fi + local lingua lflag + mozlinguas=() + # Set mozlinguas based on the enabled l10n_* USE flags. + for lingua in "${MOZ_LANGS[@]}"; do + # strip region subtag if $x is in the list + if has ${lingua} en en-US; then + # For mozilla products, en and en_US are handled internally + continue + elif has ${lingua} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then + lflag=${lingua%%-*} + else + lflag=${lingua} + fi + use l10n_${lflag/[_@]/-} && mozlinguas+=( ${lingua} ) + done + # Compatibility code - Check LINGUAS and warn if anything set there isn't enabled via l10n + for lingua in ${LINGUAS}; do + if has ${lingua//[_@]/-} en en-US; then + # For mozilla products, en and en_US are handled internally + continue + # If this language is supported by ${P}, + elif has ${lingua} "${MOZ_LANGS[@]//-/_}"; then + # Warn the language is missing, if it isn't already there + has ${lingua//[_@]/-} "${mozlinguas[@]//[_@]/-}" || \ + ewarn "LINGUAS value ${lingua} is not enabled using L10N use flags" + continue + # For each short lingua that isn't in MOZ_LANGS, + # We used to add *all* long MOZ_LANGS to the mozlinguas list, + # but we stopped doing that due to bug 325195. + else + : + fi + einfo "Sorry, but ${P} does not support the ${lingua} locale in LINGUAS" + done +} + +# @FUNCTION: mozlinguas_src_unpack +# @DESCRIPTION: +# Unpack xpi language packs according to the user's LINGUAS settings +mozlinguas_src_unpack() { + local x + if ! [[ -n ${MOZ_GENERATE_LANGPACKS} ]]; then + mozlinguas_export + for x in "${mozlinguas[@]}"; do + # FIXME: Add support for unpacking xpis to portage + xpi_unpack "${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}.xpi" + done + if [[ "${mozlinguas[*]}" != "" && "${mozlinguas[*]}" != "en" ]]; then + einfo "Selected language packs (first will be default): ${mozlinguas[*]}" + fi + fi +} +# For the phase function export +mozlinguas-v2_src_unpack() { + mozlinguas_src_unpack +} + + +# @FUNCTION: mozlinguas_mozconfig +# @DESCRIPTION: +# if applicable, add the necessary flag to .mozconfig to support +# the generation of locales. Note that this function requires +# mozconfig_annontate to already be declared via an inherit of +# mozconfig or mozcoreconf. +mozlinguas_mozconfig() { + if [[ -n ${MOZ_GENERATE_LANGPACKS} ]]; then + if declare -f mozconfig_annotate >/dev/null ; then + mozconfig_annotate 'for building locales' --with-l10n-base=${MOZ_L10N_SOURCEDIR} + else + die "Could not configure l10n-base, mozconfig_annotate not declared -- missing inherit?" + fi + fi +} + +# @FUNCTION: mozlinguas_src_compile +# @DESCRIPTION: +# if applicable, build the selected locales. +mozlinguas_src_compile() { + if [[ -n ${MOZ_GENERATE_LANGPACKS} ]]; then + # leverage BUILD_OBJ_DIR if set otherwise assume PWD. + local x y targets=( "langpack" ) localedir="${BUILD_OBJ_DIR:-.}" + case ${PN} in + *firefox) + localedir+="/browser/locales" + ;; + seamonkey) + localedir+="/suite/locales" + ;; + *thunderbird) + localedir+="/mail/locales" + targets+=( "calendar-langpack" ) + ;; + *) die "Building locales for ${PN} is not supported." + esac + pushd "${localedir}" > /dev/null || die + mozlinguas_export + for x in "${mozlinguas[@]}"; do for y in "${targets[@]}"; do + emake ${y}-${x} LOCALE_MERGEDIR="./${y}-${x}" + done; done + popd > /dev/null || die + fi +} + +# For the phase function export +mozlinguas-v2_src_compile() { + mozlinguas_src_compile +} + +# @FUNCTION: mozlinguas_xpistage_langpacks +# @DESCRIPTION: +# Add extra langpacks to the xpi-stage dir for prebuilt plugins +# +# First argument is the path to the extension +# Second argument is the prefix of the source (same as first if unspecified) +# Remaining arguments are the modules in the extension that are localized +# (basename of first if unspecified) +# +# Example - installing extra langpacks for lightning: +# src_install() { +# ... # general installation steps +# mozlinguas_xpistage_langpacks \ +# "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \ +# "${WORKDIR}"/lightning \ +# lightning calendar +# ... # proceed with installation from the xpi-stage dir +# } + +mozlinguas_xpistage_langpacks() { + local l c modpath="${1}" srcprefix="${1}" modules=( "${1##*/}" ) + shift + if [[ -n ${1} ]] ; then srcprefix="${1}" ; shift ; fi + if [[ -n ${1} ]] ; then modules=( $@ ) ; fi + + mozlinguas_export + mkdir -p "${modpath}/chrome" || die + for l in "${mozlinguas[@]}"; do for c in "${modules[@]}" ; do + if [[ -e "${srcprefix}-${l}/chrome/${c}-${l}" ]]; then + cp -RLp -t "${modpath}/chrome" "${srcprefix}-${l}/chrome/${c}-${l}" || die + grep "locale ${c} ${l} chrome/" "${srcprefix}-${l}/chrome.manifest" \ + >>"${modpath}/chrome.manifest" || die + elif [[ -e "${srcprefix}/chrome/${c}-${l}" ]]; then + cp -RLp -t "${modpath}/chrome" "${srcprefix}/chrome/${c}-${l}" || die + grep "locale ${c} ${l} chrome/" "${srcprefix}/chrome.manifest" \ + >>"${modpath}/chrome.manifest" || die + else + ewarn "Locale ${l} was not found for ${c}, skipping." + fi + done; done +} + +# @FUNCTION: mozlinguas-v2_src_install +# @DESCRIPTION: +# Install xpi language packs according to the user's L10N settings +# NOTE - uses ${BUILD_OBJ_DIR} or PWD if unset, for source-generated langpacks +mozlinguas_src_install() { + local x + mozlinguas_export + if [[ -n ${MOZ_GENERATE_LANGPACKS} ]] && [[ -n ${mozlinguas[*]} ]]; then + local repopath="${WORKDIR}/${PN}-generated-langpacks" + mkdir -p "${repopath}" || die + pushd "${BUILD_OBJ_DIR:-.}"/dist/*/xpi > /dev/null || die + for x in "${mozlinguas[@]}"; do + cp "${MOZ_P}.${x}.langpack.xpi" \ + "${repopath}/${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}.xpi" || die + xpi_unpack "${repopath}/${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}.xpi" + done + popd > /dev/null || die + fi + for x in "${mozlinguas[@]}"; do + xpi_install "${WORKDIR}/${MOZ_P}-${x}${MOZ_LANGPACK_UNOFFICIAL:+.unofficial}" + done +} + +# For the phase function export +mozlinguas-v2_src_install() { + mozlinguas_src_install +} diff -uNr a/eclass/multibuild.eclass b/eclass/multibuild.eclass --- a/eclass/multibuild.eclass false +++ b/eclass/multibuild.eclass ff38711aef9a24eb3a7e8915bbc0bc198dfee8ce16fe5d4c5115b41c1af9e7648f9384a18e17bac5dc37023e0e7e7b7fcdc5f19ec14061634ec1989f5056910d @@ -0,0 +1,270 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: multibuild.eclass +# @MAINTAINER: +# Michał Górny <mgorny@gentoo.org> +# @AUTHOR: +# Author: Michał Górny <mgorny@gentoo.org> +# @BLURB: A generic eclass for building multiple variants of packages. +# @DESCRIPTION: +# The multibuild eclass aims to provide a generic framework for building +# multiple 'variants' of a package (e.g. multilib, Python +# implementations). + +case "${EAPI:-0}" in + 0|1|2|3) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 4|5|6|7) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +if [[ ! ${_MULTIBUILD} ]]; then + +# @ECLASS-VARIABLE: MULTIBUILD_VARIANTS +# @DESCRIPTION: +# An array specifying all enabled variants which multibuild_foreach* +# can execute the process for. +# +# In ebuild, it can be set in global scope. Eclasses should set it +# locally in function scope to support nesting properly. +# +# Example: +# @CODE +# python_foreach_impl() { +# local MULTIBUILD_VARIANTS=( python{2_5,2_6,2_7} ... ) +# multibuild_foreach_variant python_compile +# } +# @CODE + +# @ECLASS-VARIABLE: MULTIBUILD_VARIANT +# @DESCRIPTION: +# The current variant which the function was executed for. +# +# Example value: +# @CODE +# python2_6 +# @CODE + +# @ECLASS-VARIABLE: MULTIBUILD_ID +# @DESCRIPTION: +# The unique identifier for a multibuild run. In a simple run, it is +# equal to MULTIBUILD_VARIANT. In a nested multibuild environment, it +# contains the complete selection tree. +# +# It can be used to create variant-unique directories and files. +# +# Example value: +# @CODE +# amd64-double +# @CODE + +# @ECLASS-VARIABLE: BUILD_DIR +# @DESCRIPTION: +# The current build directory. In global scope, it is supposed +# to contain an 'initial' build directory. If unset, ${S} is used. +# +# multibuild_foreach_variant() sets BUILD_DIR locally +# to variant-specific build directories based on the initial value +# of BUILD_DIR. +# +# Example value: +# @CODE +# ${WORKDIR}/foo-1.3-python2_6 +# @CODE + +# @FUNCTION: multibuild_foreach_variant +# @USAGE: [<argv>...] +# @DESCRIPTION: +# Run the passed command repeatedly for each of the enabled package +# variants. +# +# Each of the runs will have variant-specific BUILD_DIR set, and output +# teed to a separate log in ${T}. +# +# The function returns 0 if all commands return 0, or the first non-zero +# exit status otherwise. However, it performs all the invocations +# nevertheless. It is preferred to call 'die' inside of the passed +# function. +multibuild_foreach_variant() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${MULTIBUILD_VARIANTS} ]] \ + || die "MULTIBUILD_VARIANTS need to be set" + + local bdir=${BUILD_DIR:-${S}} + + # Avoid writing outside WORKDIR if S=${WORKDIR}. + [[ ${bdir%%/} == ${WORKDIR%%/} ]] && bdir=${WORKDIR}/build + + local prev_id=${MULTIBUILD_ID:+${MULTIBUILD_ID}-} + local ret=0 lret=0 v + + debug-print "${FUNCNAME}: initial build_dir = ${bdir}" + + for v in "${MULTIBUILD_VARIANTS[@]}"; do + local MULTIBUILD_VARIANT=${v} + local MULTIBUILD_ID=${prev_id}${v} + local BUILD_DIR=${bdir%%/}-${v} + + _multibuild_run() { + # find the first non-private command + local i=1 + while [[ ${!i} == _* ]]; do + (( i += 1 )) + done + + [[ ${i} -le ${#} ]] && einfo "${v}: running ${@:${i}}" + "${@}" + } + + _multibuild_run "${@}" \ + > >(exec tee -a "${T}/build-${MULTIBUILD_ID}.log") 2>&1 + lret=${?} + done + [[ ${ret} -eq 0 && ${lret} -ne 0 ]] && ret=${lret} + + return ${ret} +} + +# @FUNCTION: multibuild_parallel_foreach_variant +# @USAGE: [<argv>...] +# @DESCRIPTION: +# Run the passed command repeatedly for each of the enabled package +# variants. This used to run the commands in parallel but now it's +# just a deprecated alias to multibuild_foreach_variant. +# +# The function returns 0 if all commands return 0, or the first non-zero +# exit status otherwise. However, it performs all the invocations +# nevertheless. It is preferred to call 'die' inside of the passed +# function. +multibuild_parallel_foreach_variant() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}" + + multibuild_foreach_variant "${@}" +} + +# @FUNCTION: multibuild_for_best_variant +# @USAGE: [<argv>...] +# @DESCRIPTION: +# Run the passed command once, for the best of the enabled package +# variants. +# +# The run will have a proper, variant-specificBUILD_DIR set, and output +# teed to a separate log in ${T}. +# +# The function returns command exit status. +multibuild_for_best_variant() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${MULTIBUILD_VARIANTS} ]] \ + || die "MULTIBUILD_VARIANTS need to be set" + + # bash-4.1 can't handle negative subscripts + local MULTIBUILD_VARIANTS=( + "${MULTIBUILD_VARIANTS[$(( ${#MULTIBUILD_VARIANTS[@]} - 1 ))]}" + ) + multibuild_foreach_variant "${@}" +} + +# @FUNCTION: multibuild_copy_sources +# @DESCRIPTION: +# Create per-variant copies of source tree. The source tree is assumed +# to be in ${BUILD_DIR}, or ${S} if the former is unset. The copies will +# be placed in directories matching BUILD_DIRs used by +# multibuild_foreach(). +multibuild_copy_sources() { + debug-print-function ${FUNCNAME} "${@}" + + local _MULTIBUILD_INITIAL_BUILD_DIR=${BUILD_DIR:-${S}} + + einfo "Will copy sources from ${_MULTIBUILD_INITIAL_BUILD_DIR}" + + local cp_args=() + if cp --reflink=auto --version &>/dev/null; then + # enable reflinking if possible to make this faster + cp_args+=( --reflink=auto ) + fi + + _multibuild_create_source_copy() { + einfo "${MULTIBUILD_VARIANT}: copying to ${BUILD_DIR}" + cp -p -R "${cp_args[@]}" \ + "${_MULTIBUILD_INITIAL_BUILD_DIR}" "${BUILD_DIR}" || die + } + + multibuild_foreach_variant _multibuild_create_source_copy +} + +# @FUNCTION: run_in_build_dir +# @USAGE: <argv>... +# @DESCRIPTION: +# Run the given command in the directory pointed by BUILD_DIR. +run_in_build_dir() { + debug-print-function ${FUNCNAME} "${@}" + local ret + + [[ ${#} -ne 0 ]] || die "${FUNCNAME}: no command specified." + [[ ${BUILD_DIR} ]] || die "${FUNCNAME}: BUILD_DIR not set." + + mkdir -p "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + "${@}" + ret=${?} + popd >/dev/null || die + + return ${ret} +} + +# @FUNCTION: multibuild_merge_root +# @USAGE: <src-root> <dest-root> +# @DESCRIPTION: +# Merge the directory tree (fake root) from <src-root> to <dest-root> +# (the real root). Both directories have to be real, absolute paths +# (i.e. including ${D}). Source root will be removed. +multibuild_merge_root() { + local src=${1} + local dest=${2} + + local ret + + if use userland_BSD; then + # Most of BSD variants fail to copy broken symlinks, #447370 + # also, they do not support --version + + tar -C "${src}" -f - -c . \ + | tar -x -f - -C "${dest}" + [[ ${PIPESTATUS[*]} == '0 0' ]] + ret=${?} + else + local cp_args=() + + if cp -a --version &>/dev/null; then + cp_args+=( -a ) + else + cp_args+=( -P -R -p ) + fi + + if cp --reflink=auto --version &>/dev/null; then + # enable reflinking if possible to make this faster + cp_args+=( --reflink=auto ) + fi + + cp "${cp_args[@]}" "${src}"/. "${dest}"/ + ret=${?} + fi + + if [[ ${ret} -ne 0 ]]; then + die "${MULTIBUILD_VARIANT:-(unknown)}: merging image failed." + fi + + rm -rf "${src}" +} + +_MULTIBUILD=1 +fi diff -uNr a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass --- a/eclass/multilib-build.eclass false +++ b/eclass/multilib-build.eclass 04fb3525f3877ca6c909372a6f4d207996ca833db5e040d0901ef7bf6e174a3f85da0c5fa04760b926615e3711baeee5cb54ed6755814385c9cdc659e97bf480 @@ -0,0 +1,672 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: multilib-build.eclass +# @MAINTAINER: +# gx86-multilib team <multilib@gentoo.org> +# @AUTHOR: +# Author: Michał Górny <mgorny@gentoo.org> +# @BLURB: flags and utility functions for building multilib packages +# @DESCRIPTION: +# The multilib-build.eclass exports USE flags and utility functions +# necessary to build packages for multilib in a clean and uniform +# manner. +# +# Please note that dependency specifications for multilib-capable +# dependencies shall use the USE dependency string in ${MULTILIB_USEDEP} +# to properly request multilib enabled. + +if [[ ! ${_MULTILIB_BUILD} ]]; then + +# EAPI=4 is required for meaningful MULTILIB_USEDEP. +case ${EAPI:-0} in + 4|5|6|7) ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +[[ ${EAPI} == [45] ]] && inherit eutils +inherit multibuild multilib + +# @ECLASS-VARIABLE: _MULTILIB_FLAGS +# @INTERNAL +# @DESCRIPTION: +# The list of multilib flags and corresponding ABI values. If the same +# flag is reused for multiple ABIs (e.g. x86 on Linux&FreeBSD), multiple +# ABIs may be separated by commas. +# +# Please contact multilib before modifying this list. This way we can +# ensure that every *preliminary* work is done and the multilib can be +# extended safely. +_MULTILIB_FLAGS=( + abi_x86_32:x86,x86_fbsd,x86_freebsd,x86_linux,x86_macos,x86_solaris + abi_x86_64:amd64,amd64_fbsd,x64_freebsd,amd64_linux,x64_macos,x64_solaris + abi_x86_x32:x32 + abi_mips_n32:n32 + abi_mips_n64:n64 + abi_mips_o32:o32 + abi_ppc_32:ppc,ppc_aix,ppc_macos + abi_ppc_64:ppc64 + abi_s390_32:s390 + abi_s390_64:s390x +) +readonly _MULTILIB_FLAGS + +# @ECLASS-VARIABLE: MULTILIB_COMPAT +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of multilib ABIs supported by the ebuild. If unset, defaults to +# all ABIs supported by the eclass. +# +# This variable is intended for use in prebuilt multilib packages that +# can provide binaries only for a limited set of ABIs. If ABIs need to +# be limited due to a bug in source code, package.use.mask is to be used +# instead. Along with MULTILIB_COMPAT, KEYWORDS should contain '-*'. +# +# Note that setting this variable effectively disables support for all +# other ABIs, including other architectures. For example, specifying +# abi_x86_{32,64} disables support for MIPS as well. +# +# The value of MULTILIB_COMPAT determines the value of IUSE. If set, it +# also enables REQUIRED_USE constraints. +# +# Example use: +# @CODE +# # Upstream provides binaries for x86 & amd64 only +# MULTILIB_COMPAT=( abi_x86_{32,64} ) +# @CODE + +# @ECLASS-VARIABLE: MULTILIB_USEDEP +# @DESCRIPTION: +# The USE-dependency to be used on dependencies (libraries) needing +# to support multilib as well. +# +# Example use: +# @CODE +# RDEPEND="dev-libs/libfoo[${MULTILIB_USEDEP}] +# net-libs/libbar[ssl,${MULTILIB_USEDEP}]" +# @CODE + +# @ECLASS-VARIABLE: MULTILIB_ABI_FLAG +# @DEFAULT_UNSET +# @DESCRIPTION: +# The complete ABI name. Resembles the USE flag name. +# +# This is set within multilib_foreach_abi(), +# multilib_parallel_foreach_abi() and multilib-minimal sub-phase +# functions. +# +# It may be null (empty) when the build is done on ABI not controlled +# by a USE flag (e.g. on non-multilib arch or when using multilib +# portage). The build will always be done for a single ABI then. +# +# Example value: +# @CODE +# abi_x86_64 +# @CODE + +_multilib_build_set_globals() { + local flags=( "${_MULTILIB_FLAGS[@]%:*}" ) + + if [[ ${MULTILIB_COMPAT[@]} ]]; then + # Validate MULTILIB_COMPAT and filter out the flags. + local f + for f in "${MULTILIB_COMPAT[@]}"; do + if ! has "${f}" "${flags[@]}"; then + die "Invalid value in MULTILIB_COMPAT: ${f}" + fi + done + + flags=( "${MULTILIB_COMPAT[@]}" ) + + REQUIRED_USE="|| ( ${flags[*]} )" + fi + + local usedeps=${flags[@]/%/(-)?} + + IUSE=${flags[*]} + MULTILIB_USEDEP=${usedeps// /,} + readonly MULTILIB_USEDEP +} +_multilib_build_set_globals +unset -f _multilib_build_set_globals + +# @FUNCTION: multilib_get_enabled_abis +# @DESCRIPTION: +# Return the ordered list of enabled ABIs if multilib builds +# are enabled. The best (most preferred) ABI will come last. +# +# If multilib is disabled, the default ABI will be returned +# in order to enforce consistent testing with multilib code. +multilib_get_enabled_abis() { + debug-print-function ${FUNCNAME} "${@}" + + local pairs=( $(multilib_get_enabled_abi_pairs) ) + echo "${pairs[@]#*.}" +} + +# @FUNCTION: multilib_get_enabled_abi_pairs +# @DESCRIPTION: +# Return the ordered list of enabled <use-flag>.<ABI> pairs +# if multilib builds are enabled. The best (most preferred) +# ABI will come last. +# +# If multilib is disabled, the default ABI will be returned +# along with empty <use-flag>. +multilib_get_enabled_abi_pairs() { + debug-print-function ${FUNCNAME} "${@}" + + local abis=( $(get_all_abis) ) + + local abi i found + for abi in "${abis[@]}"; do + for i in "${_MULTILIB_FLAGS[@]}"; do + local m_abis=${i#*:} m_abi + local m_flag=${i%:*} + + # split on ,; we can't switch IFS for function scope because + # paludis is broken (bug #486592), and switching it locally + # for the split is more complex than cheating like this + for m_abi in ${m_abis//,/ }; do + if [[ ${m_abi} == ${abi} ]] \ + && { [[ ! "${MULTILIB_COMPAT[@]}" ]] || has "${m_flag}" "${MULTILIB_COMPAT[@]}"; } \ + && use "${m_flag}" + then + echo "${m_flag}.${abi}" + found=1 + break 2 + fi + done + done + done + + if [[ ! ${found} ]]; then + # ${ABI} can be used to override the fallback (multilib-portage), + # ${DEFAULT_ABI} is the safe fallback. + local abi=${ABI:-${DEFAULT_ABI}} + + debug-print "${FUNCNAME}: no ABIs enabled, fallback to ${abi}" + debug-print "${FUNCNAME}: ABI=${ABI}, DEFAULT_ABI=${DEFAULT_ABI}" + echo ".${abi}" + fi +} + +# @FUNCTION: _multilib_multibuild_wrapper +# @USAGE: <argv>... +# @INTERNAL +# @DESCRIPTION: +# Initialize the environment for ABI selected for multibuild. +_multilib_multibuild_wrapper() { + debug-print-function ${FUNCNAME} "${@}" + + local ABI=${MULTIBUILD_VARIANT#*.} + local -r MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%.*} + + multilib_toolchain_setup "${ABI}" + readonly ABI + "${@}" +} + +# @FUNCTION: multilib_foreach_abi +# @USAGE: <argv>... +# @DESCRIPTION: +# If multilib support is enabled, sets the toolchain up for each +# supported ABI along with the ABI variable and correct BUILD_DIR, +# and runs the given commands with them. +# +# If multilib support is disabled, it just runs the commands. No setup +# is done. +multilib_foreach_abi() { + debug-print-function ${FUNCNAME} "${@}" + + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) + multibuild_foreach_variant _multilib_multibuild_wrapper "${@}" +} + +# @FUNCTION: multilib_parallel_foreach_abi +# @USAGE: <argv>... +# @DESCRIPTION: +# If multilib support is enabled, sets the toolchain up for each +# supported ABI along with the ABI variable and correct BUILD_DIR, +# and runs the given commands with them. +# +# If multilib support is disabled, it just runs the commands. No setup +# is done. +# +# This function used to run multiple commands in parallel. Now it's just +# a deprecated alias to multilib_foreach_abi. +multilib_parallel_foreach_abi() { + debug-print-function ${FUNCNAME} "${@}" + + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) + multibuild_foreach_variant _multilib_multibuild_wrapper "${@}" +} + +# @FUNCTION: multilib_for_best_abi +# @USAGE: <argv>... +# @DESCRIPTION: +# Runs the given command with setup for the 'best' (usually native) ABI. +multilib_for_best_abi() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" + + eqawarn "QA warning: multilib_for_best_abi() function is deprecated and should" + eqawarn "not be used. The multilib_is_native_abi() check may be used instead." + + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) + + multibuild_for_best_variant _multilib_multibuild_wrapper "${@}" +} + +# @FUNCTION: multilib_check_headers +# @DESCRIPTION: +# Check whether the header files are consistent between ABIs. +# +# This function needs to be called after each ABI's installation phase. +# It obtains the header file checksums and compares them with previous +# runs (if any). Dies if header files differ. +multilib_check_headers() { + _multilib_header_cksum() { + set -o pipefail + + if [[ -d ${ED%/}/usr/include ]]; then + find "${ED%/}"/usr/include -type f \ + -exec cksum {} + | sort -k2 + fi + } + + local cksum cksum_prev + local cksum_file=${T}/.multilib_header_cksum + cksum=$(_multilib_header_cksum) || die + unset -f _multilib_header_cksum + + if [[ -f ${cksum_file} ]]; then + cksum_prev=$(< "${cksum_file}") || die + + if [[ ${cksum} != ${cksum_prev} ]]; then + echo "${cksum}" > "${cksum_file}.new" || die + + eerror "Header files have changed between ABIs." + + if type -p diff &>/dev/null; then + eerror "$(diff -du "${cksum_file}" "${cksum_file}.new")" + else + eerror "Old checksums in: ${cksum_file}" + eerror "New checksums in: ${cksum_file}.new" + fi + + die "Header checksum mismatch, aborting." + fi + else + echo "${cksum}" > "${cksum_file}" || die + fi +} + +# @FUNCTION: multilib_copy_sources +# @DESCRIPTION: +# Create a single copy of the package sources for each enabled ABI. +# +# The sources are always copied from initial BUILD_DIR (or S if unset) +# to ABI-specific build directory matching BUILD_DIR used by +# multilib_foreach_abi(). +multilib_copy_sources() { + debug-print-function ${FUNCNAME} "${@}" + + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) + multibuild_copy_sources +} + +# @ECLASS-VARIABLE: MULTILIB_WRAPPED_HEADERS +# @DESCRIPTION: +# A list of headers to wrap for multilib support. The listed headers +# will be moved to a non-standard location and replaced with a file +# including them conditionally to current ABI. +# +# This variable has to be a bash array. Paths shall be relative to +# installation root (${ED}), and name regular files. Recursive wrapping +# is not supported. +# +# Please note that header wrapping is *discouraged*. It is preferred to +# install all headers in a subdirectory of libdir and use pkg-config to +# locate the headers. Some C preprocessors will not work with wrapped +# headers. +# +# Example: +# @CODE +# MULTILIB_WRAPPED_HEADERS=( +# /usr/include/foobar/config.h +# ) +# @CODE + +# @ECLASS-VARIABLE: MULTILIB_CHOST_TOOLS +# @DESCRIPTION: +# A list of tool executables to preserve for each multilib ABI. +# The listed executables will be renamed to ${CHOST}-${basename}, +# and the native variant will be symlinked to the generic name. +# +# This variable has to be a bash array. Paths shall be relative to +# installation root (${ED}), and name regular files or symbolic +# links to regular files. Recursive wrapping is not supported. +# +# If symbolic link is passed, both symlink path and symlink target +# will be changed. As a result, the symlink target is expected +# to be wrapped as well (either by listing in MULTILIB_CHOST_TOOLS +# or externally). +# +# Please note that tool wrapping is *discouraged*. It is preferred to +# install pkg-config files for each ABI, and require reverse +# dependencies to use that. +# +# Packages that search for tools properly (e.g. using AC_PATH_TOOL +# macro) will find the wrapper executables automatically. Other packages +# will need explicit override of tool paths. +# +# Example: +# @CODE +# MULTILIB_CHOST_TOOLS=( +# /usr/bin/foo-config +# ) + +# @CODE +# @FUNCTION: multilib_prepare_wrappers +# @USAGE: [<install-root>] +# @DESCRIPTION: +# Perform the preparation of all kinds of wrappers for the current ABI. +# This function shall be called once per each ABI, after installing +# the files to be wrapped. +# +# Takes an optional custom <install-root> from which files will be +# used. If no root is specified, uses ${ED}. +# +# The files to be wrapped are specified using separate variables, +# e.g. MULTILIB_WRAPPED_HEADERS. Those variables shall not be changed +# between the successive calls to multilib_prepare_wrappers +# and multilib_install_wrappers. +# +# After all wrappers are prepared, multilib_install_wrappers shall +# be called to commit them to the installation tree. +multilib_prepare_wrappers() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" + + local root=${1:-${ED%/}} + local f + + if [[ ${COMPLETE_MULTILIB} == yes ]]; then + # symlink '${CHOST}-foo -> foo' to support abi-wrapper while + # keeping ${CHOST}-foo calls correct. + + for f in "${MULTILIB_CHOST_TOOLS[@]}"; do + # drop leading slash if it's there + f=${f#/} + + local dir=${f%/*} + local fn=${f##*/} + + ln -s "${fn}" "${root}/${dir}/${CHOST}-${fn}" || die + done + + return + fi + + for f in "${MULTILIB_CHOST_TOOLS[@]}"; do + # drop leading slash if it's there + f=${f#/} + + local dir=${f%/*} + local fn=${f##*/} + + if [[ -L ${root}/${f} ]]; then + # rewrite the symlink target + local target + target=$(readlink "${root}/${f}") || die + local target_dir target_fn=${target##*/} + + [[ ${target} == */* ]] && target_dir=${target%/*} + + ln -f -s "${target_dir+${target_dir}/}${CHOST}-${target_fn}" \ + "${root}/${f}" || die + fi + + mv "${root}/${f}" "${root}/${dir}/${CHOST}-${fn}" || die + + # symlink the native one back + if multilib_is_native_abi; then + ln -s "${CHOST}-${fn}" "${root}/${f}" || die + fi + done + + if [[ ${MULTILIB_WRAPPED_HEADERS[@]} ]]; then + # If abi_flag is unset, then header wrapping is unsupported on + # this ABI. This means the arch doesn't support multilib at all + # -- in this case, the headers are not wrapped and everything + # works as expected. + + if [[ ${MULTILIB_ABI_FLAG} ]]; then + for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do + # drop leading slash if it's there + f=${f#/} + + if [[ ${f} != usr/include/* ]]; then + die "Wrapping headers outside of /usr/include is not supported at the moment." + fi + # and then usr/include + f=${f#usr/include} + + local dir=${f%/*} + + # Some ABIs may have install less files than others. + if [[ -f ${root}/usr/include${f} ]]; then + local wrapper=${ED%/}/tmp/multilib-include${f} + + if [[ ! -f ${ED%/}/tmp/multilib-include${f} ]]; then + dodir "/tmp/multilib-include${dir}" + # a generic template + cat > "${wrapper}" <<_EOF_ || die +/* This file is auto-generated by multilib-build.eclass + * as a multilib-friendly wrapper. For the original content, + * please see the files that are #included below. + */ + +#if defined(__x86_64__) /* amd64 */ +# if defined(__ILP32__) /* x32 ABI */ +# error "abi_x86_x32 not supported by the package." +# else /* 64-bit ABI */ +# error "abi_x86_64 not supported by the package." +# endif +#elif defined(__i386__) /* plain x86 */ +# error "abi_x86_32 not supported by the package." +#elif defined(__mips__) +# if(_MIPS_SIM == _ABIN32) /* n32 */ +# error "abi_mips_n32 not supported by the package." +# elif(_MIPS_SIM == _ABI64) /* n64 */ +# error "abi_mips_n64 not supported by the package." +# elif(_MIPS_SIM == _ABIO32) /* o32 */ +# error "abi_mips_o32 not supported by the package." +# endif +#elif defined(__sparc__) +# if defined(__arch64__) +# error "abi_sparc_64 not supported by the package." +# else +# error "abi_sparc_32 not supported by the package." +# endif +#elif defined(__s390__) +# if defined(__s390x__) +# error "abi_s390_64 not supported by the package." +# else +# error "abi_s390_32 not supported by the package." +# endif +#elif defined(__powerpc__) || defined(__ppc__) +# if defined(__powerpc64__) || defined(__ppc64__) +# error "abi_ppc_64 not supported by the package." +# else +# error "abi_ppc_32 not supported by the package." +# endif +#elif defined(SWIG) /* https://sourceforge.net/p/swig/bugs/799/ */ +# error "Native ABI not supported by the package." +#else +# error "No ABI matched, please report a bug to bugs.gentoo.org" +#endif +_EOF_ + fi + + if ! grep -q "${MULTILIB_ABI_FLAG} " "${wrapper}" + then + die "Flag ${MULTILIB_ABI_FLAG} not listed in wrapper template. Please report a bug to https://bugs.gentoo.org." + fi + + # $CHOST shall be set by multilib_toolchain_setup + dodir "/tmp/multilib-include/${CHOST}${dir}" + mv "${root}/usr/include${f}" "${ED%/}/tmp/multilib-include/${CHOST}${dir}/" || die + + # Note: match a space afterwards to avoid collision potential. + sed -e "/${MULTILIB_ABI_FLAG} /s&error.*&include <${CHOST}${f}>&" \ + -i "${wrapper}" || die + + # Needed for swig. + if multilib_is_native_abi; then + sed -e "/Native ABI/s&error.*&include <${CHOST}${f}>&" \ + -i "${wrapper}" || die + fi + fi + done + fi + fi +} + +# @FUNCTION: multilib_install_wrappers +# @USAGE: [<install-root>] +# @DESCRIPTION: +# Install the previously-prepared wrappers. This function shall +# be called once, after all wrappers were prepared. +# +# Takes an optional custom <install-root> to which the wrappers will be +# installed. If no root is specified, uses ${ED}. There is no need to +# use the same root as when preparing the wrappers. +# +# The files to be wrapped are specified using separate variables, +# e.g. MULTILIB_WRAPPED_HEADERS. Those variables shall not be changed +# between the calls to multilib_prepare_wrappers +# and multilib_install_wrappers. +multilib_install_wrappers() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" + + [[ ${COMPLETE_MULTILIB} == yes ]] && return + + local root=${1:-${ED}} + + if [[ -d ${ED%/}/tmp/multilib-include ]]; then + multibuild_merge_root \ + "${ED%/}"/tmp/multilib-include "${root}"/usr/include + # it can fail if something else uses /tmp + rmdir "${ED%/}"/tmp &>/dev/null + fi +} + +# @FUNCTION: multilib_is_native_abi +# @DESCRIPTION: +# Determine whether the currently built ABI is the profile native. +# Return true status (0) if that is true, otherwise false (1). +multilib_is_native_abi() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments" + + [[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]] +} + +# @FUNCTION: multilib_build_binaries +# @DESCRIPTION: +# Deprecated synonym for multilib_is_native_abi +multilib_build_binaries() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" + + eqawarn "QA warning: multilib_build_binaries is deprecated. Please use the equivalent" + eqawarn "multilib_is_native_abi function instead." + + multilib_is_native_abi "${@}" +} + +# @FUNCTION: multilib_native_use_with +# @USAGE: <flag> [<opt-name> [<opt-value>]] +# @DESCRIPTION: +# Output --with configure option alike use_with if USE <flag> is enabled +# and executables are being built (multilib_is_native_abi is true). +# Otherwise, outputs --without configure option. Arguments are the same +# as for use_with in the EAPI. +multilib_native_use_with() { + if multilib_is_native_abi; then + use_with "${@}" + else + echo "--without-${2:-${1}}" + fi +} + +# @FUNCTION: multilib_native_use_enable +# @USAGE: <flag> [<opt-name> [<opt-value>]] +# @DESCRIPTION: +# Output --enable configure option alike use_enable if USE <flag> +# is enabled and executables are being built (multilib_is_native_abi +# is true). Otherwise, outputs --disable configure option. Arguments are +# the same as for use_enable in the EAPI. +multilib_native_use_enable() { + if multilib_is_native_abi; then + use_enable "${@}" + else + echo "--disable-${2:-${1}}" + fi +} + +# @FUNCTION: multilib_native_enable +# @USAGE: <opt-name> [<opt-value>] +# @DESCRIPTION: +# Output --enable configure option if executables are being built +# (multilib_is_native_abi is true). Otherwise, output --disable configure +# option. +multilib_native_enable() { + if multilib_is_native_abi; then + echo "--enable-${1}${2+=${2}}" + else + echo "--disable-${1}" + fi +} + +# @FUNCTION: multilib_native_with +# @USAGE: <opt-name> [<opt-value>] +# @DESCRIPTION: +# Output --with configure option if executables are being built +# (multilib_is_native_abi is true). Otherwise, output --without configure +# option. +multilib_native_with() { + if multilib_is_native_abi; then + echo "--with-${1}${2+=${2}}" + else + echo "--without-${1}" + fi +} + +# @FUNCTION: multilib_native_usex +# @USAGE: <flag> [<true1> [<false1> [<true2> [<false2>]]]] +# @DESCRIPTION: +# Output the concatenation of <true1> (or 'yes' if unspecified) +# and <true2> if USE <flag> is enabled and executables are being built +# (multilib_is_native_abi is true). Otherwise, output the concatenation +# of <false1> (or 'no' if unspecified) and <false2>. Arguments +# are the same as for usex in the EAPI. +# +# Note: in EAPI 4 you need to inherit eutils to use this function. +multilib_native_usex() { + if multilib_is_native_abi; then + usex "${@}" + else + echo "${3-no}${5}" + fi +} + +_MULTILIB_BUILD=1 +fi diff -uNr a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass --- a/eclass/multilib-minimal.eclass false +++ b/eclass/multilib-minimal.eclass 4f2bb028f5a38f3405deb1ffc13284b3be8a10512255f4e110062507319cd74da6539d3961e3347f0eba27684381e826bf36adbda3d84035d1abe38d1d4a017d @@ -0,0 +1,124 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: multilib-minimal.eclass +# @MAINTAINER: +# Multilib team <multilib@gentoo.org> +# @BLURB: wrapper for multilib builds providing convenient multilib_src_* functions +# @DESCRIPTION: +# +# src_configure, src_compile, src_test and src_install are exported. +# +# Use multilib_src_* instead of src_* which runs this phase for +# all enabled ABIs. +# +# multilib-minimal should _always_ go last in inherit order! +# +# If you want to use in-source builds, then you must run +# multilib_copy_sources at the end of src_prepare! +# Also make sure to set correct variables such as +# ECONF_SOURCE=${S} +# +# If you need generic install rules, use multilib_src_install_all function. + + +# EAPI=4 is required for meaningful MULTILIB_USEDEP. +case ${EAPI:-0} in + 4|5|6|7) ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + + +[[ ${EAPI} == [45] ]] && inherit eutils +inherit multilib-build + +EXPORT_FUNCTIONS src_configure src_compile src_test src_install + + +multilib-minimal_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + multilib-minimal_abi_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + mkdir -p "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + if declare -f multilib_src_configure >/dev/null ; then + multilib_src_configure + else + default_src_configure + fi + popd >/dev/null || die + } + + multilib_foreach_abi multilib-minimal_abi_src_configure +} + +multilib-minimal_src_compile() { + debug-print-function ${FUNCNAME} "$@" + + multilib-minimal_abi_src_compile() { + debug-print-function ${FUNCNAME} "$@" + + pushd "${BUILD_DIR}" >/dev/null || die + if declare -f multilib_src_compile >/dev/null ; then + multilib_src_compile + else + default_src_compile + fi + popd >/dev/null || die + } + + multilib_foreach_abi multilib-minimal_abi_src_compile +} + +multilib-minimal_src_test() { + debug-print-function ${FUNCNAME} "$@" + + multilib-minimal_abi_src_test() { + debug-print-function ${FUNCNAME} "$@" + + pushd "${BUILD_DIR}" >/dev/null || die + if declare -f multilib_src_test >/dev/null ; then + multilib_src_test + else + default_src_test + fi + popd >/dev/null || die + } + + multilib_foreach_abi multilib-minimal_abi_src_test +} + +multilib-minimal_src_install() { + debug-print-function ${FUNCNAME} "$@" + + multilib-minimal_abi_src_install() { + debug-print-function ${FUNCNAME} "$@" + + pushd "${BUILD_DIR}" >/dev/null || die + if declare -f multilib_src_install >/dev/null ; then + multilib_src_install + else + # default_src_install will not work here as it will + # break handling of DOCS wrt #468092 + # so we split up the emake and doc-install part + # this is synced with __eapi4_src_install + if [[ -f Makefile || -f GNUmakefile || -f makefile ]] ; then + emake DESTDIR="${D}" install + fi + fi + + multilib_prepare_wrappers + multilib_check_headers + popd >/dev/null || die + } + multilib_foreach_abi multilib-minimal_abi_src_install + multilib_install_wrappers + + if declare -f multilib_src_install_all >/dev/null ; then + multilib_src_install_all + else + einstalldocs + fi +} diff -uNr a/eclass/multilib.eclass b/eclass/multilib.eclass --- a/eclass/multilib.eclass false +++ b/eclass/multilib.eclass ca4a7ec50b6a43bf60e4aeee54cefb19386fcf1f3570f63ceefc445e2b909e14bf2bfd6875f5ec42b1a811a1734f82afe8970f8b8d99914d29938a49df483994 @@ -0,0 +1,472 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: multilib.eclass +# @MAINTAINER: +# amd64@gentoo.org +# toolchain@gentoo.org +# @BLURB: This eclass is for all functions pertaining to handling multilib configurations. +# @DESCRIPTION: +# This eclass is for all functions pertaining to handling multilib configurations. + +if [[ -z ${_MULTILIB_ECLASS} ]]; then +_MULTILIB_ECLASS=1 + +inherit toolchain-funcs + +# Defaults: +export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"} +export DEFAULT_ABI=${DEFAULT_ABI:-"default"} +export CFLAGS_default +export LDFLAGS_default +export CHOST_default=${CHOST_default:-${CHOST}} +export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}} +export LIBDIR_default=${CONF_LIBDIR:-"lib"} +export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}} + +# @FUNCTION: has_multilib_profile +# @DESCRIPTION: +# Return true if the current profile is a multilib profile and lists more than +# one abi in ${MULTILIB_ABIS}. When has_multilib_profile returns true, that +# profile should enable the 'multilib' use flag. This is so you can DEPEND on +# a package only for multilib or not multilib. +has_multilib_profile() { + [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] +} + +# @FUNCTION: get_libdir +# @RETURN: the libdir for the selected ABI +# @DESCRIPTION: +# This function simply returns the desired lib directory. With portage +# 2.0.51, we now have support for installing libraries to lib32/lib64 +# to accomidate the needs of multilib systems. It's no longer a good idea +# to assume all libraries will end up in lib. Replace any (sane) instances +# where lib is named directly with $(get_libdir) if possible. +# +# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): +# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, +# fall back on old behavior. Any profile that has these set should also +# depend on a newer version of portage (not yet released) which uses these +# over CONF_LIBDIR in econf, dolib, etc... +if has "${EAPI:-0}" 0 1 2 3 4 5; then + get_libdir() { + local CONF_LIBDIR + if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then + # if there is an override, we want to use that... always. + echo ${CONF_LIBDIR_OVERRIDE} + else + get_abi_LIBDIR + fi + } +fi + +# @FUNCTION: get_abi_var +# @USAGE: <VAR> [ABI] +# @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults +# @INTERNAL +# @DESCRIPTION: +# ex: +# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 +# +# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" +# This will hopefully be added to portage soon... +# +# If <ABI> is not specified, ${ABI} is used. +# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. +# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. +get_abi_var() { + local flag=$1 + local abi=${2:-${ABI:-${DEFAULT_ABI:-default}}} + local var="${flag}_${abi}" + echo ${!var} +} + +# @FUNCTION: get_abi_CFLAGS +# @USAGE: [ABI] +# @DESCRIPTION: +# Alias for 'get_abi_var CFLAGS' +get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; } + +# @FUNCTION: get_abi_LDFLAGS +# @USAGE: [ABI] +# @DESCRIPTION: +# Alias for 'get_abi_var LDFLAGS' +get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; } + +# @FUNCTION: get_abi_CHOST +# @USAGE: [ABI] +# @DESCRIPTION: +# Alias for 'get_abi_var CHOST' +get_abi_CHOST() { get_abi_var CHOST "$@"; } + +# @FUNCTION: get_abi_CTARGET +# @USAGE: [ABI] +# @DESCRIPTION: +# Alias for 'get_abi_var CTARGET' +get_abi_CTARGET() { get_abi_var CTARGET "$@"; } + +# @FUNCTION: get_abi_FAKE_TARGETS +# @USAGE: [ABI] +# @DESCRIPTION: +# Alias for 'get_abi_var FAKE_TARGETS' +get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; } + +# @FUNCTION: get_abi_LIBDIR +# @USAGE: [ABI] +# @DESCRIPTION: +# Alias for 'get_abi_var LIBDIR' +get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; } + +# @FUNCTION: get_install_abis +# @DESCRIPTION: +# Return a list of the ABIs we want to install for with +# the last one in the list being the default. +get_install_abis() { + local x order="" + + if [[ -z ${MULTILIB_ABIS} ]] ; then + echo "default" + return 0 + fi + + if [[ ${EMULTILIB_PKG} == "true" ]] ; then + for x in ${MULTILIB_ABIS} ; do + if [[ ${x} != "${DEFAULT_ABI}" ]] ; then + has ${x} ${ABI_DENY} || order="${order} ${x}" + fi + done + has ${DEFAULT_ABI} ${ABI_DENY} || order="${order} ${DEFAULT_ABI}" + + if [[ -n ${ABI_ALLOW} ]] ; then + local ordera="" + for x in ${order} ; do + if has ${x} ${ABI_ALLOW} ; then + ordera="${ordera} ${x}" + fi + done + order=${ordera} + fi + else + order=${DEFAULT_ABI} + fi + + if [[ -z ${order} ]] ; then + die "The ABI list is empty. Are you using a proper multilib profile? Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package." + fi + + echo ${order} + return 0 +} + +# @FUNCTION: get_all_abis +# @DESCRIPTION: +# Return a list of the ABIs supported by this profile. +# the last one in the list being the default. +get_all_abis() { + local x order="" mvar dvar + + mvar="MULTILIB_ABIS" + dvar="DEFAULT_ABI" + if [[ -n $1 ]] ; then + mvar="$1_${mvar}" + dvar="$1_${dvar}" + fi + + if [[ -z ${!mvar} ]] ; then + echo "default" + return 0 + fi + + for x in ${!mvar}; do + if [[ ${x} != ${!dvar} ]] ; then + order="${order:+${order} }${x}" + fi + done + order="${order:+${order} }${!dvar}" + + echo ${order} + return 0 +} + +# @FUNCTION: get_all_libdirs +# @DESCRIPTION: +# Returns a list of all the libdirs used by this profile. This includes +# those that might not be touched by the current ebuild and always includes +# "lib". +get_all_libdirs() { + local libdirs abi + + for abi in ${MULTILIB_ABIS}; do + libdirs+=" $(get_abi_LIBDIR ${abi})" + done + [[ " ${libdirs} " != *" lib "* ]] && libdirs+=" lib" + + echo "${libdirs}" +} + +# @FUNCTION: is_final_abi +# @DESCRIPTION: +# Return true if ${ABI} is the last ABI on our list (or if we're not +# using the new multilib configuration. This can be used to determine +# if we're in the last (or only) run through src_{unpack,compile,install} +is_final_abi() { + has_multilib_profile || return 0 + set -- $(get_install_abis) + local LAST_ABI=$# + [[ ${!LAST_ABI} == ${ABI} ]] +} + +# @FUNCTION: number_abis +# @DESCRIPTION: +# echo the number of ABIs we will be installing for +number_abis() { + set -- `get_install_abis` + echo $# +} + +# @FUNCTION: get_exeext +# @DESCRIPTION: +# Returns standard executable program suffix (null, .exe, etc.) +# for the current platform identified by CHOST. +# +# Example: +# get_exeext +# Returns: null string (almost everywhere) || .exe (mingw*) || ... +get_exeext() { + case ${CHOST} in + *-cygwin*|mingw*|*-mingw*) echo ".exe";; + esac +} + +# @FUNCTION: get_libname +# @USAGE: [version] +# @DESCRIPTION: +# Returns libname with proper suffix {.so,.dylib,.dll,etc} and optionally +# supplied version for the current platform identified by CHOST. +# +# Example: +# get_libname ${PV} +# Returns: .so.${PV} (ELF) || .${PV}.dylib (MACH) || ... +get_libname() { + local libname + local ver=$1 + case ${CHOST} in + *-cygwin*) libname="dll.a";; # import lib + mingw*|*-mingw*) libname="dll";; + *-darwin*) libname="dylib";; + *-mint*) libname="irrelevant";; + hppa*-hpux*) libname="sl";; + *) libname="so";; + esac + + if [[ -z $* ]] ; then + echo ".${libname}" + else + for ver in "$@" ; do + case ${CHOST} in + *-cygwin*) echo ".${ver}.${libname}";; + *-darwin*) echo ".${ver}.${libname}";; + *-mint*) echo ".${libname}";; + *) echo ".${libname}.${ver}";; + esac + done + fi +} + +# @FUNCTION: get_modname +# @USAGE: +# @DESCRIPTION: +# Returns modulename with proper suffix {.so,.bundle,etc} for the current +# platform identified by CHOST. +# +# Example: +# libfoo$(get_modname) +# Returns: libfoo.so (ELF) || libfoo.bundle (MACH) || ... +get_modname() { + local modname + local ver=$1 + case ${CHOST} in + *-darwin*) modname="bundle";; + *) modname="so";; + esac + + echo ".${modname}" +} + +# This is for the toolchain to setup profile variables when pulling in +# a crosscompiler (and thus they aren't set in the profile) +multilib_env() { + local CTARGET=${1:-${CTARGET}} + local cpu=${CTARGET%%*-} + + case ${cpu} in + aarch64*) + # Not possible to do multilib with aarch64 and a single toolchain. + export CFLAGS_arm=${CFLAGS_arm-} + case ${cpu} in + aarch64*be) export CHOST_arm="armv8b-${CTARGET#*-}";; + *) export CHOST_arm="armv8l-${CTARGET#*-}";; + esac + CHOST_arm=${CHOST_arm/%-gnu/-gnueabi} + export CTARGET_arm=${CHOST_arm} + export LIBDIR_arm="lib" + + export CFLAGS_arm64=${CFLAGS_arm64-} + export CHOST_arm64=${CTARGET} + export CTARGET_arm64=${CHOST_arm64} + export LIBDIR_arm64="lib64" + + : ${MULTILIB_ABIS=arm64} + : ${DEFAULT_ABI=arm64} + ;; + x86_64*) + export CFLAGS_x86=${CFLAGS_x86--m32} + export CHOST_x86=${CTARGET/x86_64/i686} + CHOST_x86=${CHOST_x86/%-gnux32/-gnu} + export CTARGET_x86=${CHOST_x86} + if [[ ${SYMLINK_LIB} == "yes" ]] ; then + export LIBDIR_x86="lib32" + else + export LIBDIR_x86="lib" + fi + + export CFLAGS_amd64=${CFLAGS_amd64--m64} + export CHOST_amd64=${CTARGET/%-gnux32/-gnu} + export CTARGET_amd64=${CHOST_amd64} + export LIBDIR_amd64="lib64" + + export CFLAGS_x32=${CFLAGS_x32--mx32} + export CHOST_x32=${CTARGET/%-gnu/-gnux32} + export CTARGET_x32=${CHOST_x32} + export LIBDIR_x32="libx32" + + case ${CTARGET} in + *-gnux32) + : ${MULTILIB_ABIS=x32 amd64 x86} + : ${DEFAULT_ABI=x32} + ;; + *) + : ${MULTILIB_ABIS=amd64 x86} + : ${DEFAULT_ABI=amd64} + ;; + esac + ;; + mips64*) + export CFLAGS_o32=${CFLAGS_o32--mabi=32} + export CHOST_o32=${CTARGET/mips64/mips} + export CTARGET_o32=${CHOST_o32} + export LIBDIR_o32="lib" + + export CFLAGS_n32=${CFLAGS_n32--mabi=n32} + export CHOST_n32=${CTARGET} + export CTARGET_n32=${CHOST_n32} + export LIBDIR_n32="lib32" + + export CFLAGS_n64=${CFLAGS_n64--mabi=64} + export CHOST_n64=${CTARGET} + export CTARGET_n64=${CHOST_n64} + export LIBDIR_n64="lib64" + + : ${MULTILIB_ABIS=n64 n32 o32} + : ${DEFAULT_ABI=n32} + ;; + powerpc64*) + export CFLAGS_ppc=${CFLAGS_ppc--m32} + export CHOST_ppc=${CTARGET/powerpc64/powerpc} + export CTARGET_ppc=${CHOST_ppc} + export LIBDIR_ppc="lib" + + export CFLAGS_ppc64=${CFLAGS_ppc64--m64} + export CHOST_ppc64=${CTARGET} + export CTARGET_ppc64=${CHOST_ppc64} + export LIBDIR_ppc64="lib64" + + : ${MULTILIB_ABIS=ppc64 ppc} + : ${DEFAULT_ABI=ppc64} + ;; + s390x*) + export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo + export CHOST_s390=${CTARGET/s390x/s390} + export CTARGET_s390=${CHOST_s390} + export LIBDIR_s390="lib" + + export CFLAGS_s390x=${CFLAGS_s390x--m64} + export CHOST_s390x=${CTARGET} + export CTARGET_s390x=${CHOST_s390x} + export LIBDIR_s390x="lib64" + + : ${MULTILIB_ABIS=s390x s390} + : ${DEFAULT_ABI=s390x} + ;; + sparc64*) + export CFLAGS_sparc32=${CFLAGS_sparc32--m32} + export CHOST_sparc32=${CTARGET/sparc64/sparc} + export CTARGET_sparc32=${CHOST_sparc32} + export LIBDIR_sparc32="lib" + + export CFLAGS_sparc64=${CFLAGS_sparc64--m64} + export CHOST_sparc64=${CTARGET} + export CTARGET_sparc64=${CHOST_sparc64} + export LIBDIR_sparc64="lib64" + + : ${MULTILIB_ABIS=sparc64 sparc32} + : ${DEFAULT_ABI=sparc64} + ;; + *) + : ${MULTILIB_ABIS=default} + : ${DEFAULT_ABI=default} + ;; + esac + + export MULTILIB_ABIS DEFAULT_ABI +} + +# @FUNCTION: multilib_toolchain_setup +# @DESCRIPTION: +# Hide multilib details here for packages which are forced to be compiled for a +# specific ABI when run on another ABI (like x86-specific packages on amd64) +multilib_toolchain_setup() { + local v vv + + export ABI=$1 + + # First restore any saved state we have laying around. + if [[ ${_DEFAULT_ABI_SAVED} == "true" ]] ; then + for v in CHOST CBUILD AS CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do + vv="_abi_saved_${v}" + [[ ${!vv+set} == "set" ]] && export ${v}="${!vv}" || unset ${v} + unset ${vv} + done + unset _DEFAULT_ABI_SAVED + fi + + # We want to avoid the behind-the-back magic of gcc-config as it + # screws up ccache and distcc. See #196243 for more info. + if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then + # Back that multilib-ass up so we can restore it later + for v in CHOST CBUILD AS CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do + vv="_abi_saved_${v}" + [[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv} + done + export _DEFAULT_ABI_SAVED="true" + + # Set CBUILD only if not cross-compiling. + if [[ ${CBUILD} == "${CHOST}" ]]; then + export CBUILD=$(get_abi_CHOST $1) + fi + + # Set the CHOST native first so that we pick up the native + # toolchain and not a cross-compiler by accident #202811. + export CHOST=$(get_abi_CHOST ${DEFAULT_ABI}) + export CC="$(tc-getCC) $(get_abi_CFLAGS)" + export CXX="$(tc-getCXX) $(get_abi_CFLAGS)" + export F77="$(tc-getF77) $(get_abi_CFLAGS)" + export FC="$(tc-getFC) $(get_abi_CFLAGS)" + export LD="$(tc-getLD) $(get_abi_LDFLAGS)" + export CHOST=$(get_abi_CHOST $1) + export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig + export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig + fi +} + +fi diff -uNr a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass --- a/eclass/multiprocessing.eclass false +++ b/eclass/multiprocessing.eclass e12f0a1ac047330ab5141bb95978e2aab5c7a0a97949214ac05e7f37e18b0198cab661653ae95f7e1a4a5db3f3f62629f1e9ce5929ceea285d44a9a4237de4d4 @@ -0,0 +1,103 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: multiprocessing.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @AUTHOR: +# Brian Harring <ferringb@gentoo.org> +# Mike Frysinger <vapier@gentoo.org> +# @BLURB: multiprocessing helper functions +# @DESCRIPTION: +# The multiprocessing eclass contains a suite of utility functions +# that could be helpful to controlling parallel multiple job execution. +# The most common use is processing MAKEOPTS in order to obtain job +# count. +# +# @EXAMPLE: +# +# @CODE +# src_compile() { +# # custom build system that does not support most of MAKEOPTS +# ./mybs -j$(makeopts_jobs) +# } +# @CODE + +if [[ -z ${_MULTIPROCESSING_ECLASS} ]]; then +_MULTIPROCESSING_ECLASS=1 + +# @FUNCTION: get_nproc +# @USAGE: [${fallback:-1}] +# @DESCRIPTION: +# Attempt to figure out the number of processing units available. +# If the value can not be determined, prints the provided fallback +# instead. If no fallback is provided, defaults to 1. +get_nproc() { + local nproc + + # GNU + if type -P nproc &>/dev/null; then + nproc=$(nproc) + fi + + # BSD + if [[ -z ${nproc} ]] && type -P sysctl &>/dev/null; then + nproc=$(sysctl -n hw.ncpu 2>/dev/null) + fi + + # fallback to python2.6+ + # note: this may fail (raise NotImplementedError) + if [[ -z ${nproc} ]] && type -P python &>/dev/null; then + nproc=$(python -c 'import multiprocessing; print(multiprocessing.cpu_count());' 2>/dev/null) + fi + + if [[ -n ${nproc} ]]; then + echo "${nproc}" + else + echo "${1:-1}" + fi +} + +# @FUNCTION: makeopts_jobs +# @USAGE: [${MAKEOPTS}] [${inf:-999}] +# @DESCRIPTION: +# Searches the arguments (defaults to ${MAKEOPTS}) and extracts the jobs number +# specified therein. Useful for running non-make tools in parallel too. +# i.e. if the user has MAKEOPTS=-j9, this will echo "9" -- we can't return the +# number as bash normalizes it to [0, 255]. If the flags haven't specified a +# -j flag, then "1" is shown as that is the default `make` uses. Since there's +# no way to represent infinity, we return ${inf} (defaults to 999) if the user +# has -j without a number. +makeopts_jobs() { + [[ $# -eq 0 ]] && set -- "${MAKEOPTS}" + # This assumes the first .* will be more greedy than the second .* + # since POSIX doesn't specify a non-greedy match (i.e. ".*?"). + local jobs=$(echo " $* " | sed -r -n \ + -e 's:.*[[:space:]](-[a-z]*j|--jobs[=[:space:]])[[:space:]]*([0-9]+).*:\2:p' \ + -e "s:.*[[:space:]](-[a-z]*j|--jobs)[[:space:]].*:${2:-999}:p") + echo ${jobs:-1} +} + +# @FUNCTION: makeopts_loadavg +# @USAGE: [${MAKEOPTS}] [${inf:-999}] +# @DESCRIPTION: +# Searches the arguments (defaults to ${MAKEOPTS}) and extracts the value set +# for load-average. For make and ninja based builds this will mean new jobs are +# not only limited by the jobs-value, but also by the current load - which might +# get excessive due to I/O and not just due to CPU load. +# Be aware that the returned number might be a floating-point number. Test +# whether your software supports that. +# If no limit is specified or --load-average is used without a number, ${inf} +# (defaults to 999) is returned. +makeopts_loadavg() { + [[ $# -eq 0 ]] && set -- "${MAKEOPTS}" + # This assumes the first .* will be more greedy than the second .* + # since POSIX doesn't specify a non-greedy match (i.e. ".*?"). + local lavg=$(echo " $* " | sed -r -n \ + -e 's:.*[[:space:]](-[a-z]*l|--(load-average|max-load)[=[:space:]])[[:space:]]*([0-9]+(\.[0-9]+)?)[[:space:]].*:\3:p' \ + -e "s:.*[[:space:]](-[a-z]*l|--(load-average|max-load))[[:space:]].*:${2:-999}:p") + # Default to ${inf} since the default is to not use a load limit. + echo ${lavg:-${2:-999}} +} + +fi diff -uNr a/eclass/myspell-r2.eclass b/eclass/myspell-r2.eclass --- a/eclass/myspell-r2.eclass false +++ b/eclass/myspell-r2.eclass 2d3232b6930f18132cd8859cbeb95a86e648ffd0332080f0702448e188aa6d72e5099c9275241750504ce74bb8b347009ca1ead8639d180a9fb815a8a43a9c7a @@ -0,0 +1,117 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: myspell-r2.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @AUTHOR: +# Tomáš Chvátal <scarabeus@gentoo.org> +# @BLURB: An eclass to ease the construction of ebuilds for myspell dicts +# @DESCRIPTION: + +EXPORT_FUNCTIONS src_unpack src_install + +# @ECLASS-VARIABLE: MYSPELL_DICT +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array variable containing list of all dictionary files. +# MYSPELL_DICT=( "file.dic" "dir/file2.aff" ) + +# @ECLASS-VARIABLE: MYSPELL_HYPH +# @DESCRIPTION: +# Array variable containing list of all hyphenation files. +# MYSPELL_HYPH=( "file.dic" "dir/file2.dic" ) + +# @ECLASS-VARIABLE: MYSPELL_THES +# @DESCRIPTION: +# Array variable containing list of all thesarus files. +# MYSPELL_THES=( "file.dat" "dir/file2.idx" ) + +# Basically no extra deps needed. +# Unzip is required for .oxt libreoffice extensions +# which are just fancy zip files. +DEPEND="app-arch/unzip" +RDEPEND="" + +# by default this stuff does not have any folder in the pack +S="${WORKDIR}" + +# @FUNCTION: myspell-r2_src_unpack +# @DESCRIPTION: +# Unpack all variants of weird stuff. +# In our case .oxt packs. +myspell-r2_src_unpack() { + debug-print-function ${FUNCNAME} "$@" + + local f + for f in ${A}; do + case ${f} in + *.oxt) + echo ">>> Unpacking "${DISTDIR}/${f}" to ${PWD}" + unzip -qoj ${DISTDIR}/${f} + assert "failed unpacking ${DISTDIR}/${f}" + ;; + *) unpack ${f} ;; + esac + done +} + +# @FUNCTION: myspell-r2_src_install +# @DESCRIPTION: +# Install the dictionaries to the right places. +myspell-r2_src_install() { + debug-print-function ${FUNCNAME} "$@" + + local x target + + # Following the debian directory layout here. + # DICT: /usr/share/hunspell + # THES: /usr/share/mythes + # HYPH: /usr/share/hyphen + # We just need to copy the required files to proper places. + + # TODO: backcompat dosym remove when all dictionaries and libreoffice + # ebuilds in tree use only the new paths + + # Very old installs have hunspell to be symlink to myspell. + # This results in fcked up install/symlink stuff. + if [[ -L "${EPREFIX}/usr/share/hunspell" ]] ; then + eerror "\"${EPREFIX}/usr/share/hunspell\" is a symlink." + eerror "Please remove it so it is created properly as folder" + die "\"${EPREFIX}/usr/share/hunspell\" is a symlink." + fi + + insinto /usr/share/hunspell + for x in "${MYSPELL_DICT[@]}"; do + target="${x##*/}" + newins "${x}" "${target}" || die + dosym ../hunspell/"${target}" /usr/share/myspell/"${target}" || die + done + + insinto /usr/share/mythes + for x in "${MYSPELL_THES[@]}"; do + target="${x##*/}" + newins "${x}" "${target}" || die + dosym ../mythes/"${target}" /usr/share/myspell/"${target}" || die + done + + insinto /usr/share/hyphen + for x in "${MYSPELL_HYPH[@]}"; do + target="${x##*/}" + newins "${x}" "${target}" || die + dosym ../hyphen/"${target}" /usr/share/myspell/"${target}" || die + done + + # Remove licenses as they suffix them with .txt too + rm -rf COPYING* + rm -rf LICENSE* + rm -rf LICENCE* + rm -rf license* + rm -rf licence* + # Readme and so on + for x in *.txt README*; do + if [[ -f ${x} ]]; then + dodoc ${x} || die + fi + done +} diff -uNr a/eclass/myspell.eclass b/eclass/myspell.eclass --- a/eclass/myspell.eclass false +++ b/eclass/myspell.eclass 875de7f59edbe682e77d682f03a2c3c0f840c2f564bd908349faaa8940611b027c903b79b9502d5dd26f6e21a2e567857e6c8e9e0f7db5f9f67b41d494b91700 @@ -0,0 +1,256 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Author: Kevin F. Quinn <kevquinn@gentoo.org> +# Packages: app-dicts/myspell-* +# Maintainer: maintainer-needed@gentoo.org + +inherit multilib + +EXPORT_FUNCTIONS src_install pkg_preinst pkg_postinst + +IUSE="" + +SLOT="0" + +# tar, gzip, bzip2 are included in the base profile, but not unzip +DEPEND="app-arch/unzip" + +# Dictionaries don't have any runtime dependencies +# Myspell dictionaries can be used by hunspell, openoffice and others +RDEPEND="" + +# The destination directory for myspell dictionaries +MYSPELL_DICTBASE="/usr/share/myspell" + +# Legacy variable for dictionaries installed before eselect-oodict existed +# so has to remain for binpkg support. This variable is unmaintained - +# if you have a problem with it, emerge app-eselect/eselect-oodict. +# The location for openoffice softlinks +MYSPELL_OOOBASE="/usr/lib/openoffice/share/dict/ooo" + + +# set array "fields" to the elements of $1, separated by $2. +# This saves having to muck about with IFS all over the place. +set_fields() { + local old_IFS + old_IFS="${IFS}" + IFS=$2 + fields=($1) + IFS="${old_IFS}" +} + +# language is the second element of the ebuild name +# myspell-<lang>-<version> +get_myspell_lang() { + local fields + set_fields "${P}" "-" + echo ${fields[1]} +} + +get_myspell_suffixes() { + case $1 in + DICT) echo ".aff .dic" ;; + HYPH) echo ".dic" ;; + THES) echo ".dat .idx" ;; + esac +} + +# OOo dictionary files are held on the mirrors, rather than +# being fetched direct from the OOo site as upstream doesn't +# change the name when they rebuild the dictionaries. +# <lang>-<country>.zip becomes myspell-<lang>-<country>-version.zip +get_myspell_ooo_uri() { + local files fields newfile filestem srcfile dict uris + files=() + uris="" + for dict in \ + "${MYSPELL_SPELLING_DICTIONARIES[@]}" \ + "${MYSPELL_HYPHENATION_DICTIONARIES[@]}" \ + "${MYSPELL_THESAURUS_DICTIONARIES[@]}"; do + set_fields "${dict}" "," + newfile=${fields[4]// } + for file in "${files[@]}"; do + [[ ${file} == ${newfile} ]] && continue 2 + done + filestem=${newfile/.zip} + files=("${files[@]}" "${newfile}") + srcfile="myspell-${filestem}-${PV}.zip" + [[ -z ${uris} ]] && + uris="mirror://gentoo/${srcfile}" || + uris="${uris} mirror://gentoo/${srcfile}" + done + echo "${uris}" +} + + +[[ -z ${SRC_URI} ]] && SRC_URI=$(get_myspell_ooo_uri) + +# Format of dictionary.lst files (from OOo standard +# dictionary.lst file): +# +# List of All Dictionaries to be Loaded by OpenOffice +# --------------------------------------------------- +# Each Entry in the list have the following space delimited fields +# +# Field 0: Entry Type "DICT" - spellchecking dictionary +# "HYPH" - hyphenation dictionary +# "THES" - thesaurus files +# +# Field 1: Language code from Locale "en" or "de" or "pt" ... +# +# Field 2: Country Code from Locale "US" or "GB" or "PT" +# +# Field 3: Root name of file(s) "en_US" or "hyph_de" or "th_en_US" +# (do not add extensions to the name) + +# Format of MYSPELL_[SPELLING|HYPHENATION|THESAURUS]_DICTIONARIES: +# +# Field 0: Language code +# Field 1: Country code +# Field 2: Root name of dictionary files +# Field 3: Description +# Field 4: Archive filename +# +# This format is from the available.lst, hyphavail.lst and +# thesavail.lst files on the openoffice.org repository. + +myspell_src_install() { + local filen fields entry dictlst + cd "${WORKDIR}" + # Install the dictionary, hyphenation and thesaurus files. + # Create dictionary.lst.<lang> file containing the parts of + # OOo's dictionary.lst file for this language, indicating + # which dictionaries are relevant for each country variant + # of the language. + insinto ${MYSPELL_DICTBASE} + dictlst="dictionary.lst.$(get_myspell_lang)" + echo "# Autogenerated by ${CATEGORY}/${P}" > ${dictlst} + for entry in "${MYSPELL_SPELLING_DICTIONARIES[@]}"; do + set_fields "${entry}" "," + echo "DICT ${fields[0]} ${fields[1]} ${fields[2]}" >> ${dictlst} + doins ${fields[2]}.aff || die "Missing ${fields[2]}.aff" + doins ${fields[2]}.dic || die "Missing ${fields[2]}.dic" + done + for entry in "${MYSPELL_HYPHENATION_DICTIONARIES[@]}"; do + set_fields "${entry}" "," + echo "HYPH ${fields[0]} ${fields[1]} ${fields[2]}" >> ${dictlst} + doins ${fields[2]}.dic || die "Missing ${fields[2]}.dic" + done + for entry in "${MYSPELL_THESAURUS_DICTIONARIES[@]}"; do + set_fields "${entry}" "," + echo "THES ${fields[0]} ${fields[1]} ${fields[2]}" >> ${dictlst} + doins ${fields[2]}.dat || die "Missing ${fields[2]}.dat" + doins ${fields[2]}.idx || die "Missing ${fields[2]}.idx" + done + doins ${dictlst} || die "Failed to install ${dictlst}" + # Install any txt files (usually README.txt) as documentation + for filen in *.txt; do + [[ -s ${filen} ]] && dodoc ${filen} + done +} + + +# Add entries in dictionary.lst.<lang> to OOo dictionary.lst +# and create softlinks indicated by dictionary.lst.<lang> +myspell_pkg_postinst() { + # Update for known applications + if has_version ">=app-eselect/eselect-oodict-20060706"; then + if has_version app-office/openoffice; then + eselect oodict set myspell-$(get_myspell_lang) + fi + if has_version app-office/openoffice-bin; then + # On AMD64, openoffice-bin is 32-bit so force ABI + has_multilib_profile && ABI=x86 + eselect oodict set myspell-$(get_myspell_lang) --libdir $(get_libdir) + fi + return + fi + if has_version app-eselect/eselect-oodict; then + eselect oodict set myspell-$(get_myspell_lang) + return + fi + + # Legacy code for dictionaries installed before eselect-oodict existed + # so has to remain for binpkg support. This code is unmaintained - + # if you have a problem with it, emerge app-eselect/eselect-oodict. + [[ -d ${MYSPELL_OOOBASE} ]] || return + # This stuff is here, not in src_install, as the softlinks are + # deliberately _not_ listed in the package database. + local dictlst entry fields prefix suffix suffixes filen + # Note; can only reach this point if ${MYSPELL_DICTBASE}/${dictlst} + # was successfully installed + dictlst="dictionary.lst.$(get_myspell_lang)" + while read entry; do + fields=(${entry}) + [[ ${fields[0]:0:1} == "#" ]] && continue + [[ -f ${MYSPELL_OOOBASE}/dictionary.lst ]] || \ + touch ${MYSPELL_OOOBASE}/dictionary.lst + grep "^${fields[0]} ${fields[1]} ${fields[2]} " \ + ${MYSPELL_OOOBASE}/dictionary.lst > /dev/null 2>&1 || + echo "${entry}" >> ${MYSPELL_OOOBASE}/dictionary.lst + for suffix in $(get_myspell_suffixes ${fields[0]}); do + filen="${fields[3]}${suffix}" + [[ -h ${MYSPELL_OOOBASE}/${filen} ]] && + rm -f ${MYSPELL_OOOBASE}/${filen} + [[ ! -f ${MYSPELL_OOOBASE}/${filen} ]] && + ln -s ${MYSPELL_DICTBASE}/${filen} \ + ${MYSPELL_OOOBASE}/${filen} + done + done < ${MYSPELL_DICTBASE}/${dictlst} +} + + +# Remove softlinks and entries in dictionary.lst - uses +# dictionary.<lang>.lst from /usr/share/myspell +# Done in preinst (prerm happens after postinst, which overwrites +# the dictionary.<lang>.lst file) +myspell_pkg_preinst() { + # Update for known applications + if has_version ">=app-eselect/eselect-oodict-20060706"; then + if has_version app-office/openoffice; then + # When building from source, the default library path is correct + eselect oodict unset myspell-$(get_myspell_lang) + fi + if has_version app-office/openoffice-bin; then + # On AMD64, openoffice-bin is 32-bit, so get 32-bit library directory + has_multilib_profile && ABI=x86 + eselect oodict unset myspell-$(get_myspell_lang) --libdir $(get_libdir) + fi + eselect oodict unset myspell-$(get_myspell_lang) --libdir $(get_libdir) + return + fi + # Previous versions of eselect-oodict didn't cater for -bin on amd64 + if has_version app-eselect/eselect-oodict; then + eselect oodict unset myspell-$(get_myspell_lang) + return + fi + + # Legacy code for dictionaries installed before eselect-oodict existed + # Don't delete this; needed for uninstalls and binpkg support. + # This code is unmaintained - if you have a problem with it, + # emerge app-eselect/eselect-oodict. + local filen dictlst entry fields removeentry suffix + dictlst="dictionary.lst.$(get_myspell_lang)" + [[ -d ${MYSPELL_OOOBASE} ]] || return + [[ -f ${MYSPELL_DICTBASE}/${dictlst} ]] || return + while read entry; do + fields=(${entry}) + [[ ${fields[0]:0:1} == "#" ]] && continue + [[ ${fields[3]} == "" ]] && continue + # Remove entry from dictionary.lst + sed -i -e "/^${fields[0]} ${fields[1]} ${fields[2]} ${fields[3]}$/ { d }" \ + ${MYSPELL_OOOBASE}/dictionary.lst + # See if any other entries in dictionary.lst match the current + # dictionary type and filename + grep "^${fields[0]} .* ${fields[3]}$" ${MYSPELL_OOOBASE}/dictionary.lst \ + 2>&1 > /dev/null && continue + # If no other entries match, remove relevant symlinks + for suffix in $(get_myspell_suffixes ${fields[0]}); do + filen="${fields[3]}${suffix}" + ewarn "Removing entry ${MYSPELL_OOOBASE}/${filen}" + [[ -h ${MYSPELL_OOOBASE}/${filen} ]] && + rm -f ${MYSPELL_OOOBASE}/${filen} + done + done < ${MYSPELL_DICTBASE}/${dictlst} +} diff -uNr a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass --- a/eclass/mysql-cmake.eclass false +++ b/eclass/mysql-cmake.eclass 7d760affcc52906581f6848b74d6fa21694939aa6c6072c841e0c3368457e3da75459f98f80d15d4b73bef571655cdb8eda6a40f73e56c04fa73f235c54531d6 @@ -0,0 +1,540 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: mysql-cmake.eclass +# @MAINTAINER: +# Maintainers: +# - MySQL Team <mysql-bugs@gentoo.org> +# - Robin H. Johnson <robbat2@gentoo.org> +# - Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> +# - Brian Evans <grknight@gentoo.org> +# @BLURB: This eclass provides the support for cmake based mysql releases +# @DESCRIPTION: +# The mysql-cmake.eclass provides the support to build the mysql +# ebuilds using the cmake build system. This eclass provides +# the src_prepare, src_configure, src_compile, and src_install +# phase hooks. + +inherit cmake-utils flag-o-matic multilib prefix eutils toolchain-funcs versionator + +# +# HELPER FUNCTIONS: +# + +# @FUNCTION: mysql_cmake_disable_test +# @DESCRIPTION: +# Helper function to disable specific tests. +mysql-cmake_disable_test() { + + local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir + rawtestname="${1}" ; shift + reason="${@}" + ewarn "test '${rawtestname}' disabled: '${reason}'" + + testsuite="${rawtestname/.*}" + testname="${rawtestname/*.}" + for mysql_disabled_file in \ + ${S}/mysql-test/disabled.def \ + ${S}/mysql-test/t/disabled.def ; do + [[ -f ${mysql_disabled_file} ]] && break + done + #mysql_disabled_file="${S}/mysql-test/t/disabled.def" + #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}" + echo ${testname} : ${reason} >> "${mysql_disabled_file}" + + if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then + for mysql_disabled_file in \ + ${S}/mysql-test/suite/${testsuite}/disabled.def \ + ${S}/mysql-test/suite/${testsuite}/t/disabled.def \ + FAILED ; do + [[ -f ${mysql_disabled_file} ]] && break + done + if [[ ${mysql_disabled_file} != "FAILED" ]]; then + echo "${testname} : ${reason}" >> "${mysql_disabled_file}" + else + for mysql_disabled_dir in \ + ${S}/mysql-test/suite/${testsuite} \ + ${S}/mysql-test/suite/${testsuite}/t \ + FAILED ; do + [[ -d ${mysql_disabled_dir} ]] && break + done + if [[ ${mysql_disabled_dir} != "FAILED" ]]; then + echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def" + else + ewarn "Could not find testsuite disabled.def location for ${rawtestname}" + fi + fi + fi +} + +# @FUNCTION: mysql-cmake_use_plugin +# @DESCRIPTION: +# Helper function to enable/disable plugins by use flags +# cmake-utils_use_with is not enough as some references check WITH_ (0|1) +# and some check WITHOUT_. Also, this can easily extend to non-storage plugins. +mysql-cmake_use_plugin() { + [[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>" + if use_if_iuse $1 ; then + echo "-DWITH_$2=1 -DPLUGIN_$2=YES" + else + echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO" + fi +} + +# @FUNCTION: configure_cmake_locale +# @DESCRIPTION: +# Helper function to configure locale cmake options +configure_cmake_locale() { + + if use_if_iuse minimal ; then + : + elif ! in_iuse server || use_if_iuse server ; then + if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then + ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" + ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." + ewarn "You MUST file bugs without these variables set." + + mycmakeargs+=( + -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} + -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} + ) + + elif ! use latin1 ; then + mycmakeargs+=( + -DDEFAULT_CHARSET=utf8 + -DDEFAULT_COLLATION=utf8_general_ci + ) + else + mycmakeargs+=( + -DDEFAULT_CHARSET=latin1 + -DDEFAULT_COLLATION=latin1_swedish_ci + ) + fi + fi +} + +# @FUNCTION: configure_cmake_minimal +# @DESCRIPTION: +# Helper function to configure minimal build +configure_cmake_minimal() { + + mycmakeargs+=( + -DWITHOUT_SERVER=1 + -DWITHOUT_EMBEDDED_SERVER=1 + -DEXTRA_CHARSETS=none + -DINSTALL_SQLBENCHDIR= + -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 + -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 + -DWITHOUT_CSV_STORAGE_ENGINE=1 + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + -DWITHOUT_HEAP_STORAGE_ENGINE=1 + -DWITHOUT_INNOBASE_STORAGE_ENGINE=1 + -DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1 + -DWITHOUT_MYISAM_STORAGE_ENGINE=1 + -DWITHOUT_PARTITION_STORAGE_ENGINE=1 + -DPLUGIN_ARCHIVE=NO + -DPLUGIN_BLACKHOLE=NO + -DPLUGIN_CSV=NO + -DPLUGIN_FEDERATED=NO + -DPLUGIN_HEAP=NO + -DPLUGIN_INNOBASE=NO + -DPLUGIN_MYISAMMRG=NO + -DPLUGIN_MYISAM=NO + -DPLUGIN_PARTITION=NO + ) +} + +# @FUNCTION: configure_cmake_standard +# @DESCRIPTION: +# Helper function to configure standard build +configure_cmake_standard() { + + mycmakeargs+=( + -DEXTRA_CHARSETS=all + -DMYSQL_USER=mysql + -DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock + $(cmake-utils_use_disable !static SHARED) + $(cmake-utils_use_with debug) + $(cmake-utils_use_with embedded EMBEDDED_SERVER) + $(cmake-utils_use_with profiling) + $(cmake-utils_use_enable systemtap DTRACE) + ) + + if use static; then + mycmakeargs+=( -DWITH_PIC=1 ) + fi + + if use jemalloc; then + mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) + fi + + if use tcmalloc; then + mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) + fi + + # Storage engines + mycmakeargs+=( + -DWITH_ARCHIVE_STORAGE_ENGINE=1 + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 + -DWITH_CSV_STORAGE_ENGINE=1 + -DWITH_HEAP_STORAGE_ENGINE=1 + -DWITH_INNOBASE_STORAGE_ENGINE=1 + -DWITH_MYISAMMRG_STORAGE_ENGINE=1 + -DWITH_MYISAM_STORAGE_ENGINE=1 + -DWITH_PARTITION_STORAGE_ENGINE=1 + ) + + if in_iuse pbxt ; then + mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) ) + fi + + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + mycmakeargs+=( + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + -DPLUGIN_FEDERATED=NO + -DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 + -DPLUGIN_FEDERATEDX=NO ) + fi + + mycmakeargs+=( + $(mysql-cmake_use_plugin oqgraph OQGRAPH) + $(mysql-cmake_use_plugin sphinx SPHINX) + $(mysql-cmake_use_plugin tokudb TOKUDB) + $(mysql-cmake_use_plugin pam AUTH_PAM) + ) + + if mysql_version_is_at_least 10.0.5 ; then + # CassandraSE needs Apache Thrift which is not in portage + mycmakeargs+=( + -DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0 + -DPLUGIN_CASSANDRA=NO + $(mysql-cmake_use_plugin extraengine SEQUENCE) + $(mysql-cmake_use_plugin extraengine SPIDER) + $(mysql-cmake_use_plugin extraengine CONNECT) + -DCONNECT_WITH_MYSQL=1 + $(cmake-utils_use xml CONNECT_WITH_LIBXML2) + $(cmake-utils_use odbc CONNECT_WITH_ODBC) + ) + fi + + if in_iuse mroonga ; then + use mroonga || mycmakeargs+=( -DWITHOUT_MROONGA=1 ) + else + mycmakeargs+=( -DWITHOUT_MROONGA=1 ) + fi + + if in_iuse galera ; then + mycmakeargs+=( $(cmake-utils_use_with galera WSREP) ) + fi + + if mysql_version_is_at_least "10.1.1" ; then + mycmakeargs+=( $(cmake-utils_use_with innodb-lz4 INNODB_LZ4) + $(cmake-utils_use_with innodb-lzo INNODB_LZO) ) + fi + + if in_iuse innodb-snappy ; then + mycmakeargs+=( $(cmake-utils_use_with innodb-snappy INNODB_SNAPPY) ) + fi + + if mysql_version_is_at_least "10.1.2" ; then + mycmakeargs+=( $(mysql-cmake_use_plugin cracklib CRACKLIB_PASSWORD_CHECK ) ) + fi + + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + mycmakeargs+=( -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) ) + else + mycmakeargs+=( $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) ) + fi + + if [[ ${PN} == "percona-server" ]]; then + mycmakeargs+=( + $(cmake-utils_use_with pam PAM) + ) + if in_iuse tokudb ; then + # TokuDB Backup plugin requires valgrind unconditionally + mycmakeargs+=( + $(mysql-cmake_use_plugin tokudb TOKUDB) + $(usex tokudb-backup-plugin "" -DTOKUDB_BACKUP_DISABLED=1) + ) + fi + fi + + if [[ ${PN} == "mysql-cluster" ]]; then + # TODO: This really should include the following options, + # but the memcached package doesn't install the files it seeks. + # -DWITH_BUNDLED_MEMCACHED=OFF + # -DMEMCACHED_HOME=${EPREFIX}/usr + mycmakeargs+=( + -DWITH_BUNDLED_LIBEVENT=OFF + $(cmake-utils_use_with java NDB_JAVA) + ) + fi +} + +# +# EBUILD FUNCTIONS +# + +# @FUNCTION: mysql-cmake_src_prepare +# @DESCRIPTION: +# Apply patches to the source code and remove unneeded bundled libs. +mysql-cmake_src_prepare() { + + debug-print-function ${FUNCNAME} "$@" + + cd "${S}" + + if [[ ${MY_EXTRAS_VER} != none ]]; then + + # Apply the patches for this MySQL version + EPATCH_SUFFIX="patch" + mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" + # Clean out old items + rm -f "${EPATCH_SOURCE}"/* + # Now link in right patches + mysql_mv_patches + # And apply + epatch + fi + + # last -fPIC fixup, per bug #305873 + i="${S}"/storage/innodb_plugin/plug.in + [[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" + + rm -f "scripts/mysqlbug" + if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33" ); then + echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die + fi + + if use tcmalloc; then + echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" + fi + + if in_iuse tokudb ; then + # Don't build bundled xz-utils + if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then + rm -f "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die + touch "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die + sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die + elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then + rm "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die + touch "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die + sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die + sed -i -e 's/add_dependencies$tokuportability_static_conv build_jemalloc$//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die + fi + + if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then + rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die + fi + fi + + # Remove the bundled groonga if it exists + # There is no CMake flag, it simply checks for existance + if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then + rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" + fi + + cmake-utils_src_prepare +} + +# @FUNCTION: mysql-cmake_src_configure +# @DESCRIPTION: +# Configure mysql to build the code for Gentoo respecting the use flags. +mysql-cmake_src_configure() { + + debug-print-function ${FUNCNAME} "$@" + + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # debug hack wrt #497532 + mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" + -DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr + -DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql + -DSYSCONFDIR=${EPREFIX}/etc/mysql + -DINSTALL_BINDIR=bin + -DINSTALL_DOCDIR=share/doc/${P} + -DINSTALL_DOCREADMEDIR=share/doc/${P} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_INFODIR=share/info + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_ELIBDIR=$(get_libdir)/mysql + -DINSTALL_MANDIR=share/man + -DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql + -DINSTALL_MYSQLSHAREDIR=share/mysql + -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test + -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin + -DINSTALL_SBINDIR=sbin + -DINSTALL_SCRIPTDIR=share/mysql/scripts + -DINSTALL_SQLBENCHDIR=share/mysql + -DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql + -DWITH_COMMENT="Gentoo Linux ${PF}" + $(cmake-utils_use_with test UNIT_TESTS) + -DWITH_LIBEDIT=0 + -DWITH_ZLIB=system + -DWITHOUT_LIBWRAP=1 + -DENABLED_LOCAL_INFILE=1 + $(cmake-utils_use_enable static-libs STATIC_LIBS) + -DWITH_SSL=$(usex ssl system bundled) + -DWITH_DEFAULT_COMPILER_OPTIONS=0 + -DWITH_DEFAULT_FEATURE_SET=0 + ) + + if in_iuse bindist ; then + mycmakeargs+=( + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + $(usex bindist -DHAVE_BFD_H=0 '') + ) + fi + + mycmakeargs+=( -DWITH_EDITLINE=system ) + + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then + mycmakeargs+=( + -DWITH_JEMALLOC=$(usex jemalloc system) + ) + mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system ) + fi + + configure_cmake_locale + + if use_if_iuse minimal ; then + configure_cmake_minimal + else + configure_cmake_standard + fi + + # Bug #114895, bug #110149 + filter-flags "-O" "-O[01]" + + CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" + CXXFLAGS="${CXXFLAGS} -felide-constructors" + # Causes linkage failures. Upstream bug #59607 removes it + if ! mysql_version_is_at_least "5.6" ; then + CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" + fi + # As of 5.7, exceptions and rtti are used! + if [[ ${PN} -eq 'percona-server' ]] && mysql_version_is_at_least "5.6.26" ; then + CXXFLAGS="${CXXFLAGS} -fno-rtti" + elif ! mysql_version_is_at_least "5.7" ; then + CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti" + fi + export CXXFLAGS + + # bug #283926, with GCC4.4, this is required to get correct behavior. + append-flags -fno-strict-aliasing + + cmake-utils_src_configure +} + +# @FUNCTION: mysql-cmake_src_compile +# @DESCRIPTION: +# Compile the mysql code. +mysql-cmake_src_compile() { + + debug-print-function ${FUNCNAME} "$@" + + cmake-utils_src_compile +} + +# @FUNCTION: mysql-cmake_src_install +# @DESCRIPTION: +# Install mysql. +mysql-cmake_src_install() { + + debug-print-function ${FUNCNAME} "$@" + + # Make sure the vars are correctly initialized + mysql_init_vars + + cmake-utils_src_install + + if ! in_iuse tools || use_if_iuse tools ; then + # Convenience links + einfo "Making Convenience links for mysqlcheck multi-call binary" + dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" + dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" + dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" + fi + + # Create a mariadb_config symlink + [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config" + + # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir + rm -Rf "${ED}/usr/data" + + # Various junk (my-*.cnf moved elsewhere) + einfo "Removing duplicate /usr/share/mysql files" + + # Unless they explicitly specific USE=test, then do not install the + # testsuite. It DOES have a use to be installed, esp. when you want to do a + # validation of your database configuration after tuning it. + if ! use test ; then + rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test + fi + + # Configuration stuff + case ${MYSQL_PV_MAJOR} in + 5.[1-4]*) mysql_mycnf_version="5.1" ;; + 5.5) mysql_mycnf_version="5.5" ;; + 5.[6-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.6" ;; + esac + einfo "Building default my.cnf (${mysql_mycnf_version})" + insinto "${MY_SYSCONFDIR#${EPREFIX}}" + [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf + mycnf_src="my.cnf-${mysql_mycnf_version}" + sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ + "${FILESDIR}/${mycnf_src}" \ + > "${TMPDIR}/my.cnf.ok" || die + use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok" + if use latin1 ; then + sed -i \ + -e "/character-set/s|utf8|latin1|g" \ + "${TMPDIR}/my.cnf.ok" || die + fi + eprefixify "${TMPDIR}/my.cnf.ok" + newins "${TMPDIR}/my.cnf.ok" my.cnf + + # Minimal builds don't have the MySQL server + if use_if_iuse minimal ; then + : + elif ! in_iuse server || use_if_iuse server; then + einfo "Including support files and sample configurations" + docinto "support-files" + for script in \ + "${S}"/support-files/my-*.cnf.sh \ + "${S}"/support-files/magic \ + "${S}"/support-files/ndb-config-2-node.ini.sh + do + [[ -f $script ]] && dodoc "${script}" + done + + docinto "scripts" + for script in "${S}"/scripts/mysql* ; do + [[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}" + done + fi + + #Remove mytop if perl is not selected + [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \ + && rm -f "${ED}/usr/bin/mytop" + + in_iuse client-libs && ! use client-libs && return + + # Percona has decided to rename libmysqlclient to libperconaserverclient + # Use a symlink to preserve linkages for those who don't use mysql_config + if [[ ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.5.36" ; then + dosym libperconaserverclient.so /usr/$(get_libdir)/libmysqlclient.so + dosym libperconaserverclient.so /usr/$(get_libdir)/libmysqlclient_r.so + if use static-libs ; then + dosym libperconaserverclient.a /usr/$(get_libdir)/libmysqlclient.a + dosym libperconaserverclient.a /usr/$(get_libdir)/libmysqlclient_r.a + fi + fi +} diff -uNr a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass --- a/eclass/mysql-multilib-r1.eclass false +++ b/eclass/mysql-multilib-r1.eclass 17e3a21dc65d0c164f809d5da0ab3858a78bb3b723eac5a7d5a07dce82002741c0d43b48adb0d99541985320168f37e564ec936e472c30f07c50ba45491cf2b2 @@ -0,0 +1,1141 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: mysql-multilib-r1.eclass +# @MAINTAINER: +# Maintainers: +# - MySQL Team <mysql-bugs@gentoo.org> +# - Robin H. Johnson <robbat2@gentoo.org> +# - Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> +# - Brian Evans <grknight@gentoo.org> +# @BLURB: This eclass provides common functions for mysql ebuilds +# @DESCRIPTION: +# The mysql-multilib-r1.eclass is the base eclass to build the mysql and +# alternative projects (mariadb and percona) ebuilds. +# Provider and version specific settings will be included in each ebuild. +# It provides the src_unpack, src_prepare, src_configure, src_compile, +# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm +# phase hooks. + +MYSQL_EXTRAS="" + +# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER +# @DEFAULT_UNSET +# @DESCRIPTION: +# The version of the MYSQL_EXTRAS repo to use to build mysql +# Use "none" to disable it's use +[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3" + +# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of extra CMake arguments for native multilib builds + +# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of extra CMake arguments for non-native multilib builds + +# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of CMake arguments added to native and non-native + +# Keeping eutils in EAPI=6 for emktemp in pkg_config + +inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} versionator \ + prefix toolchain-funcs user cmake-utils multilib-minimal + +if [[ "${EAPI}x" == "5x" ]]; then + inherit multilib mysql_fx +fi + +# +# Supported EAPI versions and export functions +# + +case "${EAPI:-0}" in + 5|6) ;; + *) die "Unsupported EAPI: ${EAPI}" ;; +esac + +EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config + +# +# VARIABLES: +# + +# Shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/mysql" + +[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" +if [[ ${MY_EXTRAS_VER} == "live" ]]; then + EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras + EGIT_CLONE_TYPE=shallow +fi + +# @ECLASS-VARIABLE: MYSQL_PV_MAJOR +# @DESCRIPTION: +# Upstream MySQL considers the first two parts of the version number to be the +# major version. Upgrades that change major version should always run +# mysql_upgrade. +if [[ -z ${MYSQL_PV_MAJOR} ]] ; then MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" ; fi + +# @ECLASS-VARIABLE: MYSQL_VERSION_ID +# @DESCRIPTION: +# MYSQL_VERSION_ID will be: +# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] +# This is an important part, because many of the choices the MySQL ebuild will do +# depend on this variable. +# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" +# We also strip off upstream's trailing letter that they use to respin tarballs +if [[ "${EAPI}x" == "5x" ]]; then + MYSQL_VERSION_ID="" + tpv="${PV%[a-z]}" + tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" + for vatom in 0 1 2 3 ; do + # pad to length 2 + tpv[${vatom}]="00${tpv[${vatom}]}" + MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" + done + # strip leading "0" (otherwise it's considered an octal number by BASH) + MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} +fi + +# Work out the default SERVER_URI correctly +if [[ -z ${SERVER_URI} ]]; then + if [[ ${PN} == "mariadb" ]]; then + # Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names + MARIA_FULL_PV=$(get_version_component_range 1-3) + MARIA_FULL_P="${PN}-${MARIA_FULL_PV}" + SERVER_URI="https://downloads.mariadb.org/interstitial/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz" + elif [[ ${PN} == "percona-server" ]]; then + PERCONA_PN="Percona-Server" + MIRROR_PV=$(get_version_component_range 1-2 ${PV}) + MY_PV=$(get_version_component_range 1-3 ${PV}) + PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV}) + PERCONA_RC=$(get_version_component_range 6 ${PV}) + SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz" + else + if [[ "${PN}" == "mysql-cluster" ]] ; then + URI_DIR="MySQL-Cluster" + URI_FILE="mysql-cluster-gpl" + else + URI_DIR="MySQL" + URI_FILE="mysql" + fi + [[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}" + URI_A="${URI_FILE}-${MY_PV}.tar.gz" + MIRROR_PV=$(get_version_component_range 1-2 ${PV}) + # Recently upstream switched to an archive site, and not on mirrors + SERVER_URI="http://cdn.mysql.com/Downloads/${URI_DIR}-${MIRROR_PV}/${URI_A} + http://downloads.mysql.com/archives/${URI_DIR}-${MIRROR_PV}/${URI_A}" + fi +fi + +# Define correct SRC_URIs +SRC_URI="${SERVER_URI}" + +# Gentoo patches to MySQL +if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then + SRC_URI="${SRC_URI} + mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" +fi + +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" +HOMEPAGE="http://www.mysql.com/" +LICENSE="GPL-2" +SLOT="0/${SUBSLOT:-0}" + +IUSE="debug embedded extraengine jemalloc latin1 libressl +openssl + +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl" + +REQUIRED_USE="^^ ( yassl openssl libressl )" + +# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests +RESTRICT="libressl? ( test )" + +REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded ) + ?? ( tcmalloc jemalloc ) + static? ( !libressl !openssl yassl )" + +# +# DEPENDENCIES: +# + +# Be warned, *DEPEND are version-dependant +# These are used for both runtime and compiletime +# MULTILIB_USEDEP only set for libraries used by the client library +DEPEND=" + kernel_linux? ( + sys-process/procps:0= + dev-libs/libaio:0= + ) + >=sys-apps/sed-4 + >=sys-apps/texinfo-4.7-r1 + !dev-db/mariadb-native-client[mysqlcompat] + jemalloc? ( dev-libs/jemalloc:0= ) + tcmalloc? ( dev-util/google-perftools:0= ) + systemtap? ( >=dev-util/systemtap-1.3:0= ) + openssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) + >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] + sys-libs/ncurses:0= +" + +# prefix: first need to implement something for #196294 +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-mysql ) +" + +# Having different flavours at the same time is not a good idea +for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do + [[ ${i} == ${PN} ]] || + RDEPEND="${RDEPEND} !dev-db/${i}" +done + +RDEPEND="${RDEPEND} + server? ( !prefix? ( dev-db/mysql-init-scripts ) ) + !<virtual/mysql-5.6-r4" + +# compile-time-only +# ncurses only needs multilib for compile time due to a binary that will be not installed +DEPEND="${DEPEND} + virtual/yacc + static? ( sys-libs/ncurses[static-libs] ) +" + +# For other stuff to bring us in +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 ) + server? ( ~virtual/mysql-${MYSQL_PV_MAJOR}[embedded=,static=] ) + virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]" + +# my_config.h includes ABI specific data +MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h ) + +# +# EBUILD FUNCTIONS +# + +# @FUNCTION: mysql-multilib-r1_pkg_pretend +# @DESCRIPTION: +# Perform some basic tests and tasks during pkg_pretend phase: +mysql-multilib-r1_pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]] ; then + local GCC_MAJOR_SET=$(gcc-major-version) + local GCC_MINOR_SET=$(gcc-minor-version) + if in_iuse tokudb && use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on + # non x86{,_64} arches + if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ + ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then + eerror "${PN} needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + fi +} + +# @FUNCTION: mysql-multilib-r1_pkg_setup +# @DESCRIPTION: +# Perform some basic tests and tasks during pkg_setup phase: +# die if FEATURES="test", USE="server" and not using FEATURES="userpriv" +# create new user and group for mysql +# warn about deprecated features +mysql-multilib-r1_pkg_setup() { + + if has test ${FEATURES} && \ + use server && ! has userpriv ${FEATURES} ; then + eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + + # This should come after all of the die statements + enewgroup mysql 60 || die "problem adding 'mysql' group" + enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" +} + +# @FUNCTION: mysql-multilib-r1_src_unpack +# @DESCRIPTION: +# Unpack the source code +mysql-multilib-r1_src_unpack() { + + # Initialize the proper variables first + mysql_init_vars + + unpack ${A} + # Grab the patches + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack + + mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" +} + +# @FUNCTION: mysql-multilib-r1_src_prepare +# @DESCRIPTION: +# Apply patches to the source code and remove unneeded bundled libs. +mysql-multilib-r1_src_prepare() { + + debug-print-function ${FUNCNAME} "$@" + + cd "${S}" + + if [[ ${MY_EXTRAS_VER} != none ]]; then + + # Apply the patches for this MySQL version + if [[ "${EAPI}x" == "5x" ]]; then + EPATCH_SUFFIX="patch" + mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" + # Clean out old items + rm -f "${EPATCH_SOURCE}"/* + # Now link in right patches + mysql_mv_patches + # And apply + epatch + fi + fi + + # last -fPIC fixup, per bug #305873 + i="${S}"/storage/innodb_plugin/plug.in + if [[ -f ${i} ]] ; then sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" || die ; fi + + rm -f "scripts/mysqlbug" + if use jemalloc && [[ ${PN} != "mariadb" ]] ; then + echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die + fi + + if use tcmalloc; then + echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" + fi + + if in_iuse tokudb ; then + # Don't build bundled xz-utils + if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then + echo > "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die + sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die + elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then + echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die + sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die + sed -i -e 's/add_dependencies$tokuportability_static_conv build_jemalloc$//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die + fi + + if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then + rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die + fi + fi + + # Remove the bundled groonga if it exists + # There is no CMake flag, it simply checks for existance + if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then + rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" + fi + + # Remove the centos and rhel selinux policies to support mysqld_safe under SELinux + if [[ -d "${S}/support-files/SELinux" ]] ; then + echo > "${S}/support-files/SELinux/CMakeLists.txt" || die + fi + + cmake-utils_src_prepare +} + +# @FUNCTION: mysql-multilib-r1_src_configure +# @DESCRIPTION: +# Configure mysql to build the code for Gentoo respecting the use flags. +mysql-multilib-r1_src_configure() { + # Bug #114895, bug #110149 + filter-flags "-O" "-O[01]" + + append-cxxflags -felide-constructors + + # bug #283926, with GCC4.4, this is required to get correct behavior. + append-flags -fno-strict-aliasing + + multilib-minimal_src_configure +} + +multilib_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # debug hack wrt #497532 + mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr + -DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql + -DSYSCONFDIR=${EPREFIX}/etc/mysql + -DINSTALL_BINDIR=bin + -DINSTALL_DOCDIR=share/doc/${PF} + -DINSTALL_DOCREADMEDIR=share/doc/${PF} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_INFODIR=share/info + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_ELIBDIR=$(get_libdir)/mysql + -DINSTALL_MANDIR=share/man + -DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql + -DINSTALL_MYSQLSHAREDIR=share/mysql + -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin + -DINSTALL_SBINDIR=sbin + -DINSTALL_SCRIPTDIR=share/mysql/scripts + -DINSTALL_SQLBENCHDIR=share/mysql + -DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql + -DWITH_COMMENT="Gentoo Linux ${PF}" + -DWITH_UNIT_TESTS=$(usex test ON OFF) + -DWITH_LIBEDIT=0 + -DWITH_ZLIB=system + -DWITHOUT_LIBWRAP=1 + -DENABLED_LOCAL_INFILE=1 + -DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock + -DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock + -DWITH_DEFAULT_COMPILER_OPTIONS=0 + -DWITH_DEFAULT_FEATURE_SET=0 + -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" + -DENABLE_STATIC_LIBS=$(usex static-libs ON OFF) + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) + -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)" + ) + + if use test ; then + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test ) + else + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) + fi + + if use openssl || use libressl ; then + mycmakeargs+=( -DWITH_SSL=system ) + else + mycmakeargs+=( -DWITH_SSL=bundled ) + fi + + if ! multilib_is_native_abi ; then + mycmakeargs+=( -DWITHOUT_TOOLS=1 ) + fi + + if in_iuse bindist ; then + # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION + if multilib_is_native_abi; then + mycmakeargs+=( + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + ) + else + mycmakeargs+=( + -DWITH_READLINE=1 + -DNOT_FOR_DISTRIBUTION=0 + ) + fi + fi + + ### TODO: make this system but issues with UTF-8 prevent it + mycmakeargs+=( -DWITH_EDITLINE=bundled ) + + if multilib_is_native_abi && use server ; then + + # systemd is only linked to for server notification + if in_iuse systemd ; then + mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd yes no) ) + fi + + if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then + ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" + ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." + ewarn "You MUST file bugs without these variables set." + + mycmakeargs+=( + -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} + -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} + ) + + elif ! use latin1 ; then + mycmakeargs+=( + -DDEFAULT_CHARSET=utf8 + -DDEFAULT_COLLATION=utf8_general_ci + ) + else + mycmakeargs+=( + -DDEFAULT_CHARSET=latin1 + -DDEFAULT_COLLATION=latin1_swedish_ci + ) + fi + mycmakeargs+=( + -DEXTRA_CHARSETS=all + -DMYSQL_USER=mysql + -DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock + -DDISABLE_SHARED=$(usex static YES NO) + -DWITH_DEBUG=$(usex debug) + -DWITH_EMBEDDED_SERVER=$(usex embedded) + -DWITH_PROFILING=$(usex profiling) + ) + + if use static; then + mycmakeargs+=( -DWITH_PIC=1 ) + fi + + if use jemalloc || use tcmalloc ; then + mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) + fi + + # Storage engines + mycmakeargs+=( + -DWITH_ARCHIVE_STORAGE_ENGINE=1 + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 + -DWITH_CSV_STORAGE_ENGINE=1 + -DWITH_HEAP_STORAGE_ENGINE=1 + -DWITH_INNOBASE_STORAGE_ENGINE=1 + -DWITH_MYISAMMRG_STORAGE_ENGINE=1 + -DWITH_MYISAM_STORAGE_ENGINE=1 + -DWITH_PARTITION_STORAGE_ENGINE=1 + ) + + mycmakeargs+=( -DWITH_FEDERATED_STORAGE_ENGINE=$(usex extraengine) ) + else + mycmakeargs+=( + -DWITHOUT_SERVER=1 + -DWITHOUT_EMBEDDED_SERVER=1 + -DEXTRA_CHARSETS=none + -DINSTALL_SQLBENCHDIR= + -DWITH_SYSTEMD=no + ) + fi + + # systemtap only works on native ABI bug 530132 + if multilib_is_native_abi; then + mycmakeargs+=( -DENABLE_DTRACE=$(usex systemtap) + "${MYSQL_CMAKE_NATIVE_DEFINES[@]}" ) + else + mycmakeargs+=( -DENABLE_DTRACE=0 + "${MYSQL_CMAKE_NONNATIVE_DEFINES[@]}" ) + fi + + mycmakeargs+=( "${MYSQL_CMAKE_EXTRA_DEFINES[@]}" ) + + cmake-utils_src_configure +} + +mysql-multilib-r1_src_compile() { + local _cmake_args=( "${@}" ) + + multilib-minimal_src_compile +} + +multilib_src_compile() { + + cmake-utils_src_compile "${_cmake_args[@]}" +} + + +# @FUNCTION: mysql-multilib-r1_src_install +# @DESCRIPTION: +# Install mysql. +mysql-multilib-r1_src_install() { + # wrap the config script + MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) + + multilib-minimal_src_install +} + +multilib_src_install() { + debug-print-function ${FUNCNAME} "$@" + + cmake-utils_src_install + # Make sure the vars are correctly initialized + mysql_init_vars + + # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used + if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then + rm "${D}${MY_INCLUDEDIR}/private/config.h" || die + fi + + if multilib_is_native_abi; then + + # Convenience links + einfo "Making Convenience links for mysqlcheck multi-call binary" + dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze" + dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" + dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" + + # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir + if [[ -d "${ED}/usr/data" ]] ; then + rm -Rf "${ED}/usr/data" || die + fi + + # Unless they explicitly specific USE=test, then do not install the + # testsuite. It DOES have a use to be installed, esp. when you want to do a + # validation of your database configuration after tuning it. + if ! use test ; then + rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test + fi + + # Configuration stuff + case ${MYSQL_PV_MAJOR} in + 5.5) mysql_mycnf_version="5.5" ;; + 5.[6-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.6" ;; + esac + einfo "Building default my.cnf (${mysql_mycnf_version})" + insinto "${MY_SYSCONFDIR#${EPREFIX}}" + [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf + mycnf_src="my.cnf-${mysql_mycnf_version}" + sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ + "${FILESDIR}/${mycnf_src}" \ + > "${TMPDIR}/my.cnf.ok" || die + use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok" + if use latin1 ; then + sed -i \ + -e "/character-set/s|utf8|latin1|g" \ + "${TMPDIR}/my.cnf.ok" || die + fi + eprefixify "${TMPDIR}/my.cnf.ok" + newins "${TMPDIR}/my.cnf.ok" my.cnf + + if use server ; then + einfo "Including support files and sample configurations" + docinto "support-files" + for script in \ + "${S}"/support-files/my-*.cnf.sh \ + "${S}"/support-files/magic \ + "${S}"/support-files/ndb-config-2-node.ini.sh + do + [[ -f $script ]] && dodoc "${script}" + done + + docinto "scripts" + for script in "${S}"/scripts/mysql* ; do + [[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}" + done + fi + + #Remove mytop if perl is not selected + [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" + + # Percona has decided to rename libmysqlclient to libperconaserverclient + # Use a symlink to preserve linkages for those who don't use mysql_config + local suffix + for suffix in ".so" "_r.so" ".a" "_r.a" ; do + if [[ -e "${ED}/usr/$(get_libdir)/libperconaserverclient${suffix}" ]] ; then + dosym libperconaserverclient${suffix} /usr/$(get_libdir)/libmysqlclient${suffix} + fi + done + else + if [[ "${PN}" == "mariadb" ]] && use server ; then + insinto /usr/include/mysql/private + doins "${S}"/sql/*.h + fi + fi +} + +# @FUNCTION: mysql-multilib-r1_pkg_preinst +# @DESCRIPTION: +# Warn about ABI changes when switching providers +mysql-multilib-r1_pkg_preinst() { + debug-print-function ${FUNCNAME} "$@" + + # Here we need to see if the implementation switched client libraries + # We check if this is a new instance of the package and a client library already exists + local SHOW_ABI_MESSAGE + if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then + elog "Due to ABI changes when switching between different client libraries," + elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient." + elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT:-18}" + ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries" + fi +} + +# @FUNCTION: mysql-multilib-r1_pkg_postinst +# @DESCRIPTION: +# Run post-installation tasks: +# create the dir for logfiles if non-existant +# touch the logfiles and secure them +# install scripts +# issue required steps for optional features +# issue deprecation warnings +mysql-multilib-r1_pkg_postinst() { + debug-print-function ${FUNCNAME} "$@" + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Create log directory securely if it does not exist + [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" + + if use server ; then + docinto "support-files" + for script in \ + support-files/my-*.cnf \ + support-files/magic \ + support-files/ndb-config-2-node.ini + do + [[ -f "${script}" ]] \ + && dodoc "${script}" + done + + docinto "scripts" + for script in scripts/mysql* ; do + if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then + dodoc "${script}" + fi + done + + if in_iuse pam && use pam; then + einfo + elog "This install includes the PAM authentication plugin." + elog "To activate and configure the PAM plugin, please read:" + if [[ ${PN} == "mariadb" ]] ; then + elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/" + elif [[ ${PN} == "percona-server" ]] ; then + elog "https://www.percona.com/doc/percona-server/5.6/management/pam_plugin.html" + fi + einfo + fi + + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + einfo + elog "You might want to run:" + elog "\"emerge --config =${CATEGORY}/${PF}\"" + elog "if this is a new install." + elog + elog "If you are switching server implentations, you should run the" + elog "mysql_upgrade tool." + einfo + else + einfo + elog "If you are upgrading major versions, you should run the" + elog "mysql_upgrade tool." + einfo + fi + + if in_iuse galera && use galera ; then + einfo + elog "Be sure to edit the my.cnf file to activate your cluster settings." + elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" + elog "The first time the cluster is activated, you should add" + elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." + elog "This option should then be removed for subsequent starts." + einfo + fi + fi +} + +# @FUNCTION: mysql-multilib-r1_getopt +# @DESCRIPTION: +# Use my_print_defaults to extract specific config options +mysql-multilib-r1_getopt() { + local mypd="${EROOT}"/usr/bin/my_print_defaults + section="$1" + flag="--${2}=" + "${mypd}" $section | sed -n "/^${flag}/p" +} + +# @FUNCTION: mysql-multilib-r1_getoptval +# @DESCRIPTION: +# Use my_print_defaults to extract specific config options +mysql-multilib-r1_getoptval() { + local mypd="${EROOT}"/usr/bin/my_print_defaults + local section="$1" + local flag="--${2}=" + local extra_options="${3}" + "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp" +} + +# @FUNCTION: mysql-multilib-r1_pkg_config +# @DESCRIPTION: +# Configure mysql environment. +mysql-multilib-r1_pkg_config() { + + debug-print-function ${FUNCNAME} "$@" + + local old_MY_DATADIR="${MY_DATADIR}" + local old_HOME="${HOME}" + # my_print_defaults needs to read stuff in $HOME/.my.cnf + export HOME=${EPREFIX}/root + + # Make sure the vars are correctly initialized + mysql_init_vars + + [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" + if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then + die "Minimal builds do NOT include the MySQL server" + fi + + if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then + local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" + MY_DATADIR_s="${MY_DATADIR_s%%/}" + local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" + old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" + + if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" + ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" + else + elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" + mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ + || die "Moving MY_DATADIR failed" + fi + else + ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Attempting to use ${MY_DATADIR_s}" + else + eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" + die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" + fi + fi + fi + + local pwd1="a" + local pwd2="b" + local maxtry=15 + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + local tmp_mysqld_password_source= + + for tmp_mysqld_password_source in mysql client; do + einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." + MYSQL_ROOT_PASSWORD="$(mysql-multilib-r1_getoptval "${tmp_mysqld_password_source}" password)" + if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then + if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then + ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" + MYSQL_ROOT_PASSWORD= + continue + fi + + einfo "Found password in '${tmp_mysqld_password_source}' section!" + break + fi + done + + # Sometimes --show is required to display passwords in some implementations of my_print_defaults + if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then + MYSQL_ROOT_PASSWORD="$(mysql-multilib-r1_getoptval "${tmp_mysqld_password_source}" password --show)" + fi + + unset tmp_mysqld_password_source + fi + MYSQL_TMPDIR="$(mysql-multilib-r1_getoptval mysqld tmpdir)" + # These are dir+prefix + MYSQL_RELAY_LOG="$(mysql-multilib-r1_getoptval mysqld relay-log)" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + MYSQL_LOG_BIN="$(mysql-multilib-r1_getoptval mysqld log-bin)" + MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} + + if [[ ! -d "${ROOT}"/$MYSQL_TMPDIR ]]; then + einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" + install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR + fi + if [[ ! -d "${ROOT}"/$MYSQL_LOG_BIN ]]; then + einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" + install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN + fi + if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then + einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" + install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG + fi + + if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then + ewarn "You have already a MySQL database in place." + ewarn "(${ROOT}/${MY_DATADIR}/*)" + ewarn "Please rename or delete it if you wish to replace it." + die "MySQL database already exists!" + fi + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + + einfo "Please provide a password for the mysql 'root' user now" + einfo "or through the ${HOME}/.my.cnf file." + ewarn "Avoid [\"'\\_%] characters in the password" + read -rsp " >" pwd1 ; echo + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + die "Passwords are not the same" + fi + MYSQL_ROOT_PASSWORD="${pwd1}" + unset pwd1 pwd2 + fi + + local options + local sqltmp="$(emktemp)" + + # Fix bug 446200. Don't reference host my.cnf, needs to come first, + # see http://bugs.mysql.com/bug.php?id=31312 + use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" + + local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql" + [[ -r "${help_tables}" ]] \ + && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ + || touch "${TMPDIR}/fill_help_tables.sql" + help_tables="${TMPDIR}/fill_help_tables.sql" + + # Figure out which options we need to disable to do the setup + local helpfile="${TMPDIR}/mysqld-help" + ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null + for opt in grant-tables host-cache name-resolve networking slave-start \ + federated ssl log-bin relay-log slow-query-log external-locking \ + ndbcluster log-slave-updates wsrep-on \ + ; do + optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" + egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" + done + # But some options changed names + egrep -sq external-locking "${helpfile}" && \ + options="${options/skip-locking/skip-external-locking}" + + einfo "Creating the mysql database and setting proper permissions on it ..." + + # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it + PID_DIR="${EROOT}/var/run/mysqld" + if [[ ! -d "${PID_DIR}" ]]; then + install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory" + fi + + if [[ ! -d "${MY_DATADIR}" ]]; then + install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory" + fi + + pushd "${TMPDIR}" &>/dev/null || die + + # Filling timezones, see + # http://dev.mysql.com/doc/mysql/en/time-zone-support.html + "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null + + local cmd + local initialize_options + if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && version_is_at_least "5.7.6" ; then + # --initialize-insecure will not set root password + # --initialize would set a random one in the log which we don't need as we set it ourselves + cmd=( "${EROOT}usr/sbin/mysqld" ) + initialize_options="--initialize-insecure --init-file='${sqltmp}'" + sqltmp="" # the initialize will take care of it + else + cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" ) + [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) + if [[ -r "${help_tables}" ]] ; then + cat "${help_tables}" >> "${sqltmp}" + fi + fi + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ${initialize_options} ) + einfo "Command: ${cmd[*]}" + su -s /bin/sh -c "${cmd[*]}" mysql \ + >"${TMPDIR}"/mysql_install_db.log 2>&1 + if [ $? -ne 0 ]; then + grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" + fi + popd &>/dev/null || die + [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ + || die "MySQL databases not installed" + + local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" + local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" + local mysqld="${EROOT}/usr/sbin/mysqld \ + ${options} \ + $(use prefix || echo --user=mysql) \ + --log-warnings=0 \ + --basedir=${EROOT}/usr \ + --datadir=${ROOT}/${MY_DATADIR} \ + --max_allowed_packet=8M \ + --net_buffer_length=16K \ + --default-storage-engine=MyISAM \ + --socket=${socket} \ + --pid-file=${pidfile} + --tmpdir=${ROOT}/${MYSQL_TMPDIR}" + #einfo "About to start mysqld: ${mysqld}" + ebegin "Starting mysqld" + einfo "Command ${mysqld}" + ${mysqld} & + rc=$? + while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + eend $rc + + if ! [[ -S "${socket}" ]]; then + die "Completely failed to start up mysqld with: ${mysqld}" + fi + + ebegin "Setting root password" + # Do this from memory, as we don't want clear text passwords in temp files + local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" + "${EROOT}/usr/bin/mysql" \ + --socket=${socket} \ + -hlocalhost \ + -e "${sql}" + eend $? + + if [[ -n "${sqltmp}" ]] ; then + ebegin "Loading \"zoneinfo\", this step may require a few seconds" + "${EROOT}/usr/bin/mysql" \ + --socket=${socket} \ + -hlocalhost \ + -uroot \ + --password="${MYSQL_ROOT_PASSWORD}" \ + mysql < "${sqltmp}" + rc=$? + eend $? + [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" + fi + + # Stop the server and cleanup + einfo "Stopping the server ..." + kill $(< "${pidfile}" ) + rm -f "${sqltmp}" + wait %1 + einfo "Done" +} + + +# +# HELPER FUNCTIONS: +# + +# @FUNCTION: mysql-multilib-r1_disable_test +# @DESCRIPTION: +# Helper function to disable specific tests. +mysql-multilib-r1_disable_test() { + + local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir + rawtestname="${1}" ; shift + reason="${@}" + ewarn "test '${rawtestname}' disabled: '${reason}'" + + testsuite="${rawtestname/.*}" + testname="${rawtestname/*.}" + for mysql_disabled_file in \ + ${S}/mysql-test/disabled.def \ + ${S}/mysql-test/t/disabled.def ; do + [[ -f ${mysql_disabled_file} ]] && break + done + #mysql_disabled_file="${S}/mysql-test/t/disabled.def" + #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}" + echo ${testname} : ${reason} >> "${mysql_disabled_file}" + + if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then + for mysql_disabled_file in \ + ${S}/mysql-test/suite/${testsuite}/disabled.def \ + ${S}/mysql-test/suite/${testsuite}/t/disabled.def \ + FAILED ; do + [[ -f ${mysql_disabled_file} ]] && break + done + if [[ ${mysql_disabled_file} != "FAILED" ]]; then + echo "${testname} : ${reason}" >> "${mysql_disabled_file}" + else + for mysql_disabled_dir in \ + ${S}/mysql-test/suite/${testsuite} \ + ${S}/mysql-test/suite/${testsuite}/t \ + FAILED ; do + [[ -d ${mysql_disabled_dir} ]] && break + done + if [[ ${mysql_disabled_dir} != "FAILED" ]]; then + echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def" + else + ewarn "Could not find testsuite disabled.def location for ${rawtestname}" + fi + fi + fi +} + +# @FUNCTION: mysql-cmake_use_plugin +# @DESCRIPTION: +# Helper function to enable/disable plugins by use flags +# cmake-utils_use_with is not enough as some references check WITH_ (0|1) +# and some check WITHOUT_. Also, this can easily extend to non-storage plugins. +mysql-cmake_use_plugin() { + [[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>" + if in_iuse $1 && use $1 ; then + echo "-DWITH_$2=1 -DPLUGIN_$2=YES" + else + echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO" + fi +} + +# @FUNCTION: mysql_init_vars +# @DESCRIPTION: +# void mysql_init_vars() +# Initialize global variables +# 2005-11-19 <vivo@gentoo.org> +if [[ "${EAPI}x" != "5x" ]]; then + +mysql_init_vars() { + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} + MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"} + MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"} + + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="" + if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then + MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1` + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ + | sed -e 's/.*=\s*//' \ + | tail -n1` + fi + fi + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="${MY_LOCALSTATEDIR}" + einfo "Using default MY_DATADIR" + fi + elog "MySQL MY_DATADIR is ${MY_DATADIR}" + + if [[ -z "${PREVIOUS_DATADIR}" ]] ; then + if [[ -e "${MY_DATADIR}" ]] ; then + # If you get this and you're wondering about it, see bug #207636 + elog "MySQL datadir found in ${MY_DATADIR}" + elog "A new one will not be created." + PREVIOUS_DATADIR="yes" + else + PREVIOUS_DATADIR="no" + fi + export PREVIOUS_DATADIR + fi + else + if [[ ${EBUILD_PHASE} == "config" ]]; then + local new_MY_DATADIR + new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1` + + if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then + ewarn "MySQL MY_DATADIR has changed" + ewarn "from ${MY_DATADIR}" + ewarn "to ${new_MY_DATADIR}" + MY_DATADIR="${new_MY_DATADIR}" + fi + fi + fi + + if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then + MY_SOURCEDIR=${SERVER_URI##*/} + MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} + fi + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR + export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR +} +fi diff -uNr a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass --- a/eclass/mysql-v2.eclass false +++ b/eclass/mysql-v2.eclass 56a9dbb482e04f3280f6fc175ca064e94648b2b0de9bf9bf548d7d797affb84e525c5f703c861586e39c778f8106b3319f4d9b735dfaf749b8f57dc12eee4cf2 @@ -0,0 +1,913 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: mysql-v2.eclass +# @MAINTAINER: +# Maintainers: +# - MySQL Team <mysql-bugs@gentoo.org> +# - Robin H. Johnson <robbat2@gentoo.org> +# - Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> +# - Brian Evans <grknight@gentoo.org> +# @BLURB: This eclass provides most of the functions for mysql ebuilds +# @DESCRIPTION: +# The mysql-v2.eclass is the base eclass to build the mysql and +# alternative projects (mariadb and percona) ebuilds. +# This eclass uses the mysql-autotools and mysql-cmake eclasses for the +# specific bits related to the build system. +# It provides the src_unpack, src_prepare, src_configure, src_compile, +# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm +# phase hooks. + +# @ECLASS-VARIABLE: BUILD +# @DESCRIPTION: +# Build type of the mysql version +: ${BUILD:=autotools} + +case ${BUILD} in + "cmake") + BUILD_INHERIT="mysql-cmake" + ;; + "autotools") + BUILD_INHERIT="mysql-autotools" + + WANT_AUTOCONF="latest" + WANT_AUTOMAKE="latest" + ;; + *) + die "${BUILD} is not a valid build system for mysql" + ;; +esac + +MYSQL_EXTRAS="" + +# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER +# @DEFAULT_UNSET +# @DESCRIPTION: +# The version of the MYSQL_EXTRAS repo to use to build mysql +# Use "none" to disable it's use +[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3" + +inherit eutils flag-o-matic ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs user + +# +# Supported EAPI versions and export functions +# + +case "${EAPI:-0}" in + 4|5) ;; + *) die "Unsupported EAPI: ${EAPI}" ;; +esac + +EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config pkg_postrm + +# +# VARIABLES: +# + +# Shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/mysql" + +[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" +if [[ ${MY_EXTRAS_VER} == "live" ]]; then + EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras + EGIT_CLONE_TYPE=shallow +fi + +# @ECLASS-VARIABLE: MYSQL_PV_MAJOR +# @DESCRIPTION: +# Upstream MySQL considers the first two parts of the version number to be the +# major version. Upgrades that change major version should always run +# mysql_upgrade. +MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" + +# Cluster is a special case... +if [[ ${PN} == "mysql-cluster" ]]; then + case ${PV} in + 6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;; + 7.2*) MYSQL_PV_MAJOR=5.5 ;; + 7.3*) MYSQL_PV_MAJOR=5.6 ;; + esac +fi + +# MariaDB has left the numbering schema but keeping compatibility +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + case ${PV} in + 10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;; + esac +fi + +# @ECLASS-VARIABLE: MYSQL_VERSION_ID +# @DESCRIPTION: +# MYSQL_VERSION_ID will be: +# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] +# This is an important part, because many of the choices the MySQL ebuild will do +# depend on this variable. +# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" +# We also strip off upstream's trailing letter that they use to respin tarballs +MYSQL_VERSION_ID="" +tpv="${PV%[a-z]}" +tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" +for vatom in 0 1 2 3 ; do + # pad to length 2 + tpv[${vatom}]="00${tpv[${vatom}]}" + MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" +done +# strip leading "0" (otherwise it's considered an octal number by BASH) +MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} + +# This eclass should only be used with at least mysql-5.1.50 +mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with >=mysql-5.1.50" + +# @ECLASS-VARIABLE: XTRADB_VER +# @DEFAULT_UNSET +# @DESCRIPTION: +# Version of the XTRADB storage engine + +# @ECLASS-VARIABLE: PERCONA_VER +# @DEFAULT_UNSET +# @DESCRIPTION: +# Designation by PERCONA for a MySQL version to apply an XTRADB release + +# Work out the default SERVER_URI correctly +if [[ -z ${SERVER_URI} ]]; then + [[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}" + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + # Beginning with 5.5, MariaDB stopped putting beta, alpha or rc on their tarball names + mysql_version_is_at_least "5.5" && MARIA_FULL_PV=$(get_version_component_range 1-3) || \ + MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV}) + MARIA_FULL_P="${PN}-${MARIA_FULL_PV}" + SERVER_URI=" + http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz + http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz + " + if [[ ${PN} == "mariadb-galera" ]]; then + MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}" + fi + elif [[ ${PN} == "percona-server" ]]; then + PERCONA_PN="Percona-Server" + MIRROR_PV=$(get_version_component_range 1-2 ${PV}) + MY_PV=$(get_version_component_range 1-3 ${PV}) + PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV}) + PERCONA_RC=$(get_version_component_range 6 ${PV}) + SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz" +# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-30.2.tar.gz +# http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz + else + if [[ "${PN}" == "mysql-cluster" ]] ; then + URI_DIR="MySQL-Cluster" + URI_FILE="mysql-cluster-gpl" + else + URI_DIR="MySQL" + URI_FILE="mysql" + fi + URI_A="${URI_FILE}-${MY_PV}.tar.gz" + MIRROR_PV=$(get_version_component_range 1-2 ${PV}) + # Recently upstream switched to an archive site, and not on mirrors + SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A} + https://downloads.skysql.com/files/${URI_FILE}-${MIRROR_PV}/${URI_A} + mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}" + fi +fi + +# Define correct SRC_URIs +SRC_URI="${SERVER_URI}" + +# Gentoo patches to MySQL +if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then + SRC_URI="${SRC_URI} + mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" +fi + +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" +HOMEPAGE="http://www.mysql.com/" +if [[ ${PN} == "mariadb" ]]; then + HOMEPAGE="http://mariadb.org/" + DESCRIPTION="An enhanced, drop-in replacement for MySQL" +fi +if [[ ${PN} == "mariadb-galera" ]]; then + HOMEPAGE="http://mariadb.org/" + DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication" +fi +if [[ ${PN} == "percona-server" ]]; then + HOMEPAGE="http://www.percona.com/software/percona-server" + DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team" +fi +LICENSE="GPL-2" +SLOT="0" + +case "${BUILD}" in + "autotools") + IUSE="big-tables debug embedded minimal +perl selinux ssl static test" + ;; + "cmake") + IUSE="debug embedded minimal +perl selinux ssl static static-libs test" + ;; +esac + +# Common IUSE +IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling" + +# This probably could be simplified, but the syntax would have to be just right +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ + mysql_version_is_at_least "5.5" ; then + IUSE="bindist ${IUSE}" + RESTRICT="${RESTRICT} !bindist? ( bindist )" +elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ + mysql_check_version_range "5.5.37 to 5.6.11.99" ; then + IUSE="bindist ${IUSE}" + RESTRICT="${RESTRICT} !bindist? ( bindist )" +elif [[ ${PN} == "mysql-cluster" ]] && \ + mysql_check_version_range "7.2 to 7.2.99.99" ; then + IUSE="bindist ${IUSE}" + RESTRICT="${RESTRICT} !bindist? ( bindist )" +fi + +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent" + mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \ + REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph )" + mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx" && \ + REQUIRED_USE="${REQUIRED_USE} minimal? ( !sphinx )" + mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam" + # 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers + mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb odbc xml" && \ + REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( extraengine ) tokudb? ( jemalloc !tcmalloc )" + mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" && \ + REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc !tcmalloc )" +fi + +if mysql_version_is_at_least "5.5"; then + REQUIRED_USE="${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )" + IUSE="${IUSE} jemalloc tcmalloc" +fi + +if mysql_version_is_at_least "5.5.7"; then + IUSE="${IUSE} systemtap" +fi + +if [[ ${PN} == "percona-server" ]]; then + mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam" +fi + +REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )" + +# +# DEPENDENCIES: +# + +# Be warned, *DEPEND are version-dependant +# These are used for both runtime and compiletime +DEPEND=" + ssl? ( >=dev-libs/openssl-0.9.6d:0 ) + kernel_linux? ( sys-process/procps ) + >=sys-apps/sed-4 + >=sys-apps/texinfo-4.7-r1 + >=sys-libs/zlib-1.2.3 +" +# TODO: add this as a dep if it is moved from the overlay +# !dev-db/mariadb-native-client[mysqlcompat] + +# dev-db/mysql-5.6.12+ only works with dev-libs/libedit +# This probably could be simplified +if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ + mysql_version_is_at_least "5.6.12" ; then + DEPEND="${DEPEND} dev-libs/libedit" +elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then + DEPEND="${DEPEND} dev-libs/libedit" +else + if mysql_version_is_at_least "5.5" ; then + DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0 )" + else + DEPEND="${DEPEND} >=sys-libs/readline-4.1:0" + fi +fi + +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then + mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" + mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )" + mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )" + # Bug 441700 MariaDB >=5.3 include custom mytop + mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )" + if mysql_version_is_at_least "10.0.5" ; then + DEPEND="${DEPEND} + odbc? ( dev-db/unixODBC ) + xml? ( dev-libs/libxml2 ) + " + fi + mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )" + if mysql_version_is_at_least "10.0.9" ; then + DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" + fi +fi + +# Having different flavours at the same time is not a good idea +for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do + [[ ${i} == ${PN} ]] || + DEPEND="${DEPEND} !dev-db/${i}" +done + +if mysql_version_is_at_least "5.5.7" ; then + DEPEND="${DEPEND} + jemalloc? ( dev-libs/jemalloc[static-libs?] ) + tcmalloc? ( dev-util/google-perftools ) + >=sys-libs/zlib-1.2.3[static-libs?] + ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) + systemtap? ( >=dev-util/systemtap-1.3 ) + kernel_linux? ( dev-libs/libaio ) + " +fi + +if [[ ${PN} == "mysql-cluster" ]] ; then + # TODO: This really should include net-misc/memcached + # but the package does not install the files it seeks. + mysql_version_is_at_least "7.2.3" && \ + DEPEND="${DEPEND} dev-libs/libevent" +fi + +# prefix: first need to implement something for #196294 +RDEPEND="${DEPEND} + !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) + selinux? ( sec-policy/selinux-mysql ) +" + +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then + # Bug 455016 Add dependencies of mytop + if mysql_version_is_at_least "5.3" ; then + RDEPEND="${RDEPEND} + perl? ( + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes + ) + " + fi +fi + +if [[ ${PN} == "mariadb-galera" ]] ; then + # The wsrep API version must match between the ebuild and sys-cluster/galera. + # This will be indicated by WSREP_REVISION in the ebuild and the first number + # in the version of sys-cluster/galera + RDEPEND="${RDEPEND} + =sys-cluster/galera-${WSREP_REVISION}* + " +fi + +if [[ ${PN} == "mysql-cluster" ]] ; then + mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \ + DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )" +fi + +DEPEND="${DEPEND} + virtual/yacc +" + +DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )" + +# compile-time-only +DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" + +# compile-time-only +if mysql_version_is_at_least "5.5.8" ; then + DEPEND="${DEPEND} >=dev-util/cmake-2.6.3" +fi + +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" + +# For other stuff to bring us in +PDEPEND="${PDEPEND} ~virtual/mysql-${MYSQL_PV_MAJOR}" + +# +# External patches +# + +# MariaDB has integrated PBXT until it was dropped in version 5.5.33 +# PBXT_VERSION means that we have a PBXT patch for this PV +# PBXT was only introduced after 5.1.12 +pbxt_patch_available() { + [[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" && ( -n "${PBXT_VERSION}" ) ]] + return $? +} + +pbxt_available() { + pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32" + return $? +} + +# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set +# MariaDB has integrated XtraDB +# XTRADB_VERS means that we have a XTRADB patch for this PV +# XTRADB was only introduced after 5.1.26 +xtradb_patch_available() { + [[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" + && ( -n "${XTRADB_VER}" ) && ( -n "${PERCONA_VER}" ) ]] + return $? +} + +if pbxt_patch_available; then + + PBXT_P="pbxt-${PBXT_VERSION}" + PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" + SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" +fi + +# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins +# vs. built outside the dir +if pbxt_available; then + + IUSE="${IUSE} pbxt" + PBXT_NEWSTYLE=1 + REQUIRED_USE="${REQUIRED_USE} pbxt? ( !embedded ) " +fi + +if xtradb_patch_available; then + XTRADB_P="percona-xtradb-${XTRADB_VER}" + XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" + XTRADB_SRC_B1="http://www.percona.com/" + XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" + XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" + XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" + XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" + SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" + IUSE="${IUSE} xtradb" + REQUIRED_USE="${REQUIRED_USE} xtradb? ( !embedded ) " +fi + +# +# HELPER FUNCTIONS: +# + +# @FUNCTION: mysql-v2_disable_test +# @DESCRIPTION: +# Helper function to disable specific tests. +mysql-v2_disable_test() { + ${BUILD_INHERIT}_disable_test "$@" +} + +# @FUNCTION: mysql-v2_configure_minimal +# @DESCRIPTION: +# Helper function to configure minimal build +configure_minimal() { + ${BUILD_INHERIT}_configure_minimal "$@" +} + +# @FUNCTION: mysql-v2_configure_common +# @DESCRIPTION: +# Helper function to configure common builds +configure_common() { + ${BUILD_INHERIT}_configure_common "$@" +} + +# +# EBUILD FUNCTIONS +# + +# @FUNCTION: mysql-v2_pkg_setup +# @DESCRIPTION: +# Perform some basic tests and tasks during pkg_setup phase: +# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv" +# check for conflicting use flags +# create new user and group for mysql +# warn about deprecated features +mysql-v2_pkg_setup() { + + if has test ${FEATURES} ; then + if ! use minimal ; then + if ! has userpriv ${FEATURES} ; then + eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + fi + fi + + # Check for USE flag problems in pkg_setup + if ! mysql_version_is_at_least "5.2" && use debug ; then + # Also in package.use.mask + die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51" + fi + + # This should come after all of the die statements + enewgroup mysql 60 || die "problem adding 'mysql' group" + enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" + + if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then + ewarn "Upstream has noted that the NDB cluster support in the 5.0 and" + ewarn "5.1 series should NOT be put into production. In the near" + ewarn "future, it will be disabled from building." + fi + + if [[ ${PN} == "mysql-cluster" ]] ; then + mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup + fi + + if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then + eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." + eerror "Please use gcc-config to switch to gcc-4.7 or later version." + die + fi + +} + +# @FUNCTION: mysql-v2_src_unpack +# @DESCRIPTION: +# Unpack the source code +mysql-v2_src_unpack() { + + # Initialize the proper variables first + mysql_init_vars + + unpack ${A} + # Grab the patches + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack + + mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" +} + +# @FUNCTION: mysql-v2_src_prepare +# @DESCRIPTION: +# Apply patches to the source code and remove unneeded bundled libs. +mysql-v2_src_prepare() { + ${BUILD_INHERIT}_src_prepare "$@" + if [[ ${PN} == "mysql-cluster" ]] ; then + mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_src_prepare + fi +} + +# @FUNCTION: mysql-v2_src_configure +# @DESCRIPTION: +# Configure mysql to build the code for Gentoo respecting the use flags. +mysql-v2_src_configure() { + ${BUILD_INHERIT}_src_configure "$@" +} + +# @FUNCTION: mysql-v2_src_compile +# @DESCRIPTION: +# Compile the mysql code. +mysql-v2_src_compile() { + ${BUILD_INHERIT}_src_compile "$@" +} + +# @FUNCTION: mysql-v2_src_install +# @DESCRIPTION: +# Install mysql. +mysql-v2_src_install() { + ${BUILD_INHERIT}_src_install "$@" +} + +# @FUNCTION: mysql-v2_pkg_preinst +# @DESCRIPTION: +# Create the user and groups for mysql - die if that fails. +mysql-v2_pkg_preinst() { + if [[ ${PN} == "mysql-cluster" ]] ; then + mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst + fi + enewgroup mysql 60 || die "problem adding 'mysql' group" + enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" +} + +# @FUNCTION: mysql-v2_pkg_postinst +# @DESCRIPTION: +# Run post-installation tasks: +# create the dir for logfiles if non-existant +# touch the logfiles and secure them +# install scripts +# issue required steps for optional features +# issue deprecation warnings +mysql-v2_pkg_postinst() { + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Create log directory securely if it does not exist + [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" + + # Minimal builds don't have the MySQL server + if ! use minimal ; then + docinto "support-files" + for script in \ + support-files/my-*.cnf \ + support-files/magic \ + support-files/ndb-config-2-node.ini + do + [[ -f "${script}" ]] \ + && dodoc "${script}" + done + + docinto "scripts" + for script in scripts/mysql* ; do + if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then + dodoc "${script}" + fi + done + + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then + if use_if_iuse pam ; then + einfo + elog "This install includes the PAM authentication plugin." + elog "To activate and configure the PAM plugin, please read:" + elog "https://kb.askmonty.org/en/pam-authentication-plugin/" + einfo + fi + fi + + einfo + elog "You might want to run:" + elog "\"emerge --config =${CATEGORY}/${PF}\"" + elog "if this is a new install." + einfo + + einfo + elog "If you are upgrading major versions, you should run the" + elog "mysql_upgrade tool." + einfo + + if [[ ${PN} == "mariadb-galera" ]] ; then + einfo + elog "Be sure to edit the my.cnf file to activate your cluster settings." + elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" + elog "The first time the cluster is activated, you should add" + elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." + elog "This option should then be removed for subsequent starts." + einfo + fi + fi + + if use_if_iuse pbxt ; then + elog "Note: PBXT is now statically built when enabled." + elog "" + elog "If, you previously installed as a plugin and " + elog "you cannot start the MySQL server," + elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then" + elog "use the MySQL upgrade script to restore the table" + elog "or execute the following SQL command:" + elog " CREATE TABLE IF NOT EXISTS plugin (" + elog " name char(64) binary DEFAULT '' NOT NULL," + elog " dl char(128) DEFAULT '' NOT NULL," + elog " PRIMARY KEY (name)" + elog " ) CHARACTER SET utf8 COLLATE utf8_bin;" + fi +} + +# @FUNCTION: mysql-v2_getopt +# @DESCRIPTION: +# Use my_print_defaults to extract specific config options +mysql-v2_getopt() { + local mypd="${EROOT}"/usr/bin/my_print_defaults + section="$1" + flag="--${2}=" + "${mypd}" $section | sed -n "/^${flag}/p" +} + +# @FUNCTION: mysql-v2_getoptval +# @DESCRIPTION: +# Use my_print_defaults to extract specific config options +mysql-v2_getoptval() { + local mypd="${EROOT}"/usr/bin/my_print_defaults + section="$1" + flag="--${2}=" + "${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp" +} + +# @FUNCTION: mysql-v2_pkg_config +# @DESCRIPTION: +# Configure mysql environment. +mysql-v2_pkg_config() { + + local old_MY_DATADIR="${MY_DATADIR}" + local old_HOME="${HOME}" + # my_print_defaults needs to read stuff in $HOME/.my.cnf + export HOME=${EPREFIX}/root + + # Make sure the vars are correctly initialized + mysql_init_vars + + [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" + + if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then + die "Minimal builds do NOT include the MySQL server" + fi + + if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then + local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" + MY_DATADIR_s="${MY_DATADIR_s%%/}" + local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" + old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" + + if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" + ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" + else + elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" + mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ + || die "Moving MY_DATADIR failed" + fi + else + ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" + if [[ -d "${MY_DATADIR_s}" ]]; then + ewarn "Attempting to use ${MY_DATADIR_s}" + else + eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" + die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" + fi + fi + fi + + local pwd1="a" + local pwd2="b" + local maxtry=15 + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + MYSQL_ROOT_PASSWORD="$(mysql-v2_getoptval 'client mysql' password)" + fi + MYSQL_TMPDIR="$(mysql-v2_getoptval mysqld tmpdir)" + # These are dir+prefix + MYSQL_RELAY_LOG="$(mysql-v2_getoptval mysqld relay-log)" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + MYSQL_LOG_BIN="$(mysql-v2_getoptval mysqld log-bin)" + MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} + + if [[ ! -d "${ROOT}"/$MYSQL_TMPDIR ]]; then + einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" + install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_TMPDIR + fi + if [[ ! -d "${ROOT}"/$MYSQL_LOG_BIN ]]; then + einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" + install -d -m 770 -o mysql -g mysql "${ROOT}"/$MYSQL_LOG_BIN + fi + if [[ ! -d "${EROOT}"/$MYSQL_RELAY_LOG ]]; then + einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" + install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_RELAY_LOG + fi + + if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then + ewarn "You have already a MySQL database in place." + ewarn "(${ROOT}/${MY_DATADIR}/*)" + ewarn "Please rename or delete it if you wish to replace it." + die "MySQL database already exists!" + fi + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then + + einfo "Please provide a password for the mysql 'root' user now, in the" + einfo "MYSQL_ROOT_PASSWORD env var or through the ${HOME}/.my.cnf file." + ewarn "Avoid [\"'\\_%] characters in the password" + read -rsp " >" pwd1 ; echo + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + die "Passwords are not the same" + fi + MYSQL_ROOT_PASSWORD="${pwd1}" + unset pwd1 pwd2 + fi + + local options + local sqltmp="$(emktemp)" + + # Fix bug 446200. Don't reference host my.cnf, needs to come first, + # see http://bugs.mysql.com/bug.php?id=31312 + use prefix && options="${options} --defaults-file=${MY_SYSCONFDIR}/my.cnf" + + local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql" + [[ -r "${help_tables}" ]] \ + && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ + || touch "${TMPDIR}/fill_help_tables.sql" + help_tables="${TMPDIR}/fill_help_tables.sql" + + # Figure out which options we need to disable to do the setup + helpfile="${TMPDIR}/mysqld-help" + ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null + for opt in grant-tables host-cache name-resolve networking slave-start \ + federated ssl log-bin relay-log slow-query-log external-locking \ + ndbcluster log-slave-updates wsrep-on \ + ; do + optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" + egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" + done + # But some options changed names + egrep -sq external-locking "${helpfile}" && \ + options="${options/skip-locking/skip-external-locking}" + + # MySQL 5.6+ needs InnoDB + if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then + mysql_version_is_at_least "5.6" || options="${options} --loose-skip-innodb" + fi + + einfo "Creating the mysql database and setting proper permissions on it ..." + + # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it + PID_DIR="${EROOT}/var/run/mysqld" + if [[ ! -d "${PID_DIR}" ]]; then + install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory" + fi + + if [[ ! -d "${MY_DATADIR}" ]]; then + install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory" + fi + + pushd "${TMPDIR}" &>/dev/null || die + #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}" + cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db + [[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db + cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}'" + einfo "Command: $cmd" + su -s /bin/sh -c "${cmd}" mysql \ + >"${TMPDIR}"/mysql_install_db.log 2>&1 + if [ $? -ne 0 ]; then + grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 + die "Failed to run mysql_install_db. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" + fi + popd &>/dev/null || die + [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ + || die "MySQL databases not installed" + + # Filling timezones, see + # http://dev.mysql.com/doc/mysql/en/time-zone-support.html + "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null + + if [[ -r "${help_tables}" ]] ; then + cat "${help_tables}" >> "${sqltmp}" + fi + + local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" + local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" + local mysqld="${EROOT}/usr/sbin/mysqld \ + ${options} \ + $(use prefix || echo --user=mysql) \ + --log-warnings=0 \ + --basedir=${EROOT}/usr \ + --datadir=${ROOT}/${MY_DATADIR} \ + --max_allowed_packet=8M \ + --net_buffer_length=16K \ + --default-storage-engine=MyISAM \ + --socket=${socket} \ + --pid-file=${pidfile} + --tmpdir=${ROOT}/${MYSQL_TMPDIR}" + #einfo "About to start mysqld: ${mysqld}" + ebegin "Starting mysqld" + einfo "Command ${mysqld}" + ${mysqld} & + rc=$? + while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + eend $rc + + if ! [[ -S "${socket}" ]]; then + die "Completely failed to start up mysqld with: ${mysqld}" + fi + + ebegin "Setting root password" + # Do this from memory, as we don't want clear text passwords in temp files + local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" + "${EROOT}/usr/bin/mysql" \ + --socket=${socket} \ + -hlocalhost \ + -e "${sql}" + eend $? + + ebegin "Loading \"zoneinfo\", this step may require a few seconds" + "${EROOT}/usr/bin/mysql" \ + --socket=${socket} \ + -hlocalhost \ + -uroot \ + --password="${MYSQL_ROOT_PASSWORD}" \ + mysql < "${sqltmp}" + rc=$? + eend $? + [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" + + # Stop the server and cleanup + einfo "Stopping the server ..." + kill $(< "${pidfile}" ) + rm -f "${sqltmp}" + wait %1 + einfo "Done" +} + +# @FUNCTION: mysql-v2_pkg_postrm +# @DESCRIPTION: +# Remove mysql symlinks. +mysql-v2_pkg_postrm() { + + : # mysql_lib_symlinks "${ED}" +} diff -uNr a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass --- a/eclass/mysql_fx.eclass false +++ b/eclass/mysql_fx.eclass 94c2e36ccb9d86952926ae98a48955b2d953fe3a1471e5315395588f3ad55a66928686299ee8392e7d24f695ed045644086797af730e54c90b959ce54ea7680d @@ -0,0 +1,320 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# DEPRECATED +# Recent versions have begun deprecating this eclass. +# Do not use it in new series. + +# @ECLASS: mysql_fx.eclass +# @MAINTAINER: +# - MySQL Team <mysql-bugs@gentoo.org> +# - Luca Longinotti <chtekk@gentoo.org> +# @AUTHOR: Francesco Riosa (Retired) <vivo@gentoo.org> +# @BLURB: This eclass provides some helper functions for mysql ebuilds +# @DESCRIPTION: +# This eclass providers helpers to build mysql servers including patching +# from an index and initializing certain variables as part of the build. + +inherit multilib + +# @FUNCTION: stripdots +# @DESCRIPTION: +# Helper function, version (integer) may have sections separated by dots +# for readability. +stripdots() { + local dotver=${1:-"0"} + local v="" + local ret=0 + if [[ "${dotver/./}" != "${dotver}" ]] ; then + # dotted version number + for i in 1000000 10000 100 1 ; do + v=${dotver%%\.*} + # remove leading zeroes + while [[ ${#v} -gt 1 ]] && [[ ${v:0:1} == "0" ]] ; do v=${v#0} ; done + # increment integer version number + ret=$(( ${v} * ${i} + ${ret} )) + if [[ "${dotver}" == "${dotver/\.}" ]] ; then + dotver=0 + else + dotver=${dotver#*\.} + fi + done + echo "${ret}" + else + # already an integer + v=${dotver} + while [[ ${#v} -gt 1 ]] && [[ ${v:0:1} == "0" ]] ; do v=${v#0} ; done + echo "${v}" + fi +} + +# @FUNCTION: mysql_check_version_range +# @DESCRIPTION: +# Check if a version number falls inside a given range. +# The range includes the extremes and must be specified as +# "low_version to high_version" i.e. "4.1.2 to 5.1.99.99". +# Returns true if inside the range. +mysql_check_version_range() { + local lbound="${1%% to *}" ; lbound=$(stripdots "${lbound}") + local rbound="${1#* to }" ; rbound=$(stripdots "${rbound}") + local my_ver="${2:-"${MYSQL_VERSION_ID}"}" + [[ ${lbound} -le ${my_ver} ]] && [[ ${my_ver} -le ${rbound} ]] && return 0 + return 1 +} + +# @FUNCTION: _mysql_test_patch_ver_pn +# @INTERNAL +# @DESCRIPTION: +# True if at least one applicable range is found for the patch. +_mysql_test_patch_ver_pn() { + local allelements=", version, package name" + # So that it fails the directory test if none of them exist + local filesdir="/dev/null" + for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \ + "${WORKDIR}/mysql-extras" ; do + if [ -d "${d}" ]; then + filesdir="${d}" + break + fi + done + + [[ -d "${filesdir}" ]] || die "Source dir must be a directory" + local flags=$1 pname=$2 + if [[ $(( $flags & $(( 1 + 4 + 16 )) )) -eq 21 ]] ; then + einfo "using '${pname}'" + ln -sf "${filesdir}/${pname}" "${EPATCH_SOURCE}" || die "Couldn't move ${pname}" + return 0 + fi + + [[ $(( $flags & $(( 2 + 4 )) )) -gt 0 ]] \ + && allelements="${allelements//", version"}" + + [[ $(( $flags & $(( 8 + 16 )) )) -gt 0 ]] \ + && allelements="${allelements//", package name"}" + + [[ -n "${allelements}" ]] && [[ "${flags}" -gt 0 ]] \ + && ewarn "QA notice: ${allelements} missing in ${pname} patch" + + return 1 +} + +# @FUNCTION: mysql_mv_patches +# @DESCRIPTION: +# Parse a "index_file" looking for patches to apply to the +# current MySQL version. +# If the patch applies, print its description. +# +mysql_mv_patches() { + # So that it fails the directory test if none of them exist + local filesdir="/dev/null" + if [[ -z "${1}" ]]; then + for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \ + "${WORKDIR}/mysql-extras" ; do + if [ -d "${d}" ]; then + filesdir="${d}" + break + fi + done + [[ -d "${filesdir}" ]] || die "No patches directory found!" + fi + + for i in "$1" "${filesdir}/0000_index.txt" "${filesdir}/000_index.txt" ; do + if [ -n "$i" -a -f "$i" ]; then + local index_file="$i" + break + fi + done + + local my_ver="${2:-"${MYSQL_VERSION_ID}"}" + local my_test_fx=${3:-"_mysql_test_patch_ver_pn"} + _mysql_mv_patches "${index_file}" "${my_ver}" "${my_test_fx}" +} + +# @FUNCTION: _mysql_mv_patches +# @INTERNAL +_mysql_mv_patches() { + local index_file="${1}" + local my_ver="${2}" + local my_test_fx="${3}" + local dsc ndsc=0 i + dsc=( ) + + # Values for flags are (2^x): + # 1 - one patch found + # 2 - at least one version range is wrong + # 4 - at least one version range is ok + # 8 - at least one ${PN} did not match + # 16 - at least one ${PN} has been matched + local flags=0 pname="" + while read row ; do + case "${row}" in + @patch\ *) + [[ -n "${pname}" ]] \ + && ${my_test_fx} ${flags} "${pname}" \ + && for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo "> ${dsc[$i]}" ; done + flags=1 ; ndsc=0 ; dsc=( ) + pname=${row#"@patch "} + ;; + @ver\ *) + if mysql_check_version_range "${row#"@ver "}" "${my_ver}" ; then + flags=$(( ${flags} | 4 )) + else + flags=$(( ${flags} | 2 )) + fi + ;; + @pn\ *) + if [[ ${row#"@pn "} == "${PN}" ]] ; then + flags=$(( ${flags} | 16 )) + else + flags=$(( ${flags} | 8 )) + fi + ;; + # @use\ *) ;; + @@\ *) + dsc[$ndsc]="${row#"@@ "}" + (( ++ndsc )) + ;; + esac + done < "${index_file}" + + ${my_test_fx} ${flags} "${pname}" \ + && for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo "> ${dsc[$i]}" ; done +} + +# @FUNCTION: mysql_version_is_at_least +# @DESCRIPTION: +# Is $2 (defaults to $MYSQL_VERSION_ID) at least version $1? +# (nice) idea from versionator.eclass +# +mysql_version_is_at_least() { + local want_s=$(stripdots "$1") have_s=$(stripdots "${2:-${MYSQL_VERSION_ID}}") + [[ -z "${want_s}" ]] && die "mysql_version_is_at_least missing value to check" + [[ ${want_s} -le ${have_s} ]] && return 0 || return 1 +} + +# @FUNCTION: mysql_lib_symlinks +# @DESCRIPTION: +# To be called on the live filesystem, reassigning symlinks of each MySQL +# library to the best version available. (Obsolete) +# +mysql_lib_symlinks() { + + local d dirlist maxdots libname libnameln libsuffix reldir + libsuffix=$(get_libname) + + einfo "libsuffix = ${libsuffix}" + einfo "Updating MySQL libraries symlinks" + + reldir="${1}" + pushd "${reldir}/usr/$(get_libdir)" &> /dev/null + + # dirlist must contain the less significative directory left + dirlist="mysql" + + # waste some time in removing and recreating symlinks + for d in $dirlist ; do + for libname in $( find "${d}" -mindepth 1 -maxdepth 1 -name "*${libsuffix}*" -and -not -type "l" 2>/dev/null ) ; do + # maxdot is a limit versus infinite loop + maxdots=0 + libnameln=${libname##*/} + # loop in version of the library to link it, similar to how + # libtool works + if [[ ${CHOST} == *-darwin* ]] ; then + # macho: libname.x.y.z.dylib + local libbasename=${libnameln%%.*} # libname + local libver=${libnameln#${libbasename}} # .x.y.z.dylib + libver=${libver%${libsuffix}} # .x.y.z + while [[ -n ${libver} ]] && [[ ${maxdots} -lt 6 ]] ; do + libnameln="${libbasename}${libver}${libsuffix}" + rm -f "${libnameln}" + ln -s "${libname}" "${libnameln}" + (( ++maxdots )) + libver=${libver%.*} + done + libnameln="${libbasename}${libsuffix}" + rm -f "${libnameln}" + ln -s "${libname}" "${libnameln}" + else + # elf: libname.so.x.y.z + while [[ ${libnameln:0-3} != '${libsuffix}' ]] && [[ ${maxdots} -lt 6 ]] ; do + rm -f "${libnameln}" + ln -s "${libname}" "${libnameln}" + (( ++maxdots )) + libnameln="${libnameln%.*}" + done + rm -f "${libnameln}" + ln -s "${libname}" "${libnameln}" + fi + done + done + + popd &> /dev/null +} + +# @FUNCTION: mysql_init_vars +# @DESCRIPTION: +# void mysql_init_vars() +# Initialize global variables +# 2005-11-19 <vivo@gentoo.org> +mysql_init_vars() { + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} + MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"} + MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"} + + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="" + if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then + MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1` + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ + | sed -e 's/.*=\s*//' \ + | tail -n1` + fi + fi + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="${MY_LOCALSTATEDIR}" + einfo "Using default MY_DATADIR" + fi + elog "MySQL MY_DATADIR is ${MY_DATADIR}" + + if [[ -z "${PREVIOUS_DATADIR}" ]] ; then + if [[ -e "${MY_DATADIR}" ]] ; then + # If you get this and you're wondering about it, see bug #207636 + elog "MySQL datadir found in ${MY_DATADIR}" + elog "A new one will not be created." + PREVIOUS_DATADIR="yes" + else + PREVIOUS_DATADIR="no" + fi + export PREVIOUS_DATADIR + fi + else + if [[ ${EBUILD_PHASE} == "config" ]]; then + local new_MY_DATADIR + new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1` + + if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then + ewarn "MySQL MY_DATADIR has changed" + ewarn "from ${MY_DATADIR}" + ewarn "to ${new_MY_DATADIR}" + MY_DATADIR="${new_MY_DATADIR}" + fi + fi + fi + + if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then + MY_SOURCEDIR=${SERVER_URI##*/} + MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} + fi + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR + export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR +} diff -uNr a/eclass/netsurf.eclass b/eclass/netsurf.eclass --- a/eclass/netsurf.eclass false +++ b/eclass/netsurf.eclass b2585f98fc1b16372a36a1bd65e5e5a70a6fb3216261cf5c93d78b54320952118e22c6bf08860304d2444c90289cdc2486c9d71d67a3e00da8a0e29ed78caa76 @@ -0,0 +1,177 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: netsurf.eclass +# @MAINTAINER: +# Michael Weber <xmw@gentoo.org> +# @BLURB: Handle buildsystem of www.netsurf-browser.org components +# @DESCRIPTION: +# Handle unpacking and usage of separate buildsystem tarball and manage +# multilib build, static-libs generation and debug building. +# +# Supports PATCHES and DOCS as in base.eclass + +case ${EAPI:-0} in + 0|1|2|3|4) die "this eclass doesn't support EAPI<5" ;; + *) ;; +esac + +inherit eutils toolchain-funcs multilib-minimal + +EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install + +# @ECLASS-VARIABLE: NETSURF_BUILDSYSTEM +# @DESCRIPTION: +# Select version of buildsystem tarball to be used along the component +# defaults to buildsystem-1.0 +NETSURF_BUILDSYSTEM="${NETSURF_BUILDSYSTEM:-buildsystem-1.0}" + +# @ECLASS-VARIABLE: NETSURF_BUILDSYSTEM_SRC_URI +# @DESCRIPTION: +# Download link for NETSURF_BUILDSYSTEM, add to SRC_URI iff set explicitly. +NETSURF_BUILDSYSTEM_SRC_URI="http://download.netsurf-browser.org/libs/releases/${NETSURF_BUILDSYSTEM}.tar.gz -> netsurf-${NETSURF_BUILDSYSTEM}.tar.gz" + +# @ECLASS-VARIABLE: NETSURF_COMPONENT_TYPE +# @DESCRIPTION: +# Passed to buildsystem as COMPONENT_TYPE, valid values are +# lib-shared, lib-static and binary. Defaults to "lib-static lib-shared" +NETSURF_COMPONENT_TYPE="${NETSURF_COMPONENT_TYPE:-lib-static lib-shared}" + +# @ECLASS-VARIABLE: SRC_URI +# @DESCRIPTION: +# Defaults to http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz +# and NETSURF_BUILDSYSTEM_SRC_URI. +if [ -z "${SRC_URI}" ] ; then + SRC_URI="http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz + ${NETSURF_BUILDSYSTEM_SRC_URI}" +fi + +IUSE="debug" +if has lib-static ${NETSURF_COMPONENT_TYPE} ; then + IUSE+=" static-libs" +fi + +DEPEND="virtual/pkgconfig" + +# @FUNCTION: netsurf_src_prepare +# @DESCRIPTION: +# Apply and PATCHES and multilib_copy_sources for in-source build. +netsurf_src_prepare() { + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + debug-print "$FUNCNAME: applying user patches" + epatch_user + + multilib_copy_sources +} + +# @ECLASS-VARIABLE: netsurf_makeconf +# @DESCRIPTION: +# Configuration variable bash array to be passed to emake calls. +# Defined at netsurf_src_configure and can be altered afterwards. + +# @FUNCTION: netsurf_src_configure +# @DESCRIPTION: +# Setup netsurf_makeconf and run multilib-minimal_src_configure. +# A default multilib_src_configure is provided by this eclass. +netsurf_src_configure() { + netsurf_makeconf=( + NSSHARED=${WORKDIR}/${NETSURF_BUILDSYSTEM} + Q= + HOST_CC="\$(CC)" + CCOPT= + CCNOOPT= + CCDBG= + LDDBG= + AR="$(tc-getAR)" + BUILD=$(usex debug debug release) + PREFIX="${EROOT}"usr + ) + + multilib-minimal_src_configure +} + +multilib_src_configure() { + sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \ + -i Makefile || die + if [ -f ${PN}.pc.in ] ; then + sed -e "/^libdir/s:/lib:/$(get_libdir):g" \ + -i ${PN}.pc.in || die + fi + sed -e 's:/bin/which:which:' \ + -i ../${NETSURF_BUILDSYSTEM}/makefiles/Makefile.tools || die +} + +# @FUNCTION: netsurf_make +# @DESCRIPTION: +# Calls emake with netsurf_makeconf and toolchain CC/LD +# as arguments for every NETSURF_COMPONENT_TYPE if activated. +netsurf_make() { + for COMPONENT_TYPE in ${NETSURF_COMPONENT_TYPE} ; do + if [ "${COMPONENT_TYPE}" == "lib-static" ] ; then + if ! use static-libs ; then + continue + fi + fi + emake CC="$(tc-getCC)" LD="$(tc-getLD)" "${netsurf_makeconf[@]}" \ + COMPONENT_TYPE=${COMPONENT_TYPE} LIBDIR="$(get_libdir)" "$@" + done +} + +# @FUNCTION: netsurf_src_compile +# @DESCRIPTION: +# Calls multilib-minimal_src_compile and netsurf_make doc if USE=doc. +# A default multilib_src_compile is provided by this eclass. +netsurf_src_compile() { + local problems=$(egrep -Hn -- ' (-O.?|-g)( |$)' \ + $(find . -type f -name 'Makefile*')) + if [ -n "${problems}" ] ; then + elog "found bad flags: +${problems}" + fi + + multilib-minimal_src_compile "$@" + + if has doc ${USE} ; then + netsurf_make "$@" docs + fi +} + +multilib_src_compile() { + netsurf_make "$@" +} + +# @FUNCTION: netsurf_src_test +# @DESCRIPTION: +# Calls multilib-minimal_src_test. +# A default multilib_src_test is provided by this eclass. +netsurf_src_test() { + multilib-minimal_src_test "$@" +} + +multilib_src_test() { + netsurf_make test "$@" +} + +# @FUNCTION: netsurf_src_install +# @DESCRIPTION: +# Calls multilib-minimal_src_install. +# A default multilib_src_test is provided by this eclass. +# A default multilib_src_install is provided by this eclass. +netsurf_src_install() { + multilib-minimal_src_install "$@" +} + +multilib_src_install() { + #DEFAULT_ABI may not be the last. + #install to clean dir, rename binaries, move everything back + if [ "${ABI}" == "${DEFAULT_ABI}" ] ; then + netsurf_make DESTDIR="${D}" install "$@" + else + netsurf_make DESTDIR="${D}"${ABI} install "$@" + if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then + find "${D}"${ABI}/usr/bin -type f -exec mv {} {}.${ABI} \; + fi + mv "${D}"${ABI}/* "${D}" || die + rmdir "${D}"${ABI} || die + fi +} diff -uNr a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass --- a/eclass/ninja-utils.eclass false +++ b/eclass/ninja-utils.eclass 3d3fa5862a0d630b154fc5d2ed8dde5aac7953afaa656d0279fba54ed171b837c55a1e9f0238213bc001ccd2d4c17da460b2f438b836aea416ac92f636010417 @@ -0,0 +1,57 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ninja-utils.eclass +# @MAINTAINER: +# Michał Górny <mgorny@gentoo.org> +# Mike Gilbert <floppym@gentoo.org> +# @AUTHOR: +# Michał Górny <mgorny@gentoo.org> +# Mike Gilbert <floppym@gentoo.org> +# @BLURB: common bits to run dev-util/ninja builder +# @DESCRIPTION: +# This eclass provides a single function -- eninja -- that can be used +# to run the ninja builder alike emake. It does not define any +# dependencies, you need to depend on dev-util/ninja yourself. Since +# ninja is rarely used stand-alone, most of the time this eclass will +# be used indirectly by the eclasses for other build systems (CMake, +# Meson). + +if [[ -z ${_NINJA_UTILS_ECLASS} ]]; then + +case ${EAPI:-0} in + 0|1|3) die "EAPI=${EAPI:-0} is not supported (too old)";; + # copied from cmake-utils + 2|4|5|6|7) ;; + *) die "EAPI=${EAPI} is not yet supported" ;; +esac + +# @ECLASS-VARIABLE: NINJAOPTS +# @DEFAULT_UNSET +# @DESCRIPTION: +# The default set of options to pass to Ninja. Similar to MAKEOPTS, +# supposed to be set in make.conf. If unset, eninja() will convert +# MAKEOPTS instead. + +inherit multiprocessing + +# @FUNCTION: eninja +# @USAGE: [<args>...] +# @DESCRIPTION: +# Call Ninja, passing the NINJAOPTS (or converted MAKEOPTS), followed +# by the supplied arguments. This function dies if ninja fails. Starting +# with EAPI 6, it also supports being called via 'nonfatal'. +eninja() { + local nonfatal_args=() + [[ ${EAPI:-0} != [245] ]] && nonfatal_args+=( -n ) + + if [[ -z ${NINJAOPTS+set} ]]; then + NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)" + fi + set -- ninja -v ${NINJAOPTS} "$@" + echo "$@" >&2 + "$@" || die "${nonfatal_args[@]}" "${*} failed" +} + +_NINJA_UTILS_ECLASS=1 +fi diff -uNr a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass --- a/eclass/nsplugins.eclass false +++ b/eclass/nsplugins.eclass 3b178b03c678874ceb5d6afd5edc0e75df70c1bbdba55194046d86ec4a33a8083943870263e0fc378ec5b5994eb086208472268095aff15ef6d602c7f89ae109 @@ -0,0 +1,79 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# @ECLASS: nsplugins.eclass +# @MAINTAINER: +# Mozilla Team <mozilla@gentoo.org> +# @AUTHOR: +# Original Author: Martin Schlemmer <azarah@gentoo.org> +# @BLURB: reusable functions for netscape/moz plugin sharing +# @DESCRIPTION: +# Reusable functions that promote sharing of netscape/moz plugins, also provides +# share_plugins_dir function for mozilla applications. + +inherit eutils multilib versionator mozextension + +PLUGINS_DIR="nsbrowser/plugins" + +# This function move the plugin dir in src_install() to +# ${D}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be +# the full path (without $D) to old plugin dir. +src_mv_plugins() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" + + # Move plugins dir. We use keepdir so that it might not be unmerged + # by mistake ... + keepdir /usr/$(get_libdir)/${PLUGINS_DIR} + cp -a "${ED}"/$1/* "${ED}"/usr/$(get_libdir)/${PLUGINS_DIR} + rm -rf "${ED}"/$1 + dosym /usr/$(get_libdir)/${PLUGINS_DIR} $1 +} + +# This function move plugins in pkg_preinst() in old dir to +# ${ROOT}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be +# the full path (without $ROOT) to old plugin dir. +pkg_mv_plugins() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${ROOT}" + + # Move old plugins dir + if [ -d "${ROOT}/$1" -a ! -L "${ROOT}/$1" ] + then + mkdir -p "${EROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} + cp -a "${EROOT}"/$1/* "${EROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} + rm -rf "${EROOT}"/$1 + fi +} + +# This function installs a plugin with dosym to PLUGINS_DIR. +# First argument should be the plugin file. +inst_plugin() { + if [[ -z "${1}" ]]; then + eerror "The plugin file \"${1}\" does not exist." + die "No such file or directory." + fi + + dodir /usr/$(get_libdir)/${PLUGINS_DIR} + dosym ${1} /usr/$(get_libdir)/${PLUGINS_DIR}/$(basename ${1}) +} + +# This function ensures we use proper plugin path for Gentoo. +# This should only be used by mozilla packages. +# ${MOZILLA_FIVE_HOME} must be defined in src_install to support +share_plugins_dir() { + if [[ ${PN} == seamonkey ]] ; then + rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins \ + || die "failed to remove existing plugins dir" + fi + + if [[ ${PN} == *-bin ]] ; then + PLUGIN_BASE_PATH="/usr/$(get_libdir)" + else + PLUGIN_BASE_PATH=".." + fi + + if $(mozversion_extension_location) ; then + dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/browser/plugins" + else + dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plugins" + fi +} diff -uNr a/eclass/nvidia-driver.eclass b/eclass/nvidia-driver.eclass --- a/eclass/nvidia-driver.eclass false +++ b/eclass/nvidia-driver.eclass ab261caf846878abf320b216f1557a21e9af2e9cc682ae22d753a8260b32c5f0cf2d5e47f78d6e53e1381f1a7bb7837f88b83f966d33e55ca33d0ba4d1673c7e @@ -0,0 +1,205 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: nvidia-driver.eclass +# @MAINTAINER: +# Jeroen Roovers <jer@gentoo.org> +# @AUTHOR: +# Original author: Doug Goldstein <cardoe@gentoo.org> +# @BLURB: Provide useful messages for nvidia-drivers based on currently installed Nvidia card +# @DESCRIPTION: +# Provide useful messages for nvidia-drivers based on currently installed Nvidia +# card. It inherits versionator. + +inherit readme.gentoo-r1 versionator + +DEPEND="sys-apps/pciutils" + +# Variables for readme.gentoo.eclass: +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="You must be in the video group to use the NVIDIA device +For more info, read the docs at +https://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6 + +This ebuild installs a kernel module and X driver. Both must +match explicitly in their version. This means, if you restart +X, you must modprobe -r nvidia before starting it back up + +To use the NVIDIA GLX, run \"eselect opengl set nvidia\" + +To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\" + +NVIDIA has requested that any bug reports submitted have the +output of nvidia-bug-report.sh included. +" + +# the data below is derived from +# http://us.download.nvidia.com/XFree86/Linux-x86_64/396.18/README/supportedchips.html + +drv_71xx=" + 0020 0028 0029 002c 002d 00a0 0100 0101 0103 0150 0151 0152 0153 +" + +drv_96xx=" + 0110 0111 0112 0113 0170 0171 0172 0173 0174 0175 0176 0177 0178 0179 017a + 017c 017d 0181 0182 0183 0185 0188 018a 018b 018c 01a0 01f0 0200 0201 0202 + 0203 0250 0251 0253 0258 0259 025b 0280 0281 0282 0286 0288 0289 028c +" + +drv_173x=" + 00fa 00fb 00fc 00fd 00fe 0301 0302 0308 0309 0311 0312 0314 031a 031b 031c + 0320 0321 0322 0323 0324 0325 0326 0327 0328 032a 032b 032c 032d 0330 0331 + 0332 0333 0334 0338 033f 0341 0342 0343 0344 0347 0348 034c 034e +" + +drv_304x=" + 0040 0041 0042 0043 0044 0045 0046 0047 0048 004e 0090 0091 0092 0093 0095 + 0098 0099 009d 00c0 00c1 00c2 00c3 00c8 00c9 00cc 00cd 00ce 00f1 00f2 00f3 + 00f4 00f5 00f6 00f8 00f9 0140 0141 0142 0143 0144 0145 0146 0147 0148 0149 + 014a 014c 014d 014e 014f 0160 0161 0162 0163 0164 0165 0166 0167 0168 0169 + 016a 01d0 01d1 01d2 01d3 01d6 01d7 01d8 01da 01db 01dc 01dd 01de 01df 0211 + 0212 0215 0218 0221 0222 0240 0241 0242 0244 0245 0247 0290 0291 0292 0293 + 0294 0295 0297 0298 0299 029a 029b 029c 029d 029e 029f 02e0 02e1 02e2 02e3 + 02e4 038b 0390 0391 0392 0393 0394 0395 0397 0398 0399 039c 039e 03d0 03d1 + 03d2 03d5 03d6 0531 0533 053a 053b 053e 07e0 07e1 07e2 07e3 07e5 +" + +drv_340x=" + 0191 0193 0194 0197 019d 019e 0400 0401 0402 0403 0404 0405 0406 0407 0408 + 0409 040a 040b 040c 040d 040e 040f 0410 0420 0421 0422 0423 0424 0425 0426 + 0427 0428 0429 042a 042b 042c 042d 042e 042f 05e0 05e1 05e2 05e3 05e6 05e7 + 05e7 05e7 05e7 05e7 05e7 05ea 05eb 05ed 05f8 05f9 05fd 05fe 05ff 0600 0601 + 0602 0603 0604 0605 0606 0607 0608 0609 0609 060a 060b 060c 060d 060f 0610 + 0611 0612 0613 0614 0615 0617 0618 0619 061a 061b 061c 061d 061e 061f 0621 + 0622 0623 0625 0626 0627 0628 062a 062b 062c 062d 062e 062e 0630 0631 0632 + 0635 0637 0638 063a 0640 0641 0643 0644 0645 0646 0647 0648 0649 0649 064a + 064b 064c 0651 0652 0652 0653 0654 0654 0654 0655 0656 0658 0659 065a 065b + 065c 06e0 06e1 06e2 06e3 06e4 06e5 06e6 06e7 06e8 06e8 06e9 06ea 06eb 06ec + 06ef 06f1 06f8 06f9 06f9 06fa 06fb 06fd 06ff 06ff 0840 0844 0845 0846 0847 + 0848 0849 084a 084b 084c 084d 084f 0860 0861 0862 0863 0864 0865 0866 0866 + 0867 0868 0869 086a 086c 086d 086e 086f 0870 0871 0872 0872 0873 0873 0874 + 0876 087a 087d 087e 087f 08a0 08a2 08a3 08a4 08a5 0a20 0a22 0a23 0a26 0a27 + 0a28 0a29 0a2a 0a2b 0a2c 0a2d 0a32 0a34 0a35 0a38 0a3c 0a60 0a62 0a63 0a64 + 0a65 0a66 0a67 0a68 0a69 0a6a 0a6c 0a6e 0a6e 0a6f 0a70 0a70 0a70 0a71 0a72 + 0a73 0a73 0a73 0a74 0a74 0a75 0a75 0a76 0a78 0a7a 0a7a 0a7a 0a7a 0a7a 0a7a + 0a7a 0a7a 0a7a 0a7a 0a7a 0a7c 0ca0 0ca2 0ca3 0ca4 0ca5 0ca7 0ca8 0ca9 0cac + 0caf 0cb0 0cb1 0cbc 10c0 10c3 10c5 10d8 +" + +drv_390x=" + 06c0 06c4 06ca 06cd 06d1 06d2 06d8 06d9 06da 06dc 06dd 06de 06df 0dc0 0dc4 + 0dc5 0dc6 0dcd 0dce 0dd1 0dd2 0dd3 0dd6 0dd8 0dda 0de0 0de1 0de2 0de3 0de4 + 0de5 0de7 0de8 0de9 0dea 0deb 0dec 0ded 0dee 0def 0df0 0df1 0df2 0df3 0df4 + 0df5 0df6 0df7 0df8 0df9 0dfa 0dfc 0e22 0e23 0e24 0e30 0e31 0e3a 0e3b 0f00 + 0f01 0f02 0f03 1040 1042 1048 1049 104a 104b 104c 1050 1051 1052 1054 1055 + 1056 1057 1058 1059 105a 105b 107c 107d 1080 1081 1082 1084 1086 1087 1088 + 1089 108b 1091 1094 1096 109a 109b 1140 1200 1201 1203 1205 1206 1207 1208 + 1210 1211 1212 1213 1241 1243 1244 1245 1246 1247 1248 1249 124b 124d 1251 +" + +mask_71xx=">=x11-drivers/nvidia-drivers-72.0.0" +mask_96xx=">=x11-drivers/nvidia-drivers-97.0.0" +mask_173x=">=x11-drivers/nvidia-drivers-177.0.0" +mask_304x=">=x11-drivers/nvidia-drivers-305.0.0" +mask_340x=">=x11-drivers/nvidia-drivers-341.0.0" +mask_390x=">=x11-drivers/nvidia-drivers-391.0.0" + +# @FUNCTION: nvidia-driver-get-card +# @DESCRIPTION: +# Retrieve the PCI device ID for each Nvidia video card you have +nvidia-driver-get-card() { + local NVIDIA_CARD=$( + [ -x /usr/sbin/lspci ] && /usr/sbin/lspci -d 10de: -n \ + | awk -F'[: ]' '/ 03[0-9][0-9]: /{print $6}' + ) + + if [ -n "${NVIDIA_CARD}" ]; then + echo "${NVIDIA_CARD}" + else + echo 0000 + fi +} + +nvidia-driver-get-mask() { + local NVIDIA_CARDS="$(nvidia-driver-get-card)" + local card drv + + for card in ${NVIDIA_CARDS}; do + for drv in ${drv_71xx}; do + if [ "x${card}" = "x${drv}" ]; then + echo "${mask_71xx}" + return 0 + fi + done + + for drv in ${drv_96xx}; do + if [ "x${card}" = "x${drv}" ]; then + echo "${mask_96xx}" + return 0 + fi + done + + for drv in ${drv_173x}; do + if [ "x${card}" = "x${drv}" ]; then + echo "${mask_173x}" + return 0 + fi + done + + for drv in ${drv_304x}; do + if [ "x${card}" = "x${drv}" ]; then + echo "${mask_304x}" + return 0 + fi + done + + for drv in ${drv_340x}; do + if [ "x${card}" = "x${drv}" ]; then + echo "${mask_340x}" + return 0 + fi + done + + for drv in ${drv_390x}; do + if [ "x${card}" = "x${drv}" ]; then + echo "${mask_390x}" + return 0 + fi + done + done + + echo '' + return 1 +} + +# @FUNCTION: nvidia-driver-check-warning +# @DESCRIPTION: +# Prints out a warning if the driver does not work w/ the installed video card +nvidia-driver-check-warning() { + local NVIDIA_MASK="$(nvidia-driver-get-mask)" + + if [ -n "${NVIDIA_MASK}" ]; then + version_compare "${NVIDIA_MASK##*-}" "${PV}" + if [ x"${?}" = x1 ]; then + ewarn "***** WARNING *****" + ewarn + ewarn "You are currently installing a version of nvidia-drivers that is" + ewarn "known not to work with a video card you have installed on your" + ewarn "system. If this is intentional, please ignore this. If it is not" + ewarn "please perform the following steps:" + ewarn + ewarn "Add the following mask entry to /etc/portage/package.mask by" + if [ -d "${ROOT}/etc/portage/package.mask" ]; then + ewarn "echo \"${NVIDIA_MASK}\" > /etc/portage/package.mask/nvidia-drivers" + else + ewarn "echo \"${NVIDIA_MASK}\" >> /etc/portage/package.mask" + fi + ewarn + ewarn "Failure to perform the steps above could result in a non-working" + ewarn "X setup." + ewarn + ewarn "For more information please read:" + ewarn "http://www.nvidia.com/object/IO_32667.html" + fi + fi +} diff -uNr a/eclass/oasis.eclass b/eclass/oasis.eclass --- a/eclass/oasis.eclass false +++ b/eclass/oasis.eclass 2b650a12aacee97c35547d35efa96438d9e2d769776eb2253f673cc4386bfe7554762a4a4842a4e3ede23dae248c1e0fc1fc1162adc2368446ba260234c368f2 @@ -0,0 +1,127 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: oasis.eclass +# @MAINTAINER: +# ml@gentoo.org +# @AUTHOR: +# Original Author: Alexis Ballier <aballier@gentoo.org> +# @BLURB: Provides common ebuild phases for oasis-based packages. +# @DESCRIPTION: +# Provides common ebuild phases for oasis-based packages. +# Most of these packages will just have to inherit the eclass, set their +# dependencies and the DOCS variable for base.eclass to install it and be done. +# +# It inherits multilib, findlib, eutils and base eclasses. +# Ebuilds using oasis.eclass must be EAPI>=3. + +# @ECLASS-VARIABLE: OASIS_BUILD_DOCS +# @DESCRIPTION: +# Will make oasis_src_compile build the documentation if this variable is +# defined and the doc useflag is enabled. +# The eclass takes care of setting doc in IUSE but the ebuild should take care +# of the extra dependencies it may need. +# Set before inheriting the eclass. + +# @ECLASS-VARIABLE: OASIS_BUILD_TESTS +# @DESCRIPTION: +# Will make oasis_src_configure enable building the tests if the test useflag is +# enabled. oasis_src_test will then run them. +# Note that you sometimes need to enable this for src_test to be useful, +# sometimes not. It has to be enabled on a per-case basis. +# The eclass takes care of setting test in IUSE but the ebuild should take care +# of the extra dependencies it may need. +# Set before inheriting the eclass. + + +# @ECLASS-VARIABLE: OASIS_NO_DEBUG +# @DESCRIPTION: +# Disable debug useflag usage. Old oasis versions did not support it so we allow +# disabling it in those cases. +# The eclass takes care of setting debug in IUSE. +# Set before inheriting the eclass. + +# @ECLASS-VARIABLE: OASIS_DOC_DIR +# @DESCRIPTION: +# Specify where to install documentation. Default is for ocamldoc HTML. +# Change it before inherit if this is not what you want. +# EPREFIX is automatically prepended. +: ${OASIS_DOC_DIR:="/usr/share/doc/${PF}/html"} + +inherit multilib findlib eutils base + +case ${EAPI:-0} in + 0|1|2) die "You need at least EAPI-3 to use oasis.eclass";; + 3|4) RDEPEND=">=dev-lang/ocaml-3.12[ocamlopt?]";; + *) RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]";; +esac + +IUSE="+ocamlopt" +[ -n "${OASIS_NO_DEBUG}" ] || IUSE="${IUSE} debug" +[ -n "${OASIS_BUILD_DOCS}" ] && IUSE="${IUSE} doc" +[ -n "${OASIS_BUILD_TESTS}" ] && IUSE="${IUSE} test" + +DEPEND="${RDEPEND} + dev-ml/ocamlbuild" + +# @FUNCTION: oasis_use_enable +# @USAGE: < useflag > < variable > +# @DESCRIPTION: +# A use_enable-like function for oasis configure variables. +# Outputs '--override variable (true|false)', whether useflag is enabled or +# not. +# Typical usage: $(oasis_use_enable ocamlopt is_native) as an oasis configure +# argument. +oasis_use_enable() { + echo "--override $2 $(usex $1 true false)" +} + +# @FUNCTION: oasis_src_configure +# @DESCRIPTION: +# src_configure phase shared by oasis-based packages. +# Extra arguments may be passed via oasis_configure_opts. +oasis_src_configure() { + local confargs="" + [ -n "${OASIS_BUILD_TESTS}" ] && confargs="${confargs} $(use_enable test tests)" + [ -n "${OASIS_NO_DEBUG}" ] || confargs="${confargs} $(oasis_use_enable debug debug)" + ${OASIS_SETUP_COMMAND:-ocaml setup.ml} -configure \ + --prefix "${ED}/usr" \ + --libdir "${ED}/usr/$(get_libdir)" \ + --docdir "${ED}${OASIS_DOC_DIR}" \ + $(oasis_use_enable ocamlopt is_native) \ + ${confargs} \ + ${oasis_configure_opts} \ + || die +} + +# @FUNCTION: oasis_src_compile +# @DESCRIPTION: +# Builds an oasis-based package. +# Will build documentation if OASIS_BUILD_DOCS is defined and the doc useflag is +# enabled. +oasis_src_compile() { + ${OASIS_SETUP_COMMAND:-ocaml setup.ml} -build || die + if [ -n "${OASIS_BUILD_DOCS}" ] && use doc; then + ocaml setup.ml -doc || die + fi +} + +# @FUNCTION: oasis_src_test +# @DESCRIPTION: +# Runs the testsuite of an oasis-based package. +oasis_src_test() { + LD_LIBRARY_PATH="${S}/_build/lib" ${OASIS_SETUP_COMMAND:-ocaml setup.ml} -test || die +} + +# @FUNCTION: oasis_src_install +# @DESCRIPTION: +# Installs an oasis-based package. +# It calls base_src_install_docs, so will install documentation declared in the +# DOCS variable. +oasis_src_install() { + findlib_src_preinst + ${OASIS_SETUP_COMMAND:-ocaml setup.ml} -install || die + base_src_install_docs +} + +EXPORT_FUNCTIONS src_configure src_compile src_test src_install diff -uNr a/eclass/obs-download.eclass b/eclass/obs-download.eclass --- a/eclass/obs-download.eclass false +++ b/eclass/obs-download.eclass bfbee3bb17b0941d04ed8df087cf1bc0f91086dadd4bec11dcbe893ec5dba5a64000a6b8e8c386e71a01f3c422e37e127f02d2fe66255f075e7fedb880d2a682 @@ -0,0 +1,42 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: obs-download.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @BLURB: Simplifies downloading from openSUSE Build Service. +# @DESCRIPTION: +# This eclass constructs OBS_URI based on provided project in openSUSE Build +# Service and package name. It can be used by packages/eclasses to download +# actual files. +# +# All you need to do in order to use it is set OBS_PROJECT and OBS_PACKAGE and +# inherit this eclass. It will provide OBS_URI in return which you will prepend +# to your files and use it in SRC_URI. Alternatively you can just set +# OPENSUSE_RELEASE and OBS_PACKAGE and it will give you back OBS_URI for +# downloading files from obs project corresponding to the specified openSUSE +# release. + +# @ECLASS-VARIABLE: OPENSUSE_RELEASE +# @DEFAULT_UNSET +# @DESCRIPTION: +# From which openSUSE realease to take files. +# Eg.: 12.1, 12.2, Factory + +# @ECLASS-VARIABLE: OBS_PROJECT +# @DEFAULT_UNSET +# @DESCRIPTION: +# In which obs project pakage is. +# This variable does not have to be set and is overridden, if +# OPENSUSE_RELEASE is provided. + +# @ECLASS-VARIABLE: OBS_PACKAGE +# @DESCRIPTION: +# Name of the package we want to take files from. +# By default taken from ${PN}. + +[[ -z ${OPENSUSE_RELEASE} ]] || OBS_PROJECT="openSUSE:${OPENSUSE_RELEASE}" +[[ -n ${OBS_PROJECT} ]] || die "OBS_PROJECT not set!" +[[ -n ${OBS_PACKAGE} ]] || OBS_PACKAGE="${PN}" + +OBS_URI="https://api.opensuse.org/public/source/${OBS_PROJECT}/${OBS_PACKAGE}" diff -uNr a/eclass/obs-service.eclass b/eclass/obs-service.eclass --- a/eclass/obs-service.eclass false +++ b/eclass/obs-service.eclass ad04e544fa9f97381bc929166ae03e05230084556108e6e7e3a349ac5cd94b4c560ee40ad94817b0b5042484bb4f8b5a154f3f3831351a84d831da0226744ad1 @@ -0,0 +1,111 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: obs-service.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @BLURB: Reduces code duplication in the Open Build Service services. +# @DESCRIPTION: +# This eclass makes it easier to package Open Build Service services. Based on +# provided information it will set all needed variables and takes care of +# installation. +# +# @EXAMPLE: +# Typical ebuild using obs-service.eclass: +# +# @CODE +# EAPI=4 +# +# inherit obs-service +# +# KEYWORDS="" +# +# DEPEND="" +# RDEPEND="${DEPEND}" +# +# @CODE + +# @ECLASS-VARIABLE: OBS_SERVICE_NAME +# @DESCRIPTION: +# Name of the service. If not set, it is taken from ${PN}. + +# @ECLASS-VARIABLE: ADDITIONAL_FILES +# @DEFAULT_UNSET +# @DESCRIPTION: +# If any additional files are needed. + +case "${EAPI:-0}" in + 4|5) : ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +HOMEPAGE="http://en.opensuse.org/openSUSE:OSC" +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-util/osc + dev-util/suse-build +" + +[[ -n ${OBS_SERVICE_NAME} ]] || OBS_SERVICE_NAME=${PN/obs-service-/} +OBS_PROJECT="openSUSE:Tools" + +DESCRIPTION="Open Build Service client module - ${OBS_SERVICE_NAME} service" + +inherit obs-download + +# As it aint versioned at all use arrows to deal with it +SRC_URI="${OBS_URI}/${OBS_SERVICE_NAME} -> ${OBS_SERVICE_NAME}-${PV}" +SRC_URI+=" ${OBS_URI}/${OBS_SERVICE_NAME}.service -> ${OBS_SERVICE_NAME}-${PV}.service" + +for i in ${ADDITIONAL_FILES}; do + SRC_URI+=" ${OBS_URI}/${i} -> ${i}-${PV}" +done + +# @FUNCTION: obs-service_src_unpack +# @DESCRIPTION: +# Just copy files. Files are not compressed. +obs-service_src_unpack() { + debug-print-function ${FUNCNAME} "$@" + cd "${DISTDIR}" + mkdir -p "${S}" + cp ${A} "${S}" +} + +# @FUNCTION: obs-service_src_prepare +# @DESCRIPTION: +# Replaces all /usr/lib/build directories with /usr/share/suse-build to reflect +# where suse-build is installed in Gentoo. +obs-service_src_prepare() { + debug-print-function ${FUNCNAME} "$@" + debug-print "Replacing all paths to find suse-build in Gentoo" + find "${S}" -type f -exec \ + sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} + + debug-print "Replacing all paths from hardcoded suse libexec" + find "${S}" -type f -exec \ + sed -i 's|/usr/lib/obs|/usr/libexec/obs|g' {} + +} + +# @FUNCTION: obs-service_src_install +# @DESCRIPTION: +# Does the installation of the downloaded files. +obs-service_src_install() { + debug-print-function ${FUNCNAME} "$@" + debug-print "Installing service \"${OBS_SERVICE_NAME}\"" + exeinto /usr/libexec/obs/service + newexe "${S}"/${OBS_SERVICE_NAME}-${PV} ${OBS_SERVICE_NAME} + insinto /usr/libexec/obs/service + newins "${S}"/${OBS_SERVICE_NAME}-${PV}.service ${OBS_SERVICE_NAME}.service + if [[ -n ${ADDITIONAL_FILES} ]]; then + debug-print "Installing following additional files:" + debug-print " ${ADDITIONAL_FILES}" + exeinto /usr/libexec/obs/service/${OBS_SERVICE_NAME}.files + for i in ${ADDITIONAL_FILES}; do + newexe "${S}"/${i}-${PV} ${i} + done + fi +} + +EXPORT_FUNCTIONS src_install src_prepare src_unpack diff -uNr a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass --- a/eclass/office-ext-r1.eclass false +++ b/eclass/office-ext-r1.eclass 78fce8cec653f696975a4474e01a475e10e6fc1df3b73f4d4ccaaf5f320f54af8d89bf293e2373d9e8e58215e242762d11defeefb00907015b0dc31ae2fd650a @@ -0,0 +1,238 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: office-ext-r1.eclass +# @MAINTAINER: +# The office team <openoffice@gentoo.org> +# @AUTHOR: +# Tomáš Chvátal <scarabeus@gentoo.org> +# @BLURB: Eclass for installing libreoffice/openoffice extensions +# @DESCRIPTION: +# Eclass for easing maintenance of libreoffice/openoffice extensions. + +case "${EAPI:-0}" in + 5|6) OEXT_EXPORTED_FUNCTIONS="src_unpack src_install pkg_postinst pkg_prerm" ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +inherit eutils multilib + +# @ECLASS-VARIABLE: OFFICE_REQ_USE +# @DESCRIPTION: +# Useflags required on office implementation for the extension. +# +# Example: +# @CODE +# OFFICE_REQ_USE="java,jemalloc(-)?" +# @CODE +if [[ ${OFFICE_REQ_USE} ]]; then + # Append the brackets for the depend bellow + OFFICE_REQ_USE="[${OFFICE_REQ_USE}]" +fi + +# @ECLASS-VARIABLE: OFFICE_IMPLEMENTATIONS +# @DESCRIPTION: +# List of implementations supported by the extension. +# Some work only for libreoffice and vice versa. +# Default value is all implementations. +# +# Example: +# @CODE +# OFFICE_IMPLEMENTATIONS=( "libreoffice" "openoffice" ) +# @CODE +[[ -z ${OFFICE_IMPLEMENTATIONS} ]] && OFFICE_IMPLEMENTATIONS=( "libreoffice" "openoffice" ) + +# @ECLASS-VARIABLE: OFFICE_EXTENSIONS +# @REQUIRED +# @DESCRIPTION: +# Array containing list of extensions to install. +# +# Example: +# @CODE +# OFFICE_EXTENSIONS=( ${PN}_${PV}.oxt ) +# @CODE +[[ -z ${OFFICE_EXTENSIONS} ]] && die "OFFICE_EXTENSIONS variable is unset." +if [[ "$(declare -p OFFICE_EXTENSIONS 2>/dev/null 2>&1)" != "declare -a"* ]]; then + die "OFFICE_EXTENSIONS variable is not an array." +fi + +# @ECLASS-VARIABLE: OFFICE_EXTENSIONS_LOCATION +# @DESCRIPTION: +# Path to the extensions location. Defaults to ${DISTDIR}. +# +# Example: +# @CODE +# OFFICE_EXTENSIONS_LOCATION="${S}/unpacked/" +# @CODE +: ${OFFICE_EXTENSIONS_LOCATION:=${DISTDIR}} + +IUSE="" +RDEPEND="" + +for i in ${OFFICE_IMPLEMENTATIONS[@]}; do + IUSE+=" office_implementation_${i}" + if [[ ${i} == "openoffice" ]]; then + # special only binary + RDEPEND+=" + office_implementation_openoffice? ( + app-office/openoffice-bin${OFFICE_REQ_USE} + ) + " + else + RDEPEND+=" + office_implementation_${i}? ( + || ( + app-office/${i}${OFFICE_REQ_USE} + app-office/${i}-bin${OFFICE_REQ_USE} + ) + ) + " + fi +done + +REQUIRED_USE="|| ( " +for i in ${OFFICE_IMPLEMENTATIONS[@]}; do + REQUIRED_USE+=" office_implementation_${i} " +done +REQUIRED_USE+=" )" + +DEPEND="${RDEPEND} + app-arch/unzip +" + +# Most projects actually do not provide any relevant sourcedir as they are oxt. +S="${WORKDIR}" + +# @FUNCTION: office-ext-r1_src_unpack +# @DESCRIPTION: +# Flush the cache after removal of an extension. +office-ext-r1_src_unpack() { + debug-print-function ${FUNCNAME} "$@" + local i + + default + + for i in ${OFFICE_EXTENSIONS[@]}; do + # Unpack the extensions where required and add case for oxt + # which should be most common case for the extensions. + if [[ -f "${OFFICE_EXTENSIONS_LOCATION}/${i}" ]] ; then + case ${i} in + *.oxt) + mkdir -p "${WORKDIR}/${i}/" + pushd "${WORKDIR}/${i}/" > /dev/null + echo ">>> Unpacking "${OFFICE_EXTENSIONS_LOCATION}/${i}" to ${PWD}" + unzip -qo ${OFFICE_EXTENSIONS_LOCATION}/${i} + assert "failed unpacking ${OFFICE_EXTENSIONS_LOCATION}/${i}" + popd > /dev/null + ;; + *) unpack ${i} ;; + esac + fi + done +} + +# @FUNCTION: office-ext-r1_src_install +# @DESCRIPTION: +# Install the extension source to the proper location. +office-ext-r1_src_install() { + debug-print-function ${FUNCNAME} "$@" + debug-print "Extensions: ${OFFICE_EXTENSIONS[@]}" + + local i j + + for i in ${OFFICE_IMPLEMENTATIONS[@]}; do + if use office_implementation_${i}; then + if [[ ${i} == openoffice ]]; then + # OOO needs to use uno because direct deployment segfaults. + # This is bug by their side, but i don't want to waste time + # fixing it myself. + insinto /usr/$(get_libdir)/${i}/share/extension/install + for j in ${OFFICE_EXTENSIONS[@]}; do + doins ${OFFICE_EXTENSIONS_LOCATION}/${j} + done + else + for j in ${OFFICE_EXTENSIONS[@]}; do + pushd "${WORKDIR}/${j}/" > /dev/null + insinto /usr/$(get_libdir)/${i}/share/extensions/${j/.oxt/} + doins -r * + popd > /dev/null + done + fi + fi + done +} + +#### OPENOFFICE COMPAT CODE + +UNOPKG_BINARY="/usr/lib64/openoffice/program/unopkg" + +# @FUNCTION: office-ext-r1_add_extension +# @DESCRIPTION: +# Install the extension into the libreoffice/openoffice. +office-ext-r1_add_extension() { + debug-print-function ${FUNCNAME} "$@" + local ext=$1 + local tmpdir=$(emktemp -d) + + debug-print "${FUNCNAME}: ${UNOPKG_BINARY} add --shared \"${ext}\"" + ebegin "Adding office extension: \"${ext}\"" + ${UNOPKG_BINARY} add --suppress-license \ + --shared "${ext}" \ + "-env:UserInstallation=file:///${tmpdir}" \ + "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1" + eend $? + ${UNOPKG_BINARY} list --shared > /dev/null + rm -rf "${tmpdir}" +} + +# @FUNCTION: office-ext-r1_remove_extension +# @DESCRIPTION: +# Remove the extension from the libreoffice/openoffice. +office-ext-r1_remove_extension() { + debug-print-function ${FUNCNAME} "$@" + local ext=$1 + local tmpdir=$(mktemp -d --tmpdir="${T}") + + debug-print "${FUNCNAME}: ${UNOPKG_BINARY} remove --shared \"${ext}\"" + ebegin "Removing office extension: \"${ext}\"" + ${UNOPKG_BINARY} remove --suppress-license \ + --shared "${ext}" \ + "-env:UserInstallation=file:///${tmpdir}" \ + "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1" + eend $? + ${UNOPKG_BINARY} list --shared > /dev/null + rm -rf "${tmpdir}" +} + +# @FUNCTION: office-ext-r1_pkg_postinst +# @DESCRIPTION: +# Add the extensions to the openoffice. +office-ext-r1_pkg_postinst() { + if in_iuse office_implementation_openoffice && use office_implementation_openoffice; then + debug-print-function ${FUNCNAME} "$@" + debug-print "Extensions: ${OFFICE_EXTENSIONS[@]}" + local i + + for i in ${OFFICE_EXTENSIONS[@]}; do + office-ext-r1_add_extension "/usr/lib64/openoffice/share/extension/install/${i}" + done + fi +} + +# @FUNCTION: office-ext-r1_pkg_prerm +# @DESCRIPTION: +# Remove the extensions from the openoffice. +office-ext-r1_pkg_prerm() { + if in_iuse office_implementation_openoffice && use office_implementation_openoffice; then + debug-print-function ${FUNCNAME} "$@" + debug-print "Extensions: ${OFFICE_EXTENSIONS[@]}" + local i + + for i in ${OFFICE_EXTENSIONS[@]}; do + office-ext-r1_remove_extension "${i}" + done + fi +} + +EXPORT_FUNCTIONS ${OEXT_EXPORTED_FUNCTIONS} +unset OEXT_EXPORTED_FUNCTIONS diff -uNr a/eclass/opam.eclass b/eclass/opam.eclass --- a/eclass/opam.eclass false +++ b/eclass/opam.eclass 60f3cf22a9d06742604e9bd6a370fda12f1d223c1e33642dd2d026c46ccdf46a3eb1a7ecc8c8422f8875fbfdf7b8e32d8fa512bfe64ba15d8f4cbd307384b61b @@ -0,0 +1,50 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: opam.eclass +# @MAINTAINER: +# Gentoo ML Project <ml@gentoo.org> +# @AUTHOR: +# Alexis Ballier <aballier@gentoo.org> +# @BLURB: Provides functions for installing opam packages. +# @DESCRIPTION: +# Provides dependencies on opam and ocaml, opam-install and a default +# src_install for opam-based packages. + +case ${EAPI:-0} in + 0|1|2|3|4) die "You need at least EAPI-5 to use opam.eclass";; + *) ;; +esac + +RDEPEND=">=dev-lang/ocaml-4:=" +DEPEND="${RDEPEND} + dev-ml/opam" + +# @FUNCTION: opam-install +# @USAGE: <list of packages> +# @DESCRIPTION: +# Installs the opam packages given as arguments. For each "${pkg}" element in +# that list, "${pkg}.install" must be readable from current working directory. +opam-install() { + local pkg + for pkg ; do + opam-installer -i \ + --prefix="${ED}usr" \ + --libdir="${D}$(ocamlc -where)" \ + --docdir="${ED}usr/share/doc/${PF}" \ + --mandir="${ED}usr/share/man" \ + "${pkg}.install" || die + done +} + +opam_src_install() { + local pkg="${1:-${PN}}" + opam-install "${pkg}" + # Handle opam putting doc in a subdir + if [ -d "${ED}usr/share/doc/${PF}/${pkg}" ] ; then + mv "${ED}usr/share/doc/${PF}/${pkg}/"* "${ED}usr/share/doc/${PF}/" || die + rmdir "${ED}usr/share/doc/${PF}/${pkg}" || die + fi +} + +EXPORT_FUNCTIONS src_install diff -uNr a/eclass/openib.eclass b/eclass/openib.eclass --- a/eclass/openib.eclass false +++ b/eclass/openib.eclass 117389289aa3337694eaabbbcf5f8cfa23c85e0df813786bd43f7adc43b79001c81cbcc619fc28d1d70b2c83b67ae5fbb1d8796bec7d4deb84b6e08642825e16 @@ -0,0 +1,146 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: openib.eclass +# @AUTHOR: +# Original Author: Alexey Shvetsov <alexxy@gentoo.org> +# @BLURB: Simplify working with OFED packages + +inherit eutils rpm versionator + +EXPORT_FUNCTIONS src_unpack + +HOMEPAGE="https://www.openfabrics.org/" +LICENSE="|| ( GPL-2 BSD-2 )" + +# @ECLASS-VARIABLE: OFED_VER +# @DESCRIPTION: +# Defines OFED version eg 1.4 or 1.4.0.1 + +# @ECLASS-VARIABLE: OFED_RC +# @DESCRIPTION: +# Sets if this version is RC + +# @ECLASS-VARIABLE: OFED_RC_VER +# @DESCRIPTION: +# Sets RC version + + +# @ECLASS-VARIABLE: OFED_SUFFIX +# @DESCRIPTION: +# Defines OFED package suffix eg -1.ofed1.4 + +# @ECLASS-VARIABLE: OFED_SNAPSHOT +# @DESCRIPTION: +# Defines if src tarball is git snapshot + +SLOT="${OFED_VER}" + +# @ECLASS-VARIABLE: OFED_VERSIONS +# @DESCRIPTION: +# Defines array of ofed version supported by eclass + +OFED_VERSIONS=( + "3.5" + "3.12" + ) + +# @FUNCTION: block_other_ofed_versions +# @DESCRIPTION: +# function that creates blockers list for ofed +block_other_ofed_versions() { + local slot + RDEPEND="${RDEPEND} !sys-fabric/${PN}:0" + for slot in ${OFED_VERSIONS[@]}; do + if [[ ${slot} != ${SLOT} ]]; then + RDEPEND+=" !sys-fabric/${PN}:${slot}" + fi + done +} + +OFED_BASE_VER=$(get_version_component_range 1-3 ${OFED_VER}) + +if [ -z $OFED_RC ] ; then + SRC_URI="https://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VER}/OFED-${OFED_VER}.tgz" +else + SRC_URI="https://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VER}/OFED-${OFED_VER}-rc${OFED_RC_VER}.tgz" +fi + +case ${PN} in + ofed) + MY_PN="compat-rdma" + ;; + *) + MY_PN="${PN}" + ;; +esac + +case ${PV} in + *p*) + MY_PV="${PV/p/}" + ;; + *) + MY_PV="${PV}" + ;; +esac + +case ${MY_PN} in + ofa_kernel|compat-rdma) + EXT="tgz" + ;; + *) + EXT="tar.gz" + ;; +esac + +if [ -z ${OFED_SRC_SNAPSHOT} ]; then + S="${WORKDIR}/${MY_PN}-${MY_PV}" +else + S="${WORKDIR}/${MY_PN}-${MY_PV}-${OFED_SUFFIX}" +fi + + +# @FUNCTION: openib_src_unpack +# @DESCRIPTION: +# This function will unpack OFED packages +openib_src_unpack() { + unpack ${A} + if [ -z ${OFED_RC} ]; then + case ${PN} in + ofed) + rpm_unpack "./OFED-${OFED_VER}/SRPMS/${MY_PN}-${OFED_VER}-${OFED_SUFFIX}.src.rpm" + ;; + *) + rpm_unpack "./OFED-${OFED_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.src.rpm" + ;; + esac + else + case ${PN} in + ofed) + rpm_unpack "./OFED-${OFED_VER}-rc${OFED_RC_VER}/SRPMS/${MY_PN}-${OFED_VER}-${OFED_SUFFIX}.src.rpm" + ;; + *) + rpm_unpack "./OFED-${OFED_VER}-rc${OFED_RC_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.src.rpm" + ;; + esac + fi + if [ -z ${OFED_SNAPSHOT} ]; then + case ${PN} in + ofed) + unpack ./${MY_PN}-${OFED_VER}.${EXT} + ;; + *) + unpack ./${MY_PN}-${MY_PV}.${EXT} + ;; + esac + else + case ${PN} in + ofed) + unpack ./${MY_PN}-${OFED_VER}-${OFED_SUFFIX}.${EXT} + ;; + *) + unpack ./${MY_PN}-${MY_PV}-${OFED_SUFFIX}.${EXT} + ;; + esac + fi +} diff -uNr a/eclass/out-of-source.eclass b/eclass/out-of-source.eclass --- a/eclass/out-of-source.eclass false +++ b/eclass/out-of-source.eclass b198e0f0160f836e24b23b636dfd8638f65284cbf590d06884d252b0ab5df0a4a3b96085617f58fd418c824ac5b02f7ad7e8bbbae65b33272243269d0ce76c5b @@ -0,0 +1,124 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: out-of-source.eclass +# @MAINTAINER: +# Michał Górny <mgorny@gentoo.org> +# @BLURB: convenient wrapper to build autotools packages out-of-source +# @DESCRIPTION: +# This eclass provides a minimalistic wrapper interface to easily +# build autotools (and alike) packages out-of-source. It is meant +# to resemble the interface used by multilib-minimal without actually +# requiring the package to be multilib. +# +# For the simplest ebuilds, it is enough to inherit the eclass +# and the new phase functions will automatically build the package +# out-of-source. If you need to redefine one of the default phases +# src_configure() through src_install(), you need to define +# the matching sub-phases: my_src_configure(), my_src_compile(), +# my_src_test() and/or my_src_install(). Those sub-phase functions +# will be run inside the build directory. Additionally, +# my_src_install_all() is provided to perform doc-install and other +# common tasks that are done in source directory. +# +# Example use: +# @CODE +# inherit out-of-source +# +# my_src_configure() { +# econf \ +# --disable-static +# } +# @CODE + +case ${EAPI} in + 6|7);; + *) die "EAPI ${EAPI:-0} unsupported (too old)";; +esac + +EXPORT_FUNCTIONS src_configure src_compile src_test src_install + +if [[ ! ${_OUT_OF_SOURCE_ECLASS} ]]; then + +# @FUNCTION: out-of-source_src_configure +# @DESCRIPTION: +# The default src_configure() implementation establishes a BUILD_DIR, +# sets ECONF_SOURCE to the current directory (usually S), and runs +# my_src_configure() (or the default) inside it. +out-of-source_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + # set some BUILD_DIR if we don't have one yet + : "${BUILD_DIR:=${WORKDIR}/${P}_build}" + local ECONF_SOURCE=${PWD} + + mkdir -p "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + if declare -f my_src_configure >/dev/null ; then + my_src_configure + else + default_src_configure + fi + popd >/dev/null || die +} + +# @FUNCTION: out-of-source_src_compile +# @DESCRIPTION: +# The default src_compile() implementation runs my_src_compile() +# (or the default) inside the build directory. +out-of-source_src_compile() { + debug-print-function ${FUNCNAME} "$@" + + pushd "${BUILD_DIR}" >/dev/null || die + if declare -f my_src_compile >/dev/null ; then + my_src_compile + else + default_src_compile + fi + popd >/dev/null || die +} + +# @FUNCTION: out-of-source_src_test +# @DESCRIPTION: +# The default src_test() implementation runs my_src_test() +# (or the default) inside the build directory. +out-of-source_src_test() { + debug-print-function ${FUNCNAME} "$@" + + pushd "${BUILD_DIR}" >/dev/null || die + if declare -f my_src_test >/dev/null ; then + my_src_test + else + default_src_test + fi + popd >/dev/null || die +} + +# @FUNCTION: out-of-source_src_install +# @DESCRIPTION: +# The default src_install() implementation runs my_src_install() +# (or the 'make install' part of the default) inside the build directory, +# followed by a call to my_src_install_all() (or 'einstalldocs' part +# of the default) in the original working directory. +out-of-source_src_install() { + debug-print-function ${FUNCNAME} "$@" + + pushd "${BUILD_DIR}" >/dev/null || die + if declare -f my_src_install >/dev/null ; then + my_src_install + else + if [[ -f Makefile || -f GNUmakefile || -f makefile ]] ; then + emake DESTDIR="${D}" install + fi + fi + popd >/dev/null || die + + if declare -f my_src_install_all >/dev/null ; then + my_src_install_all + else + einstalldocs + fi +} + +_OUT_OF_SOURCE_ECLASS=1 +fi diff -uNr a/eclass/pam.eclass b/eclass/pam.eclass --- a/eclass/pam.eclass false +++ b/eclass/pam.eclass 8ed27fb5742acd2b8e8e04a43933f2566d62c875a04bb89e448171de1fcb6080c8b71c7974360b2e516bd533baaf1ab8ccecae3dc3093b3e2cc28f28973dad79 @@ -0,0 +1,260 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: pam.eclass +# @MAINTAINER: +# pam-bugs@gentoo.org +# @AUTHOR: +# Diego Pettenò <flameeyes@gentoo.org> +# @BLURB: Handles pam related tasks +# @DESCRIPTION: +# This eclass contains functions to install pamd configuration files and +# pam modules. + +if [[ -z ${_PAM_ECLASS} ]]; then +_PAM_ECLASS=1 + +inherit flag-o-matic multilib + +# @FUNCTION: dopamd +# @USAGE: <file> [more files] +# @DESCRIPTION: +# Install pam auth config file in /etc/pam.d +dopamd() { + [[ -z $1 ]] && die "dopamd requires at least one argument" + + if has pam ${IUSE} && ! use pam; then + return 0; + fi + + ( # dont want to pollute calling env + insinto /etc/pam.d + insopts -m 0644 + doins "$@" + ) || die "failed to install $@" + cleanpamd "$@" +} + +# @FUNCTION: newpamd +# @USAGE: <old name> <new name> +# @DESCRIPTION: +# Install pam file <old name> as <new name> in /etc/pam.d +newpamd() { + [[ $# -ne 2 ]] && die "newpamd requires two arguments" + + if has pam ${IUSE} && ! use pam; then + return 0; + fi + + ( # dont want to pollute calling env + insinto /etc/pam.d + insopts -m 0644 + newins "$1" "$2" + ) || die "failed to install $1 as $2" + cleanpamd $2 +} + +# @FUNCTION: dopamsecurity +# @USAGE: <section> <file> [more files] +# @DESCRIPTION: +# Installs the config files in /etc/security/<section>/ +dopamsecurity() { + [[ $# -lt 2 ]] && die "dopamsecurity requires at least two arguments" + + if has pam ${IUSE} && ! use pam; then + return 0 + fi + + ( # dont want to pollute calling env + insinto /etc/security/$1 + insopts -m 0644 + doins "${@:2}" + ) || die "failed to install ${@:2}" +} + +# @FUNCTION: newpamsecurity +# @USAGE: <section> <old name> <new name> +# @DESCRIPTION: +# Installs the config file <old name> as <new name> in /etc/security/<section>/ +newpamsecurity() { + [[ $# -ne 3 ]] && die "newpamsecurity requires three arguments" + + if has pam ${IUSE} && ! use pam; then + return 0; + fi + + ( # dont want to pollute calling env + insinto /etc/security/$1 + insopts -m 0644 + newins "$2" "$3" + ) || die "failed to install $2 as $3" +} + +# @FUNCTION: getpam_mod_dir +# @DESCRIPTION: +# Returns the pam modules' directory for current implementation +getpam_mod_dir() { + if has_version sys-libs/pam || has_version sys-libs/openpam; then + PAM_MOD_DIR=/$(get_libdir)/security + else + # Unable to find PAM implementation... defaulting + PAM_MOD_DIR=/$(get_libdir)/security + fi + + echo ${PAM_MOD_DIR} +} + +# @FUNCTION: pammod_hide_symbols +# @DESCRIPTION: +# Hide all non-PAM-used symbols from the module; this function creates a +# simple ld version script that hides all the symbols that are not +# necessary for PAM to load the module, then uses append-flags to make +# sure that it gets used. +pammod_hide_symbols() { + cat - > "${T}"/pam-eclass-pam_symbols.ver <<EOF +{ + global: pam_sm_*; + local: *; +}; +EOF + + append-ldflags -Wl,--version-script="${T}"/pam-eclass-pam_symbols.ver +} + +# @FUNCTION: dopammod +# @USAGE: <file> [more files] +# @DESCRIPTION: +# Install pam module file in the pam modules' dir for current implementation +dopammod() { + [[ -z $1 ]] && die "dopammod requires at least one argument" + + if has pam ${IUSE} && ! use pam; then + return 0; + fi + + exeinto $(getpam_mod_dir) + doexe "$@" || die "failed to install $@" +} + +# @FUNCTION: newpammod +# @USAGE: <old name> <new name> +# @DESCRIPTION: +# Install pam module file <old name> as <new name> in the pam +# modules' dir for current implementation +newpammod() { + [[ $# -ne 2 ]] && die "newpammod requires two arguements" + + if has pam ${IUSE} && ! use pam; then + return 0; + fi + + exeinto $(getpam_mod_dir) + newexe "$1" "$2" || die "failed to install $1 as $2" +} + +# @FUNCTION: pamd_mimic_system +# @USAGE: <pamd file> [auth levels] +# @DESCRIPTION: +# This function creates a pamd file which mimics system-auth file +# for the given levels in the /etc/pam.d directory. +pamd_mimic_system() { + [[ $# -lt 2 ]] && die "pamd_mimic_system requires at least two argments" + pamd_mimic system-auth "$@" +} + +# @FUNCTION: pamd_mimic +# @USAGE: <stack> <pamd file> [auth levels] +# @DESCRIPTION: +# This function creates a pamd file which mimics the given stack +# for the given levels in the /etc/pam.d directory. +pamd_mimic() { + [[ $# -lt 3 ]] && die "pamd_mimic requires at least three argments" + + if has pam ${IUSE} && ! use pam; then + return 0; + fi + + dodir /etc/pam.d + pamdfile=${D}/etc/pam.d/$2 + echo -e "# File autogenerated by pamd_mimic in pam eclass\n\n" >> \ + $pamdfile + + originalstack=$1 + authlevels="auth account password session" + + if has_version '<sys-libs/pam-0.78'; then + mimic="\trequired\t\tpam_stack.so service=${originalstack}" + else + mimic="\tinclude\t\t${originalstack}" + fi + + shift; shift + + while [[ -n $1 ]]; do + has $1 ${authlevels} || die "unknown level type" + + echo -e "$1${mimic}" >> ${pamdfile} + + shift + done +} + +# @FUNCTION: cleanpamd +# @USAGE: <pamd file> +# @DESCRIPTION: +# Cleans a pam.d file from modules that might not be present on the system +# where it's going to be installed +cleanpamd() { + while [[ -n $1 ]]; do + if ! has_version sys-libs/pam; then + sed -i -e '/pam_shells\|pam_console/s:^:#:' "${D}/etc/pam.d/$1" + fi + + shift + done +} + +# @FUNCTION: pam_epam_expand +# @USAGE: <pamd file> +# @DESCRIPTION: +# Steer clear, deprecated, don't use, bad experiment +pam_epam_expand() { + sed -n -e 's|#%EPAM-$[[:alpha:]-]\+$:$[-+<>=/.![:alnum:]]\+$%#.*|\1 \2|p' \ + "$@" | sort -u | while read condition parameter; do + + disable="yes" + + case "$condition" in + If-Has) + message="This can be used only if you have ${parameter} installed" + has_version "$parameter" && disable="no" + ;; + Use-Flag) + message="This can be used only if you enabled the ${parameter} USE flag" + use "$parameter" && disable="no" + ;; + *) + eerror "Unknown EPAM condition '${condition}' ('${parameter}')" + die "Unknown EPAM condition '${condition}' ('${parameter}')" + ;; + esac + + if [ "${disable}" = "yes" ]; then + sed -i -e "/#%EPAM-${condition}:${parameter/\//\\/}%#/d" "$@" + else + sed -i -e "s|#%EPAM-${condition}:${parameter}%#||" "$@" + fi + + done +} + +# Think about it before uncommenting this one, for now run it by hand +# pam_pkg_preinst() { +# eshopts_push -o noglob # so that bash doen't expand "*" +# +# pam_epam_expand "${D}"/etc/pam.d/* +# +# eshopts_pop # reset old shell opts +# } + +fi diff -uNr a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass --- a/eclass/pax-utils.eclass false +++ b/eclass/pax-utils.eclass aa44c02e0c4a8757739c6c9de4ec4713e71d4fb9377a311381bea8aeb268faabe24621b62cc134069698176e2ea03532347a3d15b9890394c65be9de9bff59db @@ -0,0 +1,190 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: pax-utils.eclass +# @MAINTAINER: +# The Gentoo Linux Hardened Team <hardened@gentoo.org> +# @AUTHOR: +# Author: Kevin F. Quinn <kevquinn@gentoo.org> +# Author: Anthony G. Basile <blueness@gentoo.org> +# @BLURB: functions to provide PaX markings for hardened kernels +# @DESCRIPTION: +# +# This eclass provides support for manipulating PaX markings on ELF binaries, +# whether the system is using legacy PT_PAX markings or the newer XATTR_PAX. +# The eclass wraps the use of paxctl-ng, paxctl, set/getattr and scanelf utilities, +# deciding which to use depending on what's installed on the build host, and +# whether we're working with PT_PAX, XATTR_PAX or both. +# +# To control what markings are made, set PAX_MARKINGS in /etc/portage/make.conf +# to contain either "PT", "XT" or "none". The default is to attempt both +# PT_PAX and XATTR_PAX. + +if [[ -z ${_PAX_UTILS_ECLASS} ]]; then +_PAX_UTILS_ECLASS=1 + +# @ECLASS-VARIABLE: PAX_MARKINGS +# @DESCRIPTION: +# Control which markings are made: +# PT = PT_PAX markings, XT = XATTR_PAX markings +# Default to PT markings. +PAX_MARKINGS=${PAX_MARKINGS:="PT XT"} + +# @FUNCTION: pax-mark +# @USAGE: <flags> <ELF files> +# @RETURN: Shell true if we succeed, shell false otherwise +# @DESCRIPTION: +# Marks <ELF files> with provided PaX <flags> +# +# Flags are passed directly to the utilities unchanged. +# +# @CODE +# p: disable PAGEEXEC P: enable PAGEEXEC +# e: disable EMUTRAMP E: enable EMUTRAMP +# m: disable MPROTECT M: enable MPROTECT +# r: disable RANDMMAP R: enable RANDMMAP +# s: disable SEGMEXEC S: enable SEGMEXEC +# @CODE +# +# Default flags are 'PeMRS', which are the most restrictive settings. Refer +# to https://pax.grsecurity.net/ for details on what these flags are all about. +# +# Please confirm any relaxation of restrictions with the Gentoo Hardened team. +# Either ask on the gentoo-hardened mailing list, or CC/assign hardened@g.o on +# the bug report. +pax-mark() { + local f # loop over paxables + local flags # pax flags + local ret=0 # overall return code of this function + + # Only the actual PaX flags and z are accepted + # 1. The leading '-' is optional + # 2. -C -c only make sense for paxctl, but are unnecessary + # because we progressively do -q -qc -qC + # 3. z is allowed for the default + + flags="${1//[!zPpEeMmRrSs]}" + [[ "${flags}" ]] || return 0 + shift + + # z = default. For XATTR_PAX, the default is no xattr field at all + local dodefault="" + [[ "${flags//[!z]}" ]] && dodefault="yes" + + if has PT ${PAX_MARKINGS}; then + # Uncomment to list all files to be marked + # _pax_list_files einfo "$@" + for f in "$@"; do + + # First try paxctl + if type -p paxctl >/dev/null; then + einfo "PT_PAX marking -${flags} ${f} with paxctl" + # We try modifying the existing PT_PAX_FLAGS header. + paxctl -q${flags} "${f}" >/dev/null 2>&1 && continue + # We no longer try to create/convert a PT_PAX_FLAGS header, bug #590422 + # paxctl -qC${flags} "${f}" >/dev/null 2>&1 && continue + # paxctl -qc${flags} "${f}" >/dev/null 2>&1 && continue + fi + + # Next try paxctl-ng -> this will not create/convert any program headers. + if type -p paxctl-ng >/dev/null && paxctl-ng -L ; then + einfo "PT_PAX marking -${flags} ${f} with paxctl-ng" + flags="${flags//z}" + [[ ${dodefault} == "yes" ]] && paxctl-ng -L -z "${f}" >/dev/null 2>&1 + [[ "${flags}" ]] || continue + paxctl-ng -L -${flags} "${f}" >/dev/null 2>&1 && continue + fi + + # Finally fall back on scanelf. + if type -p scanelf >/dev/null && [[ ${PAX_MARKINGS} != "none" ]]; then + einfo "PT_PAX marking -${flags} ${f} with scanelf" + scanelf -Xxz ${flags} "$f" >/dev/null 2>&1 + # We failed to set PT_PAX flags. + elif [[ ${PAX_MARKINGS} != "none" ]]; then + elog "Failed to set PT_PAX markings -${flags} ${f}." + ret=1 + fi + done + fi + + if has XT ${PAX_MARKINGS}; then + # Uncomment to list all files to be marked + # _pax_list_files einfo "$@" + flags="${flags//z}" + for f in "$@"; do + + # First try paxctl-ng. + if type -p paxctl-ng >/dev/null && paxctl-ng -l ; then + einfo "XATTR_PAX marking -${flags} ${f} with paxctl-ng" + [[ ${dodefault} == "yes" ]] && paxctl-ng -d "${f}" >/dev/null 2>&1 + [[ "${flags}" ]] || continue + paxctl-ng -l -${flags} "${f}" >/dev/null 2>&1 && continue + fi + + # Next try setfattr. + if type -p setfattr >/dev/null; then + [[ "${flags//[!Ee]}" ]] || flags+="e" # bug 447150 + einfo "XATTR_PAX marking -${flags} ${f} with setfattr" + [[ ${dodefault} == "yes" ]] && setfattr -x "user.pax.flags" "${f}" >/dev/null 2>&1 + setfattr -n "user.pax.flags" -v "${flags}" "${f}" >/dev/null 2>&1 && continue + fi + + # We failed to set XATTR_PAX flags. + if [[ ${PAX_MARKINGS} != "none" ]]; then + elog "Failed to set XATTR_PAX markings -${flags} ${f}." + ret=1 + fi + done + fi + + # [[ ${ret} == 1 ]] && elog "Executables may be killed by PaX kernels." + + return ${ret} +} + +# @FUNCTION: list-paxables +# @USAGE: <files> +# @RETURN: Subset of <files> which are ELF executables or shared objects +# @DESCRIPTION: +# Print to stdout all of the <files> that are suitable to have PaX flag +# markings, i.e., filter out the ELF executables or shared objects from a list +# of files. This is useful for passing wild-card lists to pax-mark, although +# in general it is preferable for ebuilds to list precisely which ELFS are to +# be marked. Often not all the ELF installed by a package need remarking. +# @EXAMPLE: +# pax-mark -m $(list-paxables ${S}/{,usr/}bin/*) +list-paxables() { + file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//' +} + +# @FUNCTION: host-is-pax +# @RETURN: Shell true if the build process is PaX enabled, shell false otherwise +# @DESCRIPTION: +# This is intended for use where the build process must be modified conditionally +# depending on whether the host is PaX enabled or not. It is not indented to +# determine whether the final binaries need PaX markings. Note: if procfs is +# not mounted on /proc, this returns shell false (e.g. Gentoo/FreeBSD). +host-is-pax() { + grep -qs ^PaX: /proc/self/status +} + + +# INTERNAL FUNCTIONS +# ------------------ +# +# These functions are for use internally by the eclass - do not use +# them elsewhere as they are not supported (i.e. they may be removed +# or their function may change arbitrarily). + +# Display a list of things, one per line, indented a bit, using the +# display command in $1. +_pax_list_files() { + local f cmd + cmd=$1 + shift + for f in "$@"; do + ${cmd} " ${f}" + done +} + +fi diff -uNr a/eclass/perl-app.eclass b/eclass/perl-app.eclass --- a/eclass/perl-app.eclass false +++ b/eclass/perl-app.eclass 8dc7e2d716d77d587facb2ae91f75a192d0d17e3560e8ccedecfd2972d131e0b72b4bb5b292d0f6182829655913b89afe494449d42851f91d18dba180f4b795d @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Author: Michael Cummings <mcummings@gentoo.org> +# Maintained by the Perl herd <perl@gentoo.org> + +# If the ebuild doesn't override this, ensure we do not depend on the perl subslot value +: ${GENTOO_DEPEND_ON_PERL_SUBSLOT:="no"} +inherit perl-module + +case "${EAPI:-0}" in + 5) + ;; + 6) + die "EAPI=${EAPI} is not supported by perl-app.eclass. Please use perl-module.eclass instead." + ;; + *) + die "EAPI=${EAPI} is not supported by perl-app.eclass" + ;; +esac + +# @FUNCTION: perl-app_src_prep +# @USAGE: perl-app_src_prep +# @DESCRIPTION: +# This is a wrapper function to perl-app_src_configure(). +perl-app_src_prep() { + perl-app_src_configure +} + +# @FUNCTION: perl-app_src_configure +# @USAGE: perl-app_src_configure +# @DESCRIPTION: +# This is a wrapper function to perl-module_src_configure(). +perl-app_src_configure() { + perl-module_src_configure +} + +# @FUNCTION: perl-app_src_compile +# @USAGE: perl-app_src_compile +# @DESCRIPTION: +# This is a wrapper function to perl-module_src_compile(). +perl-app_src_compile() { + has "${EAPI:-0}" 0 1 && perl-app_src_prep + perl-module_src_compile +} diff -uNr a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass --- a/eclass/perl-functions.eclass false +++ b/eclass/perl-functions.eclass 23e775cb007ea8f9c9779a62430785e721420f5130871d55c22b286b61bfc58a153610637813d1a334f15f79066690c51f8c0dfcac79900d3c1b1bb420df2a5b @@ -0,0 +1,587 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: perl-functions.eclass +# @MAINTAINER: +# perl@gentoo.org +# @AUTHOR: +# Seemant Kulleen <seemant@gentoo.org> +# Andreas K. Huettel <dilfridge@gentoo.org> +# Kent Fredric <kentnl@gentoo.org> +# @BLURB: helper functions eclass for perl modules +# @DESCRIPTION: +# The perl-functions eclass is designed to allow easier installation of perl +# modules, and their incorporation into the Gentoo Linux system. +# It provides helper functions, no phases or variable manipulation in +# global scope. + +[[ ${CATEGORY} == "perl-core" ]] && inherit alternatives + +case "${EAPI:-0}" in + 5|6) + ;; + *) + die "EAPI=${EAPI} is not supported by perl-functions.eclass" + ;; +esac + +perlinfo_done=false + +# @FUNCTION: perl_set_version +# @DESCRIPTION: +# Extract version information and installation paths from the current Perl +# interpreter. +# +# This sets the following variables: PERL_VERSION, SITE_ARCH, SITE_LIB, +# ARCH_LIB, VENDOR_LIB, VENDOR_ARCH +# +# This function used to be called perlinfo as well. +# +# Example: +# @CODE +# perl_set_version +# echo $PERL_VERSION +# @CODE +perl_set_version() { + debug-print-function $FUNCNAME "$@" + debug-print "$FUNCNAME: perlinfo_done=${perlinfo_done}" + ${perlinfo_done} && return 0 + perlinfo_done=true + + local f version install{{site,vendor}{arch,lib},archlib} + eval "$(perl -V:{version,install{{site,vendor}{arch,lib},archlib}} )" + PERL_VERSION=${version} + SITE_ARCH=${installsitearch} + SITE_LIB=${installsitelib} + ARCH_LIB=${installarchlib} + VENDOR_LIB=${installvendorlib} + VENDOR_ARCH=${installvendorarch} +} + +# @FUNCTION: perl_delete_localpod +# @DESCRIPTION: +# Remove stray perllocal.pod files in the temporary install directory D. +# +# This function used to be called fixlocalpod as well. +perl_delete_localpod() { + debug-print-function $FUNCNAME "$@" + + find "${D}" -type f -name perllocal.pod -delete + find "${D}" -depth -mindepth 1 -type d -empty -delete +} + +# @FUNCTION: perl_fix_osx_extra +# @DESCRIPTION: +# Look through ${S} for AppleDouble encoded files and get rid of them. +perl_fix_osx_extra() { + debug-print-function $FUNCNAME "$@" + + local f + find "${S}" -type f -name "._*" -print0 | while read -rd '' f ; do + einfo "Removing AppleDouble encoded Macintosh file: ${f#${S}/}" + rm -f "${f}" + f=${f#${S}/} + grep -q "${f}" "${S}"/MANIFEST && \ + elog "AppleDouble encoded Macintosh file in MANIFEST: ${f#${S}/}" + done +} + +# @FUNCTION: perl_delete_module_manpages +# @DESCRIPTION: +# Bump off manpages installed by the current module such as *.3pm files as well +# as empty directories. +perl_delete_module_manpages() { + debug-print-function $FUNCNAME "$@" + + if [[ -d "${ED}"/usr/share/man ]] ; then + find "${ED}"/usr/share/man -type f -name "*.3pm" -delete + find "${ED}"/usr/share/man -depth -type d -empty -delete + fi +} + +# @FUNCTION: perl_delete_packlist +# @DESCRIPTION: +# Look through ${D} for .packlist files, empty .bs files and empty directories, +# and get rid of items found. +perl_delete_packlist() { + debug-print-function $FUNCNAME "$@" + perl_set_version + if [[ -d ${D}/${VENDOR_ARCH} ]] ; then + find "${D}/${VENDOR_ARCH}" -type f -a -name .packlist -delete + perl_delete_emptybsdir + fi +} + +# @FUNCTION: perl_delete_emptybsdir +# @DESCRIPTION: +# Look through ${D} for empty .bs files and empty directories, +# and get rid of items found. +perl_delete_emptybsdir() { + debug-print-function $FUNCNAME "$@" + perl_set_version + if [[ -d ${D}/${VENDOR_ARCH} ]] ; then + find "${D}/${VENDOR_ARCH}" -type f \ + -a -name '*.bs' -a -empty -delete + find "${D}" -depth -mindepth 1 -type d -empty -delete + fi +} + +# @FUNCTION: perl_fix_packlist +# @DESCRIPTION: +# Look through ${D} for .packlist text files containing the temporary installation +# folder (i.e. ${D}). If the pattern is found, silently replace it with `/'. +# Remove duplicate entries; then validate all entries in the packlist against ${D} +# and prune entries that do not correspond to installed files. +perl_fix_packlist() { + debug-print-function $FUNCNAME "$@" + + local packlist_temp="${T}/.gentoo_packlist_temp" + find "${D}" -type f -name '.packlist' -print0 | while read -rd '' f ; do + if file "${f}" | grep -q -i " text" ; then + einfo "Fixing packlist file /${f#${D}}" + + # remove the temporary build dir path + sed -i -e "s:${D}:/:g" "${f}" + + # remove duplicate entries + sort -u "${f}" > "${packlist_temp}" + mv "${packlist_temp}" "${f}" + + # remove files that dont exist + cat "${f}" | while read -r entry; do + if [ ! -e "${D}/${entry}" ]; then + einfo "Pruning surplus packlist entry ${entry}" + grep -v -x -F "${entry}" "${f}" > "${packlist_temp}" + mv "${packlist_temp}" "${f}" + fi + done + fi + done +} + +# @FUNCTION: perl_remove_temppath +# @DESCRIPTION: +# Look through ${D} for text files containing the temporary installation +# folder (i.e. ${D}). If the pattern is found, replace it with `/' and warn. +perl_remove_temppath() { + debug-print-function $FUNCNAME "$@" + + find "${D}" -type f -not -name '*.so' -print0 | while read -rd '' f ; do + if file "${f}" | grep -q -i " text" ; then + grep -q "${D}" "${f}" && ewarn "QA: File contains a temporary path ${f}" + sed -i -e "s:${D}:/:g" "${f}" + fi + done +} + +# @FUNCTION: perl_rm_files +# @USAGE: <list of files> +# @DESCRIPTION: +# Remove certain files from a Perl release and remove them from the MANIFEST +# while we're there. +# +# Most useful in src_prepare for nuking bad tests, and is highly recommended +# for any tests like 'pod.t', 'pod-coverage.t' or 'kwalitee.t', as what they +# test is completely irrelevant to end users, and frequently fail simply +# because the authors of Test::Pod... changed their recommendations, and thus +# failures are only useful feedback to Authors, not users. +# +# Removing from MANIFEST also avoids needless log messages warning +# users about files "missing from their kit". +# +# Example: +# @CODE +# src_test() { +# perl_rm_files t/pod{,-coverage}.t +# perl-module_src_test +# } +# @CODE +perl_rm_files() { + debug-print-function $FUNCNAME "$@" + local skipfile="${T}/.gentoo_makefile_skip" + local manifile="${S}/MANIFEST" + local manitemp="${T}/.gentoo_manifest_temp" + oldifs="$IFS" + IFS="\n" + for filename in "$@"; do + einfo "Removing un-needed ${filename}"; + # Remove the file + rm -f "${S}/${filename}" + [[ -e "${manifile}" ]] && echo "${filename}" >> "${skipfile}" + done + if [[ -e "${manifile}" && -e "${skipfile}" ]]; then + einfo "Fixing Manifest" + grep -v -F -f "${skipfile}" "${manifile}" > "${manitemp}" + mv -f -- "${manitemp}" "${manifile}" + rm -- "${skipfile}"; + fi + IFS="$oldifs" +} + +# @FUNCTION: perl_link_duallife_scripts +# @DESCRIPTION: +# Moves files and generates symlinks so dual-life packages installing scripts do not +# lead to file collisions. Mainly for use in pkg_postinst and pkg_postrm, and makes +# only sense for perl-core packages. +perl_link_duallife_scripts() { + debug-print-function $FUNCNAME "$@" + if [[ ${CATEGORY} != perl-core ]] || ! has_version ">=dev-lang/perl-5.8.8-r8" ; then + return 0 + fi + + local i ff + if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ; then + for i in "${DUALLIFESCRIPTS[@]}" ; do + alternatives_auto_makesym "/${i}" "/${i}-[0-9]*" + done + for i in "${DUALLIFEMAN[@]}" ; do + ff=`echo "${EROOT}"/${i%.1}-${PV}-${P}.1*` + ff=${ff##*.1} + alternatives_auto_makesym "/${i}${ff}" "/${i%.1}-[0-9]*" + done + else + pushd "${ED}" > /dev/null + for i in $(find usr/bin -maxdepth 1 -type f 2>/dev/null) ; do + mv ${i}{,-${PV}-${P}} || die + #DUALLIFESCRIPTS[${#DUALLIFESCRIPTS[*]}]=${i##*/} + DUALLIFESCRIPTS[${#DUALLIFESCRIPTS[*]}]=${i} + done + for i in $(find usr/share/man/man1 -maxdepth 1 -type f 2>/dev/null) ; do + mv ${i} ${i%.1}-${PV}-${P}.1 || die + DUALLIFEMAN[${#DUALLIFEMAN[*]}]=${i} + done + popd > /dev/null + fi +} + +# @FUNCTION: perl_check_env +# @DESCRIPTION: +# Checks a blacklist of known-suspect ENV values that can be accidentally set by users +# doing personal perl work, which may accidentally leak into portage and break the +# system perl installaton. +# Dies if any of the suspect fields are found, and tell the user what needs to be unset. +# There's a workaround, but you'll have to read the code for it. +perl_check_env() { + local errored value; + + for i in PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX; do + # Next unless match + [ -v $i ] || continue; + + # Warn only once, and warn only when one of the bad values are set. + # record failure here. + if [ ${errored:-0} == 0 ]; then + if [ -n "${I_KNOW_WHAT_I_AM_DOING}" ]; then + elog "perl-module.eclass: Suspicious environment values found."; + else + eerror "perl-module.eclass: Suspicious environment values found."; + fi + fi + errored=1 + + # Read ENV Value + value=${!i}; + + # Print ENV name/value pair + if [ -n "${I_KNOW_WHAT_I_AM_DOING}" ]; then + elog " $i=\"$value\""; + else + eerror " $i=\"$value\""; + fi + done + + # Return if there were no failures + [ ${errored:-0} == 0 ] && return; + + # Return if user knows what they're doing + if [ -n "${I_KNOW_WHAT_I_AM_DOING}" ]; then + elog "Continuing anyway, seems you know what you're doing." + return + fi + + eerror "Your environment settings may lead to undefined behavior and/or build failures." + die "Please fix your environment ( ~/.bashrc, package.env, ... ), see above for details." +} + +# @FUNCTION: perl_doexamples +# @USAGE: <list of files or globs> +# @DESCRIPTION: +# Install example files ready-to-run. +# Is called under certain circumstances in perl-module.eclass src_install +# (see the documentation there). +# +# Example: +# @CODE +# src_install() { +# perl-module_src_install +# use examples && perl_doexamples "eg/*" +# } +# @CODE +perl_doexamples() { + debug-print-function $FUNCNAME "$@" + + einfo "Installing examples into /usr/share/doc/${PF}/examples" + + # no compression since we want ready-to-run scripts + docompress -x /usr/share/doc/${PF}/examples + + docinto examples/ + # Lack of quoting here is important in order to support glob expansion + # in DIST_EXAMPLES=( ), which is defined before source extraction occurs + dodoc -r $@ + + # is there a way to undo "docinto" ? +} + +# @FUNCTION: perl_has_module +# @USAGE: <module name> +# @RETURN: 0 if available, non-zero otherwise +# @DESCRIPTION: +# Query the installed system Perl to see if a given module is installed. +# This does **not** load the module in question, only anticipates if it *might* load. +# +# This is primarily for the purposes of dependency weakening so that conditional +# behaviour can be triggered without adding dependencies to portage which would confuse +# a dependency resolver. +# +# returns 'true' if the module is available, returns error if the module is not available +# +# Example: +# @CODE +# perl_has_module "Test::Tester" && echo "Test::Tester installed" +# @CODE + +perl_has_module() { + debug-print-function $FUNCNAME "$@" + + [[ $# -gt 0 ]] || die "${FUNCNAME}: No module name provided" + [[ $# -lt 2 ]] || die "${FUNCNAME}: Too many parameters ($#)" + + perl -we 'my $mn = $ARGV[0]; + $mn =~ s{(::|\x{27})}{/}g; + for(@INC){ + next if ref $_; + exit 0 if -r $_ . q[/] . $mn . q[.pm] + } + exit 1' "$@"; +} + +# @FUNCTION: perl_has_module_version +# @USAGE: <module name> <minimum upstream version> +# @RETURN: 0 if satisfied, non-zero otherwise +# @DESCRIPTION: +# Query the installed system Perl to see if a given module is installed +# and is at least a given version. +# +# This requires more caution to use than perl_has_module as it requires +# loading the module in question to determine version compatibility, +# which can be SLOW, and can have side effects (ie: compilation fails in +# require due to some dependency, resulting in a "Fail") +# +# Also take care to note the module version is a *minimum*, *must* be +# written in upstream versions format and should be a a legal upstream version +# +# returns a true exit code if the module is both available and is at least +# the specified version +# +# Example: +# @CODE +# perl_has_module_version "Test::Tester" "0.017" \ +# && echo "Test::Tester 0.017 or greater installed" +# @CODE +perl_has_module_version() { + debug-print-function $FUNCNAME "$@" + + [[ $# -gt 0 ]] || die "${FUNCNAME}: No module name provided" + [[ $# -gt 1 ]] || die "${FUNCNAME}: No module version provided" + [[ $# -lt 3 ]] || die "${FUNCNAME}: Too many parameters ($#)" + + perl -we 'my $mn = $ARGV[0]; + $mn =~ s{(::|\x{27})}{/}g; + exit ( eval { + require qq[${mn}.pm]; + $ARGV[0]->VERSION($ARGV[1]); + 1 + } ? 0 : 1 )' "$@" +} + +# @FUNCTION: perl_get_module_version +# @USAGE: <module name> +# @RETURN: 0 if module available, non-zero if error +# @DESCRIPTION: +# Query the installed system perl to report the version of the installed +# module. +# +# Note this should be strictly for diagnostic purposes to the end user, +# and may be of selective use in pkg_info to enhance +# emerge --info reports. +# +# Anything that does version comparisons **must not** use the return value +# from this function +# +# Also note that this **must** at least attempt load the module in +# question as part of its operation, and is subsequently prone to SLOWness. +# +# Return codes return error in both compilation-failure and not-installed cases. +# +# Example: +# @CODE +# MODVER=$(perl_get_module_version "Test::Simple") \ +# || die "Test::Simple not installed: $MODVER" +# @CODE + +perl_get_module_version() { + debug-print-function $FUNCNAME "$@" + + [[ $# -gt 0 ]] || die "${FUNCNAME}: No module name provided" + [[ $# -lt 2 ]] || die "${FUNCNAME}: Too many parameters ($#)" + + if ! perl_has_module "$@" ; then + echo "(Not Installed)"; + return 1; + fi + + # Todo: What do we do if require fails? spew to stderr + # or stay silent? + + perl -we 'my $mn = $ARGV[0]; + $mn =~ s{(::|\x{27})}{/}g; + local $@; + eval { require qq[${mn}.pm]; 1 } or do { + print q[(Compilation failed in require)]; + exit 1; + }; + my $stash = \%{ $ARGV[0] . q[::] }; + if ( not exists $stash->{VERSION} ) { + print q[(No VERSION property)]; + exit 0; + } + if ( not defined ${$stash->{VERSION}} ) { + print q[(undef)]; + exit 0; + } + print ${$stash->{VERSION}}; + exit 0; ' "$@" +} + +# @FUNCTION: perl_get_raw_vendorlib +# @DESCRIPTION: +# Convenience function to optimise for a common case without double-handling +# variables everywhere. +# +# Note: Will include EPREFIX where relevant +# +# Example: +# @CODE +# my_raw_vendorlib="$(perl_get_raw_vendorlib)" +# @CODE + +perl_get_raw_vendorlib() { + debug-print-function $FUNCNAME "$@" + + [[ $# -lt 1 ]] || die "${FUNCNAME}: Too many parameters ($#)" + + perl -MConfig \ + -e'exists $Config{$ARGV[0]} || die qq{No such Config key "$ARGV[0]"}; + print $Config{$ARGV[0]}; + exit 0' -- "installvendorlib" || die "Can't extract installvendorlib from Perl Configuration" +} + +# @FUNCTION: perl_get_vendorlib +# @DESCRIPTION: +# Convenience helper for returning Perls' vendor install root +# without EPREFIXing. +# +# Example: +# @CODE +# my_vendorlib="$(perl_get_vendorlib)" +# @CODE + +perl_get_vendorlib() { + debug-print-function $FUNCNAME "$@" + + [[ $# -lt 1 ]] || die "${FUNCNAME}: Too many parameters ($#)" + + # Requires perl 5.14 for /r attribute of s/// + # Just in case somebody out there is stuck in a time warp: upgrade perl first + perl -M5.014 -MConfig \ + -e'exists $Config{$ARGV[0]} || die qq{No such Config key "$ARGV[0]"}; + print $Config{$ARGV[0]} =~ s{\A\Q$ARGV[1]\E}{}r; + exit 0' -- "installvendorlib" "$EPREFIX" || die "Can't extract installvendorlib from Perl Configuration" +} + +# @FUNCTION: perl_domodule +# @USAGE: [-C <target>] [-r] <files> +# @DESCRIPTION: +# Installs files in paths where they can be found in the default +# Perl runtime. +# +# Note: Should only be used in src_install or pkg_preinst +# anywhere else will do the wrong thing or die. +# +# The contents of the <files> list are copied into Perls Vendor library path +# as follows: +# @CODE +# # install perl/File.pm as Samba::File +# pushd perl/ +# perl_domodule -C Samba File.pm +# +# # install perl/ recursively under VENDORLIB/Samba/ +# pushd perl/ +# perl_domodule -C Samba -r . +# @CODE +# +# @CODE +# options: +# -C Target/Name +# The subdirectory relative to the Perl VENDOR_LIB +# to install into. +# +# defaults to "" +# -r +# Install directories recursively ( see doins ) +# files: +# list of .pm files to install to VENDORLIB +# @CODE + +perl_domodule() { + local target_prefix="" + local files=() + local doins_opts=() + + local recursive="false" + local target + local file + + while [[ $# -gt 0 ]] ; do + case $1 in + -C|--target-prefix) + [[ -z "${2}" || "${2:0:1}" == "-" ]] && die "${FUNCNAME}: -C|--target-prefix expects an argument, got \"$2\"!" + target_prefix="${2}"; + shift 2;; + -r) + recursive="true" + shift;; + *) + [[ -z "${1}" || "${1:0:1}" == "-" ]] && die "${FUNCNAME}: Unknown argument \"${1}\"!" + files+=( "${1}" ) + shift 1;; + esac + done + + if [[ "true" == $recursive ]]; then + doins_opts+=( "-r" ) + fi + for file in "${files[@]}"; do + [[ -e "${file}" ]] || die "$FUNCNAME: Argument \"${file}\" is not an existing file" + [[ "false" == ${recursive} && -d "${file}" ]] && die "$FUNCNAME: Argument \"${file}\" is a directory ( needs -r parameter )" + done + + target="$(perl_get_vendorlib)" + + # Extend target if target_prefix is set + [[ -z "${target_prefix}" ]] || target="${target%/}/${target_prefix#/}" + + insinto "/${target#/}" + doins "${doins_opts[@]}" "${files[@]}" +} diff -uNr a/eclass/perl-module.eclass b/eclass/perl-module.eclass --- a/eclass/perl-module.eclass false +++ b/eclass/perl-module.eclass 78448ae6d610c96b519bb1469ea3b3a710b6fe1780a8be7d449d3dc536c775fa5681657323d367432cd80ab6e5364219f398d2f478ce6ee670a088d0b4c7978a @@ -0,0 +1,473 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: perl-module.eclass +# @MAINTAINER: +# perl@gentoo.org +# @AUTHOR: +# Seemant Kulleen <seemant@gentoo.org> +# Andreas K. Hüttel <dilfridge@gentoo.org> +# @BLURB: eclass for installing Perl module distributions +# @DESCRIPTION: +# The perl-module eclass is designed to allow easier installation of Perl +# module distributions, and their incorporation into the Gentoo Linux system. +# All exported functions from perl-functions.eclass (inherited here) +# explicitly also belong to the interface of perl-module.eclass. +# If your package does not use any Perl-specific build system (as, e.g., +# ExtUtils::MakeMaker or Module::Build), we recommend to use perl-functions.eclass +# instead. + +case ${EAPI:-0} in + 5) + inherit eutils multiprocessing unpacker perl-functions + PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install" + ;; + 6) + inherit multiprocessing perl-functions + PERL_EXPF="src_prepare src_configure src_compile src_test src_install" + ;; + *) + die "EAPI=${EAPI} is not supported by perl-module.eclass" + ;; +esac + +# @ECLASS-VARIABLE: GENTOO_DEPEND_ON_PERL +# @DEFAULT_UNSET +# @DESCRIPTION: +# This variable controls whether a runtime and build time dependency on +# dev-lang/perl is automatically added by the eclass. It defaults to yes. +# Set to no to disable, set to noslotop to add a perl dependency without +# slot operator (EAPI=6). All packages installing into the vendor_perl +# path must use yes here. + +case ${EAPI:-0} in + 5) + [[ ${CATEGORY} == perl-core ]] && \ + PERL_EXPF+=" pkg_postinst pkg_postrm" + + case "${GENTOO_DEPEND_ON_PERL:-yes}" in + yes) + case "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" in + yes) + DEPEND="dev-lang/perl:=[-build(-)]" + ;; + *) + DEPEND="dev-lang/perl[-build(-)]" + ;; + esac + RDEPEND="${DEPEND}" + ;; + esac + + case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in + yes) + EXPORT_FUNCTIONS ${PERL_EXPF} + ;; + no) + debug-print "PERL_EXPORT_PHASE_FUNCTIONS=no" + ;; + *) + die "PERL_EXPORT_PHASE_FUNCTIONS=${PERL_EXPORT_PHASE_FUNCTIONS} is not supported by perl-module.eclass" + ;; + esac + ;; + 6) + [[ ${CATEGORY} == perl-core ]] && \ + PERL_EXPF+=" pkg_postinst pkg_postrm" + + case "${GENTOO_DEPEND_ON_PERL:-yes}" in + yes) + DEPEND="dev-lang/perl:=" + RDEPEND="dev-lang/perl:=" + ;; + noslotop) + DEPEND="dev-lang/perl" + RDEPEND="dev-lang/perl" + ;; + esac + + if [[ "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" != "yes" ]]; then + eerror "GENTOO_DEPEND_ON_PERL_SUBSLOT=no is banned in EAPI=6. If you don't want a slot operator" + die "set GENTOO_DEPEND_ON_PERL=noslotop instead." + fi + + if [[ "${PERL_EXPORT_PHASE_FUNCTIONS}" ]]; then + eerror "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6. Use perl-module.eclass if you need" + die "phase functions, perl-functions.eclass if not." + fi + + EXPORT_FUNCTIONS ${PERL_EXPF} + ;; + *) + die "EAPI=${EAPI:-0} is not supported by perl-module.eclass" + ;; +esac + +LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}" + +# @ECLASS-VARIABLE: DIST_NAME +# @DESCRIPTION: +# (EAPI=6) This variable provides a way to override PN for the calculation of S, +# SRC_URI, and HOMEPAGE. Defaults to PN. + +# @ECLASS-VARIABLE: DIST_VERSION +# @DESCRIPTION: +# (EAPI=6) This variable provides a way to override PV for the calculation of S and SRC_URI. +# Use it to provide the non-normalized, upstream version number. Defaults to PV. +# Named MODULE_VERSION in EAPI=5. + +# @ECLASS-VARIABLE: DIST_A_EXT +# @DESCRIPTION: +# (EAPI=6) This variable provides a way to override the distfile extension for the calculation of +# SRC_URI. Defaults to tar.gz. Named MODULE_A_EXT in EAPI=5. + +# @ECLASS-VARIABLE: DIST_A +# @DESCRIPTION: +# (EAPI=6) This variable provides a way to override the distfile name for the calculation of +# SRC_URI. Defaults to ${DIST_NAME}-${DIST_VERSION}.${DIST_A_EXT} Named MODULE_A in EAPI=5. + +# @ECLASS-VARIABLE: DIST_AUTHOR +# @DEFAULT_UNSET +# @DESCRIPTION: +# (EAPI=6) This variable sets the module author name for the calculation of +# SRC_URI. Named MODULE_AUTHOR in EAPI=5. + +# @ECLASS-VARIABLE: DIST_SECTION +# @DEFAULT_UNSET +# @DESCRIPTION: +# (EAPI=6) This variable sets the module section for the calculation of +# SRC_URI. Only required in rare cases for very special snowflakes. +# Named MODULE_SECTION in EAPI=5. + +# @ECLASS-VARIABLE: DIST_EXAMPLES +# @DEFAULT_UNSET +# @DESCRIPTION: +# (EAPI=6) This Bash array allows passing a list of example files to be installed +# in /usr/share/doc/${PF}/examples. If set before inherit, automatically adds +# a use-flag examples, if not you'll have to add the useflag in your ebuild. +# Examples are installed only if the useflag examples exists and is activated. + + +if [[ ${EAPI:-0} == 5 ]]; then + if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then + : ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}} + S=${MY_S:-${WORKDIR}/${MY_P}} + fi + MODULE_NAME=${MY_PN:-${PN}} + MODULE_P=${MY_P:-${P}} + + [[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \ + MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}" + [[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \ + SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}" + [[ -z "${HOMEPAGE}" ]] && \ + HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/" + + SRC_TEST="skip" +else + DIST_NAME=${DIST_NAME:-${PN}} + DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}} + S=${WORKDIR}/${DIST_P} + + [[ -z "${SRC_URI}" && -z "${DIST_A}" ]] && \ + DIST_A="${DIST_P}.${DIST_A_EXT:-tar.gz}" + [[ -z "${SRC_URI}" && -n "${DIST_AUTHOR}" ]] && \ + SRC_URI="mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${DIST_SECTION:+${DIST_SECTION}/}${DIST_A}" + [[ -z "${HOMEPAGE}" ]] && \ + HOMEPAGE="http://search.cpan.org/dist/${DIST_NAME}/" + + [[ -z "${DIST_EXAMPLES}" ]] || IUSE+=" examples" +fi + +SRC_PREP="no" +PREFER_BUILDPL="yes" + +pm_echovar="" + +# @FUNCTION: perl-module_src_unpack +# @DESCRIPTION: +# Unpack the ebuild tarball(s). +# This function is to be called during the ebuild src_unpack() phase. +perl-module_src_unpack() { + debug-print-function $FUNCNAME "$@" + [[ ${EAPI:-0} == 5 ]] || die "perl-module_src_unpack is banned in EAPI=6 or later" + unpacker_src_unpack +} + +# @FUNCTION: perl-module_src_prepare +# @DESCRIPTION: +# Get the ebuild sources ready. +# This function is to be called during the ebuild src_prepare() phase. +perl-module_src_prepare() { + debug-print-function $FUNCNAME "$@" + + if [[ ${EAPI:-0} == 5 ]] ; then + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + debug-print "$FUNCNAME: applying user patches" + epatch_user + else + default + fi + + if [[ ${PERL_RM_FILES[@]} ]]; then + debug-print "$FUNCNAME: stripping unneeded files" + perl_rm_files "${PERL_RM_FILES[@]}" + fi + perl_fix_osx_extra +} + +# @FUNCTION: perl-module_src_configure +# @DESCRIPTION: +# Configure the ebuild sources. +# This function is to be called during the ebuild src_configure() phase. +perl-module_src_configure() { + debug-print-function $FUNCNAME "$@" + + if [[ ${EAPI:-0} == 5 && ${SRC_PREP} == yes ]]; then + return 0 + fi + SRC_PREP="yes" + + perl_check_env + + perl_set_version + + [[ -z ${pm_echovar} ]] && export PERL_MM_USE_DEFAULT=1 + # Disable ExtUtils::AutoInstall from prompting + export PERL_EXTUTILS_AUTOINSTALL="--skipdeps" + + if [[ $(declare -p myconf 2>&-) != "declare -a myconf="* ]]; then + local myconf_local=(${myconf}) + else + local myconf_local=("${myconf[@]}") + fi + + if [[ ( ${PREFER_BUILDPL} == yes || ! -f Makefile.PL ) && -f Build.PL ]] ; then + if grep -q '$use\|require$\s*Module::Build::Tiny' Build.PL ; then + einfo "Using Module::Build::Tiny" + if [[ ${DEPEND} != *dev-perl/Module-Build-Tiny* && ${PN} != Module-Build-Tiny ]]; then + eerror "QA Notice: The ebuild uses Module::Build::Tiny but doesn't depend on it." + die " Add dev-perl/Module-Build-Tiny to DEPEND!" + fi + else + einfo "Using Module::Build" + if [[ ${DEPEND} != *virtual/perl-Module-Build* && ${DEPEND} != *dev-perl/Module-Build* && ${PN} != Module-Build ]] ; then + eerror "QA Notice: The ebuild uses Module::Build but doesn't depend on it." + die " Add dev-perl/Module-Build to DEPEND!" + fi + fi + set -- \ + --installdirs=vendor \ + --libdoc= \ + --destdir="${D}" \ + --create_packlist=1 \ + "${myconf_local[@]}" + einfo "perl Build.PL" "$@" + perl Build.PL "$@" <<< "${pm_echovar}" \ + || die "Unable to build!" + elif [[ -f Makefile.PL ]] ; then + einfo "Using ExtUtils::MakeMaker" + set -- \ + PREFIX=${EPREFIX}/usr \ + INSTALLDIRS=vendor \ + INSTALLMAN3DIR='none' \ + DESTDIR="${D}" \ + "${myconf_local[@]}" + einfo "perl Makefile.PL" "$@" + perl Makefile.PL "$@" <<< "${pm_echovar}" \ + || die "Unable to build!" + fi + if [[ ! -f Build.PL && ! -f Makefile.PL ]] ; then + einfo "No Make or Build file detected..." + return + fi +} + +# @FUNCTION: perl-module_src_compile +# @DESCRIPTION: +# Compile the ebuild sources. +# This function is to be called during the ebuild src_compile() phase. +perl-module_src_compile() { + debug-print-function $FUNCNAME "$@" + perl_set_version + + if [[ $(declare -p mymake 2>&-) != "declare -a mymake="* ]]; then + local mymake_local=(${mymake}) + else + local mymake_local=("${mymake[@]}") + fi + + if [[ -f Build ]] ; then + ./Build build \ + || die "Compilation failed" + elif [[ -f Makefile ]] ; then + set -- \ + OTHERLDFLAGS="${LDFLAGS}" \ + "${mymake_local[@]}" + einfo "emake" "$@" + emake "$@" \ + || die "Compilation failed" +# OPTIMIZE="${CFLAGS}" \ + fi +} + +# @ECLASS-VARIABLE: DIST_TEST +# @DESCRIPTION: +# (EAPI=6) Variable that controls if tests are run in the test phase +# at all, and if yes under which conditions. Defaults to "do parallel" +# If neither "do" nor "parallel" is recognized, tests are skipped. +# (In EAPI=5 the variable is called SRC_TEST, defaults to "skip", and +# recognizes fewer options.) +# The following space-separated keywords are recognized: +# do : run tests +# parallel : run tests in parallel +# verbose : increase test verbosity +# network : do not try to disable network tests + +# @ECLASS-VARIABLE: DIST_TEST_OVERRIDE +# @DEFAULT_UNSET +# @DESCRIPTION: +# (EAPI=6) Variable that controls if tests are run in the test phase +# at all, and if yes under which conditions. It is intended for use in +# make.conf or the environment by ebuild authors during testing, and +# accepts the same values as DIST_TEST. If set, it overrides DIST_TEST +# completely. DO NOT USE THIS IN EBUILDS! + +# @FUNCTION: perl-module_src-test +# @DESCRIPTION: +# This code attempts to work out your threadingness and runs tests +# according to the settings of DIST_TEST using Test::Harness. +perl-module_src_test() { + debug-print-function $FUNCNAME "$@" + local my_test_control + local my_test_verbose + + if [[ ${EAPI:-0} == 5 ]] ; then + my_test_control=${SRC_TEST} + my_test_verbose=${TEST_VERBOSE:-0} + if has 'do' ${my_test_control} || has 'parallel' ${my_test_control} ; then + if has "${my_test_verbose}" 0 && has 'parallel' ${my_test_control} ; then + export HARNESS_OPTIONS=j$(makeopts_jobs) + einfo "Test::Harness Jobs=$(makeopts_jobs)" + fi + else + einfo Skipping tests due to SRC_TEST=${SRC_TEST} + return 0 + fi + else + [[ -n "${DIST_TEST_OVERRIDE}" ]] && ewarn DIST_TEST_OVERRIDE is set to ${DIST_TEST_OVERRIDE} + my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}} + + if ! has 'do' ${my_test_control} && ! has 'parallel' ${my_test_control} ; then + einfo Skipping tests due to DIST_TEST=${my_test_control} + return 0 + fi + + if has verbose ${my_test_control} ; then + my_test_verbose=1 + else + my_test_verbose=0 + fi + + if has parallel ${my_test_control} ; then + export HARNESS_OPTIONS=j$(makeopts_jobs) + einfo "Test::Harness Jobs=$(makeopts_jobs)" + fi + + # this might sometimes work... + if ! has network ${my_test_control} ; then + export NO_NETWORK_TESTING=1 + fi + fi + + perl_set_version + if [[ -f Build ]] ; then + ./Build test verbose=${my_test_verbose} || die "test failed" + elif [[ -f Makefile ]] ; then + emake test TEST_VERBOSE=${my_test_verbose} || die "test failed" + fi +} + +# @FUNCTION: perl-module_src_install +# @DESCRIPTION: +# Install a Perl ebuild. +# This function is to be called during the ebuild src_install() phase. +perl-module_src_install() { + debug-print-function $FUNCNAME "$@" + + perl_set_version + + local f + + if [[ -f Build ]]; then + mytargets="${mytargets:-install}" + mbparams="${mbparams:---pure}" + einfo "./Build ${mytargets} ${mbparams}" + ./Build ${mytargets} ${mbparams} \ + || die "./Build ${mytargets} ${mbparams} failed" + elif [[ -f Makefile ]]; then + case "${CATEGORY}" in + dev-perl|perl-core) mytargets="pure_install" ;; + *) mytargets="install" ;; + esac + if [[ $(declare -p myinst 2>&-) != "declare -a myinst="* ]]; then + local myinst_local=(${myinst}) + else + local myinst_local=("${myinst[@]}") + fi + emake "${myinst_local[@]}" ${mytargets} \ + || die "emake ${myinst_local[@]} ${mytargets} failed" + fi + + perl_delete_module_manpages + perl_delete_localpod + if [[ ${EAPI:-0} == 5 ]] ; then + perl_delete_packlist + else + perl_fix_packlist + perl_delete_emptybsdir + fi + perl_remove_temppath + + for f in Change* CHANGES README* TODO FAQ ${mydoc}; do + [[ -s ${f} ]] && dodoc ${f} + done + + if [[ ${EAPI:-0} != 5 ]] ; then + if in_iuse examples && use examples ; then + [[ ${#DIST_EXAMPLES[@]} -eq 0 ]] || perl_doexamples "${DIST_EXAMPLES[@]}" + fi + fi + + perl_link_duallife_scripts +} + +# @FUNCTION: perl-module_pkg_postinst +# @DESCRIPTION: +# This function is to be called during the pkg_postinst() phase. It only does +# useful things for the perl-core category, where it handles the file renaming and symbolic +# links that prevent file collisions for dual-life packages installing scripts. +# In any other category it immediately exits. +perl-module_pkg_postinst() { + debug-print-function $FUNCNAME "$@" + if [[ ${CATEGORY} != perl-core ]] ; then + eerror "perl-module.eclass: You are calling perl-module_pkg_postinst outside the perl-core category." + die " This does not do anything; the call can be removed." + fi + perl_link_duallife_scripts +} + +# @FUNCTION: perl-module_pkg_postrm +# @DESCRIPTION: +# This function is to be called during the pkg_postrm() phase. It only does +# useful things for the perl-core category, where it handles the file renaming and symbolic +# links that prevent file collisions for dual-life packages installing scripts. +# In any other category it immediately exits. +perl-module_pkg_postrm() { + debug-print-function $FUNCNAME "$@" + if [[ ${CATEGORY} != perl-core ]] ; then + eerror "perl-module.eclass: You are calling perl-module_pkg_postrm outside the perl-core category." + die " This does not do anything; the call can be removed." + fi + perl_link_duallife_scripts +} diff -uNr a/eclass/php-ext-pecl-r3.eclass b/eclass/php-ext-pecl-r3.eclass --- a/eclass/php-ext-pecl-r3.eclass false +++ b/eclass/php-ext-pecl-r3.eclass 6ea017073d7ea05130f2168cbf87404d6328245d0af8dfa3fe10f89e1414cce0a1ad8b50a7310d385fc6d0b0367f17d29db45eba82a729841004cbfc453c2407 @@ -0,0 +1,85 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: php-ext-pecl-r3.eclass +# @MAINTAINER: +# Gentoo PHP team <php-bugs@gentoo.org> +# @BLURB: A uniform way to install PECL extensions +# @DESCRIPTION: +# This eclass should be used by all dev-php/pecl-* ebuilds as a uniform +# way of installing PECL extensions. For more information about PECL, +# see https://pecl.php.net/ + +# @ECLASS-VARIABLE: PHP_EXT_PECL_PKG +# @DESCRIPTION: +# Set in ebuild before inheriting this eclass if the tarball name +# differs from ${PN/pecl-/} so that SRC_URI and HOMEPAGE get set +# correctly by the eclass. +# +# Setting this variable manually also affects PHP_EXT_NAME and ${S} +# unless you override those in ebuild. If that is not desired, please +# use PHP_EXT_PECL_FILENAME instead. +[[ -z "${PHP_EXT_PECL_PKG}" ]] && PHP_EXT_PECL_PKG="${PN/pecl-/}" + +# @ECLASS-VARIABLE: PHP_EXT_PECL_FILENAME +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set in ebuild before inheriting this eclass if the tarball name +# differs from "${PN/pecl-/}-${PV}.tgz" so that SRC_URI gets set +# correctly by the eclass. +# +# Unlike PHP_EXT_PECL_PKG, setting this variable does not affect +# HOMEPAGE, PHP_EXT_NAME or ${S}. + + +# Set PHP_EXT_NAME for php-ext-source-r3.eclass. +[[ -z "${PHP_EXT_NAME}" ]] && PHP_EXT_NAME="${PHP_EXT_PECL_PKG}" + +# Try to guess the upstream name of the package/version. We only use +# this variable temporarily before unsetting it. +PHP_EXT_PECL_PKG_V="${PHP_EXT_PECL_PKG}-${PV/_/}" + +# It's important that we determine and set $S before we inherit below. +S="${WORKDIR}/${PHP_EXT_PECL_PKG_V}" + +inherit php-ext-source-r3 + +EXPORT_FUNCTIONS src_install src_test + +if [[ -z "${PHP_EXT_PECL_FILENAME}" ]] ; then + SRC_URI="https://pecl.php.net/get/${PHP_EXT_PECL_PKG_V}.tgz" +else + SRC_URI="https://pecl.php.net/get/${PHP_EXT_PECL_FILENAME}" +fi + +# Don't leave this laying around in the environment. +unset PHP_EXT_PECL_PKG_V + +HOMEPAGE="https://pecl.php.net/${PHP_EXT_PECL_PKG}" + + +# @FUNCTION: php-ext-pecl-r3_src_install +# @DESCRIPTION: +# Install a standard PECL package. First we delegate to +# php-ext-source-r3.eclass, and then we attempt to install examples +# found in a standard location. +php-ext-pecl-r3_src_install() { + php-ext-source-r3_src_install + + if in_iuse examples && use examples ; then + dodoc -r examples + fi +} + + +# @FUNCTION: php-ext-pecl-r3_src_test +# @DESCRIPTION: +# Run tests delivered with the PECL package. Phpize will have generated +# a run-tests.php file to be executed by `make test`. We only need to +# force the test suite to run in non-interactive mode. +php-ext-pecl-r3_src_test() { + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + NO_INTERACTION="yes" emake test + done +} diff -uNr a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass --- a/eclass/php-ext-source-r2.eclass false +++ b/eclass/php-ext-source-r2.eclass 32fcb40bb0dd18e21f0731a6994f5f8b12b5cd05826d8e39c39c5376aa64b8216eb896c84e3ee425b161d91519be923b39f1bd52577ebc63e7b2a78568821146 @@ -0,0 +1,377 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: php-ext-source-r2.eclass +# @MAINTAINER: +# Gentoo PHP team <php-bugs@gentoo.org> +# @AUTHOR: +# Author: Tal Peer <coredumb@gentoo.org> +# Author: Stuart Herbert <stuart@gentoo.org> +# Author: Luca Longinotti <chtekk@gentoo.org> +# Author: Jakub Moc <jakub@gentoo.org> (documentation) +# Author: Ole Markus With <olemarkus@gentoo.org> +# @BLURB: A unified interface for compiling and installing standalone PHP extensions. +# @DESCRIPTION: +# This eclass provides a unified interface for compiling and installing standalone +# PHP extensions (modules). + +inherit autotools multilib + +EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install + +DEPEND=">=sys-devel/m4-1.4.3 + >=sys-devel/libtool-1.5.18" +RDEPEND="" + +# Because of USE deps, we require at least EAPI 2 +case ${EAPI} in + 4|5) ;; + *) + die "php-ext-source-r2 is not compatible with EAPI=${EAPI}" +esac + +# @ECLASS-VARIABLE: PHP_EXT_NAME +# @REQUIRED +# @DESCRIPTION: +# The extension name. This must be set, otherwise the eclass dies. +# Only automagically set by php-ext-pecl-r2.eclass, so unless your ebuild +# inherits that eclass, you must set this manually before inherit. +[[ -z "${PHP_EXT_NAME}" ]] && die "No module name specified for the php-ext-source-r2 eclass" + +# @ECLASS-VARIABLE: PHP_EXT_INI +# @DESCRIPTION: +# Controls whether or not to add a line to php.ini for the extension. +# Defaults to "yes" and should not be changed in most cases. +[[ -z "${PHP_EXT_INI}" ]] && PHP_EXT_INI="yes" + +# @ECLASS-VARIABLE: PHP_EXT_ZENDEXT +# @DESCRIPTION: +# Controls whether the extension is a ZendEngine extension or not. +# Defaults to "no" and if you don't know what is it, you don't need it. +[[ -z "${PHP_EXT_ZENDEXT}" ]] && PHP_EXT_ZENDEXT="no" + +# @ECLASS-VARIABLE: USE_PHP +# @REQUIRED +# @DESCRIPTION: +# Lists the PHP slots compatibile the extension is compatibile with +# Example: +# @CODE +# USE_PHP="php5-5 php5-6" +# @CODE +[[ -z "${USE_PHP}" ]] && die "USE_PHP is not set for the php-ext-source-r2 eclass" + +# @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE +# @DESCRIPTION: +# If set, this is the USE flag that the PHP dependencies are behind +# Most commonly set as PHP_EXT_OPTIONAL_USE=php to get the dependencies behind +# USE=php. + +# @ECLASS-VARIABLE: PHP_EXT_S +# @DESCRIPTION: +# The relative location of the temporary build directory for the PHP extension within +# the source package. This is useful for packages that bundle the PHP extension. +# Defaults to ${S} +[[ -z "${PHP_EXT_S}" ]] && PHP_EXT_S="${S}" + +#Make sure at least one target is installed. +REQUIRED_USE="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| ( " +for target in ${USE_PHP}; do + IUSE="${IUSE} php_targets_${target}" + target=${target/+} + REQUIRED_USE+="php_targets_${target} " + slot=${target/php} + slot=${slot/-/.} + PHPDEPEND="${PHPDEPEND} + php_targets_${target}? ( dev-lang/php:${slot} )" +done +REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}" + +RDEPEND="${RDEPEND} + ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } + ${PHPDEPEND} + ${PHP_EXT_OPTIONAL_USE:+ )}" + +DEPEND="${DEPEND} + ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } + ${PHPDEPEND} + ${PHP_EXT_OPTIONAL_USE:+ )} +" + +# @FUNCTION: php-ext-source-r2_src_unpack +# @DESCRIPTION: +# runs standard src_unpack + _phpize + +# @ECLASS-VARIABLE: PHP_EXT_SKIP_PHPIZE +# @DESCRIPTION: +# phpize will be run by default for all ebuilds that use +# php-ext-source-r2_src_unpack +# Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize. + +php-ext-source-r2_src_unpack() { + unpack ${A} + local slot orig_s="${PHP_EXT_S}" + for slot in $(php_get_slots); do + cp -r "${orig_s}" "${WORKDIR}/${slot}" || die "Failed to copy source ${orig_s} to PHP target directory" + done +} + +php-ext-source-r2_src_prepare() { + local slot orig_s="${PHP_EXT_S}" + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + php-ext-source-r2_phpize + done +} + +# @FUNCTION: php-ext-source-r2_phpize +# @DESCRIPTION: +# Runs phpize and autotools in addition to the standard src_unpack +php-ext-source-r2_phpize() { + if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then + # Create configure out of config.m4. We use autotools_run_tool + # to avoid some warnings about WANT_AUTOCONF and + # WANT_AUTOMAKE (see bugs #329071 and #549268). + autotools_run_tool ${PHPIZE} + # force run of libtoolize and regeneration of related autotools + # files (bug 220519) + rm aclocal.m4 + eautoreconf + fi +} + +# @FUNCTION: php-ext-source-r2_src_configure +# @DESCRIPTION: +# Takes care of standard configure for PHP extensions (modules). + +# @ECLASS-VARIABLE: my_conf +# @DESCRIPTION: +# Set this in the ebuild to pass configure options to econf. + +php-ext-source-r2_src_configure() { + # net-snmp creates this file #385403 + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + local slot + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + # Set the correct config options + econf --with-php-config=${PHPCONFIG} ${my_conf} || die "Unable to configure code to compile" + done +} + +# @FUNCTION: php-ext-source-r2_src_compile +# @DESCRIPTION: +# Takes care of standard compile for PHP extensions (modules). +php-ext-source-r2_src_compile() { + # net-snmp creates this file #324739 + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + # shm extension createss a semaphore file #173574 + addpredict /session_mm_cli0.sem + local slot + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + emake || die "Unable to make code" + + done +} + +# @FUNCTION: php-ext-source-r2_src_install +# @DESCRIPTION: +# Takes care of standard install for PHP extensions (modules). + +# @ECLASS-VARIABLE: DOCS +# @DESCRIPTION: +# Set in ebuild if you wish to install additional, package-specific documentation. +php-ext-source-r2_src_install() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + + # Let's put the default module away. Strip $EPREFIX from + # $EXT_DIR before calling newins (which handles EPREFIX itself). + insinto "${EXT_DIR#$EPREFIX}" + newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension" + + local doc + for doc in ${DOCS} ; do + [[ -s ${doc} ]] && dodoc ${doc} + done + + INSTALL_ROOT="${D}" emake install-headers + done + php-ext-source-r2_createinifiles +} + + +php_get_slots() { + local s slot + for slot in ${USE_PHP}; do + use php_targets_${slot} && s+=" ${slot/-/.}" + done + echo $s +} + +php_init_slot_env() { + libdir=$(get_libdir) + + PHPIZE="${EPREFIX}/usr/${libdir}/${1}/bin/phpize" + PHPCONFIG="${EPREFIX}/usr/${libdir}/${1}/bin/php-config" + PHPCLI="${EPREFIX}/usr/${libdir}/${1}/bin/php" + PHPCGI="${EPREFIX}/usr/${libdir}/${1}/bin/php-cgi" + PHP_PKG="$(best_version =dev-lang/php-${1:3}*)" + PHPPREFIX="${EPREFIX}/usr/${libdir}/${slot}" + EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)" + PHP_CURRENTSLOT=${1:3} + + PHP_EXT_S="${WORKDIR}/${1}" + cd "${PHP_EXT_S}" +} + +php-ext-source-r2_buildinilist() { + # Work out the list of <ext>.ini files to edit/add to + if [[ -z "${PHPSAPILIST}" ]] ; then + PHPSAPILIST="apache2 cli cgi fpm embed phpdbg" + fi + + PHPINIFILELIST="" + local x + for x in ${PHPSAPILIST} ; do + if [[ -f "${EPREFIX}/etc/php/${x}-${1}/php.ini" ]] ; then + PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini" + fi + done + PHPFULLINIFILELIST="${PHPFULLINIFILELIST} ${PHPINIFILELIST}" +} + +# @FUNCTION: php-ext-source-r2_createinifiles +# @DESCRIPTION: +# Builds ini files for every enabled slot and SAPI +php-ext-source-r2_createinifiles() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + # Pull in the PHP settings + + # Build the list of <ext>.ini files to edit/add to + php-ext-source-r2_buildinilist ${slot} + + + # Add the needed lines to the <ext>.ini files + local file + if [[ "${PHP_EXT_INI}" = "yes" ]] ; then + for file in ${PHPINIFILELIST}; do + php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" "${file}" + done + fi + + # Symlink the <ext>.ini files from ext/ to ext-active/ + local inifile + for inifile in ${PHPINIFILELIST} ; do + if [[ -n "${PHP_EXT_INIFILE}" ]]; then + cat "${FILESDIR}/${PHP_EXT_INIFILE}" >> "${ED}/${inifile}" + einfo "Added content of ${FILESDIR}/${PHP_EXT_INIFILE} to ${inifile}" + fi + inidir="${inifile/${PHP_EXT_NAME}.ini/}" + inidir="${inidir/ext/ext-active}" + dodir "/${inidir}" + dosym "/${inifile}" "/${inifile/ext/ext-active}" + done + + # Add support for installing PHP files into a version dependant directory + PHP_EXT_SHARED_DIR="${EPREFIX}/usr/share/php/${PHP_EXT_NAME}" + done +} + +php-ext-source-r2_addextension() { + if [[ "${PHP_EXT_ZENDEXT}" = "yes" ]] ; then + # We need the full path for ZendEngine extensions + # and we need to check for debugging enabled! + if has_version "dev-lang/php:${PHP_CURRENTSLOT}[threads]" ; then + if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]" ; then + ext_type="zend_extension_debug_ts" + else + ext_type="zend_extension_ts" + fi + ext_file="${EXT_DIR}/${1}" + else + if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]"; then + ext_type="zend_extension_debug" + else + ext_type="zend_extension" + fi + ext_file="${EXT_DIR}/${1}" + fi + + # php-5.3 unifies zend_extension loading and just requires the + # zend_extension keyword with no suffix + # TODO: drop previous code and this check once <php-5.3 support is + # discontinued + if has_version '>=dev-lang/php-5.3' ; then + ext_type="zend_extension" + fi + else + # We don't need the full path for normal extensions! + ext_type="extension" + ext_file="${1}" + fi + + php-ext-source-r2_addtoinifile "${ext_type}" "${ext_file}" "${2}" "Extension added" +} + +# $1 - Setting name +# $2 - Setting value +# $3 - File to add to +# $4 - Sanitized text to output +php-ext-source-r2_addtoinifile() { + local inifile="${WORKDIR}/${3}" + if [[ ! -d $(dirname ${inifile}) ]] ; then + mkdir -p $(dirname ${inifile}) + fi + + # Are we adding the name of a section? + if [[ ${1:0:1} == "[" ]] ; then + echo "${1}" >> "${inifile}" + my_added="${1}" + else + echo "${1}=${2}" >> "${inifile}" + my_added="${1}=${2}" + fi + + if [[ -z "${4}" ]] ; then + einfo "Added '${my_added}' to /${3}" + else + einfo "${4} to /${3}" + fi + + insinto /$(dirname ${3}) + doins "${inifile}" +} + +# @FUNCTION: php-ext-source-r2_addtoinifiles +# @USAGE: <setting name> <setting value> [message to output]; or just [section name] +# @DESCRIPTION: +# Add value settings to php.ini file installed by the extension (module). +# You can also add a [section], see examples below. +# +# @CODE +# Add some settings for the extension: +# +# php-ext-source-r2_addtoinifiles "zend_optimizer.optimization_level" "15" +# php-ext-source-r2_addtoinifiles "zend_optimizer.enable_loader" "0" +# php-ext-source-r2_addtoinifiles "zend_optimizer.disable_licensing" "0" +# +# Adding values to a section in php.ini file installed by the extension: +# +# php-ext-source-r2_addtoinifiles "[Debugger]" +# php-ext-source-r2_addtoinifiles "debugger.enabled" "on" +# php-ext-source-r2_addtoinifiles "debugger.profiler_enabled" "on" +# @CODE +php-ext-source-r2_addtoinifiles() { + local x + for x in ${PHPFULLINIFILELIST} ; do + php-ext-source-r2_addtoinifile "${1}" "${2}" "${x}" "${3}" + done +} diff -uNr a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass --- a/eclass/php-ext-source-r3.eclass false +++ b/eclass/php-ext-source-r3.eclass 46a933e42584ca5f9dcffddce62b0eaf397218dd6677c461264060fde454a043a6e0dc46d2af6adbf6e54ad49ab3e792c6f839cd82e0e2da57f02e4c5c4e2b6e @@ -0,0 +1,452 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: php-ext-source-r3.eclass +# @MAINTAINER: +# Gentoo PHP team <php-bugs@gentoo.org> +# @BLURB: Compile and install standalone PHP extensions. +# @DESCRIPTION: +# A unified interface for compiling and installing standalone PHP +# extensions. + +inherit autotools + +EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test + +case ${EAPI} in + 6) ;; + *) + die "${ECLASS} is not compatible with EAPI=${EAPI}" +esac + +# @ECLASS-VARIABLE: PHP_EXT_NAME +# @REQUIRED +# @DESCRIPTION: +# The extension name. This must be set, otherwise the eclass dies. +# Only automagically set by php-ext-pecl-r3.eclass, so unless your ebuild +# inherits that eclass, you must set this manually before inherit. +[[ -z "${PHP_EXT_NAME}" ]] && \ + die "no extension name specified for the php-ext-source-r3 eclass" + +# @ECLASS-VARIABLE: PHP_EXT_INI +# @DESCRIPTION: +# Controls whether or not to add a line to php.ini for the extension. +# Defaults to "yes" and should not be changed in most cases. +[[ -z "${PHP_EXT_INI}" ]] && PHP_EXT_INI="yes" + +# @ECLASS-VARIABLE: PHP_EXT_ZENDEXT +# @DESCRIPTION: +# Controls whether the extension is a ZendEngine extension or not. +# Defaults to "no". If you don't know what this is, you don't need it. +[[ -z "${PHP_EXT_ZENDEXT}" ]] && PHP_EXT_ZENDEXT="no" + +# @ECLASS-VARIABLE: USE_PHP +# @REQUIRED +# @DESCRIPTION: +# Lists the PHP slots compatible the extension is compatible with. +# Example: +# @CODE +# USE_PHP="php5-6 php7-0" +# @CODE +[[ -z "${USE_PHP}" ]] && \ + die "USE_PHP is not set for the php-ext-source-r3 eclass" + +# @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set, all of the dependencies added by this eclass will be +# conditional on USE=${PHP_EXT_OPTIONAL_USE}. This is needed when +# ebuilds have to inherit this eclass unconditionally, but only +# actually use it when (for example) the user has USE=php. + +# @ECLASS-VARIABLE: PHP_EXT_S +# @DESCRIPTION: +# The relative location of the temporary build directory for the PHP +# extension within the source package. This is useful for packages that +# bundle the PHP extension. Defaults to ${S}. +[[ -z "${PHP_EXT_S}" ]] && PHP_EXT_S="${S}" + +# @ECLASS-VARIABLE: PHP_EXT_SAPIS +# @DESCRIPTION: +# A list of SAPIs for which we will install this extension. Formerly +# called PHPSAPILIST. The default includes every SAPI currently used in +# the tree. +[[ -z "${PHP_EXT_SAPIS}" ]] && PHP_EXT_SAPIS="apache2 cli cgi fpm embed phpdbg" + +# @ECLASS-VARIABLE: PHP_INI_NAME +# @DESCRIPTION: +# An optional file name of the saved ini file minis the ini extension +# This allows ordering of extensions such that one is loaded before +# or after another. Defaults to the PHP_EXT_NAME. +# Example (produces 40-foo.ini file): +# @CODE@ +# PHP_INI_NAME="40-foo" +# @CODE@ +: ${PHP_INI_NAME:=${PHP_EXT_NAME}} + +# @ECLASS-VARIABLE: PHP_EXT_NEEDED_USE +# @DEFAULT_UNSET +# @DESCRIPTION: +# A list of USE flags to append to each PHP target selected +# as a valid USE-dependency string. The value should be valid +# for all targets so USE defaults may be necessary. +# Example: +# @CODE +# PHP_EXT_NEEDED_USE="mysql?,pdo,pcre(+)" +# @CODE +# +# The PHP dependencies will result in: +# @CODE +# php_targets_php7-0? ( dev-lang/php:7.0[mysql?,pdo,pcre(+)] ) +# @CODE + + +# Make sure at least one target is installed. First, start a USE +# conditional like "php?", but only when PHP_EXT_OPTIONAL_USE is +# non-null. The option group "|| (..." is always started here. +REQUIRED_USE="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| ( " +for _php_target in ${USE_PHP}; do + # Now loop through each USE_PHP target and add the corresponding + # dev-lang/php slot to PHPDEPEND. + IUSE+=" php_targets_${_php_target}" + REQUIRED_USE+="php_targets_${_php_target} " + _php_slot=${_php_target/php} + _php_slot=${_php_slot/-/.} + if [[ ${PHP_EXT_NEEDED_USE} ]] ; then + _php_slot+=[${PHP_EXT_NEEDED_USE}] + fi + PHPDEPEND+=" php_targets_${_php_target}? ( dev-lang/php:${_php_slot} )" +done + +# Don't pollute the environment with our loop variables. +unset _php_slot _php_target + +# Finally, end the optional group that we started before the loop. Close +# the USE-conditional if PHP_EXT_OPTIONAL_USE is non-null. +REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}" + +RDEPEND="${RDEPEND} + ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } + ${PHPDEPEND} + ${PHP_EXT_OPTIONAL_USE:+ )}" + +DEPEND="${DEPEND} + sys-devel/m4 + sys-devel/libtool + ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } + ${PHPDEPEND} + ${PHP_EXT_OPTIONAL_USE:+ )} +" + +# @ECLASS-VARIABLE: PHP_EXT_SKIP_PHPIZE +# @DEFAULT_UNSET +# @DESCRIPTION: +# By default, we run "phpize" in php-ext-source-r3_src_prepare(). Set +# PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run +# phpize (and the autoreconf that becomes necessary afterwards). + +# @ECLASS-VARIABLE: PHP_EXT_SKIP_PATCHES +# @DEFAULT_UNSET +# @DESCRIPTION: +# By default, we run default_src_prepare to PHP_EXT_S. +# Set PHP_EXT_SKIP_PATCHES="yes" in your ebuild if you +# want to apply patches yourself. + +# @FUNCTION: php-ext-source-r3_src_prepare +# @DESCRIPTION: +# Runs the default src_prepare() for PATCHES/eapply_user() support (optional), +# and for each PHP slot, makes a copy of sources, initializes the environment, +# and calls php-ext-source-r3_phpize(). +php-ext-source-r3_src_prepare() { + local slot orig_s="${PHP_EXT_S}" + if [[ "${PHP_EXT_SKIP_PATCHES}" != 'yes' ]] ; then + pushd "${orig_s}" > /dev/null || die + default + popd > /dev/null || die + fi + for slot in $(php_get_slots); do + cp --recursive --preserve "${orig_s}" "${WORKDIR}/${slot}" || \ + die "failed to copy sources from ${orig_s} to ${WORKDIR}/${slot}" + php_init_slot_env "${slot}" + php-ext-source-r3_phpize + done +} + +# @FUNCTION: php-ext-source-r3_phpize +# @DESCRIPTION: +# Subject to PHP_EXT_SKIP_PHPIZE, this function runs phpize and +# autoreconf in a manner that avoids warnings. +php-ext-source-r3_phpize() { + if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then + # Create configure out of config.m4. We use autotools_run_tool + # to avoid some warnings about WANT_AUTOCONF and + # 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 + fi +} + + +# @ECLASS-VARIABLE: PHP_EXT_ECONF_ARGS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this in the ebuild to pass additional configure options to +# econf. Formerly called my_conf. Either a string or an array of +# --flag=value parameters is supported. + +# @FUNCTION: php-ext-source-r3_src_configure +# @DESCRIPTION: +# Takes care of standard configure for PHP extensions (modules). +php-ext-source-r3_src_configure() { + # net-snmp creates these, bug #385403. + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + # Support either a string or an array for PHP_EXT_ECONF_ARGS. + local econf_args + if [[ $(declare -p PHP_EXT_ECONF_ARGS) == "declare -a"* ]]; then + econf_args=( "${PHP_EXT_ECONF_ARGS[@]}" ) + else + econf_args=( ${PHP_EXT_ECONF_ARGS} ) + fi + + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + econf --with-php-config="${PHPCONFIG}" "${econf_args[@]}" + done +} + +# @FUNCTION: php-ext-source-r3_src_compile +# @DESCRIPTION: +# Compile a standard standalone PHP extension. +php-ext-source-r3_src_compile() { + # net-snmp creates these, bug #324739. + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + # shm extension creates a semaphore file, bug #173574. + addpredict /session_mm_cli0.sem + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + emake + done +} + +# @FUNCTION: php-ext-source-r3_src_install +# @DESCRIPTION: +# Install a standard standalone PHP extension. Uses einstalldocs() +# to support the DOCS variable/array. +php-ext-source-r3_src_install() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + + # Strip $EPREFIX from $EXT_DIR before calling doexe (which + # handles EPREFIX itself). Shared libs are +x by convention, + # although nothing seems to depend on that. + exeinto "${EXT_DIR#$EPREFIX}" + doexe "modules/${PHP_EXT_NAME}.so" + + INSTALL_ROOT="${D}" emake install-headers + done + einstalldocs + php-ext-source-r3_createinifiles +} + +# @FUNCTION: php-ext-source-r3_src_test +# @DESCRIPTION: +# Run tests delivered with the standalone PHP extension. Phpize will have generated +# a run-tests.php file to be executed by `make test`. We only need to +# force the test suite to run in non-interactive mode. +php-ext-source-r3_src_test() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + NO_INTERACTION="yes" emake test + done +} + +# @FUNCTION: php_get_slots +# @DESCRIPTION: +# Get a list of PHP slots contained in both the ebuild's USE_PHP and the +# user's PHP_TARGETS. +php_get_slots() { + local s="" + local slot + for slot in ${USE_PHP}; do + use php_targets_${slot} && s+=" ${slot/-/.}" + done + echo $s +} + +# @FUNCTION: php_init_slot_env +# @USAGE: <slot> +# @DESCRIPTION: +# Takes a slot name, and initializes some global variables to values +# corresponding to that slot. For example, it sets the path to the "php" +# and "phpize" binaries, which will differ for each slot. This function +# is intended to be called while looping through a list of slots +# obtained from php_get_slots(). +# +# Calling this function will change the working directory to the +# temporary build directory for the given slot. +php_init_slot_env() { + local libdir=$(get_libdir) + local slot="${1}" + + PHPPREFIX="${EPREFIX}/usr/${libdir}/${slot}" + PHPIZE="${PHPPREFIX}/bin/phpize" + PHPCONFIG="${PHPPREFIX}/bin/php-config" + PHPCLI="${PHPPREFIX}/bin/php" + PHPCGI="${PHPPREFIX}/bin/php-cgi" + PHP_PKG="$(best_version =dev-lang/php-${1:3}*)" + + EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)" + PHP_CURRENTSLOT=${1:3} + + PHP_EXT_S="${WORKDIR}/${slot}" + cd "${PHP_EXT_S}" || die "failed to change directory to ${PHP_EXT_S}" +} + +# @FUNCTION: php_slot_ini_files +# @USAGE: <slot> +# @INTERNAL +# @DESCRIPTION: +# Output a list of relative paths to INI files for the given +# slot. Usually there will be one INI file per SAPI. +php_slot_ini_files() { + local slot_ini_files="" + local x + for x in ${PHP_EXT_SAPIS} ; do + if [[ -f "${EPREFIX}/etc/php/${x}-${1}/php.ini" ]] ; then + slot_ini_files+=" etc/php/${x}-${1}/ext/${PHP_INI_NAME}.ini" + fi + done + + echo "${slot_ini_files}" +} + +# @FUNCTION: php-ext-source-r3_createinifiles +# @DESCRIPTION: +# Builds INI files for every enabled slot and SAPI. +php-ext-source-r3_createinifiles() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + + local file + for file in $(php_slot_ini_files "${slot}") ; do + if [[ "${PHP_EXT_INI}" = "yes" ]] ; then + # Add the needed lines to the <ext>.ini files + php-ext-source-r3_addextension "${PHP_EXT_NAME}.so" "${file}" + fi + + if [[ -n "${PHP_EXT_INIFILE}" ]] ; then + cat "${FILESDIR}/${PHP_EXT_INIFILE}" >> "${ED}/${file}" \ + || die "failed to append to ${ED}/${file}" + + einfo "Added contents of ${FILESDIR}/${PHP_EXT_INIFILE}" \ + "to ${file}" + fi + inidir="${file/${PHP_INI_NAME}.ini/}" + inidir="${inidir/ext/ext-active}" + dodir "/${inidir}" + dosym "/${file}" "/${file/ext/ext-active}" + done + done + + # A location where PHP code for this extension can be stored, + # independent of the PHP or extension versions. This will be part of + # PHP's include_path, configured in php.ini. For example, pecl-apcu + # installs an "apc.php" file which you are supposed to load with + # + # require('apcu/apc.php'); + # + PHP_EXT_SHARED_DIR="${EPREFIX}/usr/share/php/${PHP_EXT_NAME}" +} + +# @FUNCTION: php-ext-source-r3_addextension +# @USAGE: <extension-path> <ini-file> +# @INTERNAL +# @DESCRIPTION: +# Add a line to an INI file that will enable the given extension. The +# first parameter is the path to the extension (.so) file, and the +# second parameter is the name of the INI file in which it should be +# loaded. This function determines the setting name (either +# "extension=..." or "zend_extension=...") and then calls +# php-ext-source-r3_addtoinifile to do the actual work. +php-ext-source-r3_addextension() { + local ext_type="extension" + local ext_file="${1}" + + if [[ "${PHP_EXT_ZENDEXT}" = "yes" ]] ; then + ext_type="zend_extension" + ext_file="${EXT_DIR}/${1}" # Zend extensions need the path... + fi + + php-ext-source-r3_addtoinifile "${2}" "${ext_type}" "${ext_file}" +} + +# @FUNCTION: php-ext-source-r3_addtoinifile +# @USAGE: <relative-ini-path> <setting-or-section-name> [setting-value] +# @INTERNAL +# @DESCRIPTION: +# Add a setting=value to one INI file. The first argument is the +# relative path to the INI file. The second argument is the setting +# name, and the third argument is its value. +# +# You can also pass "[Section]" as the second parameter, to create a new +# section in the INI file. In that case, the third parameter (which +# would otherwise be the value of the setting) is ignored. +php-ext-source-r3_addtoinifile() { + local inifile="${WORKDIR}/${1}" + local inidir="${inifile%/*}" + + mkdir -p "${inidir}" || die "failed to create INI directory ${inidir}" + + # Are we adding the name of a section? Assume not by default. + local my_added="${2}=${3}" + if [[ ${2:0:1} == "[" ]] ; then + # Ok, it's a section name. + my_added="${2}" + fi + echo "${my_added}" >> "${inifile}" || die "failed to append to ${inifile}" + einfo "Added '${my_added}' to /${1}" + + insinto "/${1%/*}" + doins "${inifile}" +} + +# @FUNCTION: php-ext-source-r3_addtoinifiles +# @USAGE: <setting-or-section-name> [setting-value] [message] +# @DESCRIPTION: +# Add settings to every php.ini file installed by this extension. +# You can also add new [Section]s -- see the example below. +# +# @CODE +# Add some settings for the extension: +# +# php-ext-source-r3_addtoinifiles "zend_optimizer.optimization_level" "15" +# php-ext-source-r3_addtoinifiles "zend_optimizer.enable_loader" "0" +# php-ext-source-r3_addtoinifiles "zend_optimizer.disable_licensing" "0" +# +# Adding values to a section in php.ini file installed by the extension: +# +# php-ext-source-r3_addtoinifiles "[Debugger]" +# php-ext-source-r3_addtoinifiles "debugger.enabled" "on" +# php-ext-source-r3_addtoinifiles "debugger.profiler_enabled" "on" +# @CODE +php-ext-source-r3_addtoinifiles() { + local slot + for slot in $(php_get_slots); do + for file in $(php_slot_ini_files "${slot}") ; do + php-ext-source-r3_addtoinifile "${file}" "${1}" "${2}" + done + done +} diff -uNr a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass --- a/eclass/php-pear-r1.eclass false +++ b/eclass/php-pear-r1.eclass 78296c52be7dc9f7b08dce566e24dd7933a3914e7ece5dd0fb387f199d10487da4ab9a3b268dadc20d5042084738597d886cfee35a17ac9c21e1b3a6841d7bd0 @@ -0,0 +1,122 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @DEAD +# @ECLASS: php-pear-r1.eclass +# @MAINTAINER: +# Gentoo PHP Team <php-bugs@gentoo.org> +# @AUTHOR: +# Author: Tal Peer <coredumb@gentoo.org> +# Author: Luca Longinotti <chtekk@gentoo.org> +# @BLURB: Provides means for an easy installation of PEAR packages. +# @DESCRIPTION: +# This eclass provides means for an easy installation of PEAR packages. +# For more information on PEAR, see http://pear.php.net/ +# Note that this eclass doesn't handle dependencies of PEAR packages +# on purpose; please use (R)DEPEND to define them correctly! + +inherit multilib + +EXPORT_FUNCTIONS pkg_setup src_install + +case "${EAPI:-0}" in + 0|1|2|3|4) + PHP_DEPEND="dev-lang/php" + ;; + 5|6) + # Repoman will complain about the missing slot in newer EAPIs. + PHP_DEPEND="dev-lang/php:*" + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +DEPEND="${PHP_DEPEND} + >=dev-php/pear-1.8.1" +RDEPEND="${DEPEND}" + +# @ECLASS-VARIABLE: PHP_PEAR_PKG_NAME +# @DESCRIPTION: +# Set this if the the PEAR package name differs from ${PN/PEAR-/} +# (generally shouldn't be the case). +[[ -z "${PHP_PEAR_PKG_NAME}" ]] && PHP_PEAR_PKG_NAME="${PN/PEAR-/}" + +fix_PEAR_PV() { + local tmp="${PV}" + tmp="${tmp/_/}" + tmp="${tmp/rc/RC}" + tmp="${tmp/beta/b}" + tmp="${tmp/alpha/a}" + PEAR_PV="${tmp}" +} + +# @ECLASS-VARIABLE: PEAR_PV +# @DESCRIPTION: +# Set in ebuild if the eclass ${PV} mangling breaks SRC_URI for alpha/beta/rc versions +[[ -z "${PEAR_PV}" ]] && fix_PEAR_PV + +PEAR_PN="${PHP_PEAR_PKG_NAME}-${PEAR_PV}" +: ${PHP_PEAR_URI:=pear.php.net} +: ${PHP_PEAR_CHANNEL:=${FILESDIR}/channel.xml} + +[[ -z "${SRC_URI}" ]] && SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_PN}.tgz" +[[ -z "${HOMEPAGE}" ]] && HOMEPAGE="http://${PHP_PEAR_URI}/${PHP_PEAR_PKG_NAME}" + +S="${WORKDIR}/${PEAR_PN}" + +# @FUNCTION: php-pear-lib-r1_pkg_setup +# @DESCRIPTION: +# Adds required PEAR channel if necessary +php-pear-r1_pkg_setup() { + if [[ -f $PHP_PEAR_CHANNEL ]]; then + pear channel-add $PHP_PEAR_CHANNEL || einfo "Ignore any errors about existing channels" + fi +} + +# @FUNCTION: php-pear-r1_src_install +# @DESCRIPTION: +# Takes care of standard install for PEAR packages. +php-pear-r1_src_install() { + # SNMP support + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/ + addpredict /var/lib/net-snmp/mib_indexes + addpredict /session_mm_cli0.sem + + PHP_BIN="/usr/bin/php" + + cd "${S}" + + # metadata_dir needs to be set relative to ${D} for >=dev-php/PEAR-PEAR-1.10 + if [[ -f "${WORKDIR}"/package2.xml ]] ; then + mv -f "${WORKDIR}/package2.xml" "${S}" + if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then + local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" + peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \ + install --force --loose --nodeps --offline --packagingroot="${D}" \ + "${S}/package2.xml" || die "Unable to install PEAR package" + else + peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ + "${S}/package2.xml" || die "Unable to install PEAR package" + fi + else + mv -f "${WORKDIR}/package.xml" "${S}" + if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then + local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" + peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \ + install --force --loose --nodeps --offline --packagingroot="${D}" \ + "${S}/package.xml" || die "Unable to install PEAR package" + else + peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ + "${S}/package.xml" || die "Unable to install PEAR package" + fi + fi + + rm -Rf "${D}/usr/share/php/.channels" \ + "${D}/usr/share/php/.depdblock" \ + "${D}/usr/share/php/.depdb" \ + "${D}/usr/share/php/.filemap" \ + "${D}/usr/share/php/.lock" \ + "${D}/usr/share/php/.registry" +} diff -uNr a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass --- a/eclass/php-pear-r2.eclass false +++ b/eclass/php-pear-r2.eclass 7aa34c005e54a5d561368b88b308681b1423792dd933b165fb6a9c9c73d0038e2fc3dae595653ecf905c4ab6481330e757e624c43664c57aa25f51f2bf41f156 @@ -0,0 +1,126 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: php-pear-r2.eclass +# @MAINTAINER: +# Gentoo PHP Team <php-bugs@gentoo.org> +# @AUTHOR: +# Author: Brian Evans <grknight@gentoo.org> +# @BLURB: Provides means for an easy installation of PEAR packages. +# @DESCRIPTION: +# This eclass provides means for an easy installation of PEAR packages. +# For more information on PEAR, see https://pear.php.net/ +# Note that this eclass doesn't handle dependencies of PEAR packages +# on purpose; please use (R)DEPEND to define them correctly! + +EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm + +case "${EAPI:-0}" in + 6) + ;; + *) + die "Unsupported EAPI=${EAPI} for ${ECLASS}" + ;; +esac + +RDEPEND=">=dev-php/pear-1.8.1" + +# @ECLASS-VARIABLE: PHP_PEAR_PKG_NAME +# @DESCRIPTION: +# Set this if the PEAR package name differs from ${PN/PEAR-/} +# (generally shouldn't be the case). +: ${PHP_PEAR_PKG_NAME:=${PN/PEAR-/}} + +# @ECLASS-VARIABLE: PEAR_PV +# @DESCRIPTION: +# Set in ebuild if the ${PV} breaks SRC_URI for alpha/beta/rc versions +: ${PEAR_PV:=${PV}} + +# @ECLASS-VARIABLE: PEAR-P +# @INTERNAL +# @DESCRIPTION: Combines PHP_PEAR_PKG_NAME and PEAR_PV +PEAR_P="${PHP_PEAR_PKG_NAME}-${PEAR_PV}" + +# @ECLASS-VARIABLE: PHP_PEAR_DOMAIN +# @DESCRIPTION: +# Set in ebuild to the domain name of the channel if not pear.php.net +# When the domain is not pear.php.net, setting the SRC_URI is required +: ${PHP_PEAR_DOMAIN:=pear.php.net} + +# @ECLASS-VARIABLE: PHP_PEAR_CHANNEL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set in ebuild to the path of channel.xml file which is necessary for +# 3rd party pear channels (besides pear.php.net) to be added to PEAR +# Default is unset to do nothing + +# set default SRC_URI for pear.php.net packages +if [[ "${PHP_PEAR_DOMAIN}" == "pear.php.net" ]] ; then + SRC_URI="https://pear.php.net/get/${PEAR_P}.tgz" +fi + +: ${HOMEPAGE:=https://${PHP_PEAR_DOMAIN}/package/${PHP_PEAR_PKG_NAME}} + +S="${WORKDIR}/${PEAR_P}" + +# @FUNCTION: php-pear-r2_install_packagexml +# @DESCRIPTION: +# Copies the package2.xml or package.xml file and, optionally, the channel.xml +# file to a Gentoo-specific location so that pkg_postinst can install the package +# to the local PEAR database +php-pear-r2_install_packagexml() { + insinto /usr/share/php/.packagexml + if [[ -f "${WORKDIR}/package2.xml" ]] ; then + newins "${WORKDIR}/package2.xml" "${PEAR_P}.xml" + elif [[ -f "${WORKDIR}/package.xml" ]] ; then + newins "${WORKDIR}/package.xml" "${PEAR_P}.xml" + fi + + if [[ -f "${PHP_PEAR_CHANNEL}" ]] ; then + newins "${PHP_PEAR_CHANNEL}" "${PEAR_P}-channel.xml" + fi +} + +# @FUNCTION: php-pear-r2_src_install +# @DESCRIPTION: +# Takes care of standard install for PEAR packages. +# Override src_install if the package installs more than "${PHP_PEAR_PKG_NAME}.php" +# or "${PHP_PEAR_PKG_NAME%%_*}/" as a directory +php-pear-r2_src_install() { + insinto /usr/share/php + [[ -f "${PHP_PEAR_PKG_NAME}.php" ]] && doins "${PHP_PEAR_PKG_NAME}.php" + [[ -d "${PHP_PEAR_PKG_NAME%%_*}" ]] && doins -r "${PHP_PEAR_PKG_NAME%%_*}/" + php-pear-r2_install_packagexml + einstalldocs +} + +# @FUNCTION: php-pear-r2_pkg_postinst +# @DESCRIPTION: +# Register package with the local PEAR database. +php-pear-r2_pkg_postinst() { + # Add unknown channels + if [[ -f "${EROOT}usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then + "${EROOT}usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null + if [[ $? -ne 0 ]]; then + "${EROOT}usr/bin/peardev" channel-add \ + "${EROOT}usr/share/php/.packagexml/${PEAR_P}-channel.xml" \ + || einfo "Ignore any errors about existing channels" + fi + fi + + # Register the package from the package{,2}.xml file + # It is not critical to complete so only warn on failure + if [[ -f "${EROOT}usr/share/php/.packagexml/${PEAR_P}.xml" ]] ; then + "${EROOT}usr/bin/peardev" install -nrO --force \ + "${EROOT}usr/share/php/.packagexml/${PEAR_P}.xml" 2> /dev/null \ + || ewarn "Failed to insert package into local PEAR database" + fi +} + +# @FUNCTION: php-pear-r2_pkg_postrm +# @DESCRIPTION: +# Deregister package from the local PEAR database +php-pear-r2_pkg_postrm() { + # Uninstall known dependency + "${EROOT}usr/bin/peardev" uninstall -nrO "${PHP_PEAR_DOMAIN}/${PHP_PEAR_PKG_NAME}" +} diff -uNr a/eclass/portability.eclass b/eclass/portability.eclass --- a/eclass/portability.eclass false +++ b/eclass/portability.eclass e2c5fbe2b2ee3205649d5d3456d5cc922b31a51cce9fb79dc8adfa3bf8f412a24d482998512ed8062279f64ad45a1b979b39153bee44e645dd8156dc13a48631 @@ -0,0 +1,155 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: portability.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @AUTHOR: +# Diego Pettenò <flameeyes@gentoo.org> +# @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds + +if [[ -z ${_PORTABILITY_ECLASS} ]]; then +_PORTABILITY_ECLASS=1 + +# @FUNCTION: treecopy +# @USAGE: <orig1> [orig2 orig3 ....] <dest> +# @RETURN: +# @DESCRIPTION: +# mimic cp --parents copy, but working on BSD userland as well +treecopy() { + local dest=${!#} + local files_count=$# + + while (( $# > 1 )); do + local dirstruct=$(dirname "$1") + mkdir -p "${dest}/${dirstruct}" || die + cp -pPR "$1" "${dest}/${dirstruct}" || die + + shift + done +} + +# @FUNCTION: seq +# @USAGE: [min] <max> [step] +# @RETURN: sequence from min to max regardless of seq command being present on system +# @DESCRIPTION: +# compatibility function that mimes seq command if not available +seq() { + # First try `seq` + local p=$(type -P seq) + if [[ -n ${p} ]] ; then + "${p}" "$@" || die + return $? + fi + + local min max step + case $# in + 1) min=1 max=$1 step=1 ;; + 2) min=$1 max=$2 step=1 ;; + 3) min=$1 max=$3 step=$2 ;; + *) die "seq called with wrong number of arguments" ;; + esac + + # Then try `jot` + p=$(type -P jot) + if [[ -n ${p} ]] ; then + local reps + # BSD userland + if [[ ${step} != 0 ]] ; then + reps=$(( (max - min) / step + 1 )) + else + reps=0 + fi + + jot $reps $min $max $step || die + return $? + fi + + # Screw it, do the output ourselves + while :; do + [[ $max < $min && $step > 0 ]] && break + [[ $min < $max && $step < 0 ]] && break + echo $min + : $(( min += step )) + done + return 0 +} + +# @FUNCTION: dlopen_lib +# @USAGE: +# @RETURN: linker flag if needed +# @DESCRIPTION: +# Gets the linker flag to link to dlopen() function +dlopen_lib() { + # - Solaris needs nothing + # - Darwin needs nothing + # - *BSD needs nothing + # - Linux needs -ldl (glibc and uclibc) + # - Interix needs -ldl + case "${CHOST}" in + *-linux-gnu*|*-linux-uclibc|*-interix*) + echo "-ldl" + ;; + esac +} + +# @FUNCTION: get_bmake +# @USAGE: +# @RETURN: system version of make +# @DESCRIPTION: +# Gets the name of the BSD-ish make command (bmake from NetBSD) +# +# This will return make (provided by system packages) for BSD userlands, +# or bsdmake for Darwin userlands and pmake for the rest of userlands, +# both of which are provided by sys-devel/pmake package. +# +# Note: the bsdmake for Darwin userland is with compatibility with MacOSX +# default name. +get_bmake() { + if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then + echo make + elif [[ ${CBUILD:-${CHOST}} == *darwin* ]]; then + echo bsdmake + else + echo bmake + fi +} + +# @FUNCTION: get_mounts +# @USAGE: +# @RETURN: table of mounts in form "point node fs opts" +# @MAINTAINER: +# @DESCRIPTION: +# Portable method of getting mount names and points. +# Returns as "point node fs options" +# Remember to convert 040 back to a space. +get_mounts() { + local point= node= fs= opts= foo= + + # Linux has /proc/mounts which should always exist + if [[ $(uname -s) == "Linux" ]] ; then + while read node point fs opts foo ; do + echo "${point} ${node} ${fs} ${opts}" + done < /proc/mounts + return + fi + + # OK, pray we have a -p option that outputs mounts in fstab format + # using tabs as the seperator. + # Then pray that there are no tabs in the either. + # Currently only FreeBSD supports this and the other BSDs will + # have to be patched. + # Athough the BSD's may support /proc, they do NOT put \040 in place + # of the spaces and we should not force a /proc either. + local IFS=$'\t' + LC_ALL=C mount -p | while read node point fs foo ; do + opts=${fs#* } + fs=${fs%% *} + echo "${point// /\040} ${node// /\040} ${fs%% *} ${opts// /\040}" + done +} + +_dead_portability_user_funcs() { die "if you really need this, please file a bug for base-system@gentoo.org"; } +is-login-disabled() { _dead_portability_user_funcs; } + +fi diff -uNr a/eclass/postgres-multi.eclass b/eclass/postgres-multi.eclass --- a/eclass/postgres-multi.eclass false +++ b/eclass/postgres-multi.eclass 9a6941958fb8bb2873afa3aea482deff957aca7d607940011452fcef5bd2faee0f38f055bdabb5b88ec9a07a14a56e58da82de3d894245bd26c35b34d4138027 @@ -0,0 +1,175 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +inherit multibuild postgres +EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test + + +# @ECLASS: postgres-multi.eclass +# @MAINTAINER: +# PostgreSQL <pgsql-bugs@gentoo.org> +# @AUTHOR: Aaron W. Swenson <titanofold@gentoo.org> +# @BLURB: An eclass to build PostgreSQL-related packages against multiple slots +# @DESCRIPTION: +# postgres-multi enables ebuilds, particularly PostgreSQL extensions, to +# build and install for one or more PostgreSQL slots as specified by +# POSTGRES_TARGETS use flags. + + +case ${EAPI:-0} in + 5|6) ;; + *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;; +esac + + +# @ECLASS-VARIABLE: POSTGRES_COMPAT +# @REQUIRED +# @DESCRIPTION: +# A Bash array containing a list of compatible PostgreSQL slots as +# defined by the developer. Must be declared before inheriting this +# eclass. Example: +#@CODE +#POSTGRES_COMPAT=( 9.2 9.3 9.4 9.5 9.6 10 ) +#POSTGRES_COMPAT=( 9.{2,3} 9.{4..6} 10 ) # Same as previous +#@CODE +if ! declare -p POSTGRES_COMPAT &>/dev/null; then + die 'Required variable POSTGRES_COMPAT not declared.' +fi + +# @ECLASS-VARIABLE: _POSTGRES_INTERSECT_SLOTS +# @INTERNAL +# @DESCRIPTION: +# A Bash array containing the intersect of POSTGRES_TARGETS and +# POSTGRES_COMPAT. +export _POSTGRES_INTERSECT_SLOTS=( ) + +# @FUNCTION: _postgres-multi_multibuild_wrapper +# @USAGE: <command> [arg ...] +# @INTERNAL +# @DESCRIPTION: +# For the given variant, set the values of the PG_SLOT, PG_CONFIG, and +# PKG_CONFIG_PATH environment variables accordingly and replace any +# appearance of @PG_SLOT@ in the command and arguments with value of +# ${PG_SLOT}. +_postgres-multi_multibuild_wrapper() { + debug-print-function ${FUNCNAME} "${@}" + export PG_SLOT=${MULTIBUILD_VARIANT} + export PG_CONFIG=$(which pg_config${MULTIBUILD_VARIANT//./}) + if [[ -n ${PKG_CONFIG_PATH} ]] ; then + PKG_CONFIG_PATH="$(${PG_CONFIG} --libdir)/pkgconfig:${PKG_CONFIG_PATH}" + else + PKG_CONFIG_PATH="$(${PG_CONFIG} --libdir)/pkgconfig" + fi + export PKG_CONFIG_PATH + + $(echo "${@}" | sed "s/@PG_SLOT@/${PG_SLOT}/g") +} + +# @FUNCTION: postgres-multi_foreach +# @USAGE: <command> [arg ...] +# @DESCRIPTION: +# Run the given command in the package's build directory for each +# PostgreSQL slot in the intersect of POSTGRES_TARGETS and +# POSTGRES_COMPAT. The PG_CONFIG and PKG_CONFIG_PATH environment +# variables are updated on each iteration to point to the matching +# pg_config command and pkg-config metadata files, respectively, for the +# current slot. Any appearance of @PG_SLOT@ in the command or arguments +# will be substituted with the slot (e.g., 9.5) of the current +# iteration. +postgres-multi_foreach() { + local MULTIBUILD_VARIANTS=("${_POSTGRES_INTERSECT_SLOTS[@]}") + + multibuild_foreach_variant \ + _postgres-multi_multibuild_wrapper run_in_build_dir ${@} +} + +# @FUNCTION: postgres-multi_forbest +# @USAGE: <command> [arg ...] +# @DESCRIPTION: +# Run the given command in the package's build directory for the highest +# slot in the intersect of POSTGRES_COMPAT and POSTGRES_TARGETS. The +# PG_CONFIG and PKG_CONFIG_PATH environment variables are set to the +# matching pg_config command and pkg-config metadata files, +# respectively. Any appearance of @PG_SLOT@ in the command or arguments +# will be substituted with the matching slot (e.g., 9.5). +postgres-multi_forbest() { + # POSTGRES_COMPAT is reverse sorted once in postgres.eclass so + # element 0 has the highest slot version. + local MULTIBUILD_VARIANTS=("${_POSTGRES_INTERSECT_SLOTS[0]}") + + multibuild_foreach_variant \ + _postgres-multi_multibuild_wrapper run_in_build_dir ${@} +} + +# @FUNCTION: postgres-multi_pkg_setup +# @DESCRIPTION: +# Initialize internal environment variable(s). This is required if +# pkg_setup() is declared in the ebuild. +postgres-multi_pkg_setup() { + local user_slot + + # _POSTGRES_COMPAT is created in postgres.eclass + for user_slot in "${_POSTGRES_COMPAT[@]}"; do + use "postgres_targets_postgres${user_slot/\./_}" && \ + _POSTGRES_INTERSECT_SLOTS+=( "${user_slot}" ) + done + + if [[ "${#_POSTGRES_INTERSECT_SLOTS[@]}" -eq "0" ]]; then + die "One of the postgres_targets_postgresSL_OT use flags must be enabled" + fi + + einfo "Multibuild variants: ${_POSTGRES_INTERSECT_SLOTS[@]}" +} + +# @FUNCTION: postgres-multi_src_prepare +# @DESCRIPTION: +# Calls eapply_user then copies ${S} into a build directory for each +# intersect of POSTGRES_TARGETS and POSTGRES_COMPAT. +postgres-multi_src_prepare() { + if [[ "${#_POSTGRES_INTERSECT_SLOTS[@]}" -eq "0" ]]; then + eerror "Internal array _POSTGRES_INTERSECT_SLOTS is empty." + die "Did you forget to call postgres-multi_pkg_setup?" + fi + + # Check that the slot has been emerged (Should be prevented by + # Portage, but won't be caught by /usr/bin/ebuild) + local slot + for slot in ${_POSTGRES_INTERSECT_SLOTS[@]} ; do + if [[ -z $(which pg_config${slot/.} 2> /dev/null) ]] ; then + eerror + eerror "postgres_targets_postgres${slot/.} use flag is enabled, but hasn't been emerged." + eerror + die "a postgres_targets use flag is enabled, but not emerged" + fi + done + + case ${EAPI:-0} in + 0|1|2|3|4|5) epatch_user ;; + 6) eapply_user ;; + esac + + local MULTIBUILD_VARIANT + local MULTIBUILD_VARIANTS=("${_POSTGRES_INTERSECT_SLOTS[@]}") + multibuild_copy_sources +} + +# @FUNCTION: postgres-multi_src_compile +# @DESCRIPTION: +# Runs `emake' in each build directory +postgres-multi_src_compile() { + postgres-multi_foreach emake +} + +# @FUNCTION: postgres-multi_src_install +# @DESCRIPTION: +# Runs `emake install DESTDIR="${D}"' in each build directory. +postgres-multi_src_install() { + postgres-multi_foreach emake install DESTDIR="${D}" +} + +# @FUNCTION: postgres-multi_src_test +# @DESCRIPTION: +# Runs `emake installcheck' in each build directory. +postgres-multi_src_test() { + postgres-multi_foreach emake installcheck +} diff -uNr a/eclass/postgres.eclass b/eclass/postgres.eclass --- a/eclass/postgres.eclass false +++ b/eclass/postgres.eclass e92c1ab14083184b259558000f2fe0c36cf376a0acabdd4230938eed1dd5e48d7c0b7fff5dfc6269831b41a33909e9c0164035385556726b389c00a79786fc10 @@ -0,0 +1,184 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +inherit user +EXPORT_FUNCTIONS pkg_setup + +# @ECLASS: postgres.eclass +# @MAINTAINER: +# PostgreSQL <pgsql-bugs@gentoo.org> +# @AUTHOR: Aaron W. Swenson <titanofold@gentoo.org> +# @BLURB: An eclass for PostgreSQL-related packages +# @DESCRIPTION: +# This eclass provides common utility functions that many +# PostgreSQL-related packages perform, such as checking that the +# currently selected PostgreSQL slot is within a range, adding a system +# user to the postgres system group, and generating dependencies. + + +case ${EAPI:-0} in + 5|6) ;; + *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;; +esac + +# @ECLASS-VARIABLE: _POSTGRES_ALL_VERSIONS +# @INTERNAL +# @DESCRIPTION: +# List of versions to reverse sort POSTGRES_COMPAT slots + +_POSTGRES_ALL_VERSIONS=( 11 10 9.6 9.5 9.4 9.3 9.2 ) + + + +# @ECLASS-VARIABLE: POSTGRES_COMPAT +# @DEFAULT_UNSET +# @DESCRIPTION: +# A Bash array containing a list of compatible PostgreSQL slots as +# defined by the developer. If declared, must be declared before +# inheriting this eclass. Example: +#@CODE +#POSTGRES_COMPAT=( 9.2 9.3 9.4 9.5 9.6 10 ) +#POSTGRES_COMPAT=( 9.{2,3} 9.{4..6} 10 ) # Same as previous +#@CODE + +# @ECLASS-VARIABLE: POSTGRES_DEP +# @DESCRIPTION: +# An automatically generated dependency string suitable for use in +# DEPEND and RDEPEND declarations. +POSTGRES_DEP="dev-db/postgresql:=" + +# @ECLASS-VARIABLE: POSTGRES_USEDEP +# @DEFAULT_UNSET +# @DESCRIPTION: +# Add the 2-Style and/or 4-Style use dependencies without brackets to be used +# for POSTGRES_DEP. If declared, must be declared before inheriting this eclass. +declare -p POSTGRES_USEDEP &>/dev/null && POSTGRES_DEP+="[${POSTGRES_USEDEP}]" + +# @ECLASS-VARIABLE: POSTGRES_REQ_USE +# @DEFAULT_UNSET +# @DESCRIPTION: +# An automatically generated REQUIRED_USE-compatible string built upon +# POSTGRES_COMPAT. REQUIRED_USE="... ${POSTGRES_REQ_USE}" is only +# required if the package must build against one of the PostgreSQL slots +# declared in POSTGRES_COMPAT. + +# @ECLASS-VARIABLE: _POSTGRES_COMPAT +# @INTERNAL +# @DESCRIPTION: +# Copy of POSTGRES_COMPAT, reverse sorted +_POSTGRES_COMPAT=() + + +if declare -p POSTGRES_COMPAT &> /dev/null ; then + # Reverse sort the given POSTGRES_COMPAT so that the most recent + # slot is preferred over an older slot. + # -- do we care if dependencies are deterministic by USE flags? + for i in ${_POSTGRES_ALL_VERSIONS[@]} ; do + has ${i} ${POSTGRES_COMPAT[@]} && _POSTGRES_COMPAT+=( ${i} ) + done + + POSTGRES_DEP="" + POSTGRES_REQ_USE=" || (" + for slot in "${_POSTGRES_COMPAT[@]}" ; do + POSTGRES_DEP+=" postgres_targets_postgres${slot/\./_}? ( dev-db/postgresql:${slot}=" + declare -p POSTGRES_USEDEP &>/dev/null && \ + POSTGRES_DEP+="[${POSTGRES_USEDEP}]" + POSTGRES_DEP+=" )" + + IUSE+=" postgres_targets_postgres${slot/\./_}" + POSTGRES_REQ_USE+=" postgres_targets_postgres${slot/\./_}" + done + POSTGRES_REQ_USE+=" )" +fi + + +# @FUNCTION: postgres_check_slot +# @DESCRIPTION: +# Verify that the currently selected PostgreSQL slot is set to one of +# the slots defined in POSTGRES_COMPAT. Automatically dies unless a +# POSTGRES_COMPAT slot is selected. Should be called in pkg_pretend(). +postgres_check_slot() { + if ! declare -p POSTGRES_COMPAT &>/dev/null; then + die 'POSTGRES_COMPAT not declared.' + fi + + # Don't die because we can't run postgresql-config during pretend. + [[ "$EBUILD_PHASE" = "pretend" && -z "$(which postgresql-config 2> /dev/null)" ]] \ + && return 0 + + if has $(postgresql-config show 2> /dev/null) "${POSTGRES_COMPAT[@]}"; then + return 0 + else + eerror "PostgreSQL slot must be set to one of: " + eerror " ${POSTGRES_COMPAT[@]}" + die "Incompatible PostgreSQL slot eselected" + fi +} + +# @FUNCTION: postgres_new_user +# @USAGE: [user [(uid|-1) [(shell|-1) [(homedir|-1) [groups]]]]] +# @DESCRIPTION: +# Creates the "postgres" system group and user -- which is separate from +# the database user -- and, optionally, the developer defined user. There +# are no required parameters. +# +# When given a user to create, it'll be created with the next available +# uid, default shell set to /bin/false, default homedir is /dev/null, +# and added to the "postgres" system group. You can use "-1" to skip any +# parameter except user or groups. +postgres_new_user() { + enewgroup postgres 70 + enewuser postgres 70 /bin/bash /var/lib/postgresql postgres + + if [[ $# -gt 0 ]] ; then + if [[ "$1" = "postgres" ]] ; then + ewarn "Username 'postgres' implied, skipping" + else + local groups=$5 + [[ -n "${groups}" ]] && groups+=",postgres" || groups="postgres" + enewuser "$1" "${2:--1}" "${3:--1}" "${4:--1}" "${groups}" + fi + fi +} + +# @FUNCTION: postgres_pkg_setup +# @DESCRIPTION: +# Initialize environment variable(s) according to the best +# installed version of PostgreSQL that is also in POSTGRES_COMPAT. This +# is required if pkg_setup() is declared in the ebuild. +# Exports PG_SLOT, PG_CONFIG, and PKG_CONFIG_PATH. +postgres_pkg_setup() { + debug-print-function ${FUNCNAME} "${@}" + + local compat_slot + local best_slot + for compat_slot in "${_POSTGRES_COMPAT[@]}"; do + if use "postgres_targets_postgres${compat_slot/\./_}"; then + best_slot="${compat_slot}" + break + fi + done + + if [[ -z "${best_slot}" ]]; then + local flags f + for f in "${_POSTGRES_COMPAT[@]}"; do + flags+=" postgres${f/./_}" + done + + eerror "POSTGRES_TARGETS must contain at least one of:" + eerror " ${flags}" + die "No suitable POSTGRES_TARGETS enabled." + fi + + export PG_SLOT=${best_slot} + export PG_CONFIG=$(which pg_config${best_slot//./}) + + local pg_pkg_config_path="$(${PG_CONFIG} --libdir)/pkgconfig" + if [[ -n "${PKG_CONFIG_PATH}" ]]; then + export PKG_CONFIG_PATH="${pg_pkg_config_path}:${PKG_CONFIG_PATH}" + else + export PKG_CONFIG_PATH="${pg_pkg_config_path}" + fi + + elog "PostgreSQL Target: ${best_slot}" +} diff -uNr a/eclass/prefix.eclass b/eclass/prefix.eclass --- a/eclass/prefix.eclass false +++ b/eclass/prefix.eclass 7ee121b4cf929b3107aeb7dde345323a13ac0e86e13bf6277652b1c619b2d15dca968445d235f3a49615acd422ecbf8dc952df71b4b33a8b258dceda404124b3 @@ -0,0 +1,138 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: prefix.eclass +# @MAINTAINER: +# Feel free to contact the Prefix team through <prefix@gentoo.org> if +# you have problems, suggestions or questions. +# @BLURB: Eclass to provide Prefix functionality +# @DESCRIPTION: +# Gentoo Prefix allows users to install into a self defined offset +# located somewhere in the filesystem. Prefix ebuilds require +# additional functions and variables which are defined by this eclass. + +# @ECLASS-VARIABLE: EPREFIX +# @DESCRIPTION: +# The offset prefix of a Gentoo Prefix installation. When Gentoo Prefix +# is not used, ${EPREFIX} should be "". Prefix Portage sets EPREFIX, +# hence this eclass has nothing to do here in that case. +# Note that setting EPREFIX in the environment with Prefix Portage sets +# Portage into cross-prefix mode. +if [[ ! ${EPREFIX+set} ]]; then + export EPREFIX='' +fi + + +# @FUNCTION: eprefixify +# @USAGE: <list of to be eprefixified files> +# @DESCRIPTION: +# replaces @GENTOO_PORTAGE_EPREFIX@ with ${EPREFIX} for the given files, +# dies if no arguments are given, a file does not exist, or changing a +# file failed. +eprefixify() { + [[ $# -lt 1 ]] && die "at least one argument required" + + einfo "Adjusting to prefix ${EPREFIX:-/}" + local x + for x in "$@" ; do + if [[ -e ${x} ]] ; then + ebegin " ${x##*/}" + sed -i -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}|g" "${x}" + eend $? || die "failed to eprefixify ${x}" + else + die "${x} does not exist" + fi + done + + return 0 +} + +# @FUNCTION: hprefixify +# @USAGE: [ -w <line match> ] [ -e <extended regex> ] [ -q <quotation char> ] <list of files> +# @DESCRIPTION: +# Tries a set of heuristics to prefixify the given files. Dies if no +# arguments are given, a file does not exist, or changing a file failed. +# +# Additional extended regular expression can be passed by -e or +# environment variable PREFIX_EXTRA_REGEX. The default heuristics can +# be constrained to lines that match a sed expression passed by -w or +# environment variable PREFIX_LINE_MATCH. Quotation characters can be +# specified by -q or environment variable PREFIX_QUOTE_CHAR, unless +# EPREFIX is empty. +# +# @EXAMPLE: +# Only prefixify the 30th line, +# hprefixify -w 30 configure +# Only prefixify lines that contain "PATH", +# hprefixify -w "/PATH/" configure +# Also delete all the /opt/gnu search paths, +# hprefixify -e "/\/opt\/gnu/d" configure +# Quote the inserted EPREFIX +# hprefixify -q '"' etc/profile +hprefixify() { + use prefix || return 0 + + local xl=() x + while [[ $# -gt 0 ]]; do + case $1 in + -e) local PREFIX_EXTRA_REGEX="$2" + shift + ;; + -w) local PREFIX_LINE_MATCH="$2" + shift + ;; + -q) local PREFIX_QUOTE_CHAR="${EPREFIX:+$2}" + shift + ;; + *) + xl+=( "$1" ) + ;; + esac + shift + done + local dirs="/(usr|lib(|[onx]?32|n?64)|etc|bin|sbin|var|opt|run)" \ + eprefix="${PREFIX_QUOTE_CHAR}${EPREFIX}${PREFIX_QUOTE_CHAR}" + + [[ ${#xl[@]} -lt 1 ]] && die "at least one file operand is required" + einfo "Adjusting to prefix ${EPREFIX:-/}" + for x in "${xl[@]}" ; do + if [[ -e ${x} ]] ; then + ebegin " ${x##*/}" + sed -r \ + -e "${PREFIX_LINE_MATCH}s,([^[:alnum:]}\)\.])${dirs},\1${eprefix}/\2,g" \ + -e "${PREFIX_LINE_MATCH}s,^${dirs},${eprefix}/\1," \ + -e "${PREFIX_EXTRA_REGEX}" \ + -i "${x}" + eend $? || die "failed to prefixify ${x}" + else + die "${x} does not exist" + fi + done +} + +# @FUNCTION: prefixify_ro +# @USAGE: prefixify_ro <file>. +# @DESCRIPTION: +# prefixify a read-only file. +# copies the files to ${T}, prefixies it, echos the new file. +# @EXAMPLE: +# doexe "$(prefixify_ro "${FILESDIR}"/fix_libtool_files.sh)" +# epatch "$(prefixify_ro "${FILESDIR}"/${PN}-4.0.2-path.patch)" +prefixify_ro() { + if [[ -e $1 ]] ; then + local f=${1##*/} + cp "$1" "${T}" || die "failed to copy file" + local x="${T}"/${f} + # redirect to stderr because stdout is used to + # return the prefixified file. + if grep -qs @GENTOO_PORTAGE_EPREFIX@ "${x}" ; then + eprefixify "${T}"/${f} 1>&2 + else + hprefixify "${T}"/${f} 1>&2 + fi + echo "${x}" + else + die "$1 does not exist" + fi +} +# vim: tw=72: diff -uNr a/eclass/preserve-libs.eclass b/eclass/preserve-libs.eclass --- a/eclass/preserve-libs.eclass false +++ b/eclass/preserve-libs.eclass b97c7e62dfd2bd151f4abce38fa383eeadd7c4100d318b31df1ac2a76b365033698b6f5576fe91db4556d73c9e83b2502bc63c5bb013bbdd11af7dbbac7d03d1 @@ -0,0 +1,74 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: preserve-libs.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: preserve libraries after SONAME changes + +if [[ -z ${_PRESERVE_LIBS_ECLASS} ]]; then +_PRESERVE_LIBS_ECLASS=1 + +# @FUNCTION: preserve_old_lib +# @USAGE: <libs to preserve> [more libs] +# @DESCRIPTION: +# These functions are useful when a lib in your package changes ABI SONAME. +# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 +# would break packages that link against it. Most people get around this +# by using the portage SLOT mechanism, but that is not always a relevant +# solution, so instead you can call this from pkg_preinst. See also the +# preserve_old_lib_notify function. +preserve_old_lib() { + if [[ ${EBUILD_PHASE} != "preinst" ]] ; then + eerror "preserve_old_lib() must be called from pkg_preinst() only" + die "Invalid preserve_old_lib() usage" + fi + [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" + + # let portage worry about it + has preserve-libs ${FEATURES} && return 0 + + has "${EAPI:-0}" 0 1 2 && local ED=${D} EROOT=${ROOT} + + local lib dir + for lib in "$@" ; do + [[ -e ${EROOT}/${lib} ]] || continue + dir=${lib%/*} + dodir ${dir} || die "dodir ${dir} failed" + cp "${EROOT}"/${lib} "${ED}"/${lib} || die "cp ${lib} failed" + touch "${ED}"/${lib} + done +} + +# @FUNCTION: preserve_old_lib_notify +# @USAGE: <libs to notify> [more libs] +# @DESCRIPTION: +# Spit helpful messages about the libraries preserved by preserve_old_lib. +preserve_old_lib_notify() { + if [[ ${EBUILD_PHASE} != "postinst" ]] ; then + eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" + die "Invalid preserve_old_lib_notify() usage" + fi + + # let portage worry about it + has preserve-libs ${FEATURES} && return 0 + + has "${EAPI:-0}" 0 1 2 && local EROOT=${ROOT} + + local lib notice=0 + for lib in "$@" ; do + [[ -e ${EROOT}/${lib} ]] || continue + if [[ ${notice} -eq 0 ]] ; then + notice=1 + ewarn "Old versions of installed libraries were detected on your system." + ewarn "In order to avoid breaking packages that depend on these old libs," + ewarn "the libraries are not being removed. You need to run revdep-rebuild" + ewarn "in order to remove these old dependencies. If you do not have this" + ewarn "helper program, simply emerge the 'gentoolkit' package." + ewarn + fi + ewarn " # revdep-rebuild --library '${lib}' && rm '${lib}'" + done +} + +fi diff -uNr a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass --- a/eclass/python-any-r1.eclass false +++ b/eclass/python-any-r1.eclass 7b61357dd44bccc86d1f3340bab166a437ed81b21901a3478c5baa26548b9ebfb76c281d3ec25d0e54c7e6ffc46bd66af17352102495d34e30fe7a04bac9e123 @@ -0,0 +1,356 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: python-any-r1.eclass +# @MAINTAINER: +# Python team <python@gentoo.org> +# @AUTHOR: +# Author: Michał Górny <mgorny@gentoo.org> +# Based on work of: Krzysztof Pawlik <nelchael@gentoo.org> +# @BLURB: An eclass for packages having build-time dependency on Python. +# @DESCRIPTION: +# A minimal eclass for packages which need any Python interpreter +# installed without a need for explicit choice and invariability. +# This usually involves packages requiring Python at build-time +# but having no other relevance to it. +# +# This eclass provides a minimal PYTHON_DEPS variable with a dependency +# string on any of the supported Python implementations. It also exports +# pkg_setup() which finds the best supported implementation and sets it +# as the active one. +# +# Optionally, you can define a python_check_deps() function. It will +# be called by the eclass with EPYTHON set to each matching Python +# implementation and it is expected to check whether the implementation +# fulfills the package requirements. You can use the locally exported +# PYTHON_USEDEP to check USE-dependencies of relevant packages. It +# should return a true value (0) if the Python implementation fulfills +# the requirements, a false value (non-zero) otherwise. +# +# Please note that python-any-r1 will always inherit python-utils-r1 +# as well. Thus, all the functions defined there can be used in the +# packages using python-any-r1, and there is no need ever to inherit +# both. +# +# For more information, please see the wiki: +# https://wiki.gentoo.org/wiki/Project:Python/python-any-r1 + +case "${EAPI:-0}" in + 0|1|2|3|4|5|6|7) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +if [[ ! ${_PYTHON_ANY_R1} ]]; then + +if [[ ${_PYTHON_R1} ]]; then + die 'python-any-r1.eclass can not be used with python-r1.eclass.' +elif [[ ${_PYTHON_SINGLE_R1} ]]; then + die 'python-any-r1.eclass can not be used with python-single-r1.eclass.' +fi + +inherit python-utils-r1 + +fi + +EXPORT_FUNCTIONS pkg_setup + +# @ECLASS-VARIABLE: PYTHON_COMPAT +# @REQUIRED +# @DESCRIPTION: +# This variable contains a list of Python implementations the package +# supports. It must be set before the `inherit' call. It has to be +# an array. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python{2_5,2_6,2_7} ) +# @CODE + +# @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE +# @INTERNAL +# @DESCRIPTION: +# This variable can be used when working with ebuilds to override +# the in-ebuild PYTHON_COMPAT. It is a string naming the implementation +# which will be used to build the package. It needs to be specified +# in the calling environment, and not in ebuilds. +# +# It should be noted that in order to preserve metadata immutability, +# PYTHON_COMPAT_OVERRIDE does not affect dependencies. The value of +# EPYTHON and eselect-python preferences are ignored. Dependencies need +# to be satisfied manually. +# +# Example: +# @CODE +# PYTHON_COMPAT_OVERRIDE='pypy' emerge -1v dev-python/bar +# @CODE + +# @ECLASS-VARIABLE: PYTHON_REQ_USE +# @DEFAULT_UNSET +# @DESCRIPTION: +# The list of USEflags required to be enabled on the Python +# implementations, formed as a USE-dependency string. It should be valid +# for all implementations in PYTHON_COMPAT, so it may be necessary to +# use USE defaults. +# +# Example: +# @CODE +# PYTHON_REQ_USE="gdbm,ncurses(-)?" +# @CODE +# +# It will cause the Python dependencies to look like: +# @CODE +# || ( dev-lang/python:X.Y[gdbm,ncurses(-)?] ... ) +# @CODE + +# @ECLASS-VARIABLE: PYTHON_DEPS +# @DESCRIPTION: +# This is an eclass-generated Python dependency string for all +# implementations listed in PYTHON_COMPAT. +# +# Any of the supported interpreters will satisfy the dependency. +# +# Example use: +# @CODE +# DEPEND="${RDEPEND} +# ${PYTHON_DEPS}" +# @CODE +# +# Example value: +# @CODE +# || ( dev-lang/python:2.7[gdbm] +# dev-lang/python:2.6[gdbm] ) +# @CODE + +# @ECLASS-VARIABLE: PYTHON_USEDEP +# @DESCRIPTION: +# An eclass-generated USE-dependency string for the currently tested +# implementation. It is set locally for python_check_deps() call. +# +# The generate USE-flag list is compatible with packages using python-r1, +# python-single-r1 and python-distutils-ng eclasses. It must not be used +# on packages using python.eclass. +# +# Example use: +# @CODE +# python_check_deps() { +# has_version "dev-python/foo[${PYTHON_USEDEP}]" +# } +# @CODE +# +# Example value: +# @CODE +# python_targets_python2_7(-)?,python_single_target_python2_7(+)? +# @CODE + +_python_any_set_globals() { + local usestr deps i PYTHON_PKG_DEP + [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]" + + _python_set_impls + + for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + python_export "${i}" PYTHON_PKG_DEP + + # note: need to strip '=' slot operator for || deps + deps="${PYTHON_PKG_DEP%=} ${deps}" + done + deps="|| ( ${deps})" + + if [[ ${PYTHON_DEPS+1} ]]; then + if [[ ${PYTHON_DEPS} != "${deps}" ]]; then + eerror "PYTHON_DEPS have changed between inherits (PYTHON_REQ_USE?)!" + eerror "Before: ${PYTHON_DEPS}" + eerror "Now : ${deps}" + die "PYTHON_DEPS integrity check failed" + fi + else + PYTHON_DEPS=${deps} + readonly PYTHON_DEPS + fi +} +_python_any_set_globals +unset -f _python_any_set_globals + +if [[ ! ${_PYTHON_ANY_R1} ]]; then + +# @FUNCTION: python_gen_any_dep +# @USAGE: <dependency-block> +# @DESCRIPTION: +# Generate an any-of dependency that enforces a version match between +# the Python interpreter and Python packages. <dependency-block> needs +# to list one or more dependencies with verbatim '${PYTHON_USEDEP}' +# references (quoted!) that will get expanded inside the function. +# +# This should be used along with an appropriate python_check_deps() +# that checks which of the any-of blocks were matched. +# +# Example use: +# @CODE +# DEPEND="$(python_gen_any_dep ' +# dev-python/foo[${PYTHON_USEDEP}] +# || ( dev-python/bar[${PYTHON_USEDEP}] +# dev-python/baz[${PYTHON_USEDEP}] )')" +# +# python_check_deps() { +# has_version "dev-python/foo[${PYTHON_USEDEP}]" \ +# && { has_version "dev-python/bar[${PYTHON_USEDEP}]" \ +# || has_version "dev-python/baz[${PYTHON_USEDEP}]"; } +# } +# @CODE +# +# Example value: +# @CODE +# || ( +# ( +# dev-lang/python:2.7 +# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] +# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] +# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) +# ) +# ( +# dev-lang/python:3.3 +# dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] +# || ( dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] +# dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] ) +# ) +# ) +# @CODE +python_gen_any_dep() { + debug-print-function ${FUNCNAME} "${@}" + + local depstr=${1} + [[ ${depstr} ]] || die "No dependency string provided" + + local i PYTHON_PKG_DEP out= + for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" + python_export "${i}" PYTHON_PKG_DEP + + local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} + # note: need to strip '=' slot operator for || deps + out="( ${PYTHON_PKG_DEP%=} ${i_depstr} ) ${out}" + done + echo "|| ( ${out})" +} + +# @FUNCTION: _python_EPYTHON_supported +# @USAGE: <epython> +# @INTERNAL +# @DESCRIPTION: +# Check whether the specified implementation is supported by package +# (specified in PYTHON_COMPAT). Calls python_check_deps() if declared. +_python_EPYTHON_supported() { + debug-print-function ${FUNCNAME} "${@}" + + local EPYTHON=${1} + local i=${EPYTHON/./_} + + case "${i}" in + python*|jython*|pypy*) + ;; + *) + ewarn "Invalid EPYTHON: ${EPYTHON}" + return 1 + ;; + esac + + if has "${i}" "${_PYTHON_SUPPORTED_IMPLS[@]}"; then + if python_is_installed "${i}"; then + if declare -f python_check_deps >/dev/null; then + local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" + python_check_deps + return ${?} + fi + + return 0 + fi + elif ! has "${i}" "${_PYTHON_ALL_IMPLS[@]}"; then + ewarn "Invalid EPYTHON: ${EPYTHON}" + fi + return 1 +} + +# @FUNCTION: python_setup +# @DESCRIPTION: +# Determine what the best installed (and supported) Python +# implementation is, and set the Python build environment up for it. +# +# This function will call python_check_deps() if defined. +python_setup() { + debug-print-function ${FUNCNAME} "${@}" + + # support developer override + if [[ ${PYTHON_COMPAT_OVERRIDE} ]]; then + local impls=( ${PYTHON_COMPAT_OVERRIDE} ) + [[ ${#impls[@]} -eq 1 ]] || die "PYTHON_COMPAT_OVERRIDE must name exactly one implementation for python-any-r1" + + ewarn "WARNING: PYTHON_COMPAT_OVERRIDE in effect. The following Python" + ewarn "implementation will be used:" + ewarn + ewarn " ${PYTHON_COMPAT_OVERRIDE}" + ewarn + ewarn "Dependencies won't be satisfied, and EPYTHON/eselect-python will be ignored." + + python_export "${impls[0]}" EPYTHON PYTHON + python_wrapper_setup + return + fi + + # first, try ${EPYTHON}... maybe it's good enough for us. + if [[ ${EPYTHON} ]]; then + if _python_EPYTHON_supported "${EPYTHON}"; then + python_export EPYTHON PYTHON + python_wrapper_setup + return + fi + fi + + # then, try eselect-python + local variant i + for variant in '' '--python2' '--python3'; do + i=$(eselect python --show ${variant} 2>/dev/null) + + if [[ ! ${i} ]]; then + # no eselect-python? + break + elif _python_EPYTHON_supported "${i}"; then + python_export "${i}" EPYTHON PYTHON + python_wrapper_setup + return + fi + done + + # fallback to best installed impl. + # (reverse iteration over _PYTHON_SUPPORTED_IMPLS) + for (( i = ${#_PYTHON_SUPPORTED_IMPLS[@]} - 1; i >= 0; i-- )); do + python_export "${_PYTHON_SUPPORTED_IMPLS[i]}" EPYTHON PYTHON + if _python_EPYTHON_supported "${EPYTHON}"; then + python_wrapper_setup + return + fi + done + + eerror "No Python implementation found for the build. This is usually" + eerror "a bug in the ebuild. Please report it to bugs.gentoo.org" + eerror "along with the build log." + echo + die "No supported Python implementation installed." +} + +# @FUNCTION: python-any-r1_pkg_setup +# @DESCRIPTION: +# Runs python_setup during from-source installs. +# +# In a binary package installs is a no-op. If you need Python in pkg_* +# phases of a binary package, call python_setup directly. +python-any-r1_pkg_setup() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${MERGE_TYPE} != binary ]] && python_setup +} + +_PYTHON_ANY_R1=1 +fi diff -uNr a/eclass/python-r1.eclass b/eclass/python-r1.eclass --- a/eclass/python-r1.eclass false +++ b/eclass/python-r1.eclass 6cbaee6d116a543d68153f4c3476ebe79738da6375cb1ea65015244246d20ca46c14a45bb5c2f1a33535231854b2bc021f872617716f81cbcd53e6d547b7d914 @@ -0,0 +1,833 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: python-r1.eclass +# @MAINTAINER: +# Python team <python@gentoo.org> +# @AUTHOR: +# Author: Michał Górny <mgorny@gentoo.org> +# Based on work of: Krzysztof Pawlik <nelchael@gentoo.org> +# @BLURB: A common, simple eclass for Python packages. +# @DESCRIPTION: +# A common eclass providing helper functions to build and install +# packages supporting being installed for multiple Python +# implementations. +# +# This eclass sets correct IUSE. Modification of REQUIRED_USE has to +# be done by the author of the ebuild (but PYTHON_REQUIRED_USE is +# provided for convenience, see below). python-r1 exports PYTHON_DEPS +# and PYTHON_USEDEP so you can create correct dependencies for your +# package easily. It also provides methods to easily run a command for +# each enabled Python implementation and duplicate the sources for them. +# +# Please note that python-r1 will always inherit python-utils-r1 as +# well. Thus, all the functions defined there can be used +# in the packages using python-r1, and there is no need ever to inherit +# both. +# +# For more information, please see the wiki: +# https://wiki.gentoo.org/wiki/Project:Python/python-r1 + +case "${EAPI:-0}" in + 0|1|2|3|4) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 5|6|7) + # EAPI=5 is required for sane USE_EXPAND dependencies + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +if [[ ! ${_PYTHON_R1} ]]; then + +if [[ ${_PYTHON_SINGLE_R1} ]]; then + die 'python-r1.eclass can not be used with python-single-r1.eclass.' +elif [[ ${_PYTHON_ANY_R1} ]]; then + die 'python-r1.eclass can not be used with python-any-r1.eclass.' +fi + +[[ ${EAPI} == [45] ]] && inherit eutils +inherit multibuild python-utils-r1 + +fi + +# @ECLASS-VARIABLE: PYTHON_COMPAT +# @REQUIRED +# @DESCRIPTION: +# This variable contains a list of Python implementations the package +# supports. It must be set before the `inherit' call. It has to be +# an array. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +# @CODE +# +# Please note that you can also use bash brace expansion if you like: +# @CODE +# PYTHON_COMPAT=( python2_7 python3_{3,4} ) +# @CODE + +# @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE +# @INTERNAL +# @DESCRIPTION: +# This variable can be used when working with ebuilds to override +# the in-ebuild PYTHON_COMPAT. It is a string listing all +# the implementations which package will be built for. It need be +# specified in the calling environment, and not in ebuilds. +# +# It should be noted that in order to preserve metadata immutability, +# PYTHON_COMPAT_OVERRIDE does not affect IUSE nor dependencies. +# The state of PYTHON_TARGETS is ignored, and all the implementations +# in PYTHON_COMPAT_OVERRIDE are built. Dependencies need to be satisfied +# manually. +# +# Example: +# @CODE +# PYTHON_COMPAT_OVERRIDE='pypy python3_3' emerge -1v dev-python/foo +# @CODE + +# @ECLASS-VARIABLE: PYTHON_REQ_USE +# @DEFAULT_UNSET +# @DESCRIPTION: +# The list of USEflags required to be enabled on the chosen Python +# implementations, formed as a USE-dependency string. It should be valid +# for all implementations in PYTHON_COMPAT, so it may be necessary to +# use USE defaults. +# +# This should be set before calling `inherit'. +# +# Example: +# @CODE +# PYTHON_REQ_USE="gdbm,ncurses(-)?" +# @CODE +# +# It will cause the Python dependencies to look like: +# @CODE +# python_targets_pythonX_Y? ( dev-lang/python:X.Y[gdbm,ncurses(-)?] ) +# @CODE + +# @ECLASS-VARIABLE: PYTHON_DEPS +# @DESCRIPTION: +# This is an eclass-generated Python dependency string for all +# implementations listed in PYTHON_COMPAT. +# +# Example use: +# @CODE +# RDEPEND="${PYTHON_DEPS} +# dev-foo/mydep" +# DEPEND="${RDEPEND}" +# @CODE +# +# Example value: +# @CODE +# dev-lang/python-exec:= +# python_targets_python2_7? ( dev-lang/python:2.7[gdbm] ) +# python_targets_pypy? ( virtual/pypy[gdbm] ) +# @CODE + +# @ECLASS-VARIABLE: PYTHON_USEDEP +# @DESCRIPTION: +# This is an eclass-generated USE-dependency string which can be used to +# depend on another Python package being built for the same Python +# implementations. +# +# The generate USE-flag list is compatible with packages using python-r1 +# and python-distutils-ng eclasses. It must not be used on packages +# using python.eclass. +# +# Example use: +# @CODE +# RDEPEND="dev-python/foo[${PYTHON_USEDEP}]" +# @CODE +# +# Example value: +# @CODE +# python_targets_python2_7(-)?,python_targets_python3_4(-)? +# @CODE + +# @ECLASS-VARIABLE: PYTHON_REQUIRED_USE +# @DESCRIPTION: +# This is an eclass-generated required-use expression which ensures at +# least one Python implementation has been enabled. +# +# This expression should be utilized in an ebuild by including it in +# REQUIRED_USE, optionally behind a use flag. +# +# Example use: +# @CODE +# REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +# @CODE +# +# Example value: +# @CODE +# || ( python_targets_python2_7 python_targets_python3_4 ) +# @CODE + +_python_set_globals() { + local deps i PYTHON_PKG_DEP + + _python_set_impls + + for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + python_export "${i}" PYTHON_PKG_DEP + deps+="python_targets_${i}? ( ${PYTHON_PKG_DEP} ) " + done + + local flags=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_targets_}" ) + local optflags=${flags[@]/%/(-)?} + + # A nice QA trick here. Since a python-single-r1 package has to have + # at least one PYTHON_SINGLE_TARGET enabled (REQUIRED_USE), + # the following check will always fail on those packages. Therefore, + # it should prevent developers from mistakenly depending on packages + # not supporting multiple Python implementations. + + local flags_st=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/-python_single_target_}" ) + optflags+=,${flags_st[@]/%/(-)} + local requse="|| ( ${flags[*]} )" + local usedep=${optflags// /,} + + # 1) well, python-exec would suffice as an RDEP + # but no point in making this overcomplex, BDEP doesn't hurt anyone + # 2) python-exec should be built with all targets forced anyway + # but if new targets were added, we may need to force a rebuild + if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then + die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" + else + deps+=">=dev-lang/python-exec-2:=[${usedep}]" + fi + + if [[ ${PYTHON_DEPS+1} ]]; then + # IUSE is magical, so we can't really check it + # (but we verify PYTHON_COMPAT already) + + if [[ ${PYTHON_DEPS} != "${deps}" ]]; then + eerror "PYTHON_DEPS have changed between inherits (PYTHON_REQ_USE?)!" + eerror "Before: ${PYTHON_DEPS}" + eerror "Now : ${deps}" + die "PYTHON_DEPS integrity check failed" + fi + + # these two are formality -- they depend on PYTHON_COMPAT only + if [[ ${PYTHON_REQUIRED_USE} != ${requse} ]]; then + eerror "PYTHON_REQUIRED_USE have changed between inherits!" + eerror "Before: ${PYTHON_REQUIRED_USE}" + eerror "Now : ${requse}" + die "PYTHON_REQUIRED_USE integrity check failed" + fi + + if [[ ${PYTHON_USEDEP} != "${usedep}" ]]; then + eerror "PYTHON_USEDEP have changed between inherits!" + eerror "Before: ${PYTHON_USEDEP}" + eerror "Now : ${usedep}" + die "PYTHON_USEDEP integrity check failed" + fi + else + IUSE=${flags[*]} + + PYTHON_DEPS=${deps} + PYTHON_REQUIRED_USE=${requse} + PYTHON_USEDEP=${usedep} + readonly PYTHON_DEPS PYTHON_REQUIRED_USE + fi +} +_python_set_globals +unset -f _python_set_globals + +if [[ ! ${_PYTHON_R1} ]]; then + +# @FUNCTION: _python_validate_useflags +# @INTERNAL +# @DESCRIPTION: +# Enforce the proper setting of PYTHON_TARGETS, if PYTHON_COMPAT_OVERRIDE +# is not in effect. If it is, just warn that the flags will be ignored. +_python_validate_useflags() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ ${PYTHON_COMPAT_OVERRIDE} ]]; then + if [[ ! ${_PYTHON_COMPAT_OVERRIDE_WARNED} ]]; then + ewarn "WARNING: PYTHON_COMPAT_OVERRIDE in effect. The following Python" + ewarn "implementations will be enabled:" + ewarn + ewarn " ${PYTHON_COMPAT_OVERRIDE}" + ewarn + ewarn "Dependencies won't be satisfied, and PYTHON_TARGETS will be ignored." + _PYTHON_COMPAT_OVERRIDE_WARNED=1 + fi + # we do not use flags with PCO + return + fi + + local i + + for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + use "python_targets_${i}" && return 0 + done + + eerror "No Python implementation selected for the build. Please add one" + eerror "of the following values to your PYTHON_TARGETS (in make.conf):" + eerror + eerror "${PYTHON_COMPAT[@]}" + echo + die "No supported Python implementation in PYTHON_TARGETS." +} + +# @FUNCTION: python_gen_usedep +# @USAGE: <pattern> [...] +# @DESCRIPTION: +# Output a USE dependency string for Python implementations which +# are both in PYTHON_COMPAT and match any of the patterns passed +# as parameters to the function. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# When all implementations are requested, please use ${PYTHON_USEDEP} +# instead. Please also remember to set an appropriate REQUIRED_USE +# to avoid ineffective USE flags. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python{2_7,3_4} ) +# DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )" +# @CODE +# +# It will cause the dependency to look like: +# @CODE +# DEPEND="doc? ( dev-python/epydoc[python_targets_python2_7?] )" +# @CODE +python_gen_usedep() { + debug-print-function ${FUNCNAME} "${@}" + + local impl matches=() + + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if _python_impl_matches "${impl}" "${@}"; then + matches+=( + "python_targets_${impl}(-)?" + "-python_single_target_${impl}(-)" + ) + fi + done + + [[ ${matches[@]} ]] || die "No supported implementations match python_gen_usedep patterns: ${@}" + + local out=${matches[@]} + echo "${out// /,}" +} + +# @FUNCTION: python_gen_useflags +# @USAGE: <pattern> [...] +# @DESCRIPTION: +# Output a list of USE flags for Python implementations which +# are both in PYTHON_COMPAT and match any of the patterns passed +# as parameters to the function. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python{2_7,3_4} ) +# REQUIRED_USE="doc? ( || ( $(python_gen_useflags python2*) ) )" +# @CODE +# +# It will cause the variable to look like: +# @CODE +# REQUIRED_USE="doc? ( || ( python_targets_python2_7 ) )" +# @CODE +python_gen_useflags() { + debug-print-function ${FUNCNAME} "${@}" + + local impl matches=() + + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if _python_impl_matches "${impl}" "${@}"; then + matches+=( "python_targets_${impl}" ) + fi + done + + echo "${matches[@]}" +} + +# @FUNCTION: python_gen_cond_dep +# @USAGE: <dependency> <pattern> [...] +# @DESCRIPTION: +# Output a list of <dependency>-ies made conditional to USE flags +# of Python implementations which are both in PYTHON_COMPAT and match +# any of the patterns passed as the remaining parameters. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# In order to enforce USE constraints on the packages, verbatim +# '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency +# specification. It will get expanded within the function into a proper +# USE dependency string. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy ) +# RDEPEND="$(python_gen_cond_dep \ +# 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy )" +# @CODE +# +# It will cause the variable to look like: +# @CODE +# RDEPEND="python_targets_python2_7? ( +# dev-python/unittest2[python_targets_python2_7?] ) +# python_targets_pypy? ( +# dev-python/unittest2[python_targets_pypy?] )" +# @CODE +python_gen_cond_dep() { + debug-print-function ${FUNCNAME} "${@}" + + local impl matches=() + local dep=${1} + shift + + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if _python_impl_matches "${impl}" "${@}"; then + # substitute ${PYTHON_USEDEP} if used + # (since python_gen_usedep() will not return ${PYTHON_USEDEP} + # the code is run at most once) + if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then + local usedep=$(python_gen_usedep "${@}") + dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}} + fi + + matches+=( "python_targets_${impl}? ( ${dep} )" ) + fi + done + + echo "${matches[@]}" +} + +# @FUNCTION: python_gen_impl_dep +# @USAGE: [<requested-use-flags> [<impl-pattern>...]] +# @DESCRIPTION: +# Output a dependency on Python implementations with the specified USE +# dependency string appended, or no USE dependency string if called +# without the argument (or with empty argument). If any implementation +# patterns are passed, the output dependencies will be generated only +# for the implementations matching them. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# Use this function when you need to request different USE flags +# on the Python interpreter depending on package's USE flags. If you +# only need a single set of interpreter USE flags, just set +# PYTHON_REQ_USE and use ${PYTHON_DEPS} globally. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy ) +# RDEPEND="foo? ( $(python_gen_impl_dep 'xml(+)') )" +# @CODE +# +# It will cause the variable to look like: +# @CODE +# RDEPEND="foo? ( +# python_targets_python2_7? ( +# dev-lang/python:2.7[xml(+)] ) +# python_targets_pypy? ( +# dev-python/pypy[xml(+)] ) )" +# @CODE +python_gen_impl_dep() { + debug-print-function ${FUNCNAME} "${@}" + + local impl matches=() + local PYTHON_REQ_USE=${1} + shift + + local patterns=( "${@-*}" ) + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if _python_impl_matches "${impl}" "${patterns[@]}"; then + local PYTHON_PKG_DEP + python_export "${impl}" PYTHON_PKG_DEP + matches+=( "python_targets_${impl}? ( ${PYTHON_PKG_DEP} )" ) + fi + done + + echo "${matches[@]}" +} + +# @FUNCTION: python_gen_any_dep +# @USAGE: <dependency-block> [<impl-pattern>...] +# @DESCRIPTION: +# Generate an any-of dependency that enforces a version match between +# the Python interpreter and Python packages. <dependency-block> needs +# to list one or more dependencies with verbatim '${PYTHON_USEDEP}' +# references (quoted!) that will get expanded inside the function. +# Optionally, patterns may be specified to restrict the dependency +# to a subset of Python implementations supported by the ebuild. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# This should be used along with an appropriate python_check_deps() +# that checks which of the any-of blocks were matched, and python_setup +# call that enables use of the matched implementation. +# +# Example use: +# @CODE +# DEPEND="$(python_gen_any_dep ' +# dev-python/foo[${PYTHON_USEDEP}] +# || ( dev-python/bar[${PYTHON_USEDEP}] +# dev-python/baz[${PYTHON_USEDEP}] )' -2)" +# +# python_check_deps() { +# has_version "dev-python/foo[${PYTHON_USEDEP}]" \ +# && { has_version "dev-python/bar[${PYTHON_USEDEP}]" \ +# || has_version "dev-python/baz[${PYTHON_USEDEP}]"; } +# } +# +# src_compile() { +# python_foreach_impl usual_code +# +# # some common post-build task that requires Python 2 +# python_setup -2 +# emake frobnicate +# } +# @CODE +# +# Example value: +# @CODE +# || ( +# ( +# dev-lang/python:2.7 +# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] +# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] +# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) +# ) +# ( +# dev-lang/python:3.3 +# dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] +# || ( dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] +# dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] ) +# ) +# ) +# @CODE +python_gen_any_dep() { + debug-print-function ${FUNCNAME} "${@}" + + local depstr=${1} + [[ ${depstr} ]] || die "No dependency string provided" + shift + + local i PYTHON_PKG_DEP out= + for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if _python_impl_matches "${i}" "${@-*}"; then + local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" + python_export "${i}" PYTHON_PKG_DEP + + local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} + # note: need to strip '=' slot operator for || deps + out="( ${PYTHON_PKG_DEP%=} ${i_depstr} ) ${out}" + fi + done + echo "|| ( ${out})" +} + +# @ECLASS-VARIABLE: BUILD_DIR +# @DESCRIPTION: +# The current build directory. In global scope, it is supposed to +# contain an initial build directory; if unset, it defaults to ${S}. +# +# In functions run by python_foreach_impl(), the BUILD_DIR is locally +# set to an implementation-specific build directory. That path is +# created through appending a hyphen and the implementation name +# to the final component of the initial BUILD_DIR. +# +# Example value: +# @CODE +# ${WORKDIR}/foo-1.3-python2_7 +# @CODE + +# @FUNCTION: python_copy_sources +# @DESCRIPTION: +# Create a single copy of the package sources for each enabled Python +# implementation. +# +# The sources are always copied from initial BUILD_DIR (or S if unset) +# to implementation-specific build directory matching BUILD_DIR used by +# python_foreach_abi(). +python_copy_sources() { + debug-print-function ${FUNCNAME} "${@}" + + local MULTIBUILD_VARIANTS + _python_obtain_impls + + multibuild_copy_sources +} + +# @FUNCTION: _python_obtain_impls +# @INTERNAL +# @DESCRIPTION: +# Set up the enabled implementation list. +_python_obtain_impls() { + _python_validate_useflags + + if [[ ${PYTHON_COMPAT_OVERRIDE} ]]; then + MULTIBUILD_VARIANTS=( ${PYTHON_COMPAT_OVERRIDE} ) + return + fi + + MULTIBUILD_VARIANTS=() + + local impl + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + has "${impl}" "${PYTHON_COMPAT[@]}" && \ + use "python_targets_${impl}" && MULTIBUILD_VARIANTS+=( "${impl}" ) + done +} + +# @FUNCTION: _python_multibuild_wrapper +# @USAGE: <command> [<args>...] +# @INTERNAL +# @DESCRIPTION: +# Initialize the environment for Python implementation selected +# for multibuild. +_python_multibuild_wrapper() { + debug-print-function ${FUNCNAME} "${@}" + + local -x EPYTHON PYTHON + local -x PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH} + python_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON + python_wrapper_setup + + "${@}" +} + +# @FUNCTION: python_foreach_impl +# @USAGE: <command> [<args>...] +# @DESCRIPTION: +# Run the given command for each of the enabled Python implementations. +# If additional parameters are passed, they will be passed through +# to the command. +# +# The function will return 0 status if all invocations succeed. +# Otherwise, the return code from first failing invocation will +# be returned. +# +# For each command being run, EPYTHON, PYTHON and BUILD_DIR are set +# locally, and the former two are exported to the command environment. +python_foreach_impl() { + debug-print-function ${FUNCNAME} "${@}" + + local MULTIBUILD_VARIANTS + _python_obtain_impls + + multibuild_foreach_variant _python_multibuild_wrapper "${@}" +} + +# @FUNCTION: python_setup +# @USAGE: [<impl-pattern>...] +# @DESCRIPTION: +# Find the best (most preferred) Python implementation that is suitable +# for running common Python code. Set the Python build environment up +# for that implementation. This function has two modes of operation: +# pure and any-of dep. +# +# The pure mode is used if python_check_deps() function is not declared. +# In this case, an implementation is considered suitable if it is +# supported (in PYTHON_COMPAT), enabled (via USE flags) and matches +# at least one of the patterns passed (or '*' if no patterns passed). +# +# Implementation restrictions in the pure mode need to be accompanied +# by appropriate REQUIRED_USE constraints. Otherwise, the eclass may +# fail at build time due to unsatisfied dependencies. +# +# The any-of dep mode is used if python_check_deps() is declared. +# In this mode, an implementation is considered suitable if it is +# supported, matches at least one of the patterns and python_check_deps() +# has successful return code. USE flags are not considered. +# +# The python_check_deps() function in the any-of mode needs to be +# accompanied by appropriate any-of dependencies. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# This function needs to be used when Python is being called outside +# of python_foreach_impl calls (e.g. for shared processes like doc +# building). python_foreach_impl sets up the build environment itself. +# +# Pure mode example: +# @CODE +# DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )" +# REQUIRED_USE="doc? ( $(python_gen_useflags 'python2*') )" +# +# src_compile() { +# #... +# if use doc; then +# python_setup 'python2*' +# make doc +# fi +# } +# @CODE +# +# Any-of mode example: +# @CODE +# DEPEND="doc? ( +# $(python_gen_any_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' 'python2*') )" +# +# python_check_deps() { +# has_version "dev-python/epydoc[${PYTHON_USEDEP}]" +# } +# +# src_compile() { +# #... +# if use doc; then +# python_setup 'python2*' +# make doc +# fi +# } +# @CODE +python_setup() { + debug-print-function ${FUNCNAME} "${@}" + + _python_validate_useflags + local pycompat=( "${PYTHON_COMPAT[@]}" ) + if [[ ${PYTHON_COMPAT_OVERRIDE} ]]; then + pycompat=( ${PYTHON_COMPAT_OVERRIDE} ) + fi + + local has_check_deps + declare -f python_check_deps >/dev/null && has_check_deps=1 + + # (reverse iteration -- newest impl first) + local found + for (( i = ${#_PYTHON_SUPPORTED_IMPLS[@]} - 1; i >= 0; i-- )); do + local impl=${_PYTHON_SUPPORTED_IMPLS[i]} + + # check PYTHON_COMPAT[_OVERRIDE] + has "${impl}" "${pycompat[@]}" || continue + + # match USE flags only if override is not in effect + # and python_check_deps() is not defined + if [[ ! ${PYTHON_COMPAT_OVERRIDE} && ! ${has_check_deps} ]]; then + use "python_targets_${impl}" || continue + fi + + # check patterns + _python_impl_matches "${impl}" "${@-*}" || continue + + python_export "${impl}" EPYTHON PYTHON + + # if python_check_deps() is declared, switch into any-of mode + if [[ ${has_check_deps} ]]; then + # first check if the interpreter is installed + python_is_installed "${impl}" || continue + # then run python_check_deps + local PYTHON_USEDEP="python_targets_${impl}(-),python_single_target_${impl}(+)" + python_check_deps || continue + fi + + found=1 + break + done + + if [[ ! ${found} ]]; then + eerror "${FUNCNAME}: none of the enabled implementation matched the patterns." + eerror " patterns: ${@-'(*)'}" + eerror "Likely a REQUIRED_USE constraint (possibly USE-conditional) is missing." + eerror " suggested: || ( \$(python_gen_useflags ${@}) )" + eerror "(remember to quote all the patterns with '')" + die "${FUNCNAME}: no enabled implementation satisfy requirements" + fi + + python_wrapper_setup +} + +# @FUNCTION: python_export_best +# @USAGE: [<variable>...] +# @DESCRIPTION: +# Find the best (most preferred) Python implementation enabled +# and export given variables for it. If no variables are provided, +# EPYTHON & PYTHON will be exported. +python_export_best() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}" + + eqawarn "python_export_best() is deprecated. Please use python_setup instead," + eqawarn "combined with python_export if necessary." + + [[ ${#} -gt 0 ]] || set -- EPYTHON PYTHON + + local best MULTIBUILD_VARIANTS + _python_obtain_impls + + _python_set_best() { + best=${MULTIBUILD_VARIANT} + } + multibuild_for_best_variant _python_set_best + unset -f _python_set_best + + debug-print "${FUNCNAME}: Best implementation is: ${best}" + python_export "${best}" "${@}" + python_wrapper_setup +} + +# @FUNCTION: python_replicate_script +# @USAGE: <path>... +# @DESCRIPTION: +# Copy the given script to variants for all enabled Python +# implementations, then replace it with a symlink to the wrapper. +# +# All specified files must start with a 'python' shebang. A file not +# having a matching shebang will be refused. +python_replicate_script() { + debug-print-function ${FUNCNAME} "${@}" + + _python_replicate_script() { + local _PYTHON_FIX_SHEBANG_QUIET=1 + + local PYTHON_SCRIPTDIR + python_export PYTHON_SCRIPTDIR + + ( + exeinto "${PYTHON_SCRIPTDIR#${EPREFIX}}" + doexe "${files[@]}" + ) + + python_fix_shebang -q \ + "${files[@]/*\//${D%/}/${PYTHON_SCRIPTDIR}/}" + } + + local files=( "${@}" ) + python_foreach_impl _python_replicate_script + unset -f _python_replicate_script + + # install the wrappers + local f + for f; do + _python_ln_rel "${ED%/}/usr/lib/python-exec/python-exec2" "${f}" || die + done +} + +_PYTHON_R1=1 +fi diff -uNr a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass --- a/eclass/python-single-r1.eclass false +++ b/eclass/python-single-r1.eclass b26f669b64746dac5766b2c423c79c55d8d01b9394535508b8db0fc16772f0dbd806da9ef0b1596fc88ad906ee36e45dbd3b90731d1917cd095b978fe307e085 @@ -0,0 +1,566 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: python-single-r1.eclass +# @MAINTAINER: +# Python team <python@gentoo.org> +# @AUTHOR: +# Author: Michał Górny <mgorny@gentoo.org> +# Based on work of: Krzysztof Pawlik <nelchael@gentoo.org> +# @BLURB: An eclass for Python packages not installed for multiple implementations. +# @DESCRIPTION: +# An extension of the python-r1 eclass suite for packages which +# don't support being installed for multiple Python implementations. +# This mostly includes tools embedding Python. +# +# This eclass extends the IUSE and REQUIRED_USE set by python-r1 +# to request the PYTHON_SINGLE_TARGET when the inheriting ebuild +# can be supported by more than one Python implementation. It also +# replaces PYTHON_USEDEP and PYTHON_DEPS with a more suitable form. +# +# Please note that packages support multiple Python implementations +# (using python-r1 eclass) can not depend on packages not supporting +# them (using this eclass). +# +# Please note that python-single-r1 will always inherit python-utils-r1 +# as well. Thus, all the functions defined there can be used +# in the packages using python-single-r1, and there is no need ever +# to inherit both. +# +# For more information, please see the wiki: +# https://wiki.gentoo.org/wiki/Project:Python/python-single-r1 + +case "${EAPI:-0}" in + 0|1|2|3|4) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 5|6|7) + # EAPI=5 is required for sane USE_EXPAND dependencies + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +if [[ ! ${_PYTHON_SINGLE_R1} ]]; then + +if [[ ${_PYTHON_R1} ]]; then + die 'python-single-r1.eclass can not be used with python-r1.eclass.' +elif [[ ${_PYTHON_ANY_R1} ]]; then + die 'python-single-r1.eclass can not be used with python-any-r1.eclass.' +fi + +inherit python-utils-r1 + +fi + +EXPORT_FUNCTIONS pkg_setup + +# @ECLASS-VARIABLE: PYTHON_COMPAT +# @REQUIRED +# @DESCRIPTION: +# This variable contains a list of Python implementations the package +# supports. It must be set before the `inherit' call. It has to be +# an array. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +# @CODE +# +# Please note that you can also use bash brace expansion if you like: +# @CODE +# PYTHON_COMPAT=( python2_7 python3_{3,4} ) +# @CODE + +# @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE +# @INTERNAL +# @DESCRIPTION: +# This variable can be used when working with ebuilds to override +# the in-ebuild PYTHON_COMPAT. It is a string naming the implementation +# which package will be built for. It needs to be specified +# in the calling environment, and not in ebuilds. +# +# It should be noted that in order to preserve metadata immutability, +# PYTHON_COMPAT_OVERRIDE does not affect IUSE nor dependencies. +# The state of PYTHON_TARGETS and PYTHON_SINGLE_TARGET is ignored, +# and the implementation in PYTHON_COMPAT_OVERRIDE is built instead. +# Dependencies need to be satisfied manually. +# +# Example: +# @CODE +# PYTHON_COMPAT_OVERRIDE='pypy' emerge -1v dev-python/bar +# @CODE + +# @ECLASS-VARIABLE: PYTHON_REQ_USE +# @DEFAULT_UNSET +# @DESCRIPTION: +# The list of USEflags required to be enabled on the chosen Python +# implementations, formed as a USE-dependency string. It should be valid +# for all implementations in PYTHON_COMPAT, so it may be necessary to +# use USE defaults. +# +# This should be set before calling `inherit'. +# +# Example: +# @CODE +# PYTHON_REQ_USE="gdbm,ncurses(-)?" +# @CODE +# +# It will cause the Python dependencies to look like: +# @CODE +# python_single_target_pythonX_Y? ( dev-lang/python:X.Y[gdbm,ncurses(-)?] ) +# @CODE + +# @ECLASS-VARIABLE: PYTHON_DEPS +# @DESCRIPTION: +# This is an eclass-generated Python dependency string for all +# implementations listed in PYTHON_COMPAT. +# +# The dependency string is conditional on PYTHON_SINGLE_TARGET. +# +# Example use: +# @CODE +# RDEPEND="${PYTHON_DEPS} +# dev-foo/mydep" +# DEPEND="${RDEPEND}" +# @CODE +# +# Example value: +# @CODE +# dev-lang/python-exec:= +# python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] ) +# python_single_target_pypy? ( virtual/pypy[gdbm] ) +# @CODE + +# @ECLASS-VARIABLE: PYTHON_USEDEP +# @DESCRIPTION: +# This is an eclass-generated USE-dependency string which can be used to +# depend on another Python package being built for the same Python +# implementations. +# +# The generate USE-flag list is compatible with packages using python-r1, +# python-single-r1 and python-distutils-ng eclasses. It must not be used +# on packages using python.eclass. +# +# Example use: +# @CODE +# RDEPEND="dev-python/foo[${PYTHON_USEDEP}]" +# @CODE +# +# Example value: +# @CODE +# python_targets_python2_7(-)?,python_single_target_python3_4(+)? +# @CODE + +# @ECLASS-VARIABLE: PYTHON_REQUIRED_USE +# @DESCRIPTION: +# This is an eclass-generated required-use expression which ensures the following +# when more than one python implementation is possible: +# 1. Exactly one PYTHON_SINGLE_TARGET value has been enabled. +# 2. The selected PYTHON_SINGLE_TARGET value is enabled in PYTHON_TARGETS. +# +# This expression should be utilized in an ebuild by including it in +# REQUIRED_USE, optionally behind a use flag. +# +# Example use: +# @CODE +# REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +# @CODE +# +# Example value: +# @CODE +# python_single_target_python2_7? ( python_targets_python2_7 ) +# python_single_target_python3_3? ( python_targets_python3_3 ) +# ^^ ( python_single_target_python2_7 python_single_target_python3_3 ) +# @CODE + +_python_single_set_globals() { + _python_set_impls + + local i PYTHON_PKG_DEP + + local flags_mt=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_targets_}" ) + local flags=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_single_target_}" ) + local unflags=( "${_PYTHON_UNSUPPORTED_IMPLS[@]/#/-python_single_target_}" ) + + local optflags=${flags_mt[@]/%/(-)?},${unflags[@]/%/(-)} + + IUSE="${flags_mt[*]}" + + local deps requse usedep + if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then + # There is only one supported implementation; set IUSE and other + # variables without PYTHON_SINGLE_TARGET. + requse=${flags_mt[*]} + python_export "${_PYTHON_SUPPORTED_IMPLS[0]}" PYTHON_PKG_DEP + deps="${flags_mt[*]}? ( ${PYTHON_PKG_DEP} ) " + # Force on the python_single_target_* flag for this impl, so + # that any dependencies that inherit python-single-r1 and + # happen to have multiple implementations will still need + # to bound by the implementation used by this package. + optflags+=,${flags[0]/%/(+)} + else + # Multiple supported implementations; honor PYTHON_SINGLE_TARGET. + IUSE+=" ${flags[*]}" + requse="^^ ( ${flags[*]} )" + # Ensure deps honor the same python_single_target_* flag as is set + # on this package. + optflags+=,${flags[@]/%/(+)?} + + for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + # The chosen targets need to be in PYTHON_TARGETS as well. + # This is in order to enforce correct dependencies on packages + # supporting multiple implementations. + requse+=" python_single_target_${i}? ( python_targets_${i} )" + + python_export "${i}" PYTHON_PKG_DEP + deps+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) " + done + fi + usedep=${optflags// /,} + + # 1) well, python-exec would suffice as an RDEP + # but no point in making this overcomplex, BDEP doesn't hurt anyone + # 2) python-exec should be built with all targets forced anyway + # but if new targets were added, we may need to force a rebuild + if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then + die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" + else + deps+=">=dev-lang/python-exec-2:=[${usedep}]" + fi + + if [[ ${PYTHON_DEPS+1} ]]; then + if [[ ${PYTHON_DEPS} != "${deps}" ]]; then + eerror "PYTHON_DEPS have changed between inherits (PYTHON_REQ_USE?)!" + eerror "Before: ${PYTHON_DEPS}" + eerror "Now : ${deps}" + die "PYTHON_DEPS integrity check failed" + fi + + # these two are formality -- they depend on PYTHON_COMPAT only + if [[ ${PYTHON_REQUIRED_USE} != ${requse} ]]; then + eerror "PYTHON_REQUIRED_USE have changed between inherits!" + eerror "Before: ${PYTHON_REQUIRED_USE}" + eerror "Now : ${requse}" + die "PYTHON_REQUIRED_USE integrity check failed" + fi + + if [[ ${PYTHON_USEDEP} != "${usedep}" ]]; then + eerror "PYTHON_USEDEP have changed between inherits!" + eerror "Before: ${PYTHON_USEDEP}" + eerror "Now : ${usedep}" + die "PYTHON_USEDEP integrity check failed" + fi + else + PYTHON_DEPS=${deps} + PYTHON_REQUIRED_USE=${requse} + PYTHON_USEDEP=${usedep} + readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_USEDEP + fi +} +_python_single_set_globals +unset -f _python_single_set_globals + +if [[ ! ${_PYTHON_SINGLE_R1} ]]; then + +# @FUNCTION: python_gen_usedep +# @USAGE: <pattern> [...] +# @DESCRIPTION: +# Output a USE dependency string for Python implementations which +# are both in PYTHON_COMPAT and match any of the patterns passed +# as parameters to the function. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# When all implementations are requested, please use ${PYTHON_USEDEP} +# instead. Please also remember to set an appropriate REQUIRED_USE +# to avoid ineffective USE flags. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python{2_7,3_4} ) +# DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )" +# @CODE +# +# It will cause the dependency to look like: +# @CODE +# DEPEND="doc? ( dev-python/epydoc[python_targets_python2_7(-)?,...] )" +# @CODE +python_gen_usedep() { + debug-print-function ${FUNCNAME} "${@}" + + local impl matches=() + + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if _python_impl_matches "${impl}" "${@}"; then + matches+=( + "python_targets_${impl}(-)?" + "python_single_target_${impl}(+)?" + ) + fi + done + + [[ ${matches[@]} ]] || die "No supported implementations match python_gen_usedep patterns: ${@}" + + local out=${matches[@]} + echo "${out// /,}" +} + +# @FUNCTION: python_gen_useflags +# @USAGE: <pattern> [...] +# @DESCRIPTION: +# Output a list of USE flags for Python implementations which +# are both in PYTHON_COMPAT and match any of the patterns passed +# as parameters to the function. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python{2_7,3_4} ) +# REQUIRED_USE="doc? ( ^^ ( $(python_gen_useflags 'python2*') ) )" +# @CODE +# +# It will cause the variable to look like: +# @CODE +# REQUIRED_USE="doc? ( ^^ ( python_single_target_python2_7 ) )" +# @CODE +python_gen_useflags() { + debug-print-function ${FUNCNAME} "${@}" + + local flag_prefix impl matches=() + + if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then + flag_prefix=python_targets + else + flag_prefix=python_single_target + fi + + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if _python_impl_matches "${impl}" "${@}"; then + matches+=( "${flag_prefix}_${impl}" ) + fi + done + + echo "${matches[@]}" +} + +# @FUNCTION: python_gen_cond_dep +# @USAGE: <dependency> <pattern> [...] +# @DESCRIPTION: +# Output a list of <dependency>-ies made conditional to USE flags +# of Python implementations which are both in PYTHON_COMPAT and match +# any of the patterns passed as the remaining parameters. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# In order to enforce USE constraints on the packages, verbatim +# '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency +# specification. It will get expanded within the function into a proper +# USE dependency string. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy ) +# RDEPEND="$(python_gen_cond_dep \ +# 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy )" +# @CODE +# +# It will cause the variable to look like: +# @CODE +# RDEPEND="python_single_target_python2_7? ( +# dev-python/unittest2[python_targets_python2_7(-)?,...] ) +# python_single_target_pypy? ( +# dev-python/unittest2[python_targets_pypy(-)?,...] )" +# @CODE +python_gen_cond_dep() { + debug-print-function ${FUNCNAME} "${@}" + + local flag_prefix impl matches=() + + if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then + flag_prefix=python_targets + else + flag_prefix=python_single_target + fi + + local dep=${1} + shift + + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if _python_impl_matches "${impl}" "${@}"; then + # substitute ${PYTHON_USEDEP} if used + # (since python_gen_usedep() will not return ${PYTHON_USEDEP} + # the code is run at most once) + if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then + local usedep=$(python_gen_usedep "${@}") + dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}} + fi + + matches+=( "${flag_prefix}_${impl}? ( ${dep} )" ) + fi + done + + echo "${matches[@]}" +} + +# @FUNCTION: python_gen_impl_dep +# @USAGE: [<requested-use-flags> [<impl-pattern>...]] +# @DESCRIPTION: +# Output a dependency on Python implementations with the specified USE +# dependency string appended, or no USE dependency string if called +# without the argument (or with empty argument). If any implementation +# patterns are passed, the output dependencies will be generated only +# for the implementations matching them. +# +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# +# Use this function when you need to request different USE flags +# on the Python interpreter depending on package's USE flags. If you +# only need a single set of interpreter USE flags, just set +# PYTHON_REQ_USE and use ${PYTHON_DEPS} globally. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy ) +# RDEPEND="foo? ( $(python_gen_impl_dep 'xml(+)') )" +# @CODE +# +# It will cause the variable to look like: +# @CODE +# RDEPEND="foo? ( +# python_single_target_python2_7? ( +# dev-lang/python:2.7[xml(+)] ) +# python_single_target_pypy? ( +# dev-python/pypy[xml(+)] ) )" +# @CODE +python_gen_impl_dep() { + debug-print-function ${FUNCNAME} "${@}" + + local impl pattern + local matches=() + + if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then + flag_prefix=python_targets + else + flag_prefix=python_single_target + fi + + local PYTHON_REQ_USE=${1} + shift + + local patterns=( "${@-*}" ) + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if _python_impl_matches "${impl}" "${patterns[@]}"; then + local PYTHON_PKG_DEP + python_export "${impl}" PYTHON_PKG_DEP + matches+=( "${flag_prefix}_${impl}? ( ${PYTHON_PKG_DEP} )" ) + fi + done + + echo "${matches[@]}" +} + +# @FUNCTION: python_setup +# @DESCRIPTION: +# Determine what the selected Python implementation is and set +# the Python build environment up for it. +python_setup() { + debug-print-function ${FUNCNAME} "${@}" + + unset EPYTHON + + # support developer override + if [[ ${PYTHON_COMPAT_OVERRIDE} ]]; then + local impls=( ${PYTHON_COMPAT_OVERRIDE} ) + [[ ${#impls[@]} -eq 1 ]] || die "PYTHON_COMPAT_OVERRIDE must name exactly one implementation for python-single-r1" + + ewarn "WARNING: PYTHON_COMPAT_OVERRIDE in effect. The following Python" + ewarn "implementation will be used:" + ewarn + ewarn " ${PYTHON_COMPAT_OVERRIDE}" + ewarn + ewarn "Dependencies won't be satisfied, and PYTHON_SINGLE_TARGET flags will be ignored." + + python_export "${impls[0]}" EPYTHON PYTHON + python_wrapper_setup + return + fi + + if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then + if use "python_targets_${_PYTHON_SUPPORTED_IMPLS[0]}"; then + # Only one supported implementation, enable it explicitly + python_export "${_PYTHON_SUPPORTED_IMPLS[0]}" EPYTHON PYTHON + python_wrapper_setup + fi + else + local impl + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if use "python_single_target_${impl}"; then + if [[ ${EPYTHON} ]]; then + eerror "Your PYTHON_SINGLE_TARGET setting lists more than a single Python" + eerror "implementation. Please set it to just one value. If you need" + eerror "to override the value for a single package, please use package.env" + eerror "or an equivalent solution (man 5 portage)." + echo + die "More than one implementation in PYTHON_SINGLE_TARGET." + fi + + if ! use "python_targets_${impl}"; then + eerror "The implementation chosen as PYTHON_SINGLE_TARGET must be added" + eerror "to PYTHON_TARGETS as well. This is in order to ensure that" + eerror "dependencies are satisfied correctly. We're sorry" + eerror "for the inconvenience." + echo + die "Build target (${impl}) not in PYTHON_TARGETS." + fi + + python_export "${impl}" EPYTHON PYTHON + python_wrapper_setup + fi + done + fi + + if [[ ! ${EPYTHON} ]]; then + eerror "No Python implementation selected for the build. Please set" + if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then + eerror "the PYTHON_TARGETS variable in your make.conf to include one" + else + eerror "the PYTHON_SINGLE_TARGET variable in your make.conf to one" + fi + eerror "of the following values:" + eerror + eerror "${_PYTHON_SUPPORTED_IMPLS[@]}" + echo + die "No supported Python implementation in PYTHON_SINGLE_TARGET/PYTHON_TARGETS." + fi +} + +# @FUNCTION: python-single-r1_pkg_setup +# @DESCRIPTION: +# Runs python_setup. +python-single-r1_pkg_setup() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${MERGE_TYPE} != binary ]] && python_setup +} + +_PYTHON_SINGLE_R1=1 +fi diff -uNr a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass --- a/eclass/python-utils-r1.eclass false +++ b/eclass/python-utils-r1.eclass b081d875ad8534ab66a4070388e789a023ec3dd72986d2542c7ed2f6ccf5828a789587204ea1fa95a13d168ea1a3556b403e47911847725059cf8fc25925339a @@ -0,0 +1,1512 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: python-utils-r1.eclass +# @MAINTAINER: +# Python team <python@gentoo.org> +# @AUTHOR: +# Author: Michał Górny <mgorny@gentoo.org> +# Based on work of: Krzysztof Pawlik <nelchael@gentoo.org> +# @BLURB: Utility functions for packages with Python parts. +# @DESCRIPTION: +# A utility eclass providing functions to query Python implementations, +# install Python modules and scripts. +# +# This eclass does not set any metadata variables nor export any phase +# functions. It can be inherited safely. +# +# For more information, please see the wiki: +# https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1 + +case "${EAPI:-0}" in + 0|1|2|3|4|5|6|7) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +if [[ ${_PYTHON_ECLASS_INHERITED} ]]; then + die 'python-r1 suite eclasses can not be used with python.eclass.' +fi + +if [[ ! ${_PYTHON_UTILS_R1} ]]; then + +[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib +inherit toolchain-funcs + +# @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS +# @INTERNAL +# @DESCRIPTION: +# All supported Python implementations, most preferred last. +_PYTHON_ALL_IMPLS=( + jython2_7 + pypy pypy3 + python2_7 + python3_4 python3_5 python3_6 +) +readonly _PYTHON_ALL_IMPLS + +# @ECLASS-VARIABLE: PYTHON_COMPAT_NO_STRICT +# @INTERNAL +# @DESCRIPTION: +# Set to a non-empty value in order to make eclass tolerate (ignore) +# unknown implementations in PYTHON_COMPAT. +# +# This is intended to be set by the user when using ebuilds that may +# have unknown (newer) implementations in PYTHON_COMPAT. The assumption +# is that the ebuilds are intended to be used within multiple contexts +# which can involve revisions of this eclass that support a different +# set of Python implementations. + +# @FUNCTION: _python_impl_supported +# @USAGE: <impl> +# @INTERNAL +# @DESCRIPTION: +# Check whether the implementation <impl> (PYTHON_COMPAT-form) +# is still supported. +# +# Returns 0 if the implementation is valid and supported. If it is +# unsupported, returns 1 -- and the caller should ignore the entry. +# If it is invalid, dies with an appopriate error messages. +_python_impl_supported() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${#} -eq 1 ]] || die "${FUNCNAME}: takes exactly 1 argument (impl)." + + local impl=${1} + + # keep in sync with _PYTHON_ALL_IMPLS! + # (not using that list because inline patterns shall be faster) + case "${impl}" in + python2_7|python3_[456]|jython2_7) + return 0 + ;; + pypy1_[89]|pypy2_0|python2_[56]|python3_[123]) + return 1 + ;; + pypy|pypy3) + if [[ ${EAPI:-0} == [01234] ]]; then + die "PyPy is supported in EAPI 5 and newer only." + fi + ;; + *) + [[ ${PYTHON_COMPAT_NO_STRICT} ]] && return 1 + die "Invalid implementation in PYTHON_COMPAT: ${impl}" + esac +} + +# @FUNCTION: _python_set_impls +# @INTERNAL +# @DESCRIPTION: +# Check PYTHON_COMPAT for well-formedness and validity, then set +# two global variables: +# +# - _PYTHON_SUPPORTED_IMPLS containing valid implementations supported +# by the ebuild (PYTHON_COMPAT - dead implementations), +# +# - and _PYTHON_UNSUPPORTED_IMPLS containing valid implementations that +# are not supported by the ebuild. +# +# Implementations in both variables are ordered using the pre-defined +# eclass implementation ordering. +# +# This function must be called once in global scope by an eclass +# utilizing PYTHON_COMPAT. +_python_set_impls() { + local i + + if ! declare -p PYTHON_COMPAT &>/dev/null; then + die 'PYTHON_COMPAT not declared.' + fi + if [[ $(declare -p PYTHON_COMPAT) != "declare -a"* ]]; then + die 'PYTHON_COMPAT must be an array.' + fi + for i in "${PYTHON_COMPAT[@]}"; do + # trigger validity checks + _python_impl_supported "${i}" + done + + local supp=() unsupp=() + + for i in "${_PYTHON_ALL_IMPLS[@]}"; do + if has "${i}" "${PYTHON_COMPAT[@]}"; then + supp+=( "${i}" ) + else + unsupp+=( "${i}" ) + fi + done + + if [[ ! ${supp[@]} ]]; then + die "No supported implementation in PYTHON_COMPAT." + fi + + if [[ ${_PYTHON_SUPPORTED_IMPLS[@]} ]]; then + # set once already, verify integrity + if [[ ${_PYTHON_SUPPORTED_IMPLS[@]} != ${supp[@]} ]]; then + eerror "Supported impls (PYTHON_COMPAT) changed between inherits!" + eerror "Before: ${_PYTHON_SUPPORTED_IMPLS[*]}" + eerror "Now : ${supp[*]}" + die "_PYTHON_SUPPORTED_IMPLS integrity check failed" + fi + if [[ ${_PYTHON_UNSUPPORTED_IMPLS[@]} != ${unsupp[@]} ]]; then + eerror "Unsupported impls changed between inherits!" + eerror "Before: ${_PYTHON_UNSUPPORTED_IMPLS[*]}" + eerror "Now : ${unsupp[*]}" + die "_PYTHON_UNSUPPORTED_IMPLS integrity check failed" + fi + else + _PYTHON_SUPPORTED_IMPLS=( "${supp[@]}" ) + _PYTHON_UNSUPPORTED_IMPLS=( "${unsupp[@]}" ) + readonly _PYTHON_SUPPORTED_IMPLS _PYTHON_UNSUPPORTED_IMPLS + fi +} + +# @FUNCTION: _python_impl_matches +# @USAGE: <impl> <pattern>... +# @INTERNAL +# @DESCRIPTION: +# Check whether the specified <impl> matches at least one +# of the patterns following it. Return 0 if it does, 1 otherwise. +# +# <impl> can be in PYTHON_COMPAT or EPYTHON form. The patterns can be +# either: +# a) fnmatch-style patterns, e.g. 'python2*', 'pypy'... +# b) '-2' to indicate all Python 2 variants (= !python_is_python3) +# c) '-3' to indicate all Python 3 variants (= python_is_python3) +_python_impl_matches() { + [[ ${#} -ge 2 ]] || die "${FUNCNAME}: takes at least 2 parameters" + + local impl=${1} pattern + shift + + for pattern; do + if [[ ${pattern} == -2 ]]; then + ! python_is_python3 "${impl}" + return + elif [[ ${pattern} == -3 ]]; then + python_is_python3 "${impl}" + return + # unify value style to allow lax matching + elif [[ ${impl/./_} == ${pattern/./_} ]]; then + return 0 + fi + done + + return 1 +} + +# @ECLASS-VARIABLE: PYTHON +# @DEFAULT_UNSET +# @DESCRIPTION: +# The absolute path to the current Python interpreter. +# +# This variable is set automatically in the following contexts: +# +# python-r1: Set in functions called by python_foreach_impl() or after +# calling python_export_best(). +# +# python-single-r1: Set after calling python-single-r1_pkg_setup(). +# +# distutils-r1: Set within any of the python sub-phase functions. +# +# Example value: +# @CODE +# /usr/bin/python2.7 +# @CODE + +# @ECLASS-VARIABLE: EPYTHON +# @DEFAULT_UNSET +# @DESCRIPTION: +# The executable name of the current Python interpreter. +# +# This variable is set automatically in the following contexts: +# +# python-r1: Set in functions called by python_foreach_impl() or after +# calling python_export_best(). +# +# python-single-r1: Set after calling python-single-r1_pkg_setup(). +# +# distutils-r1: Set within any of the python sub-phase functions. +# +# Example value: +# @CODE +# python2.7 +# @CODE + +# @ECLASS-VARIABLE: PYTHON_SITEDIR +# @DEFAULT_UNSET +# @DESCRIPTION: +# The path to Python site-packages directory. +# +# Set and exported on request using python_export(). +# Requires a proper build-time dependency on the Python implementation. +# +# Example value: +# @CODE +# /usr/lib64/python2.7/site-packages +# @CODE + +# @ECLASS-VARIABLE: PYTHON_INCLUDEDIR +# @DEFAULT_UNSET +# @DESCRIPTION: +# The path to Python include directory. +# +# Set and exported on request using python_export(). +# Requires a proper build-time dependency on the Python implementation. +# +# Example value: +# @CODE +# /usr/include/python2.7 +# @CODE + +# @ECLASS-VARIABLE: PYTHON_LIBPATH +# @DEFAULT_UNSET +# @DESCRIPTION: +# The path to Python library. +# +# Set and exported on request using python_export(). +# Valid only for CPython. Requires a proper build-time dependency +# on the Python implementation. +# +# Example value: +# @CODE +# /usr/lib64/libpython2.7.so +# @CODE + +# @ECLASS-VARIABLE: PYTHON_CFLAGS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Proper C compiler flags for building against Python. Obtained from +# pkg-config or python-config. +# +# Set and exported on request using python_export(). +# Valid only for CPython. Requires a proper build-time dependency +# on the Python implementation and on pkg-config. +# +# Example value: +# @CODE +# -I/usr/include/python2.7 +# @CODE + +# @ECLASS-VARIABLE: PYTHON_LIBS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Proper C compiler flags for linking against Python. Obtained from +# pkg-config or python-config. +# +# Set and exported on request using python_export(). +# Valid only for CPython. Requires a proper build-time dependency +# on the Python implementation and on pkg-config. +# +# Example value: +# @CODE +# -lpython2.7 +# @CODE + +# @ECLASS-VARIABLE: PYTHON_CONFIG +# @DEFAULT_UNSET +# @DESCRIPTION: +# Path to the python-config executable. +# +# Set and exported on request using python_export(). +# Valid only for CPython. Requires a proper build-time dependency +# on the Python implementation and on pkg-config. +# +# Example value: +# @CODE +# /usr/bin/python2.7-config +# @CODE + +# @ECLASS-VARIABLE: PYTHON_PKG_DEP +# @DEFAULT_UNSET +# @DESCRIPTION: +# The complete dependency on a particular Python package as a string. +# +# Set and exported on request using python_export(). +# +# Example value: +# @CODE +# dev-lang/python:2.7[xml] +# @CODE + +# @ECLASS-VARIABLE: PYTHON_SCRIPTDIR +# @DEFAULT_UNSET +# @DESCRIPTION: +# The location where Python scripts must be installed for current impl. +# +# Set and exported on request using python_export(). +# +# Example value: +# @CODE +# /usr/lib/python-exec/python2.7 +# @CODE + +# @FUNCTION: python_export +# @USAGE: [<impl>] <variables>... +# @DESCRIPTION: +# Set and export the Python implementation-relevant variables passed +# as parameters. +# +# The optional first parameter may specify the requested Python +# implementation (either as PYTHON_TARGETS value, e.g. python2_7, +# or an EPYTHON one, e.g. python2.7). If no implementation passed, +# the current one will be obtained from ${EPYTHON}. +# +# The variables which can be exported are: PYTHON, EPYTHON, +# PYTHON_SITEDIR. They are described more completely in the eclass +# variable documentation. +python_export() { + debug-print-function ${FUNCNAME} "${@}" + + local impl var + + case "${1}" in + python*|jython*) + impl=${1/_/.} + shift + ;; + pypy|pypy3) + impl=${1} + shift + ;; + *) + impl=${EPYTHON} + if [[ -z ${impl} ]]; then + die "python_export called without a python implementation and EPYTHON is unset" + fi + ;; + esac + debug-print "${FUNCNAME}: implementation: ${impl}" + + for var; do + case "${var}" in + EPYTHON) + export EPYTHON=${impl} + debug-print "${FUNCNAME}: EPYTHON = ${EPYTHON}" + ;; + PYTHON) + export PYTHON=${EPREFIX}/usr/bin/${impl} + debug-print "${FUNCNAME}: PYTHON = ${PYTHON}" + ;; + PYTHON_SITEDIR) + [[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" + # sysconfig can't be used because: + # 1) pypy doesn't give site-packages but stdlib + # 2) jython gives paths with wrong case + PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') || die + export PYTHON_SITEDIR + debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}" + ;; + PYTHON_INCLUDEDIR) + [[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" + PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') || die + export PYTHON_INCLUDEDIR + debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}" + + # Jython gives a non-existing directory + if [[ ! -d ${PYTHON_INCLUDEDIR} ]]; then + die "${impl} does not install any header files!" + fi + ;; + PYTHON_LIBPATH) + [[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" + PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")') || die + export PYTHON_LIBPATH + debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}" + + if [[ ! ${PYTHON_LIBPATH} ]]; then + die "${impl} lacks a (usable) dynamic library" + fi + ;; + PYTHON_CFLAGS) + local val + + case "${impl}" in + python*) + # python-2.7, python-3.2, etc. + val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-}) || die + ;; + *) + die "${impl}: obtaining ${var} not supported" + ;; + esac + + export PYTHON_CFLAGS=${val} + debug-print "${FUNCNAME}: PYTHON_CFLAGS = ${PYTHON_CFLAGS}" + ;; + PYTHON_LIBS) + local val + + case "${impl}" in + python*) + # python-2.7, python-3.2, etc. + val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) || die + ;; + *) + die "${impl}: obtaining ${var} not supported" + ;; + esac + + export PYTHON_LIBS=${val} + debug-print "${FUNCNAME}: PYTHON_LIBS = ${PYTHON_LIBS}" + ;; + PYTHON_CONFIG) + local flags val + + case "${impl}" in + python*) + [[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" + flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') || die + val=${PYTHON}${flags}-config + ;; + *) + die "${impl}: obtaining ${var} not supported" + ;; + esac + + export PYTHON_CONFIG=${val} + debug-print "${FUNCNAME}: PYTHON_CONFIG = ${PYTHON_CONFIG}" + ;; + PYTHON_PKG_DEP) + local d + case ${impl} in + python2.7) + PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';; + python3.3) + PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';; + python*) + PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; + pypy) + PYTHON_PKG_DEP='>=virtual/pypy-5:0=';; + pypy3) + PYTHON_PKG_DEP='>=virtual/pypy3-5:0=';; + jython2.7) + PYTHON_PKG_DEP='dev-java/jython:2.7';; + *) + die "Invalid implementation: ${impl}" + esac + + # use-dep + if [[ ${PYTHON_REQ_USE} ]]; then + PYTHON_PKG_DEP+=[${PYTHON_REQ_USE}] + fi + + export PYTHON_PKG_DEP + debug-print "${FUNCNAME}: PYTHON_PKG_DEP = ${PYTHON_PKG_DEP}" + ;; + PYTHON_SCRIPTDIR) + local dir + export PYTHON_SCRIPTDIR=${EPREFIX}/usr/lib/python-exec/${impl} + debug-print "${FUNCNAME}: PYTHON_SCRIPTDIR = ${PYTHON_SCRIPTDIR}" + ;; + *) + die "python_export: unknown variable ${var}" + esac + done +} + +# @FUNCTION: python_get_sitedir +# @USAGE: [<impl>] +# @DESCRIPTION: +# Obtain and print the 'site-packages' path for the given +# implementation. If no implementation is provided, ${EPYTHON} will +# be used. +# +# If you just need to have PYTHON_SITEDIR set (and exported), then it is +# better to use python_export() directly instead. +python_get_sitedir() { + debug-print-function ${FUNCNAME} "${@}" + + python_export "${@}" PYTHON_SITEDIR + echo "${PYTHON_SITEDIR}" +} + +# @FUNCTION: python_get_includedir +# @USAGE: [<impl>] +# @DESCRIPTION: +# Obtain and print the include path for the given implementation. If no +# implementation is provided, ${EPYTHON} will be used. +# +# If you just need to have PYTHON_INCLUDEDIR set (and exported), then it +# is better to use python_export() directly instead. +python_get_includedir() { + debug-print-function ${FUNCNAME} "${@}" + + python_export "${@}" PYTHON_INCLUDEDIR + echo "${PYTHON_INCLUDEDIR}" +} + +# @FUNCTION: python_get_library_path +# @USAGE: [<impl>] +# @DESCRIPTION: +# Obtain and print the Python library path for the given implementation. +# If no implementation is provided, ${EPYTHON} will be used. +# +# Please note that this function can be used with CPython only. Use +# in another implementation will result in a fatal failure. +python_get_library_path() { + debug-print-function ${FUNCNAME} "${@}" + + python_export "${@}" PYTHON_LIBPATH + echo "${PYTHON_LIBPATH}" +} + +# @FUNCTION: python_get_CFLAGS +# @USAGE: [<impl>] +# @DESCRIPTION: +# Obtain and print the compiler flags for building against Python, +# for the given implementation. If no implementation is provided, +# ${EPYTHON} will be used. +# +# Please note that this function can be used with CPython only. +# It requires Python and pkg-config installed, and therefore proper +# build-time dependencies need be added to the ebuild. +python_get_CFLAGS() { + debug-print-function ${FUNCNAME} "${@}" + + python_export "${@}" PYTHON_CFLAGS + echo "${PYTHON_CFLAGS}" +} + +# @FUNCTION: python_get_LIBS +# @USAGE: [<impl>] +# @DESCRIPTION: +# Obtain and print the compiler flags for linking against Python, +# for the given implementation. If no implementation is provided, +# ${EPYTHON} will be used. +# +# Please note that this function can be used with CPython only. +# It requires Python and pkg-config installed, and therefore proper +# build-time dependencies need be added to the ebuild. +python_get_LIBS() { + debug-print-function ${FUNCNAME} "${@}" + + python_export "${@}" PYTHON_LIBS + echo "${PYTHON_LIBS}" +} + +# @FUNCTION: python_get_PYTHON_CONFIG +# @USAGE: [<impl>] +# @DESCRIPTION: +# Obtain and print the PYTHON_CONFIG location for the given +# implementation. If no implementation is provided, ${EPYTHON} will be +# used. +# +# Please note that this function can be used with CPython only. +# It requires Python installed, and therefore proper build-time +# dependencies need be added to the ebuild. +python_get_PYTHON_CONFIG() { + debug-print-function ${FUNCNAME} "${@}" + + python_export "${@}" PYTHON_CONFIG + echo "${PYTHON_CONFIG}" +} + +# @FUNCTION: python_get_scriptdir +# @USAGE: [<impl>] +# @DESCRIPTION: +# Obtain and print the script install path for the given +# implementation. If no implementation is provided, ${EPYTHON} will +# be used. +python_get_scriptdir() { + debug-print-function ${FUNCNAME} "${@}" + + python_export "${@}" PYTHON_SCRIPTDIR + echo "${PYTHON_SCRIPTDIR}" +} + +# @FUNCTION: _python_ln_rel +# @USAGE: <from> <to> +# @INTERNAL +# @DESCRIPTION: +# Create a relative symlink. +_python_ln_rel() { + debug-print-function ${FUNCNAME} "${@}" + + local target=${1} + local symname=${2} + + local tgpath=${target%/*}/ + local sympath=${symname%/*}/ + local rel_target= + + while [[ ${sympath} ]]; do + local tgseg= symseg= + + while [[ ! ${tgseg} && ${tgpath} ]]; do + tgseg=${tgpath%%/*} + tgpath=${tgpath#${tgseg}/} + done + + while [[ ! ${symseg} && ${sympath} ]]; do + symseg=${sympath%%/*} + sympath=${sympath#${symseg}/} + done + + if [[ ${tgseg} != ${symseg} ]]; then + rel_target=../${rel_target}${tgseg:+${tgseg}/} + fi + done + rel_target+=${tgpath}${target##*/} + + debug-print "${FUNCNAME}: ${symname} -> ${target}" + debug-print "${FUNCNAME}: rel_target = ${rel_target}" + + ln -fs "${rel_target}" "${symname}" +} + +# @FUNCTION: python_optimize +# @USAGE: [<directory>...] +# @DESCRIPTION: +# Compile and optimize Python modules in specified directories (absolute +# paths). If no directories are provided, the default system paths +# are used (prepended with ${D}). +python_optimize() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ ${EBUILD_PHASE} == pre* || ${EBUILD_PHASE} == post* ]]; then + eerror "The new Python eclasses expect the compiled Python files to" + eerror "be controlled by the Package Manager. For this reason," + eerror "the python_optimize function can be used only during src_* phases" + eerror "(src_install most commonly) and not during pkg_* phases." + echo + die "python_optimize is not to be used in pre/post* phases" + fi + + [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' + + local PYTHON=${PYTHON} + [[ ${PYTHON} ]] || python_export PYTHON + + # default to sys.path + if [[ ${#} -eq 0 ]]; then + local f + while IFS= read -r -d '' f; do + # 1) accept only absolute paths + # (i.e. skip '', '.' or anything like that) + # 2) skip paths which do not exist + # (python2.6 complains about them verbosely) + + if [[ ${f} == /* && -d ${D%/}${f} ]]; then + set -- "${D%/}${f}" "${@}" + fi + done < <("${PYTHON}" -c 'import sys; print("\0".join(sys.path))' || die) + + debug-print "${FUNCNAME}: using sys.path: ${*/%/;}" + fi + + local d + for d; do + # make sure to get a nice path without // + local instpath=${d#${D%/}} + instpath=/${instpath##/} + + case "${EPYTHON}" in + python2.7|python3.[34]) + "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}" + "${PYTHON}" -OO -m compileall -q -f -d "${instpath}" "${d}" + ;; + python*|pypy3) + # both levels of optimization are separate since 3.5 + "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}" + "${PYTHON}" -O -m compileall -q -f -d "${instpath}" "${d}" + "${PYTHON}" -OO -m compileall -q -f -d "${instpath}" "${d}" + ;; + *) + "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}" + ;; + esac + done +} + +# @FUNCTION: python_scriptinto +# @USAGE: <new-path> +# @DESCRIPTION: +# Set the directory to which files passed to python_doexe(), +# python_doscript(), python_newexe() and python_newscript() +# are going to be installed. The new value needs to be relative +# to the installation root (${ED}). +# +# If not set explicitly, the directory defaults to /usr/bin. +# +# Example: +# @CODE +# src_install() { +# python_scriptinto /usr/sbin +# python_foreach_impl python_doscript foo +# } +# @CODE +python_scriptinto() { + debug-print-function ${FUNCNAME} "${@}" + + python_scriptroot=${1} +} + +# @FUNCTION: python_doexe +# @USAGE: <files>... +# @DESCRIPTION: +# Install the given executables into the executable install directory, +# for the current Python implementation (${EPYTHON}). +# +# The executable will be wrapped properly for the Python implementation, +# though no shebang mangling will be performed. +python_doexe() { + debug-print-function ${FUNCNAME} "${@}" + + local f + for f; do + python_newexe "${f}" "${f##*/}" + done +} + +# @FUNCTION: python_newexe +# @USAGE: <path> <new-name> +# @DESCRIPTION: +# Install the given executable into the executable install directory, +# for the current Python implementation (${EPYTHON}). +# +# The executable will be wrapped properly for the Python implementation, +# though no shebang mangling will be performed. It will be renamed +# to <new-name>. +python_newexe() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' + [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>" + if [[ ${EAPI:-0} == [0123] ]]; then + die "python_do* and python_new* helpers are banned in EAPIs older than 4." + fi + + local wrapd=${python_scriptroot:-/usr/bin} + + local f=${1} + local newfn=${2} + + local PYTHON_SCRIPTDIR d + python_export PYTHON_SCRIPTDIR + d=${PYTHON_SCRIPTDIR#${EPREFIX}} + + ( + dodir "${wrapd}" + exeinto "${d}" + newexe "${f}" "${newfn}" || return ${?} + ) + + # install the wrapper + _python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \ + "${ED%/}/${wrapd}/${newfn}" || die + + # don't use this at home, just call python_doscript() instead + if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then + python_fix_shebang -q "${ED%/}/${d}/${newfn}" + fi +} + +# @FUNCTION: python_doscript +# @USAGE: <files>... +# @DESCRIPTION: +# Install the given scripts into the executable install directory, +# for the current Python implementation (${EPYTHON}). +# +# All specified files must start with a 'python' shebang. The shebang +# will be converted, and the files will be wrapped properly +# for the Python implementation. +# +# Example: +# @CODE +# src_install() { +# python_foreach_impl python_doscript ${PN} +# } +# @CODE +python_doscript() { + debug-print-function ${FUNCNAME} "${@}" + + local _PYTHON_REWRITE_SHEBANG=1 + python_doexe "${@}" +} + +# @FUNCTION: python_newscript +# @USAGE: <path> <new-name> +# @DESCRIPTION: +# Install the given script into the executable install directory +# for the current Python implementation (${EPYTHON}), and name it +# <new-name>. +# +# The file must start with a 'python' shebang. The shebang will be +# converted, and the file will be wrapped properly for the Python +# implementation. It will be renamed to <new-name>. +# +# Example: +# @CODE +# src_install() { +# python_foreach_impl python_newscript foo.py foo +# } +# @CODE +python_newscript() { + debug-print-function ${FUNCNAME} "${@}" + + local _PYTHON_REWRITE_SHEBANG=1 + python_newexe "${@}" +} + +# @FUNCTION: python_moduleinto +# @USAGE: <new-path> +# @DESCRIPTION: +# Set the Python module install directory for python_domodule(). +# The <new-path> can either be an absolute target system path (in which +# case it needs to start with a slash, and ${ED} will be prepended to +# it) or relative to the implementation's site-packages directory +# (then it must not start with a slash). The relative path can be +# specified either using the Python package notation (separated by dots) +# or the directory notation (using slashes). +# +# When not set explicitly, the modules are installed to the top +# site-packages directory. +# +# In the relative case, the exact path is determined directly +# by each python_doscript/python_newscript function. Therefore, +# python_moduleinto can be safely called before establishing the Python +# interpreter and/or a single call can be used to set the path correctly +# for multiple implementations, as can be seen in the following example. +# +# Example: +# @CODE +# src_install() { +# python_moduleinto bar +# # installs ${PYTHON_SITEDIR}/bar/baz.py +# python_foreach_impl python_domodule baz.py +# } +# @CODE +python_moduleinto() { + debug-print-function ${FUNCNAME} "${@}" + + python_moduleroot=${1} +} + +# @FUNCTION: python_domodule +# @USAGE: <files>... +# @DESCRIPTION: +# Install the given modules (or packages) into the current Python module +# installation directory. The list can mention both modules (files) +# and packages (directories). All listed files will be installed +# for all enabled implementations, and compiled afterwards. +# +# Example: +# @CODE +# src_install() { +# # (${PN} being a directory) +# python_foreach_impl python_domodule ${PN} +# } +# @CODE +python_domodule() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' + if [[ ${EAPI:-0} == [0123] ]]; then + die "python_do* and python_new* helpers are banned in EAPIs older than 4." + fi + + local d + if [[ ${python_moduleroot} == /* ]]; then + # absolute path + d=${python_moduleroot} + else + # relative to site-packages + local PYTHON_SITEDIR=${PYTHON_SITEDIR} + [[ ${PYTHON_SITEDIR} ]] || python_export PYTHON_SITEDIR + + d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot//.//} + fi + + ( + insinto "${d}" + doins -r "${@}" || return ${?} + ) + + python_optimize "${ED%/}/${d}" +} + +# @FUNCTION: python_doheader +# @USAGE: <files>... +# @DESCRIPTION: +# Install the given headers into the implementation-specific include +# directory. This function is unconditionally recursive, i.e. you can +# pass directories instead of files. +# +# Example: +# @CODE +# src_install() { +# python_foreach_impl python_doheader foo.h bar.h +# } +# @CODE +python_doheader() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' + if [[ ${EAPI:-0} == [0123] ]]; then + die "python_do* and python_new* helpers are banned in EAPIs older than 4." + fi + + local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} + [[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR + + d=${PYTHON_INCLUDEDIR#${EPREFIX}} + + ( + insinto "${d}" + doins -r "${@}" || return ${?} + ) +} + +# @FUNCTION: python_wrapper_setup +# @USAGE: [<path> [<impl>]] +# @DESCRIPTION: +# Create proper 'python' executable and pkg-config wrappers +# (if available) in the directory named by <path>. Set up PATH +# and PKG_CONFIG_PATH appropriately. <path> defaults to ${T}/${EPYTHON}. +# +# The wrappers will be created for implementation named by <impl>, +# or for one named by ${EPYTHON} if no <impl> passed. +# +# If the named directory contains a python symlink already, it will +# be assumed to contain proper wrappers already and only environment +# setup will be done. If wrapper update is requested, the directory +# shall be removed first. +python_wrapper_setup() { + debug-print-function ${FUNCNAME} "${@}" + + local workdir=${1:-${T}/${EPYTHON}} + local impl=${2:-${EPYTHON}} + + [[ ${workdir} ]] || die "${FUNCNAME}: no workdir specified." + [[ ${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. + rm -f "${workdir}"/bin/python{,2,3}{,-config} || die + rm -f "${workdir}"/bin/2to3 || die + rm -f "${workdir}"/pkgconfig/python{,2,3}.pc || die + + local EPYTHON PYTHON + python_export "${impl}" EPYTHON PYTHON + + local pyver pyother + if python_is_python3; then + pyver=3 + pyother=2 + else + pyver=2 + pyother=3 + fi + + # Python interpreter + # note: we don't use symlinks because python likes to do some + # symlink reading magic that breaks stuff + # https://bugs.gentoo.org/show_bug.cgi?id=555752 + cat > "${workdir}/bin/python" <<-_EOF_ || die + #!/bin/sh + exec "${PYTHON}" "\${@}" + _EOF_ + cp "${workdir}/bin/python" "${workdir}/bin/python${pyver}" || die + chmod +x "${workdir}/bin/python" "${workdir}/bin/python${pyver}" || die + + local nonsupp=( "python${pyother}" "python${pyother}-config" ) + + # CPython-specific + if [[ ${EPYTHON} == python* ]]; then + cat > "${workdir}/bin/python-config" <<-_EOF_ || die + #!/bin/sh + exec "${PYTHON}-config" "\${@}" + _EOF_ + cp "${workdir}/bin/python-config" \ + "${workdir}/bin/python${pyver}-config" || die + chmod +x "${workdir}/bin/python-config" \ + "${workdir}/bin/python${pyver}-config" || die + + # Python 2.6+. + ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || die + + # Python 2.7+. + ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \ + "${workdir}"/pkgconfig/python.pc || die + ln -s python.pc "${workdir}"/pkgconfig/python${pyver}.pc || die + else + nonsupp+=( 2to3 python-config "python${pyver}-config" ) + fi + + local x + for x in "${nonsupp[@]}"; do + cat >"${workdir}"/bin/${x} <<-_EOF_ || die + #!/bin/sh + echo "${ECLASS}: ${FUNCNAME}: ${x} is not supported by ${EPYTHON} (PYTHON_COMPAT)" >&2 + exit 127 + _EOF_ + chmod +x "${workdir}"/bin/${x} || die + done + fi + + # Now, set the environment. + # But note that ${workdir} may be shared with something else, + # and thus already on top of PATH. + if [[ ${PATH##:*} != ${workdir}/bin ]]; then + PATH=${workdir}/bin${PATH:+:${PATH}} + fi + if [[ ${PKG_CONFIG_PATH##:*} != ${workdir}/pkgconfig ]]; then + PKG_CONFIG_PATH=${workdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} + fi + export PATH PKG_CONFIG_PATH +} + +# @FUNCTION: python_is_python3 +# @USAGE: [<impl>] +# @DESCRIPTION: +# Check whether <impl> (or ${EPYTHON}) is a Python3k variant +# (i.e. uses syntax and stdlib of Python 3.*). +# +# Returns 0 (true) if it is, 1 (false) otherwise. +python_is_python3() { + local impl=${1:-${EPYTHON}} + [[ ${impl} ]] || die "python_is_python3: no impl nor EPYTHON" + + [[ ${impl} == python3* || ${impl} == pypy3 ]] +} + +# @FUNCTION: python_is_installed +# @USAGE: [<impl>] +# @DESCRIPTION: +# Check whether the interpreter for <impl> (or ${EPYTHON}) is installed. +# Uses has_version with a proper dependency string. +# +# Returns 0 (true) if it is, 1 (false) otherwise. +python_is_installed() { + local impl=${1:-${EPYTHON}} + [[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON" + local hasv_args=() + + case ${EAPI:-0} in + 0|1|2|3|4) + local -x ROOT=/ + ;; + 5|6) + hasv_args+=( --host-root ) + ;; + *) + hasv_args+=( -b ) + ;; + esac + + case "${impl}" in + pypy|pypy3) + local append= + if [[ ${PYTHON_REQ_USE} ]]; then + append=[${PYTHON_REQ_USE}] + fi + + # be happy with just the interpeter, no need for the virtual + has_version "${hasv_args[@]}" "dev-python/${impl}${append}" \ + || has_version "${hasv_args[@]}" "dev-python/${impl}-bin${append}" + ;; + *) + local PYTHON_PKG_DEP + python_export "${impl}" PYTHON_PKG_DEP + has_version "${hasv_args[@]}" "${PYTHON_PKG_DEP}" + ;; + esac +} + +# @FUNCTION: python_fix_shebang +# @USAGE: [-f|--force] [-q|--quiet] <path>... +# @DESCRIPTION: +# Replace the shebang in Python scripts with the current Python +# implementation (EPYTHON). If a directory is passed, works recursively +# on all Python scripts. +# +# Only files having a 'python*' shebang will be modified. Files with +# other shebang will either be skipped when working recursively +# on a directory or treated as error when specified explicitly. +# +# Shebangs matching explicitly current Python version will be left +# unmodified. Shebangs requesting another Python version will be treated +# as fatal error, unless --force is given. +# +# --force causes the function to replace even shebangs that require +# incompatible Python version. --quiet causes the function not to list +# modified files verbosely. +python_fix_shebang() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EPYTHON} ]] || die "${FUNCNAME}: EPYTHON unset (pkg_setup not called?)" + + local force quiet + while [[ ${@} ]]; do + case "${1}" in + -f|--force) force=1; shift;; + -q|--quiet) quiet=1; shift;; + --) shift; break;; + *) break;; + esac + done + + [[ ${1} ]] || die "${FUNCNAME}: no paths given" + + local path f + for path; do + local any_correct any_fixed is_recursive + + [[ -d ${path} ]] && is_recursive=1 + + while IFS= read -r -d '' f; do + local shebang i + local error= from= + + # note: we can't ||die here since read will fail if file + # has no newline characters + IFS= read -r shebang <"${f}" + + # First, check if it's shebang at all... + if [[ ${shebang} == '#!'* ]]; then + local split_shebang=() + read -r -a split_shebang <<<${shebang} || die + + # Match left-to-right in a loop, to avoid matching random + # repetitions like 'python2.7 python2'. + for i in "${split_shebang[@]}"; do + case "${i}" in + *"${EPYTHON}") + debug-print "${FUNCNAME}: in file ${f#${D%/}}" + debug-print "${FUNCNAME}: shebang matches EPYTHON: ${shebang}" + + # Nothing to do, move along. + any_correct=1 + from=${EPYTHON} + break + ;; + *python|*python[23]) + debug-print "${FUNCNAME}: in file ${f#${D%/}}" + debug-print "${FUNCNAME}: rewriting shebang: ${shebang}" + + if [[ ${i} == *python2 ]]; then + from=python2 + if [[ ! ${force} ]]; then + python_is_python3 "${EPYTHON}" && error=1 + fi + elif [[ ${i} == *python3 ]]; then + from=python3 + if [[ ! ${force} ]]; then + python_is_python3 "${EPYTHON}" || error=1 + fi + else + from=python + fi + break + ;; + *python[23].[0123456789]|*pypy|*pypy3|*jython[23].[0123456789]) + # Explicit mismatch. + if [[ ! ${force} ]]; then + error=1 + else + case "${i}" in + *python[23].[0123456789]) + from="python[23].[0123456789]";; + *pypy) + from="pypy";; + *pypy3) + from="pypy3";; + *jython[23].[0123456789]) + from="jython[23].[0123456789]";; + *) + die "${FUNCNAME}: internal error in 2nd pattern match";; + esac + fi + break + ;; + esac + done + fi + + if [[ ! ${error} && ! ${from} ]]; then + # Non-Python shebang. Allowed in recursive mode, + # disallowed when specifying file explicitly. + [[ ${is_recursive} ]] && continue + error=1 + fi + + if [[ ! ${quiet} ]]; then + einfo "Fixing shebang in ${f#${D%/}}." + fi + + if [[ ! ${error} ]]; then + # We either want to match ${from} followed by space + # or at end-of-string. + if [[ ${shebang} == *${from}" "* ]]; then + sed -i -e "1s:${from} :${EPYTHON} :" "${f}" || die + else + sed -i -e "1s:${from}$:${EPYTHON}:" "${f}" || die + fi + any_fixed=1 + else + eerror "The file has incompatible shebang:" + eerror " file: ${f#${D%/}}" + eerror " current shebang: ${shebang}" + eerror " requested impl: ${EPYTHON}" + die "${FUNCNAME}: conversion of incompatible shebang requested" + fi + done < <(find -H "${path}" -type f -print0 || die) + + if [[ ! ${any_fixed} ]]; then + local cmd=eerror + [[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn + + "${cmd}" "QA warning: ${FUNCNAME}, ${path#${D%/}} did not match any fixable files." + if [[ ${any_correct} ]]; then + "${cmd}" "All files have ${EPYTHON} shebang already." + else + "${cmd}" "There are no Python files in specified directory." + fi + + [[ ${cmd} == eerror ]] && die "${FUNCNAME} did not match any fixable files (QA warning fatal in EAPI ${EAPI})" + fi + done +} + +# @FUNCTION: _python_check_locale_sanity +# @USAGE: <locale> +# @RETURN: 0 if sane, 1 otherwise +# @DESCRIPTION: +# Check whether the specified locale sanely maps between lowercase +# and uppercase ASCII characters. +_python_check_locale_sanity() { + local -x LC_ALL=${1} + local IFS= + + local lc=( {a..z} ) + local uc=( {A..Z} ) + local input="${lc[*]}${uc[*]}" + + local output=$(tr '[:lower:][:upper:]' '[:upper:][:lower:]' <<<"${input}") + [[ ${output} == "${uc[*]}${lc[*]}" ]] +} + +# @FUNCTION: python_export_utf8_locale +# @RETURN: 0 on success, 1 on failure. +# @DESCRIPTION: +# Attempts to export a usable UTF-8 locale in the LC_CTYPE variable. Does +# nothing if LC_ALL is defined, or if the current locale uses a UTF-8 charmap. +# This may be used to work around the quirky open() behavior of python3. +python_export_utf8_locale() { + debug-print-function ${FUNCNAME} "${@}" + + # If the locale program isn't available, just return. + type locale >/dev/null || return 0 + + if [[ $(locale charmap) != UTF-8 ]]; then + # Try English first, then everything else. + local lang locales="C.UTF-8 en_US.UTF-8 en_GB.UTF-8 $(locale -a)" + + for lang in ${locales}; do + if [[ $(LC_ALL=${lang} locale charmap 2>/dev/null) == UTF-8 ]]; then + if _python_check_locale_sanity "${lang}"; then + export LC_CTYPE=${lang} + if [[ -n ${LC_ALL} ]]; then + export LC_NUMERIC=${LC_ALL} + export LC_TIME=${LC_ALL} + export LC_COLLATE=${LC_ALL} + export LC_MONETARY=${LC_ALL} + export LC_MESSAGES=${LC_ALL} + export LC_PAPER=${LC_ALL} + export LC_NAME=${LC_ALL} + export LC_ADDRESS=${LC_ALL} + export LC_TELEPHONE=${LC_ALL} + export LC_MEASUREMENT=${LC_ALL} + export LC_IDENTIFICATION=${LC_ALL} + export LC_ALL= + fi + return 0 + fi + fi + done + + ewarn "Could not find a UTF-8 locale. This may trigger build failures in" + ewarn "some python packages. Please ensure that a UTF-8 locale is listed in" + ewarn "/etc/locale.gen and run locale-gen." + return 1 + fi + + return 0 +} + +# -- 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() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_execute_nosetests() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_execute_py.test() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_execute_trial() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_enable_pyc() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_disable_pyc() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_mod_optimize() { + die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation" +} + +python_mod_cleanup() { + die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation" +} + +# python.eclass::progress + +python_abi_depend() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_install_executables() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_get_extension_module_suffix() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_byte-compile_modules() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_clean_byte-compiled_modules() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +python_generate_cffi_modules() { + die "${FUNCNAME}() is invalid for python-r1 suite" +} + +_PYTHON_UTILS_R1=1 +fi diff -uNr a/eclass/qmail.eclass b/eclass/qmail.eclass --- a/eclass/qmail.eclass false +++ b/eclass/qmail.eclass a9e9c6842ad5355753abeb27ffabd399efdbc5fa18ef66f28c4f2099b896025003b19496cc9dc31d1ce2f9c0d1fd5876878916425ef74b334ea2e70722502c35 @@ -0,0 +1,535 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: qmail.eclass +# @MAINTAINER: +# qmail-bugs@gentoo.org +# @BLURB: common qmail functions + +inherit flag-o-matic toolchain-funcs fixheadtails user + +# hardcoded paths +QMAIL_HOME="/var/qmail" +TCPRULES_DIR="/etc/tcprules.d" +SUPERVISE_DIR="/var/qmail/supervise" + +# source files and directories +GENQMAIL_F=genqmail-${GENQMAIL_PV}.tar.bz2 +GENQMAIL_S="${WORKDIR}"/genqmail-${GENQMAIL_PV} + +QMAIL_SPP_F=qmail-spp-${QMAIL_SPP_PV}.tar.gz +QMAIL_SPP_S="${WORKDIR}"/qmail-spp-${QMAIL_SPP_PV} + +# @FUNCTION: primes +# @USAGE: <min> <max> +# @DESCRIPTION: +# Prints a list of primes between min and max inclusive +# Note: this functions gets very slow when used with large numbers. +primes() { + local min=${1} max=${2} + local result= primelist=2 i p + + [[ ${min} -le 2 ]] && result="${result} 2" + + for ((i = 3; i <= max; i += 2)) + do + for p in ${primelist} + do + [[ $[i % p] == 0 || $[p * p] -gt ${i} ]] && \ + break + done + if [[ $[i % p] != 0 ]] + then + primelist="${primelist} ${i}" + [[ ${i} -ge ${min} ]] && \ + result="${result} ${i}" + fi + done + + echo ${result} +} + +# @FUNCTION: is_prima +# @USAGE: <number> +# @DESCRIPTION: +# Checks wether a number is a prime number +is_prime() { + local number=${1} i + for i in $(primes ${number} ${number}) + do + [[ ${i} == ${number} ]] && return 0 + done + return 1 +} + +dospp() { + insinto "${QMAIL_HOME}"/plugins/ + insopts -o root -g "$GROUP_ROOT" -m 0755 + newins $1 ${2:-$(basename $1)} +} + +# @FUNCTION: dosupervise +# @USAGE: dosupervise <service> [<runfile> <logfile>] +# @DESCRIPTION: +# Install runfiles for services and logging to supervise directory +dosupervise() { + local service=$1 + local runfile=${2:-${service}} logfile=${3:-${service}-log} + [[ -z "${service}" ]] && die "no service given" + + insopts -o root -g "$GROUP_ROOT" -m 0755 + diropts -o root -g "$GROUP_ROOT" -m 0755 + + dodir ${SUPERVISE_DIR}/${service}{,/log} + fperms +t ${SUPERVISE_DIR}/${service}{,/log} + + insinto ${SUPERVISE_DIR}/${service} + newins ${runfile} run + + insinto ${SUPERVISE_DIR}/${service}/log + newins ${logfile} run +} + +# @FUNCTION: qmail_set_cc +# @DESCRIPTION: +# The following commands patch the conf-{cc,ld} files to use the user's +# specified CFLAGS and LDFLAGS. These rather complex commands are needed +# because a user supplied patch might apply changes to these files, too. +# See bug #165981. +qmail_set_cc() { + local cc=$(head -n 1 ./conf-cc | sed -e "s#^g\?cc\s\+$-O2$\?#$(tc-getCC) #") + local ld=$(head -n 1 ./conf-ld | sed -e "s#^g\?cc\s\+$-s$\?#$(tc-getCC) #") + + echo "${cc} ${CFLAGS} ${CPPFLAGS}" > ./conf-cc || die 'Patching conf-cc failed.' + echo "${ld} ${LDFLAGS}" > ./conf-ld || die 'Patching conf-ld failed.' +} + +# @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}" +} + +qmail_spp_src_unpack() { + cd "${WORKDIR}" + [[ -n ${QMAIL_SPP_PV} ]] && unpack "${QMAIL_SPP_F}" +} + +# @FUNCTION: qmail_src_postunpack +# @DESCRIPTION: +# Unpack common config files, apply custom patches if supplied and +# set built configuration (CFLAGS, LDFLAGS, etc) +qmail_src_postunpack() { + cd "${S}" + + qmail_set_cc + + mysplit=${QMAIL_CONF_SPLIT:-23} + is_prime ${mysplit} || die "QMAIL_CONF_SPLIT is not a prime number." + einfo "Using conf-split value of ${mysplit}." + echo -n ${mysplit} > "${S}"/conf-split +} + +qmail_src_compile() { + cd "${S}" + emake it man "$@" || die "make failed" +} + +qmail_spp_src_compile() { + cd "${GENQMAIL_S}"/spp/ + emake || die "make spp failed" +} + +qmail_base_install() { + einfo "Setting up basic directory hierarchy" + diropts -o root -g qmail -m 755 + keepdir "${QMAIL_HOME}"/{,bin,control} + + einfo "Installing basic qmail software" + insinto "${QMAIL_HOME}"/bin + + insopts -o root -g qmail -m 755 + doins datemail elq forward maildir2mbox maildirmake \ + maildirwatch mailsubj pinq predate qail \ + qmail-{inject,qmqpc,showctl} sendmail + + einfo "Adding env.d entry for qmail" + doenvd "${GENQMAIL_S}"/conf/99qmail + + declare -F qmail_base_install_hook >/dev/null && \ + qmail_base_install_hook +} + +qmail_full_install() { + einfo "Setting up full directory hierarchy" + keepdir "${QMAIL_HOME}"/users + diropts -o alias -g qmail -m 755 + keepdir "${QMAIL_HOME}"/alias + + einfo "Installing all qmail software" + insopts -o root -g qmail -m 755 + doins bouncesaying condredirect config-fast except preline qbiff \ + qmail-{pop3d,qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto} \ + qreceipt qsmhook tcp-env + + insopts -o root -g qmail -m 711 + doins qmail-{clean,getpw,local,popup,pw2u,remote,rspawn,send} splogger + + insopts -o root -g qmail -m 700 + doins qmail-{lspawn,newmrh,newu,start} + + insopts -o qmailq -g qmail -m 4711 + doins qmail-queue + + declare -F qmail_full_install_hook >/dev/null && \ + qmail_full_install_hook +} + +qmail_config_install() { + einfo "Installing stock configuration files" + insinto "${QMAIL_HOME}"/control + insopts -o root -g "$GROUP_ROOT" -m 644 + doins "${GENQMAIL_S}"/control/{conf-*,defaultdelivery} + + einfo "Installing configuration sanity checker and launcher" + insinto "${QMAIL_HOME}"/bin + insopts -o root -g "$GROUP_ROOT" -m 644 + doins "${GENQMAIL_S}"/control/qmail-config-system + + declare -F qmail_config_install_hook >/dev/null && \ + qmail_config_install_hook +} + +qmail_man_install() { + einfo "Installing manpages and documentation" + + # those are tagged for section 8 but named for + # section 9 (which does not exist anyway) + for i in *.9; do + mv ${i} ${i/.9/.8} + done + + into /usr + doman *.[1578] + dodoc BLURB* CHANGES FAQ INSTALL* PIC* README* REMOVE* SECURITY \ + SENDMAIL SYSDEPS TEST* THANKS* THOUGHTS TODO* \ + UPGRADE VERSION* + + declare -F qmail_man_install_hook >/dev/null && \ + qmail_man_install_hook +} + +qmail_sendmail_install() { + einfo "Installing sendmail replacement" + diropts -m 755 + dodir /usr/sbin /usr/lib + + dosym "${QMAIL_HOME}"/bin/sendmail /usr/sbin/sendmail + dosym "${QMAIL_HOME}"/bin/sendmail /usr/lib/sendmail + + declare -F qmail_sendmail_install_hook >/dev/null && \ + qmail_sendmail_install_hook +} + +qmail_maildir_install() { + # use the correct maildirmake + # the courier-imap one has some extensions that are nicer + MAILDIRMAKE="${D}${QMAIL_HOME}/bin/maildirmake" + [[ -e /usr/bin/maildirmake ]] && \ + MAILDIRMAKE="/usr/bin/maildirmake" + + einfo "Setting up the default aliases" + diropts -o alias -g qmail -m 700 + "${MAILDIRMAKE}" "${D}${QMAIL_HOME}"/alias/.maildir + keepdir "${QMAIL_HOME}"/alias/.maildir/{cur,new,tmp} + + for i in "${QMAIL_HOME}"/alias/.qmail-{mailer-daemon,postmaster,root}; do + if [[ ! -f "${ROOT}${i}" ]]; then + touch "${D}${i}" + fowners alias:qmail "${i}" + fi + done + + einfo "Setting up default maildirs in the account skeleton" + diropts -o root -g "$GROUP_ROOT" -m 755 + insinto /etc/skel + insopts -o root -g "$GROUP_ROOT" -m 644 + newins "${GENQMAIL_S}"/control/defaultdelivery .qmail.sample + "${MAILDIRMAKE}" "${D}"/etc/skel/.maildir + keepdir /etc/skel/.maildir/{cur,new,tmp} + + declare -F qmail_maildir_install_hook >/dev/null && \ + qmail_maildir_install_hook +} + +qmail_tcprules_install() { + dodir "${TCPRULES_DIR}" + insinto "${TCPRULES_DIR}" + insopts -o root -g "$GROUP_ROOT" -m 0644 + doins "${GENQMAIL_S}"/tcprules/Makefile.qmail + doins "${GENQMAIL_S}"/tcprules/tcp.qmail-* + use ssl || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd +} + +qmail_supervise_install() { + einfo "Installing supervise scripts" + + cd "${GENQMAIL_S}"/supervise + + for i in qmail-{send,smtpd,qmtpd,qmqpd,pop3d}; do + dosupervise ${i} + diropts -o qmaill -g "$GROUP_ROOT" -m 755 + keepdir /var/log/qmail/${i} + done + + if use ssl; then + dosupervise qmail-pop3sd + diropts -o qmaill -g "$GROUP_ROOT" -m 755 + keepdir /var/log/qmail/qmail-pop3sd + fi + + declare -F qmail_supervise_install_hook >/dev/null && \ + qmail_supervise_install_hook +} + +qmail_spp_install() { + einfo "Installing qmail-spp configuration files" + insinto "${QMAIL_HOME}"/control/ + insopts -o root -g "$GROUP_ROOT" -m 0644 + doins "${GENQMAIL_S}"/spp/smtpplugins + + einfo "Installing qmail-spp plugins" + keepdir "${QMAIL_HOME}"/plugins/ + for i in authlog mfdnscheck ifauthnext tarpit; do + dospp "${GENQMAIL_S}"/spp/${i} + done + + declare -F qmail_spp_install_hook >/dev/null && \ + qmail_spp_install_hook +} + +qmail_ssl_install() { + use gencertdaily && \ + CRON_FOLDER=cron.daily || \ + CRON_FOLDER=cron.hourly + + einfo "Installing SSL Certificate creation script" + insinto "${QMAIL_HOME}"/control + insopts -o root -g "$GROUP_ROOT" -m 0644 + doins "${GENQMAIL_S}"/ssl/servercert.cnf + + insinto "${QMAIL_HOME}"/bin + insopts -o root -g "$GROUP_ROOT" -m 0755 + doins "${GENQMAIL_S}"/ssl/mkservercert + + einfo "Installing RSA key generation cronjob" + insinto /etc/${CRON_FOLDER} + insopts -o root -g "$GROUP_ROOT" -m 0755 + doins "${GENQMAIL_S}"/ssl/qmail-genrsacert.sh + + keepdir "${QMAIL_HOME}"/control/tlshosts + + declare -F qmail_ssl_install_hook >/dev/null && \ + qmail_ssl_install_hook +} + +qmail_src_install() { + export GROUP_ROOT="$(id -gn root)" + qmail_base_install + qmail_full_install + qmail_config_install + qmail_man_install + qmail_sendmail_install + qmail_maildir_install + qmail_tcprules_install + qmail_supervise_install + + use qmail-spp && qmail_spp_install + use ssl && qmail_ssl_install +} + +qmail_queue_setup() { + if use highvolume; then + myconf="--bigtodo" + else + myconf="--no-bigtodo" + fi + + mysplit=${QMAIL_CONF_SPLIT:-23} + is_prime ${mysplit} || die "QMAIL_CONF_SPLIT is not a prime number." + + einfo "Setting up the message queue hierarchy" + /usr/bin/queue-repair.py --create ${myconf} \ + --split ${mysplit} \ + "${ROOT}${QMAIL_HOME}" >/dev/null || \ + die 'queue-repair failed' +} + +qmail_rootmail_fixup() { + local TMPCMD="ln -sf ${QMAIL_HOME}/alias/.maildir/ ${ROOT}/root/.maildir" + + if [[ -d "${ROOT}"/root/.maildir && ! -L "${ROOT}"/root/.maildir ]] ; then + elog "Previously the qmail ebuilds created /root/.maildir/ but not" + elog "every mail was delivered there. If the directory does not" + elog "contain any mail, please delete it and run:" + elog "${TMPCMD}" + else + ${TMPCMD} + fi + + chown -R alias:qmail "${ROOT}${QMAIL_HOME}"/alias/.maildir 2>/dev/null +} + +qmail_tcprules_fixup() { + mkdir -p "${TCPRULES_DIR}" + for f in {smtp,qmtp,qmqp,pop3}{,.cdb}; do + old="/etc/tcp.${f}" + new="${TCPRULES_DIR}/tcp.qmail-${f}" + fail=0 + if [[ -f "${old}" && ! -f "${new}" ]]; then + einfo "Moving ${old} to ${new}" + cp "${old}" "${new}" || fail=1 + else + fail=1 + fi + if [[ "${fail}" = 1 && -f "${old}" ]]; then + eerror "Error moving ${old} to ${new}, be sure to check the" + eerror "configuration! You may have already moved the files," + eerror "in which case you can delete ${old}" + fi + done +} + +qmail_tcprules_build() { + for f in tcp.qmail-{smtp,qmtp,qmqp,pop3,pop3s}; do + # please note that we don't check if it exists + # as we want it to make the cdb files anyway! + src="${ROOT}${TCPRULES_DIR}/${f}" + cdb="${ROOT}${TCPRULES_DIR}/${f}.cdb" + tmp="${ROOT}${TCPRULES_DIR}/.${f}.tmp" + [[ -e "${src}" ]] && tcprules "${cdb}" "${tmp}" < "${src}" + done +} + +qmail_config_notice() { + elog + elog "To setup ${PN} to run out-of-the-box on your system, run:" + elog "emerge --config =${CATEGORY}/${PF}" +} + +qmail_supervise_config_notice() { + elog + elog "To start qmail at boot you have to add svscan to your startup" + elog "and create the following links:" + elog "ln -s ${SUPERVISE_DIR}/qmail-send /service/qmail-send" + elog "ln -s ${SUPERVISE_DIR}/qmail-smtpd /service/qmail-smtpd" + elog + elog "To start the pop3 server as well, create the following link:" + elog "ln -s ${SUPERVISE_DIR}/qmail-pop3d /service/qmail-pop3d" + elog + if use ssl; then + elog "To start the pop3s server as well, create the following link:" + elog "ln -s ${SUPERVISE_DIR}/qmail-pop3sd /service/qmail-pop3sd" + elog + fi + elog "Additionally, the QMTP and QMQP protocols are supported, " + elog "and can be started as:" + elog "ln -s ${SUPERVISE_DIR}/qmail-qmtpd /service/qmail-qmtpd" + elog "ln -s ${SUPERVISE_DIR}/qmail-qmqpd /service/qmail-qmqpd" + elog + elog "Additionally, if you wish to run qmail right now, you should " + elog "run this before anything else:" + elog "source /etc/profile" +} + +qmail_config_fast() { + if [[ ${ROOT} = / ]]; then + local host=$(hostname --fqdn) + + if [[ -z "${host}" ]]; then + eerror + eerror "Cannot determine your fully-qualified hostname" + eerror "Please setup your /etc/hosts as described in" + eerror "https://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=1&chap=8#doc_chap2_sect4" + eerror + die "cannot determine FQDN" + fi + + if [[ ! -f "${ROOT}${QMAIL_HOME}"/control/me ]]; then + "${ROOT}${QMAIL_HOME}"/bin/config-fast ${host} + fi + else + ewarn "Skipping some configuration as it MUST be run on the final host" + fi +} + +qmail_tcprules_config() { + local localips ip tcpstring line proto f + + einfo "Accepting relaying by default from all ips configured on this machine." + + # Start with iproute2 as ifconfig is deprecated, and ifconfig does not handle + # additional addresses added via iproute2. + # Note: We have to strip off the packed netmask w/e.g. 192.168.0.2/24 + localips=$(ip address show 2>/dev/null | awk '$1 == "inet" {print $2}' | sed 's:/.*::') + if [[ -z ${localips} ]] ; then + # Hello old friend. Maybe you can tell us at least something. + localips=$(ifconfig | awk '$1 == "inet" {print $2}') + fi + + tcpstring=':allow,RELAYCLIENT="",RBLSMTPD=""' + + for ip in ${localips}; do + line="${ip}${tcpstring}" + for proto in smtp qmtp qmqp; do + f="${EROOT}${TCPRULES_DIR}/tcp.qmail-${proto}" + egrep -qs "${line}" "${f}" || echo "${line}" >> "${f}" + done + done +} + +qmail_ssl_generate() { + CRON_FOLDER=cron.hourly + use gencertdaily && CRON_FOLDER=cron.daily + + ebegin "Generating RSA keys for SSL/TLS, this can take some time" + "${ROOT}"/etc/${CRON_FOLDER}/qmail-genrsacert.sh + eend $? + + einfo "Creating a self-signed ssl-certificate:" + "${ROOT}${QMAIL_HOME}"/bin/mkservercert + + einfo "If you want to have a properly signed certificate " + einfo "instead, do the following:" + # space at the end of the string because of the current implementation + # of einfo + einfo "openssl req -new -nodes -out req.pem \\ " + einfo " -config ${QMAIL_HOME}/control/servercert.cnf \\ " + einfo " -keyout ${QMAIL_HOME}/control/servercert.pem" + einfo "Send req.pem to your CA to obtain signed_req.pem, and do:" + einfo "cat signed_req.pem >> ${QMAIL_HOME}/control/servercert.pem" +} diff -uNr a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass --- a/eclass/qmake-utils.eclass false +++ b/eclass/qmake-utils.eclass e9d95155861e8f9c9dda26e7848a7e15f7a4f08586f945cc84ea915c76046841c831415f571db07e2f0f382fb5b73f94c4e48c7e5d75be2404e669531bbb4dac @@ -0,0 +1,323 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: qmake-utils.eclass +# @MAINTAINER: +# qt@gentoo.org +# @AUTHOR: +# Davide Pesavento <pesa@gentoo.org> +# @BLURB: Common functions for qmake-based packages. +# @DESCRIPTION: +# Utility eclass providing wrapper functions for Qt4 and Qt5 qmake. +# +# This eclass does not set any metadata variables nor export any phase +# functions. It can be inherited safely. + +if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then +_QMAKE_UTILS_ECLASS=1 + +[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib +inherit estack toolchain-funcs + +# @FUNCTION: qt4_get_bindir +# @DESCRIPTION: +# Echoes the directory where Qt4 binaries are installed. +# EPREFIX is already prepended to the returned path. +qt4_get_bindir() { + has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= + + local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin + if [[ -d ${qtbindir} ]]; then + echo ${qtbindir} + else + echo ${EPREFIX}/usr/bin + fi +} + +# @FUNCTION: qt4_get_headerdir +# @DESCRIPTION: +# Echoes the directory where Qt4 headers are installed. +qt4_get_headerdir() { + echo /usr/include/qt4 +} + +# @FUNCTION: qt4_get_libdir +# @DESCRIPTION: +# Echoes the directory where Qt4 libraries are installed. +qt4_get_libdir() { + echo /usr/$(get_libdir)/qt4 +} + +# @FUNCTION: qt4_get_mkspecsdir +# @DESCRIPTION: +# Echoes the directory where Qt4 mkspecs are installed. +qt4_get_mkspecsdir() { + echo /usr/share/qt4/mkspecs +} + +# @FUNCTION: qt4_get_plugindir +# @DESCRIPTION: +# Echoes the directory where Qt4 plugins are installed. +qt4_get_plugindir() { + echo $(qt4_get_libdir)/plugins +} + +# @FUNCTION: qt5_get_bindir +# @DESCRIPTION: +# Echoes the directory where Qt5 binaries are installed. +# EPREFIX is already prepended to the returned path. +qt5_get_bindir() { + has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= + + echo ${EPREFIX}$(qt5_get_libdir)/qt5/bin +} + +# @FUNCTION: qt5_get_headerdir +# @DESCRIPTION: +# Echoes the directory where Qt5 headers are installed. +qt5_get_headerdir() { + echo /usr/include/qt5 +} + +# @FUNCTION: qt5_get_libdir +# @DESCRIPTION: +# Echoes the directory where Qt5 libraries are installed. +qt5_get_libdir() { + echo /usr/$(get_libdir) +} + +# @FUNCTION: qt5_get_mkspecsdir +# @DESCRIPTION: +# Echoes the directory where Qt5 mkspecs are installed. +qt5_get_mkspecsdir() { + echo $(qt5_get_libdir)/qt5/mkspecs +} + +# @FUNCTION: qt5_get_plugindir +# @DESCRIPTION: +# Echoes the directory where Qt5 plugins are installed. +qt5_get_plugindir() { + echo $(qt5_get_libdir)/qt5/plugins +} + +# @FUNCTION: qmake-utils_find_pro_file +# @RETURN: zero or one qmake .pro file names +# @INTERNAL +# @DESCRIPTION: +# Outputs a project file name that can be passed to eqmake. +# 0 *.pro files found --> outputs null string; +# 1 *.pro file found --> outputs its name; +# 2 or more *.pro files found --> if "${PN}.pro" or +# "$(basename ${S}).pro" are there, outputs one of them. +qmake-utils_find_pro_file() { + local dir_name=$(basename "${S}") + + # set nullglob to avoid expanding *.pro to the literal + # string "*.pro" when there are no matching files + eshopts_push -s nullglob + local pro_files=(*.pro) + eshopts_pop + + case ${#pro_files[@]} in + 0) + : ;; + 1) + echo "${pro_files}" + ;; + *) + for pro_file in "${pro_files[@]}"; do + if [[ ${pro_file%.pro} == ${dir_name} || ${pro_file%.pro} == ${PN} ]]; then + echo "${pro_file}" + break + fi + done + ;; + esac +} + +# @VARIABLE: EQMAKE4_EXCLUDE +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of files to be excluded from eqmake4 CONFIG processing. +# Paths are relative to the current working directory (usually ${S}). +# +# Example: EQMAKE4_EXCLUDE="ignore/me.pro foo/*" + +# @FUNCTION: eqmake4 +# @USAGE: [project_file] [parameters to qmake] +# @DESCRIPTION: +# Wrapper for Qt4's qmake. If project_file is not specified, eqmake4 looks +# for one in the current directory (non-recursively). If multiple project +# files are found, then ${PN}.pro is used, if it exists, otherwise eqmake4 +# will not be able to continue. +# +# All other arguments are appended unmodified to qmake command line. +# +# For recursive build systems, i.e. those based on the subdirs template, +# you should run eqmake4 on the top-level project file only, unless you +# have a valid reason to do otherwise. During the building, qmake will +# be automatically re-invoked with the right arguments on every directory +# specified inside the top-level project file. +eqmake4() { + debug-print-function ${FUNCNAME} "$@" + + has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= + + ebegin "Running qmake" + + local qmake_args=("$@") + + # Check if the project file name was passed as first argument. If not, look for candidates. + local regexp='.*\.pro' + if ! [[ ${1} =~ ${regexp} ]]; then + local project_file=$(qmake-utils_find_pro_file) + if [[ -z ${project_file} ]]; then + echo + eerror "No project files found in '${PWD}'" + eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/" + echo + die "eqmake4 failed" + fi + qmake_args+=("${project_file}") + fi + + # Make sure the CONFIG variable is correctly set for both release and debug builds. + local config_add=release + local config_remove=debug + if in_iuse debug && use debug; then + config_add=debug + config_remove=release + fi + + local awkscript='BEGIN { + printf "### eqmake4 was here ###\n" > file; + printf "CONFIG -= debug_and_release %s\n", remove >> file; + printf "CONFIG += %s\n\n", add >> file; + fixed=0; + } + /^[[:blank:]]*CONFIG[[:blank:]]*[\+\*]?=/ { + if (gsub("\\<((" remove ")|(debug_and_release))\\>", "") > 0) { + fixed=1; + } + } + /^[[:blank:]]*CONFIG[[:blank:]]*-=/ { + if (gsub("\\<" add "\\>", "") > 0) { + fixed=1; + } + } + { + print >> file; + } + END { + print fixed; + }' + + [[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_push -o noglob + + local file + while read file; do + local excl + for excl in ${EQMAKE4_EXCLUDE}; do + [[ ${file} == ${excl} ]] && continue 2 + done + grep -q '^### eqmake4 was here ###$' "${file}" && continue + + local retval=$({ + rm -f "${file}" || echo FAIL + awk -v file="${file}" \ + -v add=${config_add} \ + -v remove=${config_remove} \ + -- "${awkscript}" || echo FAIL + } < "${file}") + + if [[ ${retval} == 1 ]]; then + einfo " - fixed CONFIG in ${file}" + elif [[ ${retval} != 0 ]]; then + eerror " - error while processing ${file}" + die "eqmake4 failed to process ${file}" + fi + done < <(find . -type f -name '*.pr[io]' -printf '%P\n' 2>/dev/null) + + [[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop + + "$(qt4_get_bindir)"/qmake \ + -makefile \ + QMAKE_AR="$(tc-getAR) cqs" \ + QMAKE_CC="$(tc-getCC)" \ + QMAKE_CXX="$(tc-getCXX)" \ + QMAKE_LINK="$(tc-getCXX)" \ + QMAKE_LINK_C="$(tc-getCC)" \ + QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ + QMAKE_RANLIB= \ + QMAKE_STRIP= \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CFLAGS_RELEASE= \ + QMAKE_CFLAGS_DEBUG= \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_CXXFLAGS_RELEASE= \ + QMAKE_CXXFLAGS_DEBUG= \ + QMAKE_LFLAGS="${LDFLAGS}" \ + QMAKE_LFLAGS_RELEASE= \ + QMAKE_LFLAGS_DEBUG= \ + QMAKE_LIBDIR_QT="${EPREFIX}$(qt4_get_libdir)" \ + QMAKE_LIBDIR_X11="${EPREFIX}/usr/$(get_libdir)" \ + QMAKE_LIBDIR_OPENGL="${EPREFIX}/usr/$(get_libdir)" \ + "${qmake_args[@]}" + + if ! eend $? ; then + echo + eerror "Running qmake has failed! (see above for details)" + eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/" + echo + die "eqmake4 failed" + fi +} + +# @FUNCTION: eqmake5 +# @USAGE: [arguments for qmake] +# @DESCRIPTION: +# Wrapper for Qt5's qmake. All arguments are passed to qmake. +# +# For recursive build systems, i.e. those based on the subdirs template, +# you should run eqmake5 on the top-level project file only, unless you +# have a valid reason to do otherwise. During the building, qmake will +# be automatically re-invoked with the right arguments on every directory +# specified inside the top-level project file. +eqmake5() { + debug-print-function ${FUNCNAME} "$@" + + ebegin "Running qmake" + + "$(qt5_get_bindir)"/qmake \ + -makefile \ + QMAKE_AR="$(tc-getAR) cqs" \ + QMAKE_CC="$(tc-getCC)" \ + QMAKE_LINK_C="$(tc-getCC)" \ + QMAKE_LINK_C_SHLIB="$(tc-getCC)" \ + QMAKE_CXX="$(tc-getCXX)" \ + QMAKE_LINK="$(tc-getCXX)" \ + QMAKE_LINK_SHLIB="$(tc-getCXX)" \ + QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ + QMAKE_RANLIB= \ + QMAKE_STRIP= \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CFLAGS_RELEASE= \ + QMAKE_CFLAGS_DEBUG= \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_CXXFLAGS_RELEASE= \ + QMAKE_CXXFLAGS_DEBUG= \ + QMAKE_LFLAGS="${LDFLAGS}" \ + QMAKE_LFLAGS_RELEASE= \ + QMAKE_LFLAGS_DEBUG= \ + "$@" + + if ! eend $? ; then + echo + eerror "Running qmake has failed! (see above for details)" + eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/" + echo + die "eqmake5 failed" + fi +} + +fi diff -uNr a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass --- a/eclass/qt4-build-multilib.eclass false +++ b/eclass/qt4-build-multilib.eclass ac66244716b4c73fd73d21953121db2701bd6b835017499510eddfa1884036b819f5022626bad9bc6f25835ee3da9bc733b42e770b1b503b0134224a20d98087 @@ -0,0 +1,847 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: qt4-build-multilib.eclass +# @MAINTAINER: +# qt@gentoo.org +# @AUTHOR: +# Davide Pesavento <pesa@gentoo.org> +# @BLURB: Eclass for Qt4 split ebuilds with multilib support. +# @DESCRIPTION: +# This eclass contains various functions that are used when building Qt4. +# Requires EAPI 5. + +case ${EAPI} in + 5) : ;; + *) die "qt4-build-multilib.eclass: unsupported EAPI=${EAPI:-0}" ;; +esac + +inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs + +HOMEPAGE="https://www.qt.io/" +LICENSE="|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3" +SLOT="4" + +case ${PV} in + 4.?.9999) + # git stable branch + QT4_BUILD_TYPE="live" + EGIT_BRANCH=${PV%.9999} + ;; + *) + # official stable release + QT4_BUILD_TYPE="release" + MY_P=qt-everywhere-opensource-src-${PV/_/-} + SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz" + S=${WORKDIR}/${MY_P} + ;; +esac + +EGIT_REPO_URI=( + "git://code.qt.io/qt/qt.git" + "https://code.qt.io/git/qt/qt.git" + "https://github.com/qtproject/qt.git" +) +[[ ${QT4_BUILD_TYPE} == live ]] && inherit git-r3 + +if [[ ${PN} != qttranslations ]]; then + IUSE="aqua debug pch" + [[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions" +fi + +DEPEND=" + dev-lang/perl + virtual/pkgconfig[${MULTILIB_USEDEP}] +" +RDEPEND=" + dev-qt/qtchooser +" + + +# src_{configure,compile,test,install} are inherited from multilib-minimal +EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst pkg_postrm + +multilib_src_configure() { qt4_multilib_src_configure; } +multilib_src_compile() { qt4_multilib_src_compile; } +multilib_src_test() { qt4_multilib_src_test; } +multilib_src_install() { qt4_multilib_src_install; } +multilib_src_install_all() { qt4_multilib_src_install_all; } + + +# @ECLASS-VARIABLE: PATCHES +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array variable containing all the patches to be applied. This variable +# is expected to be defined in the global scope of ebuilds. Make sure to +# specify the full path. This variable is used in src_prepare phase. +# +# Example: +# @CODE +# PATCHES=( +# "${FILESDIR}/mypatch.patch" +# "${FILESDIR}/mypatch2.patch" +# ) +# @CODE + +# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES +# @DEFAULT_UNSET +# @DESCRIPTION: +# Space-separated list of directories that will be configured, +# compiled, and installed. All paths must be relative to ${S}. + +# @ECLASS-VARIABLE: QCONFIG_ADD +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of options that must be added to QT_CONFIG in qconfig.pri + +# @ECLASS-VARIABLE: QCONFIG_REMOVE +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of options that must be removed from QT_CONFIG in qconfig.pri + +# @ECLASS-VARIABLE: QCONFIG_DEFINE +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of macros that must be defined in QtCore/qconfig.h + + +###### Phase functions ###### + +# @FUNCTION: qt4-build-multilib_src_unpack +# @DESCRIPTION: +# Unpacks the sources. +qt4-build-multilib_src_unpack() { + if tc-is-gcc; then + if [[ $(gcc-major-version) -lt 4 ]] || \ + [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then + ewarn + ewarn "Using a GCC version lower than 4.4 is not supported" + ewarn + fi + fi + + if [[ ${PN} == qtwebkit ]]; then + eshopts_push -s extglob + if is-flagq '-g?(gdb)?([1-9])'; then + ewarn + ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." + ewarn "You may experience really long compilation times and/or increased memory usage." + ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." + ewarn "For more info check out https://bugs.gentoo.org/307861" + ewarn + fi + eshopts_pop + fi + + case ${QT4_BUILD_TYPE} in + live) git-r3_src_unpack ;; + release) default ;; + esac +} + +# @FUNCTION: qt4-build-multilib_src_prepare +# @DESCRIPTION: +# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix +# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf. +qt4-build-multilib_src_prepare() { + if [[ ${PN} != qtcore ]]; then + # avoid unnecessary qmake recompilations + sed -i -e 's/^if true;/if false;/' configure \ + || die "sed failed (skip qmake bootstrap)" + fi + + # skip X11 tests in non-gui packages to avoid spurious dependencies + if has ${PN} qtbearer qtcore qtdbus qtscript qtsql qttest qttranslations qtxmlpatterns; then + sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' configure \ + || die "sed failed (skip X11 tests)" + fi + + # Qt4 is not safe to build with C++14 (the new gcc-6 default). + # Upstream has addressed this for Qt5, but while we continue to + # support Qt4, we need to ensure everything is built in C++98 mode. + # See bugs 582522, 582618, 583662, 583744. + append-cxxflags -std=gnu++98 + + if [[ ${PN} == qtcore ]]; then + # Bug 373061 + # qmake bus errors with -O2 or -O3 but -O1 works + if [[ ${CHOST} == *86*-apple-darwin* ]]; then + replace-flags -O[23] -O1 + fi + + # Bug 503500 + # undefined reference with -Os and --as-needed + if use x86 || use_if_iuse abi_x86_32; then + replace-flags -Os -O2 + fi + fi + + if [[ ${PN} == qtdeclarative ]]; then + # Bug 551560 + # gcc-4.8 ICE with -Os, fixed in 4.9 + if use x86 && tc-is-gcc && [[ $(gcc-version) == 4.8 ]]; then + replace-flags -Os -O2 + fi + fi + + if [[ ${PN} == qtwebkit ]]; then + # Bug 550780 + # various ICEs with graphite-related flags, gcc-5 works + if [[ $(gcc-major-version) -lt 5 ]]; then + filter-flags -fgraphite-identity -floop-strip-mine + fi + fi + + # Bug 261632 + if use ppc64; then + append-flags -mminimal-toc + fi + + # Teach configure about gcc-6 and later + sed -i -e 's:5\*|:[5-9]*|:' \ + configure || die "sed gcc version failed" + + # Read also AR from the environment + sed -i -e 's/^SYSTEM_VARIABLES="/&AR /' \ + configure || die "sed SYSTEM_VARIABLES failed" + + # Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables, + # or they will override the user's flags (via .qmake.cache) + sed -i -e '/^SYSTEM_VARIABLES=/ i \ + QMakeVar set QMAKE_CFLAGS_RELEASE\ + QMakeVar set QMAKE_CFLAGS_DEBUG\ + QMakeVar set QMAKE_CXXFLAGS_RELEASE\ + QMakeVar set QMAKE_CXXFLAGS_DEBUG\ + QMakeVar set QMAKE_LFLAGS_RELEASE\ + QMakeVar set QMAKE_LFLAGS_DEBUG\n' \ + configure || die "sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed" + + # Drop -nocache from qmake invocation in all configure tests, to ensure that the + # correct toolchain and build flags are picked up from config.tests/.qmake.cache + find config.tests/unix -name '*.test' -type f -execdir \ + sed -i -e '/bin\/qmake/s/-nocache//' '{}' + || die "sed -nocache failed" + + # compile.test needs additional patching so that it doesn't create another cache file + # inside the test subdir, which would incorrectly override config.tests/.qmake.cache + sed -i -e '/echo.*QT_BUILD_TREE.*\.qmake\.cache/d' \ + -e '/bin\/qmake/s/ "$SRCDIR/ "QT_BUILD_TREE=$OUTDIR"&/' \ + config.tests/unix/compile.test || die "sed compile.test failed" + + # Delete references to the obsolete /usr/X11R6 directory + # On prefix, this also prevents looking at non-prefix stuff + sed -i -re '/^QMAKE_(LIB|INC)DIR(_X11|_OPENGL|)\s+/ s/=.*/=/' \ + mkspecs/common/linux.conf \ + mkspecs/$(qt4_get_mkspec)/qmake.conf \ + || die "sed QMAKE_(LIB|INC)DIR failed" + + if use_if_iuse aqua; then + sed -i \ + -e '/^CONFIG/s:app_bundle::' \ + -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ + mkspecs/$(qt4_get_mkspec)/qmake.conf \ + || die "sed failed (aqua)" + + # we are crazy and build cocoa + qt3support + if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then + sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ + configure || die "sed failed (cocoa + qt3support)" + fi + fi + + if [[ ${CHOST} == *-darwin* ]]; then + # Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design) + sed -i \ + -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \ + -e "s:-arch\s\w*::g" \ + mkspecs/common/g++-macx.conf \ + || die "sed g++-macx.conf failed" + + # Fix configure's -arch settings that appear in qmake/Makefile and also + # fix arch handling (automagically duplicates our -arch arg and breaks + # pch). Additionally disable Xarch support. + sed -i \ + -e "s:-arch i386::" \ + -e "s:-arch ppc::" \ + -e "s:-arch x86_64::" \ + -e "s:-arch ppc64::" \ + -e "s:-arch \$i::" \ + -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ + -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ + -e "s:-Xarch_x86_64::g" \ + -e "s:-Xarch_ppc64::g" \ + configure mkspecs/common/gcc-base-macx.conf mkspecs/common/g++-macx.conf \ + || die "sed -arch/-Xarch failed" + + # On Snow Leopard don't fall back to 10.5 deployment target. + if [[ ${CHOST} == *-apple-darwin10 ]]; then + sed -i \ + -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ + -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \ + configure mkspecs/common/g++-macx.conf \ + || die "sed deployment target failed" + fi + fi + + if [[ ${CHOST} == *-solaris* ]]; then + sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \ + mkspecs/$(qt4_get_mkspec)/qmake.conf || die + fi + + # apply patches + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + epatch_user +} + +qt4_multilib_src_configure() { + qt4_prepare_env + + qt4_symlink_tools_to_build_dir + + # toolchain setup ('local -x' because of bug 532510) + local -x \ + AR="$(tc-getAR) cqs" \ + CC=$(tc-getCC) \ + CXX=$(tc-getCXX) \ + LD=$(tc-getCXX) \ + MAKEFLAGS=${MAKEOPTS} \ + OBJCOPY=$(tc-getOBJCOPY) \ + OBJDUMP=$(tc-getOBJDUMP) \ + STRIP=$(tc-getSTRIP) + + # convert tc-arch to the values supported by Qt + local arch=$(tc-arch) + case ${arch} in + amd64|x64-*) arch=x86_64 ;; + arm64|hppa) arch=generic ;; + ppc*-macos) arch=ppc ;; + ppc*) arch=powerpc ;; + sparc*) arch=sparc ;; + x86-macos) arch=x86 ;; + x86*) arch=i386 ;; + esac + + # configure arguments + local conf=( + # installation paths + -prefix "${QT4_PREFIX}" + -bindir "${QT4_BINDIR}" + -libdir "${QT4_LIBDIR}" + -docdir "${QT4_DOCDIR}" + -headerdir "${QT4_HEADERDIR}" + -plugindir "${QT4_PLUGINDIR}" + -importdir "${QT4_IMPORTDIR}" + -datadir "${QT4_DATADIR}" + -translationdir "${QT4_TRANSLATIONDIR}" + -sysconfdir "${QT4_SYSCONFDIR}" + -examplesdir "${QT4_EXAMPLESDIR}" + -demosdir "${QT4_DEMOSDIR}" + + # debug/release + $(use_if_iuse debug && echo -debug || echo -release) + -no-separate-debug-info + + # licensing stuff + -opensource -confirm-license + + # build shared libraries + -shared + + # skip recursive processing of .pro files at the end of configure + # (we run qmake by ourselves), thus saving quite a bit of time + -dont-process + + # always enable large file support + -largefile + + # exceptions USE flag + $(in_iuse exceptions && qt_use exceptions || echo -exceptions) + + # build STL support + -stl + + # architecture/platform (mkspec) + -arch ${arch} + -platform $(qt4_get_mkspec) + + # instruction set support + $(is-flagq -mno-mmx && echo -no-mmx) + $(is-flagq -mno-3dnow && echo -no-3dnow) + $(is-flagq -mno-sse && echo -no-sse) + $(is-flagq -mno-sse2 && echo -no-sse2) + $(is-flagq -mno-sse3 && echo -no-sse3) + $(is-flagq -mno-ssse3 && echo -no-ssse3) + $(is-flagq -mno-sse4.1 && echo -no-sse4.1) + $(is-flagq -mno-sse4.2 && echo -no-sse4.2) + $(is-flagq -mno-avx && echo -no-avx) + $(is-flagq -mfpu=* && ! is-flagq -mfpu=*neon* && echo -no-neon) + + # bug 367045 + $([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3) + + # prefer system libraries + -system-zlib + + # exclude examples and demos from default build + -nomake examples + -nomake demos + + # disable rpath on non-prefix (bugs 380415 and 417169) + $(usex prefix '' -no-rpath) + + # print verbose information about each configure test + -verbose + + # precompiled headers don't work on hardened, where the flag is masked + $(in_iuse pch && qt_use pch || echo -no-pch) + + # enable linker optimizations to reduce relocations, except on Solaris + # where this flag seems to introduce major breakage to applications, + # mostly to be seen as a core dump with the message: + # "QPixmap: Must construct a QApplication before a QPaintDevice" + $([[ ${CHOST} != *-solaris* ]] && echo -reduce-relocations) + ) + + if use_if_iuse aqua; then + if [[ ${CHOST##*-darwin} -ge 9 ]]; then + conf+=( + # on (snow) leopard use the new (frameworked) cocoa code + -cocoa -framework + # add hint for the framework location + -F"${QT4_LIBDIR}" + ) + else + conf+=(-no-framework) + fi + fi + + conf+=( + # module-specific options + "${myconf[@]}" + ) + + einfo "Configuring with: ${conf[@]}" + "${S}"/configure "${conf[@]}" || die "configure failed" + + # configure is stupid and assigns QMAKE_LFLAGS twice, + # thus the previous -rpath-link flag gets overwritten + # and some packages (e.g. qthelp) fail to link + sed -i -e '/^QMAKE_LFLAGS =/ s:$: $$QMAKE_LFLAGS:' \ + .qmake.cache || die "sed .qmake.cache failed" + + qt4_qmake + qt4_foreach_target_subdir qt4_qmake +} + +qt4_multilib_src_compile() { + qt4_prepare_env + + qt4_foreach_target_subdir emake +} + +qt4_multilib_src_test() { + qt4_prepare_env + + qt4_foreach_target_subdir emake -j1 check +} + +qt4_multilib_src_install() { + qt4_prepare_env + + qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install + + if [[ ${PN} == qtcore ]]; then + set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake} + einfo "Running $*" + "$@" + + # install env.d file + cat > "${T}/44qt4-${CHOST}" <<-_EOF_ + LDPATH="${QT4_LIBDIR}" + _EOF_ + doenvd "${T}/44qt4-${CHOST}" + + # install qtchooser configuration file + cat > "${T}/qt4-${CHOST}.conf" <<-_EOF_ + ${QT4_BINDIR} + ${QT4_LIBDIR} + _EOF_ + + ( + insinto /etc/xdg/qtchooser + doins "${T}/qt4-${CHOST}.conf" + ) + + if multilib_is_native_abi; then + # convenience symlinks + dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/4.conf + dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/qt4.conf + fi + fi + + # move pkgconfig directory to the correct location + if [[ -d ${D}${QT4_LIBDIR}/pkgconfig ]]; then + mv "${D}${QT4_LIBDIR}"/pkgconfig "${ED}usr/$(get_libdir)" || die + fi + + qt4_install_module_qconfigs + qt4_symlink_framework_headers +} + +qt4_multilib_src_install_all() { + if [[ ${PN} == qtcore ]]; then + # include gentoo-qconfig.h at the beginning of Qt{,Core}/qconfig.h + if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then + sed -i -e '1i #include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ + "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \ + || die "sed failed (qconfig.h)" + dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \ + "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo + else + sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \ + "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \ + || die "sed failed (qconfig.h)" + fi + + dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo + mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die + fi + + # install private headers of a few modules + if has ${PN} qtcore qtdeclarative qtgui qtscript; then + local moduledir=${PN#qt} + local modulename=Qt$(tr 'a-z' 'A-Z' <<< ${moduledir:0:1})${moduledir:1} + [[ ${moduledir} == core ]] && moduledir=corelib + + einfo "Installing private headers into ${QT4_HEADERDIR}/${modulename}/private" + insinto "${QT4_HEADERDIR#${EPREFIX}}"/${modulename}/private + find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die + fi + + prune_libtool_files +} + +# @FUNCTION: qt4-build-multilib_pkg_postinst +# @DESCRIPTION: +# Regenerate configuration after installation or upgrade/downgrade. +qt4-build-multilib_pkg_postinst() { + qt4_regenerate_global_qconfigs +} + +# @FUNCTION: qt4-build-multilib_pkg_postrm +# @DESCRIPTION: +# Regenerate configuration when a module is completely removed. +qt4-build-multilib_pkg_postrm() { + qt4_regenerate_global_qconfigs +} + + +###### Public helpers ###### + +# @FUNCTION: qt_use +# @USAGE: <flag> [feature] [enableval] +# @DESCRIPTION: +# <flag> is the name of a flag in IUSE. +# +# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}" +# otherwise. If [feature] is not specified, <flag> is used in its place. +# If [enableval] is not specified, the "-${enableval}" prefix is omitted. +qt_use() { + [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" + + usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}" +} + +# @FUNCTION: qt_native_use +# @USAGE: <flag> [feature] [enableval] +# @DESCRIPTION: +# <flag> is the name of a flag in IUSE. +# +# Outputs "-${enableval}-${feature}" if <flag> is enabled and we are currently +# building for the native ABI, "-no-${feature}" otherwise. If [feature] is not +# specified, <flag> is used in its place. If [enableval] is not specified, +# the "-${enableval}" prefix is omitted. +qt_native_use() { + [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" + + multilib_is_native_abi && qt_use "$@" || echo "-no-${2:-$1}" +} + + +###### Internal functions ###### + +# @FUNCTION: qt4_prepare_env +# @INTERNAL +# @DESCRIPTION: +# Prepares the environment for building Qt. +qt4_prepare_env() { + # setup installation directories + # note: keep paths in sync with qmake-utils.eclass + QT4_PREFIX=${EPREFIX}/usr + QT4_HEADERDIR=${QT4_PREFIX}/include/qt4 + QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4 + QT4_BINDIR=${QT4_LIBDIR}/bin + QT4_PLUGINDIR=${QT4_LIBDIR}/plugins + QT4_IMPORTDIR=${QT4_LIBDIR}/imports + QT4_DATADIR=${QT4_PREFIX}/share/qt4 + QT4_DOCDIR=${QT4_PREFIX}/share/doc/qt-${PV} + QT4_TRANSLATIONDIR=${QT4_DATADIR}/translations + QT4_EXAMPLESDIR=${QT4_DATADIR}/examples + QT4_DEMOSDIR=${QT4_DATADIR}/demos + QT4_SYSCONFDIR=${EPREFIX}/etc/qt4 + + # are these still needed? + QMAKE_LIBDIR_QT=${QT4_LIBDIR} + export XDG_CONFIG_HOME="${T}" + + # can confuse qmake if set (bug 583352) + unset QMAKESPEC +} + +# @FUNCTION: qt4_foreach_target_subdir +# @INTERNAL +# @DESCRIPTION: +# Executes the given command inside each directory listed in QT4_TARGET_DIRECTORIES. +qt4_foreach_target_subdir() { + local ret=0 subdir= + for subdir in ${QT4_TARGET_DIRECTORIES}; do + mkdir -p "${subdir}" || die + pushd "${subdir}" >/dev/null || die + + einfo "Running $* ${subdir:+in ${subdir}}" + "$@" + ((ret+=$?)) + + popd >/dev/null || die + done + + return ${ret} +} + +# @FUNCTION: qt4_symlink_tools_to_build_dir +# @INTERNAL +# @DESCRIPTION: +# Symlinks qtcore tools to BUILD_DIR, +# so that they can be used when building other modules. +qt4_symlink_tools_to_build_dir() { + local tool= tools=() + if [[ ${PN} != qtcore ]]; then + tools+=(qmake moc rcc uic) + fi + + mkdir -p "${BUILD_DIR}"/bin || die + pushd "${BUILD_DIR}"/bin >/dev/null || die + + for tool in "${tools[@]}"; do + [[ -e ${QT4_BINDIR}/${tool} ]] || continue + ln -s "${QT4_BINDIR}/${tool}" . || die "failed to symlink ${tool}" + done + + popd >/dev/null || die +} + +# @FUNCTION: qt4_qmake +# @INTERNAL +# @DESCRIPTION: +# Helper function that runs qmake in the current target subdir. +# Intended to be called by qt4_foreach_target_subdir(). +qt4_qmake() { + local projectdir=${PWD/#${BUILD_DIR}/${S}} + + "${BUILD_DIR}"/bin/qmake \ + "${projectdir}" \ + CONFIG+=nostrip \ + LIBS+=-L"${QT4_LIBDIR}" \ + "${myqmakeargs[@]}" \ + || die "qmake failed (${projectdir#${S}/})" +} + +# @FUNCTION: qt4_install_module_qconfigs +# @INTERNAL +# @DESCRIPTION: +# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files. +qt4_install_module_qconfigs() { + local x + if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then + for x in QCONFIG_ADD QCONFIG_REMOVE; do + [[ -n ${!x} ]] && echo ${x}=${!x} >> "${BUILD_DIR}"/${PN}-qconfig.pri + done + insinto ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo + doins "${BUILD_DIR}"/${PN}-qconfig.pri + fi + + if [[ -n ${QCONFIG_DEFINE} ]]; then + for x in ${QCONFIG_DEFINE}; do + echo "#define ${x}" >> "${BUILD_DIR}"/gentoo-${PN}-qconfig.h + done + insinto ${QT4_HEADERDIR#${EPREFIX}}/Gentoo + doins "${BUILD_DIR}"/gentoo-${PN}-qconfig.h + fi +} + +# @FUNCTION: qt4_regenerate_global_qconfigs +# @INTERNAL +# @DESCRIPTION: +# Generates Gentoo-specific qconfig.{h,pri} according to the build configuration. +# Don't call die here because dying in pkg_post{inst,rm} only makes things worse. +qt4_regenerate_global_qconfigs() { + if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qtcore ]]; then + local x qconfig_add qconfig_remove qconfig_new + for x in "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/*-qconfig.pri; do + [[ -f ${x} ]] || continue + qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" + qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" + done + + if [[ -e "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then + # start with the qconfig.pri that qtcore installed + if ! cp "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri \ + "${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri; then + eerror "cp qconfig failed." + return 1 + fi + + # generate list of QT_CONFIG entries from the existing list + # including qconfig_add and excluding qconfig_remove + for x in $(sed -n 's/^QT_CONFIG +=//p' \ + "${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do + has ${x} ${qconfig_remove} || qconfig_new+=" ${x}" + done + + # replace the existing QT_CONFIG list with qconfig_new + if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \ + "${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri; then + eerror "Sed for QT_CONFIG failed" + return 1 + fi + + # create Gentoo/qconfig.h + if [[ ! -e ${ROOT}${QT4_HEADERDIR}/Gentoo ]]; then + if ! mkdir -p "${ROOT}${QT4_HEADERDIR}"/Gentoo; then + eerror "mkdir ${QT4_HEADERDIR}/Gentoo failed" + return 1 + fi + fi + : > "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h + for x in "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do + [[ -f ${x} ]] || continue + cat "${x}" >> "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h + done + else + rm -f "${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri + rm -f "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h + rmdir "${ROOT}${QT4_DATADIR}"/mkspecs \ + "${ROOT}${QT4_DATADIR}" \ + "${ROOT}${QT4_HEADERDIR}"/Gentoo \ + "${ROOT}${QT4_HEADERDIR}" 2>/dev/null + fi + fi +} + +# @FUNCTION: qt4_symlink_framework_headers +# @DESCRIPTION: +# On OS X we need to add some symlinks when frameworks are being +# used, to avoid complications with some more or less stupid packages. +qt4_symlink_framework_headers() { + if use_if_iuse aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then + local frw dest f h rdir + # Some packages tend to include <Qt/...> + dodir "${QT4_HEADERDIR#${EPREFIX}}"/Qt + + # Fake normal headers when frameworks are installed... eases life later + # on, make sure we use relative links though, as some ebuilds assume + # these dirs exist in src_install to add additional files + f=${QT4_HEADERDIR} + h=${QT4_LIBDIR} + while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do + f=${f#*/} + h=${h#*/} + done + rdir=${h} + f="../" + while [[ ${h} == */* ]] ; do + f="${f}../" + h=${h#*/} + done + rdir="${f}${rdir}" + + for frw in "${D}${QT4_LIBDIR}"/*.framework; do + [[ -e "${frw}"/Headers ]] || continue + f=$(basename ${frw}) + dest="${QT4_HEADERDIR#${EPREFIX}}"/${f%.framework} + dosym "${rdir}"/${f}/Headers "${dest}" + + # Link normal headers as well. + for hdr in "${D}${QT4_LIBDIR}/${f}"/Headers/*; do + h=$(basename ${hdr}) + dosym "../${rdir}"/${f}/Headers/${h} \ + "${QT4_HEADERDIR#${EPREFIX}}"/Qt/${h} + done + done + fi +} + +# @FUNCTION: qt4_get_mkspec +# @INTERNAL +# @DESCRIPTION: +# Returns the right mkspec for the current CHOST/CXX combination. +qt4_get_mkspec() { + local spec= + + case ${CHOST} in + *-linux*) + spec=linux ;; + *-darwin*) + use_if_iuse aqua && + spec=macx || # mac with carbon/cocoa + spec=darwin ;; # darwin/mac with X11 + *-freebsd*|*-dragonfly*) + spec=freebsd ;; + *-netbsd*) + spec=netbsd ;; + *-openbsd*) + spec=openbsd ;; + *-aix*) + spec=aix ;; + hppa*-hpux*) + spec=hpux ;; + ia64*-hpux*) + spec=hpuxi ;; + *-solaris*) + spec=solaris ;; + *) + die "qt4-build-multilib.eclass: unsupported CHOST '${CHOST}'" ;; + esac + + case $(tc-getCXX) in + *g++*) + spec+=-g++ ;; + *clang*) + if [[ -d ${S}/mkspecs/unsupported/${spec}-clang ]]; then + spec=unsupported/${spec}-clang + else + ewarn "${spec}-clang mkspec does not exist, falling back to ${spec}-g++" + spec+=-g++ + fi ;; + *icpc*) + if [[ -d ${S}/mkspecs/${spec}-icc ]]; then + spec+=-icc + else + ewarn "${spec}-icc mkspec does not exist, falling back to ${spec}-g++" + spec+=-g++ + fi ;; + *) + die "qt4-build-multilib.eclass: unsupported compiler '$(tc-getCXX)'" ;; + esac + + # Add -64 for 64-bit prefix profiles + if use amd64-linux || use ppc64-linux || + use x64-macos || + use sparc64-solaris || use x64-solaris + then + [[ -d ${S}/mkspecs/${spec}-64 ]] && spec+=-64 + fi + + echo ${spec} +} diff -uNr a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass --- a/eclass/qt4-r2.eclass false +++ b/eclass/qt4-r2.eclass 8a2977a4e1dc82c119f625ca6ee4644289c43ef74d755b603e43cd0f74af4e4a6274f14be7f3198da2e11648f38dc811d7f5dfc336f7288142c6f219a51702af @@ -0,0 +1,139 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: qt4-r2.eclass +# @MAINTAINER: +# qt@gentoo.org +# @BLURB: Eclass for Qt4-based packages, second edition. +# @DESCRIPTION: +# This eclass contains various functions that may be useful when +# dealing with packages using Qt4 libraries. Supports only EAPIs +# 2, 3, 4, and 5. Use qmake-utils.eclass in EAPI 6 and later. + +case ${EAPI} in + 2|3|4|5) : ;; + 6) die "qt4-r2.eclass is banned in EAPI 6 and later" ;; + *) die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;; +esac + +inherit base eutils qmake-utils + +export XDG_CONFIG_HOME="${T}" + +# @ECLASS-VARIABLE: DOCS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array containing documents passed to dodoc command. +# Paths can be absolute or relative to ${S}. +# +# Example: DOCS=( ChangeLog README "${WORKDIR}/doc_folder/" ) + +# @ECLASS-VARIABLE: HTML_DOCS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array containing documents passed to dohtml command. +# Paths can be absolute or relative to ${S}. +# +# Example: HTML_DOCS=( "doc/document.html" "${WORKDIR}/html_folder/" ) + +# @ECLASS-VARIABLE: LANGS +# @DEFAULT_UNSET +# @DESCRIPTION: +# In case your Qt4 application provides various translations, use this variable +# to specify them in order to populate "linguas_*" IUSE automatically. Make sure +# that you set this variable before inheriting qt4-r2 eclass. +# +# Example: LANGS="de el it ja" +for x in ${LANGS}; do + IUSE+=" linguas_${x}" +done + +# @ECLASS-VARIABLE: LANGSLONG +# @DEFAULT_UNSET +# @DESCRIPTION: +# Same as LANGS, but this variable is for LINGUAS that must be in long format. +# Remember to set this variable before inheriting qt4-r2 eclass. +# Look at ${PORTDIR}/profiles/desc/linguas.desc for details. +# +# Example: LANGSLONG="en_GB ru_RU" +for x in ${LANGSLONG}; do + IUSE+=" linguas_${x%_*}" +done +unset x + +# @ECLASS-VARIABLE: PATCHES +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array variable containing all the patches to be applied. This variable +# is expected to be defined in the global scope of ebuilds. Make sure to +# specify the full path. This variable is used in src_prepare phase. +# +# Example: +# @CODE +# PATCHES=( +# "${FILESDIR}/mypatch.patch" +# "${FILESDIR}/mypatch2.patch" +# ) +# @CODE + +# @FUNCTION: qt4-r2_src_unpack +# @DESCRIPTION: +# Default src_unpack function for packages that depend on qt4. If you have to +# override src_unpack in your ebuild (probably you don't need to), call +# qt4-r2_src_unpack in it. +qt4-r2_src_unpack() { + debug-print-function $FUNCNAME "$@" + + base_src_unpack "$@" +} + +# @FUNCTION: qt4-r2_src_prepare +# @DESCRIPTION: +# Default src_prepare function for packages that depend on qt4. If you have to +# override src_prepare in your ebuild, you should call qt4-r2_src_prepare in it, +# otherwise autopatcher will not work! +qt4-r2_src_prepare() { + debug-print-function $FUNCNAME "$@" + + base_src_prepare "$@" +} + +# @FUNCTION: qt4-r2_src_configure +# @DESCRIPTION: +# Default src_configure function for packages that depend on qt4. If you have to +# override src_configure in your ebuild, call qt4-r2_src_configure in it. +qt4-r2_src_configure() { + debug-print-function $FUNCNAME "$@" + + local project_file=$(qmake-utils_find_pro_file) + + if [[ -n ${project_file} ]]; then + eqmake4 "${project_file}" + else + base_src_configure "$@" + fi +} + +# @FUNCTION: qt4-r2_src_compile +# @DESCRIPTION: +# Default src_compile function for packages that depend on qt4. If you have to +# override src_compile in your ebuild (probably you don't need to), call +# qt4-r2_src_compile in it. +qt4-r2_src_compile() { + debug-print-function $FUNCNAME "$@" + + base_src_compile "$@" +} + +# @FUNCTION: qt4-r2_src_install +# @DESCRIPTION: +# Default src_install function for qt4-based packages. Installs compiled code, +# and documentation (via DOCS and HTML_DOCS variables). +qt4-r2_src_install() { + debug-print-function $FUNCNAME "$@" + + base_src_install INSTALL_ROOT="${D}" "$@" + einstalldocs +} + +EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install diff -uNr a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass --- a/eclass/qt5-build.eclass false +++ b/eclass/qt5-build.eclass d99fe74ef1d99a014ec10f931a2211442728354577b98ae797df688c4666d22c7e5374fe105b9f39d30444f8f06a855916cfdea6f04db22897228be827c01c5d @@ -0,0 +1,971 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: qt5-build.eclass +# @MAINTAINER: +# qt@gentoo.org +# @AUTHOR: +# Davide Pesavento <pesa@gentoo.org> +# @SUPPORTED_EAPIS: 6 +# @BLURB: Eclass for Qt5 split ebuilds. +# @DESCRIPTION: +# This eclass contains various functions that are used when building Qt5. +# Requires EAPI 6. + +if [[ ${CATEGORY} != dev-qt ]]; then + die "qt5-build.eclass is only to be used for building Qt 5" +fi + +case ${EAPI} in + 6) : ;; + *) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;; +esac + +# @ECLASS-VARIABLE: QT5_MODULE +# @PRE_INHERIT +# @DESCRIPTION: +# The upstream name of the module this package belongs to. Used for +# SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass. +: ${QT5_MODULE:=${PN}} + +# @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array variable containing the source directories that should be built. +# All paths must be relative to ${S}. + +# @ECLASS-VARIABLE: QT5_GENTOO_CONFIG +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array of <useflag:feature:macro> triplets that are evaluated in src_install +# to generate the per-package list of enabled QT_CONFIG features and macro +# definitions, which are then merged together with all other Qt5 packages +# installed on the system to obtain the global qconfig.{h,pri} files. + +# @ECLASS-VARIABLE: QT5_GENTOO_PRIVATE_CONFIG +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array of <useflag:feature> pairs that are evaluated in src_install +# to generate the per-package list of enabled QT.global_private features, +# which are then merged together with all other Qt5 packages installed on the +# system to obtain the global qmodule.pri file. + +# @ECLASS-VARIABLE: VIRTUALX_REQUIRED +# @DESCRIPTION: +# For proper description see virtualx.eclass man page. +# Here we redefine default value to be manual, if your package needs virtualx +# for tests you should proceed with setting VIRTUALX_REQUIRED=test. +: ${VIRTUALX_REQUIRED:=manual} + +inherit eapi7-ver estack flag-o-matic toolchain-funcs virtualx + +HOMEPAGE="https://www.qt.io/" +LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" +SLOT=5/$(ver_cut 1-2) + +QT5_MINOR_VERSION=$(ver_cut 2) +readonly QT5_MINOR_VERSION + +case ${PV} in + 5.9999) + # git dev branch + QT5_BUILD_TYPE="live" + EGIT_BRANCH="dev" + ;; + 5.?.9999|5.??.9999|5.???.9999) + # git stable branch + QT5_BUILD_TYPE="live" + EGIT_BRANCH=${PV%.9999} + ;; + *_alpha*|*_beta*|*_rc*) + # development release + QT5_BUILD_TYPE="release" + + if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then + MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-} + else + MY_P=${QT5_MODULE}-opensource-src-${PV/_/-} + fi + + SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz" + S=${WORKDIR}/${MY_P} + ;; + *) + # official stable release + QT5_BUILD_TYPE="release" + + if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then + MY_P=${QT5_MODULE}-everywhere-src-${PV} + else + MY_P=${QT5_MODULE}-opensource-src-${PV} + fi + + SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz" + S=${WORKDIR}/${MY_P} + ;; +esac +readonly QT5_BUILD_TYPE + +EGIT_REPO_URI=( + "https://code.qt.io/qt/${QT5_MODULE}.git" + "https://github.com/qt/${QT5_MODULE}.git" +) +[[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3 + +# @ECLASS-VARIABLE: QT5_BUILD_DIR +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# Build directory for out-of-source builds. +case ${QT5_BUILD_TYPE} in + live) : ${QT5_BUILD_DIR:=${S}_build} ;; + release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312 +esac + +IUSE="debug test" + +[[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584 +[[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182 + +DEPEND=" + dev-lang/perl + virtual/pkgconfig +" +if [[ (${PN} != qttest && ${PN} != qtwebkit) || (${PN} == qtwebkit && ${QT5_MINOR_VERSION} -lt 9) ]]; then + DEPEND+=" test? ( ~dev-qt/qttest-${PV} )" +fi +RDEPEND=" + dev-qt/qtchooser +" + + +###### Phase functions ###### + +EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm + +# @FUNCTION: qt5-build_src_unpack +# @DESCRIPTION: +# Unpacks the sources. +qt5-build_src_unpack() { + # bug 307861 + if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then + eshopts_push -s extglob + if is-flagq '-g?(gdb)?([1-9])'; then + ewarn + ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." + ewarn "You may experience really long compilation times and/or increased memory usage." + ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." + ewarn + fi + eshopts_pop + fi + + case ${QT5_BUILD_TYPE} in + live) git-r3_src_unpack ;& + release) default ;; + esac +} + +# @FUNCTION: qt5-build_src_prepare +# @DESCRIPTION: +# Prepares the environment and patches the sources if necessary. +qt5-build_src_prepare() { + qt5_prepare_env + + if [[ ${QT5_MODULE} == qtbase ]]; then + qt5_symlink_tools_to_build_dir + + # Avoid unnecessary qmake recompilations + if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then + sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \ + -e '/echo "Done."/a fi' \ + configure || die "sed failed (skip qmake bootstrap)" + else + sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \ + configure || die "sed failed (skip qmake bootstrap)" + fi + + # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake + sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \ + ${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \ + 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \ + -e 's/$setBootstrapVariable\s\+\|EXTRA_C\(XX$\?FLAGS=.*\)QMAKE_C$XX$\?FLAGS_$DEBUG\|RELEASE$.*/:/' \ + configure || die "sed failed (respect env for qmake build)" + sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ + qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)" + + # Respect CXX in bsymbolic_functions, fvisibility, precomp, and a few other tests + sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ + configure || die "sed failed (QMAKE_CONF_COMPILER)" + + if [[ ${QT5_MINOR_VERSION} -le 7 ]]; then + # Respect toolchain and flags in config.tests + find config.tests/unix -name '*.test' -type f -execdir \ + sed -i -e 's/-nocache //' '{}' + || die + fi + + # Don't inject -msse/-mavx/... into CXXFLAGS when detecting + # compiler support for extended instruction sets (bug 552942) + find config.tests/common -name '*.pro' -type f -execdir \ + sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die + + # Don't add -O3 to CXXFLAGS (bug 549140) + sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ + src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" + + # Respect build variables in configure tests (bug #639494) + if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then + sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die + fi + fi + + default +} + +# @FUNCTION: qt5-build_src_configure +# @DESCRIPTION: +# Runs qmake in the target directories. For packages +# in qtbase, ./configure is also run before qmake. +qt5-build_src_configure() { + if [[ ${QT5_MODULE} == qtbase ]]; then + qt5_base_configure + fi + + qt5_foreach_target_subdir qt5_qmake +} + +# @FUNCTION: qt5-build_src_compile +# @DESCRIPTION: +# Runs emake in the target directories. +qt5-build_src_compile() { + qt5_foreach_target_subdir emake +} + +# @FUNCTION: qt5-build_src_test +# @DESCRIPTION: +# Runs tests in the target directories. +qt5-build_src_test() { + # disable broken cmake tests (bug 474004) + local myqmakeargs=("${myqmakeargs[@]}" -after SUBDIRS-=cmake SUBDIRS-=installed_cmake) + + qt5_foreach_target_subdir qt5_qmake + qt5_foreach_target_subdir emake + + # create a custom testrunner script that correctly sets + # LD_LIBRARY_PATH before executing the given test + local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner + cat > "${testrunner}" <<-_EOF_ || die + #!/bin/sh + export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}" + "\$@" + _EOF_ + chmod +x "${testrunner}" + + set -- qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check + if [[ ${VIRTUALX_REQUIRED} == test ]]; then + virtx "$@" + else + "$@" + fi +} + +# @FUNCTION: qt5-build_src_install +# @DESCRIPTION: +# Runs emake install in the target directories. +qt5-build_src_install() { + qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install + + if [[ ${PN} == qtcore ]]; then + pushd "${QT5_BUILD_DIR}" >/dev/null || die + + set -- emake INSTALL_ROOT="${D}" \ + sub-qmake-qmake-aux-pro-install_subtargets \ + install_{syncqt,mkspecs} + + einfo "Running $*" + "$@" + + popd >/dev/null || die + + docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global + + # install an empty Gentoo/gentoo-qconfig.h in ${D} + # so that it's placed under package manager control + > "${T}"/gentoo-qconfig.h + ( + insinto "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo + doins "${T}"/gentoo-qconfig.h + ) + + # include gentoo-qconfig.h at the beginning of QtCore/qconfig.h + sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \ + "${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \ + || die "sed failed (qconfig.h)" + + # install qtchooser configuration file + cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die + ${QT5_BINDIR} + ${QT5_LIBDIR} + _EOF_ + + ( + insinto /etc/xdg/qtchooser + doins "${T}/qt5-${CHOST}.conf" + ) + + # convenience symlinks + dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf + dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf + # TODO bug 522646: write an eselect module to manage default.conf + dosym qt5.conf /etc/xdg/qtchooser/default.conf + fi + + qt5_install_module_config + + # prune libtool files + find "${D}" -name '*.la' -delete || die +} + +# @FUNCTION: qt5-build_pkg_postinst +# @DESCRIPTION: +# Regenerate configuration after installation or upgrade/downgrade. +qt5-build_pkg_postinst() { + qt5_regenerate_global_configs +} + +# @FUNCTION: qt5-build_pkg_postrm +# @DESCRIPTION: +# Regenerate configuration when a module is completely removed. +qt5-build_pkg_postrm() { + if [[ -z ${REPLACED_BY_VERSION} && ${PN} != qtcore ]]; then + qt5_regenerate_global_configs + fi +} + + +###### Public helpers ###### + +# @FUNCTION: qt_use +# @USAGE: <flag> [feature] [enableval] +# @DESCRIPTION: +# <flag> is the name of a flag in IUSE. +# +# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}" +# otherwise. If [feature] is not specified, <flag> is used in its place. +# If [enableval] is not specified, the "-${enableval}" prefix is omitted. +qt_use() { + [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" + + usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}" +} + +# @FUNCTION: qt_use_compile_test +# @USAGE: <flag> [config] +# @DESCRIPTION: +# <flag> is the name of a flag in IUSE. +# [config] is the argument of qtCompileTest, defaults to <flag>. +# +# This function is useful to disable optional dependencies that are checked +# at qmake-time using the qtCompileTest() function. If <flag> is disabled, +# the compile test is skipped and the dependency is assumed to be unavailable, +# i.e. the corresponding feature will be disabled. Note that all invocations +# of this function must happen before calling qt5-build_src_configure. +qt_use_compile_test() { + [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" + + if ! use "$1"; then + mkdir -p "${QT5_BUILD_DIR}" || die + echo "CONFIG += done_config_${2:-$1}" >> "${QT5_BUILD_DIR}"/.qmake.cache || die + fi +} + +# @FUNCTION: qt_use_disable_config +# @USAGE: <flag> <config> <files...> +# @DESCRIPTION: +# <flag> is the name of a flag in IUSE. +# <config> is the (lowercase) name of a Qt5 config entry. +# <files...> is a list of one or more qmake project files. +# +# This function patches <files> to treat <config> as disabled +# when <flag> is disabled, otherwise it does nothing. +# This can be useful to avoid an automagic dependency when the config entry +# is enabled on the system but the corresponding USE flag is disabled. +qt_use_disable_config() { + [[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least three arguments" + + local flag=$1 + local config=$2 + shift 2 + + if ! use "${flag}"; then + echo "$@" | xargs sed -i -e "s/qtConfig(${config})/false/g" || die + fi +} + +# @FUNCTION: qt_use_disable_mod +# @USAGE: <flag> <module> <files...> +# @DESCRIPTION: +# <flag> is the name of a flag in IUSE. +# <module> is the (lowercase) name of a Qt5 module. +# <files...> is a list of one or more qmake project files. +# +# This function patches <files> to treat <module> as not installed +# when <flag> is disabled, otherwise it does nothing. +# This can be useful to avoid an automagic dependency when the module +# is present on the system but the corresponding USE flag is disabled. +qt_use_disable_mod() { + [[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least three arguments" + + local flag=$1 + local module=$2 + shift 2 + + if ! use "${flag}"; then + echo "$@" | xargs sed -i -e "s/qtHaveModule(${module})/false/g" || die + fi +} + + +###### Internal functions ###### + +# @FUNCTION: qt5_prepare_env +# @INTERNAL +# @DESCRIPTION: +# Prepares the environment for building Qt. +qt5_prepare_env() { + # setup installation directories + # note: keep paths in sync with qmake-utils.eclass + QT5_PREFIX=${EPREFIX}/usr + QT5_HEADERDIR=${QT5_PREFIX}/include/qt5 + QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir) + QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5 + QT5_BINDIR=${QT5_ARCHDATADIR}/bin + QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins + QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec + QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports + QT5_QMLDIR=${QT5_ARCHDATADIR}/qml + QT5_DATADIR=${QT5_PREFIX}/share/qt5 + QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} + QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations + QT5_EXAMPLESDIR=${QT5_DATADIR}/examples + QT5_TESTSDIR=${QT5_DATADIR}/tests + QT5_SYSCONFDIR=${EPREFIX}/etc/xdg + readonly QT5_PREFIX QT5_HEADERDIR QT5_LIBDIR QT5_ARCHDATADIR \ + QT5_BINDIR QT5_PLUGINDIR QT5_LIBEXECDIR QT5_IMPORTDIR \ + QT5_QMLDIR QT5_DATADIR QT5_DOCDIR QT5_TRANSLATIONDIR \ + QT5_EXAMPLESDIR QT5_TESTSDIR QT5_SYSCONFDIR + + if [[ ${QT5_MODULE} == qtbase ]]; then + # see mkspecs/features/qt_config.prf + export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules" + fi +} + +# @FUNCTION: qt5_foreach_target_subdir +# @INTERNAL +# @DESCRIPTION: +# Executes the command given as argument from inside each directory +# listed in QT5_TARGET_SUBDIRS. Handles autotests subdirs automatically. +qt5_foreach_target_subdir() { + [[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("") + + local subdir= + for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do + if [[ ${EBUILD_PHASE} == test ]]; then + subdir=tests/auto${subdir#src} + [[ -d ${S}/${subdir} ]] || continue + fi + + local msg="Running $* ${subdir:+in ${subdir}}" + einfo "${msg}" + + mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die -n || return $? + pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die -n || return $? + + "$@" || die -n "${msg} failed" || return $? + + popd >/dev/null || die -n || return $? + done +} + +# @FUNCTION: qt5_symlink_tools_to_build_dir +# @INTERNAL +# @DESCRIPTION: +# Symlinks qmake and a few other tools to QT5_BUILD_DIR, +# so that they can be used when building other modules. +qt5_symlink_tools_to_build_dir() { + local tool= tools=() + if [[ ${PN} != qtcore ]]; then + tools+=(qmake moc rcc qlalr) + [[ ${PN} != qtdbus ]] && tools+=(qdbuscpp2xml qdbusxml2cpp) + [[ ${PN} != qtwidgets ]] && tools+=(uic) + fi + + mkdir -p "${QT5_BUILD_DIR}"/bin || die + pushd "${QT5_BUILD_DIR}"/bin >/dev/null || die + + for tool in "${tools[@]}"; do + [[ -e ${QT5_BINDIR}/${tool} ]] || continue + ln -s "${QT5_BINDIR}/${tool}" . || die "failed to symlink ${tool}" + done + + popd >/dev/null || die +} + +# @FUNCTION: qt5_base_configure +# @INTERNAL +# @DESCRIPTION: +# Runs ./configure for modules belonging to qtbase. +qt5_base_configure() { + # setup toolchain variables used by configure + tc-export AR CC CXX OBJDUMP RANLIB STRIP + export LD="$(tc-getCXX)" + + # bug 633838 + if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then + unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES + fi + + # configure arguments + local conf=( + # installation paths + -prefix "${QT5_PREFIX}" + -bindir "${QT5_BINDIR}" + -headerdir "${QT5_HEADERDIR}" + -libdir "${QT5_LIBDIR}" + -archdatadir "${QT5_ARCHDATADIR}" + -plugindir "${QT5_PLUGINDIR}" + -libexecdir "${QT5_LIBEXECDIR}" + -importdir "${QT5_IMPORTDIR}" + -qmldir "${QT5_QMLDIR}" + -datadir "${QT5_DATADIR}" + -docdir "${QT5_DOCDIR}" + -translationdir "${QT5_TRANSLATIONDIR}" + -sysconfdir "${QT5_SYSCONFDIR}" + -examplesdir "${QT5_EXAMPLESDIR}" + -testsdir "${QT5_TESTSDIR}" + + # force appropriate compiler + $(if use kernel_FreeBSD; then + if tc-is-gcc; then + echo -platform freebsd-g++ + elif tc-is-clang; then + echo -platform freebsd-clang + fi + fi) + $(if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then + if use kernel_linux; then + if tc-is-gcc; then + echo -platform linux-g++ + elif tc-is-clang; then + echo -platform linux-clang + fi + fi + fi) + + # configure in release mode by default, + # override via the CONFIG qmake variable + -release + -no-separate-debug-info + + # no need to forcefully build host tools in optimized mode, + # just follow the overall debug/release build type + -no-optimized-tools + + # licensing stuff + -opensource -confirm-license + + # autodetect the highest supported version of the C++ standard + #-c++std <c++11|c++14|c++1z> + + # build shared libraries + -shared + + # always enable large file support + $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -largefile) + + # disabling accessibility is not recommended by upstream, as + # it will break QStyle and may break other internal parts of Qt + -accessibility + + # disable all SQL drivers by default, override in qtsql + -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc + -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds + + # ensure the QML debugging support (qmltooling) is built in qtdeclarative + $([[ ${QT5_MINOR_VERSION} -lt 11 ]] && echo -qml-debug) + + # MIPS DSP instruction set extensions + $(is-flagq -mno-dsp && echo -no-mips_dsp) + $(is-flagq -mno-dspr2 && echo -no-mips_dspr2) + + # use pkg-config to detect include and library paths + -pkg-config + + # prefer system libraries (only common hard deps here) + -system-zlib + -system-pcre + -system-doubleconversion + + # disable everything to prevent automagic deps (part 1) + -no-mtdev + -no-journald -no-syslog + -no-libpng -no-libjpeg + -no-freetype -no-harfbuzz + -no-openssl -no-libproxy + -no-xkbcommon-x11 -no-xkbcommon-evdev + -no-xinput2 -no-xcb-xlib + + # cannot use -no-gif because there is no way to override it later + #-no-gif + + # always enable glib event loop support + -glib + + # disable everything to prevent automagic deps (part 2) + -no-gtk + $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio -no-alsa) + + # exclude examples and tests from default build + -nomake examples + -nomake tests + -no-compile-examples + + # disable rpath on non-prefix (bugs 380415 and 417169) + $(usex prefix '' -no-rpath) + + # print verbose information about each configure test + -verbose + + # always enable iconv support + # since 5.8 this is handled in qtcore + $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv) + + # disable everything to prevent automagic deps (part 3) + -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus + + # let portage handle stripping + -no-strip + + # precompiled headers can cause problems on hardened, so turn them off + -no-pch + + # link-time code generation is not something we want to enable by default + -no-ltcg + + # reduced relocations cause major breakage on at least arm and ppc, so + # don't specify anything and let the configure figure out if they are + # supported; see also https://bugreports.qt.io/browse/QTBUG-36129 + #-reduce-relocations + + # use the system linker (gold will be selected automagically otherwise) + $(tc-ld-is-gold && echo -use-gold-linker || echo -no-use-gold-linker) + + # disable all platform plugins by default, override in qtgui + -no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb -no-mirclient + + # disable undocumented X11-related flags, override in qtgui + # (not shown in ./configure -help output) + -no-xkb + $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-xrender) + + # disable obsolete/unused X11-related flags + $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync) + + # always enable session management support: it doesn't need extra deps + # at configure time and turning it off is dangerous, see bug 518262 + -sm + + # typedef qreal to double (warning: changing this flag breaks the ABI) + -qreal double + + # disable OpenGL and EGL support by default, override in qtgui, + # qtopengl, qtprintsupport and qtwidgets + -no-opengl -no-egl + + # disable libinput-based generic plugin by default, override in qtgui + -no-libinput + + # disable gstreamer by default, override in qtmultimedia + $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-gstreamer) + + # respect system proxies by default: it's the most natural + # setting, and it'll become the new upstream default in 5.8 + -system-proxies + + # do not build with -Werror + -no-warnings-are-errors + + # enable in respective modules to avoid poisoning QT.global_private.enabled_features + $([[ ${QT5_MINOR_VERSION} -ge 9 ]] && echo -no-gui -no-widgets) + + # module-specific options + "${myconf[@]}" + ) + + pushd "${QT5_BUILD_DIR}" >/dev/null || die + + einfo "Configuring with: ${conf[@]}" + "${S}"/configure "${conf[@]}" || die "configure failed" + + if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then + # a forwarding header is no longer created since 5.8, causing the system + # config to always be used. bug 599636 + cp src/corelib/global/qconfig.h include/QtCore/ || die + fi + + popd >/dev/null || die + +} + +# @FUNCTION: qt5_qmake_args +# @INTERNAL +# @DESCRIPTION: +# Helper function to get the various toolchain-related variables. +qt5_qmake_args() { + echo \ + QMAKE_AR=\"$(tc-getAR)\" \ + QMAKE_CC=\"$(tc-getCC)\" \ + QMAKE_LINK_C=\"$(tc-getCC)\" \ + QMAKE_LINK_C_SHLIB=\"$(tc-getCC)\" \ + QMAKE_CXX=\"$(tc-getCXX)\" \ + QMAKE_LINK=\"$(tc-getCXX)\" \ + QMAKE_LINK_SHLIB=\"$(tc-getCXX)\" \ + QMAKE_OBJCOPY=\"$(tc-getOBJCOPY)\" \ + QMAKE_RANLIB= \ + QMAKE_STRIP=\"$(tc-getSTRIP)\" \ + QMAKE_CFLAGS=\"${CFLAGS}\" \ + QMAKE_CFLAGS_RELEASE= \ + QMAKE_CFLAGS_DEBUG= \ + QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \ + QMAKE_CXXFLAGS_RELEASE= \ + QMAKE_CXXFLAGS_DEBUG= \ + QMAKE_LFLAGS=\"${LDFLAGS}\" \ + QMAKE_LFLAGS_RELEASE= \ + QMAKE_LFLAGS_DEBUG= +} + +# @FUNCTION: qt5_qmake +# @INTERNAL +# @DESCRIPTION: +# Helper function that runs qmake in the current target subdir. +# Intended to be called by qt5_foreach_target_subdir(). +qt5_qmake() { + local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}} + local qmakepath= + if [[ ${QT5_MODULE} == qtbase ]]; then + qmakepath=${QT5_BUILD_DIR}/bin + else + qmakepath=${QT5_BINDIR} + fi + + "${qmakepath}"/qmake \ + "${projectdir}" \ + CONFIG+=$(usex debug debug release) \ + CONFIG-=$(usex debug release debug) \ + QMAKE_AR="$(tc-getAR) cqs" \ + QMAKE_CC="$(tc-getCC)" \ + QMAKE_LINK_C="$(tc-getCC)" \ + QMAKE_LINK_C_SHLIB="$(tc-getCC)" \ + QMAKE_CXX="$(tc-getCXX)" \ + QMAKE_LINK="$(tc-getCXX)" \ + QMAKE_LINK_SHLIB="$(tc-getCXX)" \ + QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ + QMAKE_RANLIB= \ + QMAKE_STRIP="$(tc-getSTRIP)" \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CFLAGS_RELEASE= \ + QMAKE_CFLAGS_DEBUG= \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_CXXFLAGS_RELEASE= \ + QMAKE_CXXFLAGS_DEBUG= \ + QMAKE_LFLAGS="${LDFLAGS}" \ + QMAKE_LFLAGS_RELEASE= \ + QMAKE_LFLAGS_DEBUG= \ + "${myqmakeargs[@]}" \ + || die "qmake failed (${projectdir#${S}/})" +} + +# @FUNCTION: qt5_install_module_config +# @INTERNAL +# @DESCRIPTION: +# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} and +# ${PN}-qmodule.pri files. +qt5_install_module_config() { + local x qconfig_add= qconfig_remove= qprivateconfig_add= qprivateconfig_remove= + + > "${T}"/${PN}-qconfig.h + > "${T}"/${PN}-qconfig.pri + [[ ${QT5_MINOR_VERSION} -ge 9 ]] && > "${T}"/${PN}-qmodule.pri + + # generate qconfig_{add,remove} and ${PN}-qconfig.h + for x in "${QT5_GENTOO_CONFIG[@]}"; do + local flag=${x%%:*} + x=${x#${flag}:} + local feature=${x%%:*} + x=${x#${feature}:} + local macro=${x} + macro=$(tr 'a-z-' 'A-Z_' <<< "${macro}") + + if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then + [[ -n ${feature} ]] && qconfig_add+=" ${feature}" + [[ -n ${macro} ]] && echo "#define QT_${macro}" >> "${T}"/${PN}-qconfig.h + else + [[ -n ${feature} ]] && qconfig_remove+=" ${feature}" + [[ -n ${macro} ]] && echo "#define QT_NO_${macro}" >> "${T}"/${PN}-qconfig.h + fi + done + + # install ${PN}-qconfig.h + [[ -s ${T}/${PN}-qconfig.h ]] && ( + insinto "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo + doins "${T}"/${PN}-qconfig.h + ) + + # generate and install ${PN}-qconfig.pri + [[ -n ${qconfig_add} ]] && echo "QCONFIG_ADD=${qconfig_add}" >> "${T}"/${PN}-qconfig.pri + [[ -n ${qconfig_remove} ]] && echo "QCONFIG_REMOVE=${qconfig_remove}" >> "${T}"/${PN}-qconfig.pri + [[ -s ${T}/${PN}-qconfig.pri ]] && ( + insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo + doins "${T}"/${PN}-qconfig.pri + ) + + if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then + # generate qprivateconfig + for x in "${QT5_GENTOO_PRIVATE_CONFIG[@]}"; do + local flag=${x%%:*} + x=${x#${flag}:} + local feature=${x%%:*} + x=${x#${feature}:} + + if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then + [[ -n ${feature} ]] && qprivateconfig_add+=" ${feature}" + else + [[ -n ${feature} ]] && qprivateconfig_remove+=" ${feature}" + fi + done + + # generate and install ${PN}-qmodule.pri + [[ -n ${qprivateconfig_add} ]] && echo "QT.global_private.enabled_features = ${qprivateconfig_add}" >> "${T}"/${PN}-qmodule.pri + [[ -n ${qprivateconfig_remove} ]] && echo "QT.global_private.disabled_features = ${qprivateconfig_remove}" >> "${T}"/${PN}-qmodule.pri + [[ -s ${T}/${PN}-qmodule.pri ]] && ( + insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo + doins "${T}"/${PN}-qmodule.pri + ) + fi + + # install the original {qconfig,qmodule}.pri from qtcore + [[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && ( + insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo + newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qconfig.pri qconfig-qtcore.pri + newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qmodule.pri qmodule-qtcore.pri + ) +} + +# @FUNCTION: qt5_regenerate_global_configs +# @INTERNAL +# @DESCRIPTION: +# Generates Gentoo-specific qconfig.{h,pri} and qmodule.pri according to the +# build configuration. +# Don't call die here because dying in pkg_post{inst,rm} only makes things worse. +qt5_regenerate_global_configs() { + einfo "Regenerating gentoo-qconfig.h" + + find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \ + -name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \ + -execdir cat '{}' + | sort -u > "${T}"/gentoo-qconfig.h + + [[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty" + mv -f "${T}"/gentoo-qconfig.h "${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \ + || eerror "Failed to install new gentoo-qconfig.h" + + einfo "Updating QT_CONFIG in qconfig.pri" + + local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri + local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri + if [[ -f ${qconfig_pri} ]]; then + local x qconfig_add= qconfig_remove= + local qt_config new_qt_config= + if [[ -f ${qconfig_pri_orig} ]]; then + qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") + else + qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}") + fi + + # generate list of QT_CONFIG entries from the existing list, + # appending QCONFIG_ADD and excluding QCONFIG_REMOVE + eshopts_push -s nullglob + for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do + qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=\s*//p' "${x}")" + qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=\s*//p' "${x}")" + done + eshopts_pop + for x in ${qt_config} ${qconfig_add}; do + if ! has "${x}" ${new_qt_config} ${qconfig_remove}; then + new_qt_config+=" ${x}" + fi + done + + # now replace the existing QT_CONFIG with the generated list + sed -i -e "s/^QT_CONFIG\s*+=.*/QT_CONFIG +=${new_qt_config}/" \ + "${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in ${qconfig_pri}" + else + ewarn "${qconfig_pri} does not exist or is not a regular file" + fi + + if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then + einfo "Updating QT.global_private in qmodule.pri" + + local qmodule_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri + local qmodule_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri + if [[ -f ${qmodule_pri} && -f ${qmodule_pri_orig} ]]; then + local x + local qprivateconfig_enabled= qprivateconfig_disabled= + local qprivateconfig_orig_enabled= qprivateconfig_orig_disabled= + local new_qprivateconfig_enabled= new_qprivateconfig_disabled= + + # generate lists of QT.global_private.{dis,en}abled_features + qprivateconfig_orig_enabled="$(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${qmodule_pri_orig}")" + qprivateconfig_orig_disabled="$(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${qmodule_pri_orig}")" + eshopts_push -s nullglob + for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do + qprivateconfig_enabled+=" $(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${x}")" + qprivateconfig_disabled+=" $(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${x}")" + done + eshopts_pop + + # anything enabled is enabled, but anything disabled is + # only disabled if it isn't enabled somewhere else. + # this is because we need to forcibly disable some stuff + # in qtcore to support split qtbase. + new_qprivateconfig_enabled=${qprivateconfig_enabled} + for x in ${qprivateconfig_disabled}; do + if ! has "${x}" ${qprivateconfig_enabled}; then + new_qprivateconfig_disabled+=" ${x}" + fi + done + + # check all items from the original qtcore qmodule.pri, + # and add them to the appropriate list if not overridden + # elsewhere + for x in ${qprivateconfig_orig_enabled}; do + if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then + new_qprivateconfig_enabled+=" ${x}" + fi + done + for x in ${qprivateconfig_orig_disabled}; do + if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then + new_qprivateconfig_disabled+=" ${x}" + fi + done + + # now replace the existing QT.global_private.{dis,en}abled_features + # with the generated list + sed \ + -e "s/^QT.global_private.enabled_features\s*=.*/QT.global_private.enabled_features =${new_qprivateconfig_enabled}/" \ + -e "s/^QT.global_private.disabled_features\s*=.*/QT.global_private.disabled_features =${new_qprivateconfig_disabled}/" \ + -i "${qmodule_pri}" || eerror "Failed to sed QT.global_private.enabled_features in ${qmodule_pri}" + else + ewarn "${qmodule_pri} or ${qmodule_pri_orig} does not exist or is not a regular file" + fi + fi +} diff -uNr a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass --- a/eclass/readme.gentoo-r1.eclass false +++ b/eclass/readme.gentoo-r1.eclass ad5a41385d8d0a26ee95619be45fa55829706a4233588350d97e3511736050df25a3dbc201c0c0293dd920ca81dc5851a41888766ad6516c750d756ede2ef639 @@ -0,0 +1,108 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: readme.gentoo-r1.eclass +# @MAINTAINER: +# Pacho Ramos <pacho@gentoo.org> +# @AUTHOR: +# Author: Pacho Ramos <pacho@gentoo.org> +# @BLURB: An eclass for installing a README.gentoo doc file recording tips +# shown via elog messages. +# @DESCRIPTION: +# An eclass for installing a README.gentoo doc file recording tips +# shown via elog messages. With this eclass, those elog messages will only be +# shown at first package installation and a file for later reviewing will be +# installed under /usr/share/doc/${PF} +# +# You need to call readme.gentoo_create_doc in src_install phase and +# readme.gentoo_print_elog in pkg_postinst + +if [[ -z ${_README_GENTOO_ECLASS} ]]; then +_README_GENTOO_ECLASS=1 + +case "${EAPI:-0}" in + 0|1|2|3) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 4|5|6) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +# @ECLASS-VARIABLE: DISABLE_AUTOFORMATTING +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty, DOC_CONTENTS information will be strictly respected, +# not getting it automatically formatted by fmt. If empty, it will +# rely on fmt for formatting and 'echo -e' options to tweak lines a bit. + +# @ECLASS-VARIABLE: FORCE_PRINT_ELOG +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty this variable forces elog messages to be printed. + +# @ECLASS-VARIABLE: README_GENTOO_SUFFIX +# @DESCRIPTION: +# If you want to specify a suffix for README.gentoo file please export it. +: ${README_GENTOO_SUFFIX:=""} + +# @FUNCTION: readme.gentoo_create_doc +# @DESCRIPTION: +# Create doc file with ${DOC_CONTENTS} variable (preferred) and, if not set, +# look for "${FILESDIR}/README.gentoo" contents. You can use +# ${FILESDIR}/README.gentoo-${SLOT} also. +# Usually called at src_install phase. +readme.gentoo_create_doc() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ -n "${DOC_CONTENTS}" ]]; then + if [[ -n "${DISABLE_AUTOFORMATTING}" ]]; then + echo "${DOC_CONTENTS}" > "${T}"/README.gentoo || die + else + local saved_flags=$- + set -f # disable filename expansion in echo arguments + echo -e ${DOC_CONTENTS} | fold -s -w 70 \ + | sed 's/[[:space:]]*$//' > "${T}"/README.gentoo + assert + set +f -${saved_flags} + fi + elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then + cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo || die + elif [[ -f "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" ]]; then + cp "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" "${T}"/README.gentoo || die + else + die "You are not specifying README.gentoo contents!" + fi + + dodoc "${T}"/README.gentoo + README_GENTOO_DOC_VALUE=$(< "${T}/README.gentoo") +} + +# @FUNCTION: readme.gentoo_print_elog +# @DESCRIPTION: +# Print elog messages with "${T}"/README.gentoo contents. They will be +# shown only when package is installed at first time. +# Usually called at pkg_postinst phase. +# +# If you want to show them always, please set FORCE_PRINT_ELOG to a non empty +# value in your ebuild before this function is called. +# This can be useful when, for example, DOC_CONTENTS is modified, then, you can +# rely on specific REPLACING_VERSIONS handling in your ebuild to print messages +# when people update from versions still providing old message. +readme.gentoo_print_elog() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ -z "${README_GENTOO_DOC_VALUE}" ]]; then + die "readme.gentoo_print_elog invoked without matching readme.gentoo_create_doc call!" + elif ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then + echo -e "${README_GENTOO_DOC_VALUE}" | while read -r ELINE; do elog "${ELINE}"; done + elog "" + elog "(Note: Above message is only printed the first time package is" + elog "installed. Please look at ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" + elog "for future reference)" + fi +} + +fi diff -uNr a/eclass/readme.gentoo.eclass b/eclass/readme.gentoo.eclass --- a/eclass/readme.gentoo.eclass false +++ b/eclass/readme.gentoo.eclass 1e21794c14fa415f01aef3bb38860e06d24098901ab79f102e6d9a2fa5f548b7d5b5a35172cb6d73230c7b18b18835a181f8925b75d92f2a6ca9daaa53a3bf9e @@ -0,0 +1,140 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: readme.gentoo.eclass +# @MAINTAINER: +# Pacho Ramos <pacho@gentoo.org> +# @AUTHOR: +# Author: Pacho Ramos <pacho@gentoo.org> +# @BLURB: An eclass for installing a README.gentoo doc file recording tips +# shown via elog messages. +# @DESCRIPTION: +# An eclass for installing a README.gentoo doc file recording tips +# shown via elog messages. With this eclass, those elog messages will only be +# shown at first package installation and a file for later reviewing will be +# installed under /usr/share/doc/${PF} +# +# This eclass is DEPRECATED. Please use readme.gentoo-r1 instead. + +if [[ -z ${_README_GENTOO_ECLASS} ]]; then +_README_GENTOO_ECLASS=1 + +inherit eutils + +case "${EAPI:-0}" in + 0|1|2|3) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 4|5) + # EAPI>=4 is required for REPLACING_VERSIONS preventing us + # from needing to export another pkg_preinst phase to save has_version + # result. Also relies on EAPI >=4 default src_install phase. + EXPORT_FUNCTIONS src_install pkg_postinst + ;; + 6) + die "Unsupported EAPI=${EAPI} for ${ECLASS}" + die "Please migrate to readme.gentoo-r1.eclass and note that" + die "it stops to export any ebuild phases and, then, you will" + die "need to ensure readme.gentoo_create_doc is called in" + die "src_install and readme.gentoo_print_elog in pkg_postinst" + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +# @ECLASS-VARIABLE: DISABLE_AUTOFORMATTING +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty, DOC_CONTENTS information will be strictly respected, +# not getting it automatically formatted by fmt. If empty, it will +# rely on fmt for formatting and 'echo -e' options to tweak lines a bit. + +# @ECLASS-VARIABLE: FORCE_PRINT_ELOG +# @DEFAULT_UNSET +# @DESCRIPTION: +# If non-empty this variable forces elog messages to be printed. + +# @ECLASS-VARIABLE: README_GENTOO_SUFFIX +# @DESCRIPTION: +# If you want to specify a suffix for README.gentoo file please export it. +: ${README_GENTOO_SUFFIX:=""} + +# @FUNCTION: readme.gentoo_create_doc +# @DESCRIPTION: +# Create doc file with ${DOC_CONTENTS} variable (preferred) and, if not set, +# look for "${FILESDIR}/README.gentoo" contents. You can use +# ${FILESDIR}/README.gentoo-${SLOT} also. +# Usually called at src_install phase. +readme.gentoo_create_doc() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ -n "${DOC_CONTENTS}" ]]; then + eshopts_push + set -f + if [[ -n "${DISABLE_AUTOFORMATTING}" ]]; then + echo "${DOC_CONTENTS}" > "${T}"/README.gentoo + else + echo -e ${DOC_CONTENTS} | fold -s -w 70 \ + | sed 's/[[:space:]]*$//' > "${T}"/README.gentoo + fi + eshopts_pop + elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then + cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo || die + elif [[ -f "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" ]]; then + cp "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" "${T}"/README.gentoo || die + else + die "You are not specifying README.gentoo contents!" + fi + + dodoc "${T}"/README.gentoo + README_GENTOO_DOC_VALUE=$(< "${T}/README.gentoo") +} + +# @FUNCTION: readme.gentoo_print_elog +# @DESCRIPTION: +# Print elog messages with "${T}"/README.gentoo contents. They will be +# shown only when package is installed at first time. +# Usually called at pkg_postinst phase. +# +# If you want to show them always, please set FORCE_PRINT_ELOG to a non empty +# value in your ebuild before this function is called. +# This can be useful when, for example, DOC_CONTENTS is modified, then, you can +# rely on specific REPLACING_VERSIONS handling in your ebuild to print messages +# when people update from versions still providing old message. +readme.gentoo_print_elog() { + debug-print-function ${FUNCNAME} "${@}" + + eqawarn "${CATEGORY}/${PN} is using the deprecated readme.gentoo.eclass." + eqawarn "Please use readme.gentoo-r1 instead." + + if [[ -z "${README_GENTOO_DOC_VALUE}" ]]; then + die "readme.gentoo_print_elog invoked without matching readme.gentoo_create_doc call!" + elif ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then + echo -e "${README_GENTOO_DOC_VALUE}" | while read -r ELINE; do elog "${ELINE}"; done + elog "" + elog "(Note: Above message is only printed the first time package is" + elog "installed. Please look at ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" + elog "for future reference)" + fi +} + + +# @FUNCTION: readme.gentoo_src_install +# @DESCRIPTION: +# Install generated doc file automatically. +readme.gentoo_src_install() { + debug-print-function ${FUNCNAME} "${@}" + default + readme.gentoo_create_doc +} + +# @FUNCTION: readme.gentoo_pkg_postinst +# @DESCRIPTION: +# Show elog messages from from just generated doc file. +readme.gentoo_pkg_postinst() { + debug-print-function ${FUNCNAME} "${@}" + readme.gentoo_print_elog +} + +fi diff -uNr a/eclass/rebar.eclass b/eclass/rebar.eclass --- a/eclass/rebar.eclass false +++ b/eclass/rebar.eclass 7acd5706451aaef3c46e81c44627056862a44568ae2f16a07133fb03bd33f006476d69f44ad3651183ebf4bc15cf2ea176cf60bece53d15c00ce4b3ebc7ea2fa @@ -0,0 +1,258 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: rebar.eclass +# @MAINTAINER: +# Amadeusz Żołnowski <aidecoe@gentoo.org> +# @AUTHOR: +# Amadeusz Żołnowski <aidecoe@gentoo.org> +# @BLURB: Build Erlang/OTP projects using dev-util/rebar. +# @DESCRIPTION: +# An eclass providing functions to build Erlang/OTP projects using +# dev-util/rebar. +# +# rebar is a tool which tries to resolve dependencies itself which is by +# cloning remote git repositories. Dependant projects are usually expected to +# be in sub-directory 'deps' rather than looking at system Erlang lib +# directory. Projects relying on rebar usually don't have 'install' make +# targets. The eclass workarounds some of these problems. It handles +# installation in a generic way for Erlang/OTP structured projects. + +case "${EAPI:-0}" in + 0|1|2|3|4|5) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 6) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +EXPORT_FUNCTIONS src_prepare src_compile src_test src_install + +RDEPEND="dev-lang/erlang" +DEPEND="${RDEPEND} + dev-util/rebar + >=sys-apps/gawk-4.1" + +# @ECLASS-VARIABLE: REBAR_APP_SRC +# @DESCRIPTION: +# Relative path to .app.src description file. +REBAR_APP_SRC="${REBAR_APP_SRC-src/${PN}.app.src}" + +# @FUNCTION: get_erl_libs +# @RETURN: the path to Erlang lib directory +# @DESCRIPTION: +# Get the full path without EPREFIX to Erlang lib directory. +get_erl_libs() { + echo "/usr/$(get_libdir)/erlang/lib" +} + +# @FUNCTION: _rebar_find_dep +# @INTERNAL +# @USAGE: <project_name> +# @RETURN: full path with EPREFIX to a Erlang package/project on success, +# code 1 when dependency is not found and code 2 if multiple versions of +# dependency are found. +# @DESCRIPTION: +# Find a Erlang package/project by name in Erlang lib directory. Project +# directory is usually suffixed with version. It is matched to '<project_name>' +# or '<project_name>-*'. +_rebar_find_dep() { + local pn="$1" + local p + local result + + pushd "${EPREFIX}$(get_erl_libs)" >/dev/null || return 1 + for p in ${pn} ${pn}-*; do + if [[ -d ${p} ]]; then + # Ensure there's at most one matching. + [[ ${result} ]] && return 2 + result="${p}" + fi + done + popd >/dev/null || die + + [[ ${result} ]] || return 1 + echo "${result}" +} + +# @FUNCTION: rebar_disable_coverage +# @USAGE: [<rebar_config>] +# @DESCRIPTION: +# Disable coverage in rebar.config. This is a workaround for failing coverage. +# Coverage is not relevant in this context, so there's no harm to disable it, +# although the issue should be fixed. +rebar_disable_coverage() { + debug-print-function ${FUNCNAME} "${@}" + + local rebar_config="${1:-rebar.config}" + + sed -e 's/{cover_enabled, true}/{cover_enabled, false}/' \ + -i "${rebar_config}" \ + || die "failed to disable coverage in ${rebar_config}" +} + +# @FUNCTION: erebar +# @USAGE: <targets> +# @DESCRIPTION: +# Run rebar with verbose flag. Die on failure. +erebar() { + debug-print-function ${FUNCNAME} "${@}" + + (( $# > 0 )) || die "erebar: at least one target is required" + + local -x ERL_LIBS="${EPREFIX}$(get_erl_libs)" + rebar -v skip_deps=true "$@" || die -n "rebar $@ failed" +} + +# @FUNCTION: rebar_fix_include_path +# @USAGE: <project_name> [<rebar_config>] +# @DESCRIPTION: +# Fix path in rebar.config to 'include' directory of dependant project/package, +# so it points to installation in system Erlang lib rather than relative 'deps' +# directory. +# +# <rebar_config> is optional. Default is 'rebar.config'. +# +# The function dies on failure. +rebar_fix_include_path() { + debug-print-function ${FUNCNAME} "${@}" + + local pn="$1" + local rebar_config="${2:-rebar.config}" + local erl_libs="${EPREFIX}$(get_erl_libs)" + local p + + p="$(_rebar_find_dep "${pn}")" \ + || die "failed to unambiguously resolve dependency of '${pn}'" + + gawk -i inplace \ + -v erl_libs="${erl_libs}" -v pn="${pn}" -v p="${p}" ' +/^{[[:space:]]*erl_opts[[:space:]]*,/, /}[[:space:]]*\.$/ { + pattern = "\"(./)?deps/" pn "/include\""; + if (match($0, "{i,[[:space:]]*" pattern "[[:space:]]*}")) { + sub(pattern, "\"" erl_libs "/" p "/include\""); + } + print $0; + next; +} +1 +' "${rebar_config}" || die "failed to fix include paths in ${rebar_config} for '${pn}'" +} + +# @FUNCTION: rebar_remove_deps +# @USAGE: [<rebar_config>] +# @DESCRIPTION: +# Remove dependencies list from rebar.config and deceive build rules that any +# dependencies are already fetched and built. Otherwise rebar tries to fetch +# dependencies and compile them. +# +# <rebar_config> is optional. Default is 'rebar.config'. +# +# The function dies on failure. +rebar_remove_deps() { + debug-print-function ${FUNCNAME} "${@}" + + local rebar_config="${1:-rebar.config}" + + mkdir -p "${S}/deps" && :>"${S}/deps/.got" && :>"${S}/deps/.built" || die + gawk -i inplace ' +/^{[[:space:]]*deps[[:space:]]*,/, /}[[:space:]]*\.$/ { + if ($0 ~ /}[[:space:]]*\.$/) { + print "{deps, []}."; + } + next; +} +1 +' "${rebar_config}" || die "failed to remove deps from ${rebar_config}" +} + +# @FUNCTION: rebar_set_vsn +# @USAGE: [<version>] +# @DESCRIPTION: +# Set version in project description file if it's not set. +# +# <version> is optional. Default is PV stripped from version suffix. +# +# The function dies on failure. +rebar_set_vsn() { + debug-print-function ${FUNCNAME} "${@}" + + local version="${1:-${PV%_*}}" + + sed -e "s/vsn, git/vsn, \"${version}\"/" \ + -i "${S}/${REBAR_APP_SRC}" \ + || die "failed to set version in src/${PN}.app.src" +} + +# @FUNCTION: rebar_src_prepare +# @DESCRIPTION: +# Prevent rebar from fetching and compiling dependencies. Set version in +# project description file if it's not set. +# +# Existence of rebar.config is optional, but file description file must exist +# at 'src/${PN}.app.src'. +rebar_src_prepare() { + debug-print-function ${FUNCNAME} "${@}" + + default + rebar_set_vsn + if [[ -f rebar.config ]]; then + rebar_disable_coverage + rebar_remove_deps + fi +} + +# @FUNCTION: rebar_src_configure +# @DESCRIPTION: +# Configure with ERL_LIBS set. +rebar_src_configure() { + debug-print-function ${FUNCNAME} "${@}" + + local -x ERL_LIBS="${EPREFIX}$(get_erl_libs)" + default +} + +# @FUNCTION: rebar_src_compile +# @DESCRIPTION: +# Compile project with rebar. +rebar_src_compile() { + debug-print-function ${FUNCNAME} "${@}" + + erebar compile +} + +# @FUNCTION: rebar_src_test +# @DESCRIPTION: +# Run unit tests. +rebar_src_test() { + debug-print-function ${FUNCNAME} "${@}" + + erebar eunit +} + +# @FUNCTION: rebar_src_install +# @DESCRIPTION: +# Install BEAM files, include headers, executables and native libraries. +# Install standard docs like README or defined in DOCS variable. +# +# Function expects that project conforms to Erlang/OTP structure. +rebar_src_install() { + debug-print-function ${FUNCNAME} "${@}" + + local bin + local dest="$(get_erl_libs)/${P}" + + insinto "${dest}" + doins -r ebin + [[ -d include ]] && doins -r include + [[ -d bin ]] && for bin in bin/*; do dobin "$bin"; done + + if [[ -d priv ]]; then + cp -pR priv "${ED}${dest}/" || die "failed to install priv/" + fi + + einstalldocs +} diff -uNr a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass --- a/eclass/ros-catkin.eclass false +++ b/eclass/ros-catkin.eclass 8b4ac47fb92ffa5d05acbe06f40cc6e9a326231b2856b498b046a5f3fdbb7db4760a5e843b12cc614766fce4fec2a0b1b2cb2b1193305d0415f21eb69bcf19b0 @@ -0,0 +1,255 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ros-catkin.eclass +# @MAINTAINER: +# ros@gentoo.org +# @AUTHOR: +# Alexis Ballier <aballier@gentoo.org> +# @BLURB: Template eclass for catkin based ROS packages. +# @DESCRIPTION: +# Provides function for building ROS packages on Gentoo. +# It supports selectively building messages, multi-python installation, live ebuilds (git only). + +case "${EAPI:-0}" in + 0|1|2|3|4) + die "EAPI='${EAPI}' is not supported" + ;; + *) + ;; +esac + +# @ECLASS-VARIABLE: ROS_REPO_URI +# @DESCRIPTION: +# URL of the upstream repository. Usually on github. +# Serves for fetching tarballs, live ebuilds and inferring the meta-package name. +EGIT_REPO_URI="${ROS_REPO_URI}" + +# @ECLASS-VARIABLE: ROS_SUBDIR +# @DEFAULT_UNSET +# @DESCRIPTION: +# Subdir in which current packages is located. +# Usually, a repository contains several packages, hence a typical value is: +# ROS_SUBDIR=${PN} + +# @ECLASS-VARIABLE: CATKIN_IN_SOURCE_BUILD +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set to enable in-source build. + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" +fi + +# This should be temporary. ROS only really works with one global python +# version. The idea here is to have a ROS_COMPAT in the same vein as +# PYTHON_COMPAT where packages would define what distro they can work on, then +# we'd have ros_distro_gentoo_python_2_7 & co plus the OSRF ones (lunar, etc.). +# Note that this uncondtionally pulls python but in the ROS world there will +# most certainly be something pulling python anyway. +PYTHON_COMPAT=( python2_7 ) + +inherit ${SCM} python-r1 cmake-utils flag-o-matic + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +IUSE="test" +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND} + dev-util/catkin[${PYTHON_USEDEP}] + dev-python/empy[${PYTHON_USEDEP}] +" + +# @ECLASS-VARIABLE: CATKIN_HAS_MESSAGES +# @DESCRIPTION: +# Set it to a non-empty value before inherit to tell the eclass the package has messages to build. +# Messages will be built based on ROS_MESSAGES USE_EXPANDed variable. + +# @ECLASS-VARIABLE: CATKIN_MESSAGES_TRANSITIVE_DEPS +# @DESCRIPTION: +# Some messages have dependencies on other messages. +# In that case, CATKIN_MESSAGES_TRANSITIVE_DEPS should contain a space-separated list of atoms +# representing those dependencies. The eclass uses it to ensure proper dependencies on these packages. +if [ -n "${CATKIN_HAS_MESSAGES}" ] ; then + IUSE="${IUSE} +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs" + RDEPEND="${RDEPEND} + ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[${PYTHON_USEDEP}] ) + ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[${PYTHON_USEDEP}] ) + ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[${PYTHON_USEDEP}] ) + ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[${PYTHON_USEDEP}] ) + ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[${PYTHON_USEDEP}] ) + dev-ros/message_runtime + " + DEPEND="${DEPEND} ${RDEPEND} + dev-ros/message_generation + dev-ros/genmsg[${PYTHON_USEDEP}] + " + if [ -n "${CATKIN_MESSAGES_TRANSITIVE_DEPS}" ] ; then + for i in ${CATKIN_MESSAGES_TRANSITIVE_DEPS} ; do + ds="${i}[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( ${i}[${PYTHON_USEDEP}] )" + RDEPEND="${RDEPEND} ${ds}" + DEPEND="${DEPEND} ${ds}" + done + fi +fi + +# @ECLASS-VARIABLE: CATKIN_MESSAGES_CXX_USEDEP +# @DESCRIPTION: +# Use it as cat/pkg[${CATKIN_MESSAGES_CXX_USEDEP}] to indicate a dependency on the C++ messages of cat/pkg. +CATKIN_MESSAGES_CXX_USEDEP="ros_messages_cxx(-)" + +# @ECLASS-VARIABLE: CATKIN_MESSAGES_PYTHON_USEDEP +# @DESCRIPTION: +# Use it as cat/pkg[${CATKIN_MESSAGES_PYTHON_USEDEP}] to indicate a dependency on the Python messages of cat/pkg. +CATKIN_MESSAGES_PYTHON_USEDEP="ros_messages_python(-),${PYTHON_USEDEP}" + +# @ECLASS-VARIABLE: CATKIN_MESSAGES_LISP_USEDEP +# @DESCRIPTION: +# Use it as cat/pkg[${CATKIN_MESSAGES_LISP_USEDEP}] to indicate a dependency on the Common-Lisp messages of cat/pkg. +CATKIN_MESSAGES_LISP_USEDEP="ros_messages_lisp(-)" + +# @ECLASS-VARIABLE: CATKIN_MESSAGES_EUS_USEDEP +# @DESCRIPTION: +# Use it as cat/pkg[${CATKIN_MESSAGES_EUS_USEDEP}] to indicate a dependency on the EusLisp messages of cat/pkg. +CATKIN_MESSAGES_EUS_USEDEP="ros_messages_eus(-)" + +# @ECLASS-VARIABLE: CATKIN_MESSAGES_NODEJS_USEDEP +# @DESCRIPTION: +# Use it as cat/pkg[${CATKIN_MESSAGES_NODEJS_USEDEP}] to indicate a dependency on the nodejs messages of cat/pkg. +CATKIN_MESSAGES_NODEJS_USEDEP="ros_messages_nodejs(-)" + +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" + KEYWORDS="" + S=${WORKDIR}/${P}/${ROS_SUBDIR} +else + SRC_URI="${ROS_REPO_URI}/archive/${VER_PREFIX}${PV%_*}${VER_SUFFIX}.tar.gz -> ${ROS_REPO_URI##*/}-${PV}.tar.gz" + S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}${VER_SUFFIX}/${ROS_SUBDIR} +fi + +HOMEPAGE="http://wiki.ros.org/${PN}" + +# @FUNCTION: ros-catkin_src_prepare +# @DESCRIPTION: +# Calls cmake-utils_src_prepare (so that PATCHES array is handled there) and initialises the workspace +# by installing a recursive CMakeLists.txt to handle bundles. +ros-catkin_src_prepare() { + # If no multibuild, just use cmake IN_SOURCE support + [ -n "${CATKIN_IN_SOURCE_BUILD}" ] && export CMAKE_IN_SOURCE_BUILD=yes + + cmake-utils_src_prepare + + if [ ! -f "${S}/CMakeLists.txt" ] ; then + catkin_init_workspace || die + fi + + # Most packages require C++11 these days. Do it here, in src_prepare so that + # ebuilds can override it in src_configure. + append-cxxflags '-std=c++11' +} + +# @FUNCTION: ros-catkin_python_setup +# @DESCRIPTION: +# Sets up python environment for ROS packages. +ros-catkin_python_setup() { + # Todo: Need to match this with ros distro. + local pyimpl="${PYTHON_COMPAT[0]}" + python_export "${pyimpl}" EPYTHON PYTHON + python_wrapper_setup + python_export PYTHON_SCRIPTDIR +} + +# @VARIABLE: mycatkincmakeargs +# @DEFAULT_UNSET +# @DESCRIPTION: +# Optional cmake defines as a bash array. Should be defined before calling +# src_configure. + +# @FUNCTION: ros-catkin_src_configure +# @DESCRIPTION: +# Configures a catkin-based package. +ros-catkin_src_configure() { + ros-catkin_python_setup + + export CATKIN_PREFIX_PATH="${EPREFIX}/usr" + export ROS_ROOT="${EPREFIX}/usr/share/ros" + if [ -n "${CATKIN_HAS_MESSAGES}" ] ; then + ROS_LANG_DISABLE="" + use ros_messages_cxx || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:gencpp" + use ros_messages_eus || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:geneus" + use ros_messages_lisp || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:genlisp" + use ros_messages_python || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:genpy" + use ros_messages_nodejs || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:gennodejs" + export ROS_LANG_DISABLE + fi + + local mycmakeargs=( + "$(cmake-utils_use test CATKIN_ENABLE_TESTING)" + "-DCATKIN_BUILD_BINARY_PACKAGE=ON" + "-DCATKIN_PREFIX_PATH=${SYSROOT:-${EROOT}}/usr" + "${mycatkincmakeargs[@]}" + ) + + local sitedir="$(python_get_sitedir)" + mycmakeargs+=( + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" + ) + if [ -n "${CATKIN_IN_SOURCE_BUILD}" ] ; then + export CMAKE_USE_DIR="${BUILD_DIR}" + fi + + cmake-utils_src_configure "${@}" +} + +# @FUNCTION: ros-catkin_src_compile +# @DESCRIPTION: +# Builds a catkin-based package. +ros-catkin_src_compile() { + ros-catkin_python_setup + cmake-utils_src_compile "${@}" +} + +# @FUNCTION: ros-catkin_src_test +# @DESCRIPTION: +# Run the tests of a catkin-based package. +ros-catkin_src_test() { + cd "${BUILD_DIR}" || die + + ros-catkin_python_setup + + # Regenerate env for tests, PYTHONPATH is not set properly otherwise... + if [ -f catkin_generated/generate_cached_setup.py ] ; then + einfo "Regenerating setup_cached.sh for tests" + ${PYTHON:-python} catkin_generated/generate_cached_setup.py || die + fi + # Using cmake-utils_src_make with nonfatal does not work and breaks e.g. + # dev-ros/rviz. + if nonfatal emake tests -n &> /dev/null ; then + cmake-utils_src_make tests + fi + cmake-utils_src_test "${@}" +} + +# @FUNCTION: ros-catkin_src_install +# @DESCRIPTION: +# Installs a catkin-based package. +ros-catkin_src_install() { + ros-catkin_python_setup + + if [ -n "${CATKIN_IN_SOURCE_BUILD}" ] ; then + export CMAKE_USE_DIR="${BUILD_DIR}" + fi + + cmake-utils_src_install "${@}" + if [ ! -f "${T}/.catkin_python_symlinks_generated" -a -d "${D}/${PYTHON_SCRIPTDIR}" ]; then + dodir /usr/bin + for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do + dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" + done + touch "${T}/.catkin_python_symlinks_generated" || die + fi +} + +EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install diff -uNr a/eclass/rpm.eclass b/eclass/rpm.eclass --- a/eclass/rpm.eclass false +++ b/eclass/rpm.eclass 5013d12140ebcfc4f45097ac17cea6d3df9e85bd51b39dec11dcdad455e16e6c6fe378801ac28f75670e3a7442d96cf863dad90b200f6e219915be25eff18f5e @@ -0,0 +1,126 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: rpm.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: convenience class for extracting RPMs + +inherit eutils + +DEPEND=">=app-arch/rpm2targz-9.0.0.3g" + +# @FUNCTION: rpm_unpack +# @USAGE: <rpms> +# @DESCRIPTION: +# Unpack the contents of the specified rpms like the unpack() function. +rpm_unpack() { + [[ $# -eq 0 ]] && set -- ${A} + local a + for a in "$@" ; do + echo ">>> Unpacking ${a} to ${PWD}" + if [[ ${a} == ./* ]] ; then + : nothing to do -- path is local + elif [[ ${a} == ${DISTDIR}/* ]] ; then + ewarn 'QA: do not use ${DISTDIR} with rpm_unpack -- it is added for you' + elif [[ ${a} == /* ]] ; then + ewarn 'QA: do not use full paths with rpm_unpack -- use ./ paths instead' + else + a="${DISTDIR}/${a}" + fi + rpm2tar -O "${a}" | tar xf - || die "failure unpacking ${a}" + done +} + +# @FUNCTION: srcrpm_unpack +# @USAGE: <rpms> +# @DESCRIPTION: +# Unpack the contents of the specified rpms like the unpack() function as well +# as any archives that it might contain. Note that the secondary archive +# unpack isn't perfect in that it simply unpacks all archives in the working +# directory (with the assumption that there weren't any to start with). +srcrpm_unpack() { + [[ $# -eq 0 ]] && set -- ${A} + rpm_unpack "$@" + + # no .src.rpm files, then nothing to do + [[ "$* " != *".src.rpm " ]] && return 0 + + eshopts_push -s nullglob + + # unpack everything + local a + for a in *.tar.{gz,bz2,xz} *.t{gz,bz2,xz,pxz} *.zip *.ZIP ; do + unpack "./${a}" + rm -f "${a}" + done + + eshopts_pop + + return 0 +} + +# @FUNCTION: rpm_src_unpack +# @DESCRIPTION: +# Automatically unpack all archives in ${A} including rpms. If one of the +# archives in a source rpm, then the sub archives will be unpacked as well. +rpm_src_unpack() { + local a + for a in ${A} ; do + case ${a} in + *.rpm) srcrpm_unpack "${a}" ;; + *) unpack "${a}" ;; + esac + done +} + +# @FUNCTION: rpm_spec_epatch +# @USAGE: [spec] +# @DESCRIPTION: +# Read the specified spec (defaults to ${PN}.spec) and attempt to apply +# all the patches listed in it. If the spec does funky things like moving +# files around, well this won't handle that. +rpm_spec_epatch() { + local p spec=$1 + local dir + + if [[ -z ${spec} ]] ; then + # search likely places for the spec file + for spec in "${PWD}" "${S}" "${WORKDIR}" ; do + spec+="/${PN}.spec" + [[ -e ${spec} ]] && break + done + fi + [[ ${spec} == */* ]] \ + && dir=${spec%/*} \ + || dir= + + ebegin "Applying patches from ${spec}" + + grep '^%patch' "${spec}" | \ + while read line ; do + # expand the %patch line + set -- ${line} + p=$1 + shift + + # process the %patch arguments + local arg + EPATCH_OPTS= + for arg in "$@" ; do + case ${arg} in + -b) EPATCH_OPTS+=" --suffix" ;; + *) EPATCH_OPTS+=" ${arg}" ;; + esac + done + + # extract the patch name from the Patch# line + set -- $(grep "^P${p#%p}: " "${spec}") + shift + epatch "${dir:+${dir}/}$*" + done + + eend +} + +EXPORT_FUNCTIONS src_unpack diff -uNr a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass --- a/eclass/ruby-fakegem.eclass false +++ b/eclass/ruby-fakegem.eclass 0f30ca0595a7c8385fa9213aa81326e1098260d93aac27336edcb6d25d627625aaa0cc2dbf17b3ac0c2b54a226872b09fa3dca47695d0282046ebbc1985ad7e6 @@ -0,0 +1,535 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ruby-fakegem.eclass +# @MAINTAINER: +# Ruby herd <ruby@gentoo.org> +# @AUTHOR: +# Author: Diego E. Pettenò <flameeyes@gentoo.org> +# Author: Alex Legler <a3li@gentoo.org> +# @BLURB: An eclass for installing Ruby packages to behave like RubyGems. +# @DESCRIPTION: +# This eclass allows to install arbitrary Ruby libraries (including Gems), +# providing integration into the RubyGems system even for "regular" packages. + +inherit ruby-ng + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_NAME +# @DESCRIPTION: +# Sets the Gem name for the generated fake gemspec. +# This variable MUST be set before inheriting the eclass. +RUBY_FAKEGEM_NAME="${RUBY_FAKEGEM_NAME:-${PN}}" + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_VERSION +# @DESCRIPTION: +# Sets the Gem version for the generated fake gemspec. +# This variable MUST be set before inheriting the eclass. +RUBY_FAKEGEM_VERSION="${RUBY_FAKEGEM_VERSION:-${PV/_pre/.pre}}" + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_TASK_DOC +# @DESCRIPTION: +# Specify the rake(1) task to run to generate documentation. +RUBY_FAKEGEM_TASK_DOC="${RUBY_FAKEGEM_TASK_DOC-rdoc}" + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_RECIPE_TEST +# @DESCRIPTION: +# Specify one of the default testing function for ruby-fakegem: +# - rake (default; see also RUBY_FAKEGEM_TASK_TEST) +# - rspec (calls ruby-ng_rspec, adds dev-ruby/rspec:2 to the dependencies) +# - rspec3 (calls ruby-ng_rspec, adds dev-ruby/rspec:3 to the dependencies) +# - cucumber (calls ruby-ng_cucumber, adds dev-util/cucumber to the +# dependencies; does not work on JRuby). +# - none +RUBY_FAKEGEM_RECIPE_TEST="${RUBY_FAKEGEM_RECIPE_TEST-rake}" + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_TASK_TEST +# @DESCRIPTION: +# Specify the rake(1) task used for executing tests. Only valid +# if RUBY_FAKEGEM_RECIPE_TEST is set to "rake" (the default). +RUBY_FAKEGEM_TASK_TEST="${RUBY_FAKEGEM_TASK_TEST-test}" + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_RECIPE_DOC +# @DESCRIPTION: +# Specify one of the default API doc building function for ruby-fakegem: +# - rake (default; see also RUBY_FAKEGEM_TASK_DOC) +# - rdoc (calls `rdoc-2`, adds dev-ruby/rdoc to the dependencies); +# - yard (calls `yard`, adds dev-ruby/yard to the dependencies); +# - none +RUBY_FAKEGEM_RECIPE_DOC="${RUBY_FAKEGEM_RECIPE_DOC-rake}" + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_DOCDIR +# @DEFAULT_UNSET +# @DESCRIPTION: +# Specify the directory under which the documentation is built; +# if empty no documentation will be installed automatically. +# Note: if RUBY_FAKEGEM_RECIPE_DOC is set to `rdoc`, this variable is +# hardwired to `doc`. + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_EXTRADOC +# @DEFAULT_UNSET +# @DESCRIPTION: +# Extra documentation to install (readme, changelogs, …). + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_DOC_SOURCES +# @DESCRIPTION: +# Allow settings defined sources to scan for documentation. +# This only applies if RUBY_FAKEGEM_DOC_TASK is set to `rdoc`. +RUBY_FAKEGEM_DOC_SOURCES="${RUBY_FAKEGEM_DOC_SOURCES-lib}" + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_BINWRAP +# @DESCRIPTION: +# Binaries to wrap around (relative to the RUBY_FAKEGEM_BINDIR directory) +RUBY_FAKEGEM_BINWRAP="${RUBY_FAKEGEM_BINWRAP-*}" + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_BINDIR +# @DESCRIPTION: +# Path that contains binaries to be binwrapped. Equivalent to the +# gemspec bindir option. +RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}" + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_REQUIRE_PATHS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Extra require paths (beside lib) to add to the specification + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_GEMSPEC +# @DEFAULT_UNSET +# @DESCRIPTION: +# Filename of .gemspec file to install instead of generating a generic one. + +# @ECLASS-VARIABLE: RUBY_FAKEGEM_EXTRAINSTALL +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of files and directories relative to the top directory that also +# get installed. Some gems provide extra files such as version information, +# Rails generators, or data that needs to be installed as well. + +case "${EAPI:-0}" in + 0|1|2|3|4|5|6) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + + +RUBY_FAKEGEM_SUFFIX="${RUBY_FAKEGEM_SUFFIX:-}" + + +[[ ${RUBY_FAKEGEM_TASK_DOC} == "" ]] && RUBY_FAKEGEM_RECIPE_DOC="none" + +case ${RUBY_FAKEGEM_RECIPE_DOC} in + rake) + IUSE+=" doc" + ruby_add_bdepend "doc? ( dev-ruby/rake )" + RUBY_FAKEGEM_DOCDIR="doc" + ;; + rdoc) + IUSE+=" doc" + ruby_add_bdepend "doc? ( dev-ruby/rdoc )" + RUBY_FAKEGEM_DOCDIR="doc" + ;; + yard) + IUSE+="doc" + ruby_add_bdepend "doc? ( dev-ruby/yard )" + RUBY_FAKEGEM_DOCDIR="doc" + ;; + none) + [[ -n ${RUBY_FAKEGEM_DOCDIR} ]] && IUSE+=" doc" + ;; +esac + +[[ ${RUBY_FAKEGEM_TASK_TEST} == "" ]] && RUBY_FAKEGEM_RECIPE_TEST="none" + +case ${RUBY_FAKEGEM_RECIPE_TEST} in + rake) + IUSE+=" test" + ruby_add_bdepend "test? ( dev-ruby/rake )" + ;; + rspec) + IUSE+=" test" + # Also require a new enough rspec-core version that installs the + # rspec-2 wrapper. + ruby_add_bdepend "test? ( dev-ruby/rspec:2 >=dev-ruby/rspec-core-2.14.8-r2 )" + ;; + rspec3) + IUSE+=" test" + ruby_add_bdepend "test? ( dev-ruby/rspec:3 )" + ;; + cucumber) + IUSE+=" test" + # Unfortunately as of August 2012, cucumber is not supported on + # JRuby. We work it around here to avoid repeating the same + # code over and over again. + USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( dev-util/cucumber )" + ;; + *) + RUBY_FAKEGEM_RECIPE_TEST="none" + ;; +esac + +SRC_URI="mirror://rubygems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}${RUBY_FAKEGEM_SUFFIX:+-${RUBY_FAKEGEM_SUFFIX}}.gem" + +ruby_add_bdepend virtual/rubygems +ruby_add_rdepend virtual/rubygems + +# @FUNCTION: ruby_fakegem_gemsdir +# @RETURN: Returns the gem data directory +# @DESCRIPTION: +# This function returns the gems data directory for the ruby +# implementation in question. +ruby_fakegem_gemsdir() { + has "${EAPI}" 2 && ! use prefix && EPREFIX= + + local _gemsitedir=$(ruby_rbconfig_value 'sitelibdir') + _gemsitedir=${_gemsitedir//site_ruby/gems} + _gemsitedir=${_gemsitedir#${EPREFIX}} + + [[ -z ${_gemsitedir} ]] && { + eerror "Unable to find the gems dir" + die "Unable to find the gems dir" + } + + echo "${_gemsitedir}" +} + +# @FUNCTION: ruby_fakegem_doins +# @USAGE: file [file...] +# @DESCRIPTION: +# Installs the specified file(s) into the gems directory. +ruby_fakegem_doins() { + ( + insinto $(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION} + doins "$@" + ) || die "failed $0 $@" +} + +# @FUNCTION: ruby_fakegem_newsins +# @USAGE: file filename +# @DESCRIPTION: +# Installs the specified file into the gems directory using the provided filename. +ruby_fakegem_newins() { + ( + # Since newins does not accept full paths but just basenames + # for the target file, we want to extend it here. + local newdirname=/$(dirname "$2") + [[ ${newdirname} == "/." ]] && newdirname= + + local newbasename=$(basename "$2") + + insinto $(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}${newdirname} + newins "$1" ${newbasename} + ) || die "failed $0 $@" +} + +# @FUNCTION: ruby_fakegem_install_gemspec +# @DESCRIPTION: +# Install a .gemspec file for this package. Either use the file indicated +# by the RUBY_FAKEGEM_GEMSPEC variable, or generate one using +# ruby_fakegem_genspec. +ruby_fakegem_install_gemspec() { + local gemspec="${T}"/${RUBY_FAKEGEM_NAME}-${_ruby_implementation} + + ( + if [[ ${RUBY_FAKEGEM_GEMSPEC} != "" ]]; then + ruby_fakegem_gemspec_gemspec ${RUBY_FAKEGEM_GEMSPEC} ${gemspec} + else + local metadata="${WORKDIR}"/${_ruby_implementation}/metadata + + if [[ -e ${metadata} ]]; then + ruby_fakegem_metadata_gemspec ${metadata} ${gemspec} + else + ruby_fakegem_genspec ${gemspec} + fi + fi + ) || die "Unable to generate gemspec file." + + insinto $(ruby_fakegem_gemsdir)/specifications + newins ${gemspec} ${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}.gemspec || die "Unable to install gemspec file." +} + +# @FUNCTION: ruby_fakegem_gemspec_gemspec +# @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 +# in a way similar to packaging the gemspec file. +ruby_fakegem_gemspec_gemspec() { + ${RUBY} -e "puts eval(File::open('$1').read).to_ruby" > $2 +} + +# @FUNCTION: ruby_fakegem_metadata_gemspec +# @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 +# rubygems creates an installation from a .gem file. +ruby_fakegem_metadata_gemspec() { + case ${RUBY} in + *jruby) + ${RUBY} -r yaml -e "puts Gem::Specification.from_yaml(File::open('$1').read).to_ruby" > $2 + ;; + *) + ${RUBY} -r yaml -e "puts Gem::Specification.from_yaml(File::open('$1', :encoding => 'UTF-8').read).to_ruby" > $2 + ;; + esac +} + +# @FUNCTION: ruby_fakegem_genspec +# @USAGE: output-gemspec +# @DESCRIPTION: +# Generates a gemspec for the package and places it into the "specifications" +# directory of RubyGems. +# If the metadata normally distributed with a gem is present then that is +# used to generate the gemspec file. +# +# As a fallback we can generate our own version. +# In the gemspec, the following values are set: name, version, summary, +# homepage, and require_paths=["lib"]. +# See RUBY_FAKEGEM_NAME and RUBY_FAKEGEM_VERSION for setting name and version. +# See RUBY_FAKEGEM_REQUIRE_PATHS for setting extra require paths. +ruby_fakegem_genspec() { + local required_paths="'lib'" + for path in ${RUBY_FAKEGEM_REQUIRE_PATHS}; do + required_paths="${required_paths}, '${path}'" + done + + # We use the _ruby_implementation variable to avoid having stray + # copies with different implementations; while for now we're using + # the same exact content, we might have differences in the future, + # so better taking this into consideration. + local quoted_description=${DESCRIPTION//\"/\\\"} + cat - > $1 <<EOF +# generated by ruby-fakegem.eclass +Gem::Specification.new do |s| + s.name = "${RUBY_FAKEGEM_NAME}" + s.version = "${RUBY_FAKEGEM_VERSION}" + s.summary = "${quoted_description}" + s.homepage = "${HOMEPAGE}" + s.require_paths = [${required_paths}] +end +EOF +} + +# @FUNCTION: ruby_fakegem_binwrapper +# @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 +# to inject additional ruby code into the wrapper. This may be useful to +# e.g. force a specific version using the gem command. +ruby_fakegem_binwrapper() { + ( + local gembinary=$1 + local newbinary=${2:-/usr/bin/$gembinary} + local content=$3 + local relativegembinary=${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/${RUBY_FAKEGEM_BINDIR}/${gembinary} + local binpath=$(dirname $newbinary) + [[ ${binpath} = . ]] && binpath=/usr/bin + + # Try to find out whether the package is going to install for + # one or multiple implementations; if we're installing for a + # *single* implementation, no need to use “/usr/bin/env ruby” + # in the shebang, and we can actually avoid errors when + # calling the script by default (see for instance the + # JRuby-specific commands). + local rubycmd= + for implementation in $(_ruby_get_all_impls); do + # ignore non-enabled implementations + use ruby_targets_${implementation} || continue + if [ -z $rubycmd ]; then + # if no other implementation was set before, set it. + rubycmd="$(ruby_implementation_command ${implementation})" + else + # if another implementation already arrived, then make + # it generic and break out of the loop. This ensures + # that we do at most two iterations. + rubycmd="/usr/bin/env ruby" + break + fi + done + + cat - > "${T}"/gembin-wrapper-${gembinary} <<EOF +#!${rubycmd} +# This is a simplified version of the RubyGems wrapper +# +# Generated by ruby-fakegem.eclass + +require 'rubygems' + +${content} +load Gem::default_path[-1] + "/gems/${relativegembinary}" + +EOF + + exeinto ${binpath:-/usr/bin} + newexe "${T}"/gembin-wrapper-${gembinary} $(basename $newbinary) + ) || die "Unable to create fakegem wrapper" +} + +# @FUNCTION: all_fakegem_compile +# @DESCRIPTION: +# Build documentation for the package if indicated by the doc USE flag +# and if there is a documetation task defined. +all_fakegem_compile() { + if [[ -n ${RUBY_FAKEGEM_DOCDIR} ]] && use doc; then + case ${RUBY_FAKEGEM_RECIPE_DOC} in + rake) + rake ${RUBY_FAKEGEM_TASK_DOC} || die "failed to (re)build documentation" + ;; + rdoc) + rdoc ${RUBY_FAKEGEM_DOC_SOURCES} || die "failed to (re)build documentation" + ;; + yard) + yard doc ${RUBY_FAKEGEM_DOC_SOURCES} || die "failed to (re)build documentation" + ;; + esac + fi +} + +# @FUNCTION: all_ruby_unpack +# @DESCRIPTION: +# Unpack the source archive, including support for unpacking gems. +all_ruby_unpack() { + # Special support for extracting .gem files; the file need to be + # extracted twice and the mtime from the archive _has_ to be + # ignored (it's always set to epoch 0). + for archive in ${A}; do + case "${archive}" in + *.gem) + # Make sure that we're not running unpack for more than + # one .gem file, since we won't support that at all. + [[ -d "${S}" ]] && die "Unable to unpack ${archive}, ${S} exists" + + ebegin "Unpacking .gem file..." + tar -mxf "${DISTDIR}"/${archive} || die + eend $? + + ebegin "Uncompressing metadata" + gunzip metadata.gz || die + eend $? + + mkdir "${S}" + pushd "${S}" &>/dev/null || die + + ebegin "Unpacking data.tar.gz" + tar -mxf "${my_WORKDIR}"/data.tar.gz || die + eend $? + + popd &>/dev/null || die + ;; + *.patch.bz2) + # We apply the patches with RUBY_PATCHES directly from DISTDIR, + # as the WORKDIR variable changes value between the global-scope + # and the time all_ruby_unpack/_prepare are called. Since we can + # simply decompress them when applying, this is much easier to + # deal with for us. + einfo "Keeping ${archive} as-is" + ;; + *) + unpack ${archive} + ;; + esac + done +} + +# @FUNCTION: all_ruby_compile +# @DESCRIPTION: +# Compile the package. +all_ruby_compile() { + all_fakegem_compile +} + +# @FUNCTION: each_fakegem_test +# @DESCRIPTION: +# Run tests for the package for each ruby target if the test task is defined. +each_fakegem_test() { + case ${RUBY_FAKEGEM_RECIPE_TEST} in + rake) + ${RUBY} -S rake ${RUBY_FAKEGEM_TASK_TEST} || die "tests failed" + ;; + rspec) + RSPEC_VERSION=2 ruby-ng_rspec + ;; + rspec3) + RSPEC_VERSION=3 ruby-ng_rspec + ;; + cucumber) + ruby-ng_cucumber + ;; + none) + ewarn "each_fakegem_test called, but \${RUBY_FAKEGEM_RECIPE_TEST} is 'none'" + ;; + esac +} + +if [[ ${RUBY_FAKEGEM_RECIPE_TEST} != none ]]; then + # @FUNCTION: each_ruby_test + # @DESCRIPTION: + # Run the tests for this package. + each_ruby_test() { + each_fakegem_test + } +fi + +# @FUNCTION: each_fakegem_install +# @DESCRIPTION: +# Install the package for each ruby target. +each_fakegem_install() { + ruby_fakegem_install_gemspec + + local _gemlibdirs="${RUBY_FAKEGEM_EXTRAINSTALL}" + for directory in "${RUBY_FAKEGEM_BINDIR}" lib; do + [[ -d ${directory} ]] && _gemlibdirs="${_gemlibdirs} ${directory}" + done + + [[ -n ${_gemlibdirs} ]] && \ + ruby_fakegem_doins -r ${_gemlibdirs} +} + +# @FUNCTION: each_ruby_install +# @DESCRIPTION: +# Install the package for each target. +each_ruby_install() { + each_fakegem_install +} + +# @FUNCTION: all_fakegem_install +# @DESCRIPTION: +# Install files common to all ruby targets. +all_fakegem_install() { + if [[ -n ${RUBY_FAKEGEM_DOCDIR} ]] && use doc; then + for dir in ${RUBY_FAKEGEM_DOCDIR}; do + [[ -d ${dir} ]] || continue + + pushd ${dir} &>/dev/null || die + dodoc -r * || die "failed to install documentation" + popd &>/dev/null || die + done + fi + + if [[ -n ${RUBY_FAKEGEM_EXTRADOC} ]]; then + dodoc ${RUBY_FAKEGEM_EXTRADOC} || die "failed to install further documentation" + fi + + # binary wrappers; we assume that all the implementations get the + # same binaries, or something is wrong anyway, so... + if [[ -n ${RUBY_FAKEGEM_BINWRAP} ]]; then + local bindir=$(find "${D}" -type d -path "*/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/${RUBY_FAKEGEM_BINDIR}" -print -quit) + + if [[ -d "${bindir}" ]]; then + pushd "${bindir}" &>/dev/null || die + for binary in ${RUBY_FAKEGEM_BINWRAP}; do + ruby_fakegem_binwrapper "${binary}" + done + popd &>/dev/null || die + fi + fi +} + +# @FUNCTION: all_ruby_install +# @DESCRIPTION: +# Install files common to all ruby targets. +all_ruby_install() { + all_fakegem_install +} diff -uNr a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass --- a/eclass/ruby-ng-gnome2.eclass false +++ b/eclass/ruby-ng-gnome2.eclass 1067b356f4c11d1703c8b8b2c37aa6b6a7e8075cf6742ea7cc6e958e719e74842a6fba19db96cabbcc810d78f805007dbac88098f8ffddc3e4536cd67ba63776 @@ -0,0 +1,92 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ruby-ng-gnome2.eclass +# @MAINTAINER: +# Ruby herd <ruby@gentoo.org> +# @AUTHOR: +# Author: Hans de Graaff <graaff@gentoo.org> +# @BLURB: An eclass to simplify handling of various ruby-gnome2 parts. +# @DESCRIPTION: +# This eclass simplifies installation of the various pieces of +# ruby-gnome2 since they share a very common installation procedure. + +RUBY_FAKEGEM_NAME="${RUBY_FAKEGEM_NAME:-${PN#ruby-}}" +RUBY_FAKEGEM_TASK_TEST="" +RUBY_FAKEGEM_TASK_DOC="" + +inherit ruby-fakegem multilib versionator + +IUSE="" + +# Define EPREFIX if needed +has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + +subbinding=${PN#ruby-} +if [ $(get_version_component_range "1-2") == "0.19" ]; then + subbinding=${subbinding/%2} +else + subbinding=${subbinding/-/_} + DEPEND="virtual/pkgconfig" + ruby_add_bdepend "dev-ruby/pkg-config" +fi +if has "${EAPI:-0}" 0 1 2 3 ; then + S=${WORKDIR}/ruby-gnome2-all-${PV}/${subbinding} +else + RUBY_S=ruby-gnome2-all-${PV}/${subbinding} +fi +SRC_URI="mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-${PV}.tar.gz" +HOMEPAGE="http://ruby-gnome2.sourceforge.jp/" +LICENSE="Ruby" +SLOT="0" + +# @FUNCTION: each_ruby_configure +# @DESCRIPTION: +# Run the configure script in the subbinding for each specific ruby target. +each_ruby_configure() { + ${RUBY} extconf.rb || die "extconf.rb failed" +} + +# @FUNCTION: each_ruby_compile +# @DESCRIPTION: +# Compile the C bindings in the subbinding for each specific ruby target. +each_ruby_compile() { + # We have injected --no-undefined in Ruby as a safety precaution + # against broken ebuilds, but the Ruby-Gnome bindings + # unfortunately rely on the lazy load of other extensions; see bug + # #320545. + find . -name Makefile -print0 | xargs -0 \ + sed -i -e 's:-Wl,--no-undefined ::' \ + -e "s/^ldflags = /ldflags = $$LDFLAGS$ /" \ + || die "--no-undefined removal failed" + + emake V=1 || die "emake failed" +} + +# @FUNCTION: each_ruby_install +# @DESCRIPTION: +# Install the files in the subbinding for each specific ruby target. +each_ruby_install() { + # Create the directories, or the package will create them as files. + local archdir=$(ruby_rbconfig_value "sitearchdir") + dodir ${archdir#${EPREFIX}} /usr/$(get_libdir)/pkgconfig + + emake DESTDIR="${D}" install || die "make install failed" + + each_fakegem_install +} + +# @FUNCTION: all_ruby_install +# @DESCRIPTION: +# Install the files common to all ruby targets. +all_ruby_install() { + for doc in ../AUTHORS ../NEWS ChangeLog README; do + [ -s "$doc" ] && dodoc $doc + done + if [[ -d sample ]]; then + insinto /usr/share/doc/${PF} + doins -r sample || die "sample install failed" + fi + + all_fakegem_install +} diff -uNr a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass --- a/eclass/ruby-ng.eclass false +++ b/eclass/ruby-ng.eclass 6789085d591dd911363441bb21ea4516e09769a2d95f97be6305a8acf148beb58f11ce9dbecd0bfda513fbbacf35911735d284b34c3bdea001d27e94181e96cc @@ -0,0 +1,755 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ruby-ng.eclass +# @MAINTAINER: +# Ruby herd <ruby@gentoo.org> +# @AUTHOR: +# Author: Diego E. Pettenò <flameeyes@gentoo.org> +# Author: Alex Legler <a3li@gentoo.org> +# Author: Hans de Graaff <graaff@gentoo.org> +# @BLURB: An eclass for installing Ruby packages with proper support for multiple Ruby slots. +# @DESCRIPTION: +# The Ruby eclass is designed to allow an easier installation of Ruby packages +# and their incorporation into the Gentoo Linux system. +# +# Currently available targets are listed in ruby-utils.eclass +# +# This eclass does not define the implementation of the configure, +# compile, test, or install phases. Instead, the default phases are +# used. Specific implementations of these phases can be provided in +# the ebuild either to be run for each Ruby implementation, or for all +# Ruby implementations, as follows: +# +# * each_ruby_configure +# * all_ruby_configure + +# @ECLASS-VARIABLE: USE_RUBY +# @DEFAULT_UNSET +# @REQUIRED +# @DESCRIPTION: +# This variable contains a space separated list of targets (see above) a package +# is compatible to. It must be set before the `inherit' call. There is no +# default. All ebuilds are expected to set this variable. + +# @ECLASS-VARIABLE: RUBY_PATCHES +# @DEFAULT_UNSET +# @DESCRIPTION: +# A String or Array of filenames of patches to apply to all implementations. + +# @ECLASS-VARIABLE: RUBY_OPTIONAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set the value to "yes" to make the dependency on a Ruby interpreter +# optional and then ruby_implementations_depend() to help populate +# DEPEND and RDEPEND. + +# @ECLASS-VARIABLE: RUBY_S +# @DEFAULT_UNSET +# @DESCRIPTION: +# If defined this variable determines the source directory name after +# unpacking. This defaults to the name of the package. Note that this +# variable supports a wildcard mechanism to help with github tarballs +# that contain the commit hash as part of the directory name. + +# @ECLASS-VARIABLE: RUBY_QA_ALLOWED_LIBS +# @DEFAULT_UNSET +# @DESCRIPTION: +# If defined this variable contains a whitelist of shared objects that +# are allowed to exist even if they don't link to libruby. This avoids +# the QA check that makes this mandatory. This is most likely not what +# you are looking for if you get the related "Missing links" QA warning, +# since the proper fix is almost always to make sure the shared object +# is linked against libruby. There are cases were this is not the case +# and the shared object is generic code to be used in some other way +# (e.g. selenium's firefox driver extension). When set this argument is +# passed to "grep -E" to remove reporting of these shared objects. + +local inherits="" +case ${EAPI} in + 2|3|4|5) + inherits="eutils" + ;; +esac + +inherit ${inherits} java-utils-2 multilib toolchain-funcs ruby-utils + +EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup + +case ${EAPI} in + 0|1) + die "Unsupported EAPI=${EAPI} (too old) for ruby-ng.eclass" ;; + 2|3) ;; + 4|5|6) + # S is no longer automatically assigned when it doesn't exist. + S="${WORKDIR}" + ;; + *) + die "Unknown EAPI=${EAPI} for ruby-ng.eclass" +esac + +# @FUNCTION: ruby_implementation_depend +# @USAGE: target [comparator [version]] +# @RETURN: Package atom of a Ruby implementation to be used in dependencies. +# @DESCRIPTION: +# This function returns the formal package atom for a Ruby implementation. +# +# `target' has to be one of the valid values for USE_RUBY (see above) +# +# Set `comparator' and `version' to include a comparator (=, >=, etc.) and a +# version string to the returned string +ruby_implementation_depend() { + _ruby_implementation_depend $1 +} + +# @FUNCTION: _ruby_get_all_impls +# @INTERNAL +# @RETURN: list of valid values in USE_RUBY +# Return a list of valid implementations in USE_RUBY, skipping the old +# implementations that are no longer supported. +_ruby_get_all_impls() { + local i + for i in ${USE_RUBY}; do + case ${i} in + # removed implementations + ruby19|ruby20|ruby21|ruby22|jruby) + ;; + *) + echo ${i};; + esac + done +} + +# @FUNCTION: ruby_samelib +# @RETURN: use flag string with current ruby implementations +# @DESCRIPTION: +# Convenience function to output the use dependency part of a +# dependency. Used as a building block for ruby_add_rdepend() and +# ruby_add_bdepend(), but may also be useful in an ebuild to specify +# more complex dependencies. +ruby_samelib() { + local res= + for _ruby_implementation in $(_ruby_get_all_impls); do + has -${_ruby_implementation} $@ || \ + res="${res}ruby_targets_${_ruby_implementation}?," + done + + echo "[${res%,}]" +} + +_ruby_atoms_samelib_generic() { + eshopts_push -o noglob + echo "RUBYTARGET? (" + for token in $*; do + case "$token" in + "||" | "(" | ")" | *"?") + echo "${token}" ;; + *]) + echo "${token%[*}[RUBYTARGET,${token/*[}" ;; + *) + echo "${token}[RUBYTARGET]" ;; + esac + done + echo ")" + eshopts_pop +} + +# @FUNCTION: ruby_implementation_command +# @RETURN: the path to the given ruby implementation +# @DESCRIPTION: +# Not all implementations have the same command basename as the +# target; This function translate between the two +ruby_implementation_command() { + local _ruby_name=$1 + + # Add all USE_RUBY values where the flag name diverts from the binary here + + echo $(type -p ${_ruby_name} 2>/dev/null) +} + +_ruby_atoms_samelib() { + local atoms=$(_ruby_atoms_samelib_generic "$*") + + for _ruby_implementation in $(_ruby_get_all_impls); do + echo "${atoms//RUBYTARGET/ruby_targets_${_ruby_implementation}}" + done +} + +_ruby_wrap_conditions() { + local conditions="$1" + local atoms="$2" + + for condition in $conditions; do + atoms="${condition}? ( ${atoms} )" + done + + echo "$atoms" +} + +# @FUNCTION: ruby_add_rdepend +# @USAGE: dependencies +# @DESCRIPTION: +# Adds the specified dependencies, with use condition(s) to RDEPEND, +# taking the current set of ruby targets into account. This makes sure +# that all ruby dependencies of the package are installed for the same +# ruby targets. Use this function for all ruby dependencies instead of +# setting RDEPEND yourself. The list of atoms uses the same syntax as +# normal dependencies. +# +# Note: runtime dependencies are also added as build-time test +# dependencies. +ruby_add_rdepend() { + case $# in + 1) ;; + 2) + [[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_rdepend for $CATEGORY/$PF" + ruby_add_rdepend "$(_ruby_wrap_conditions "$1" "$2")" + return + ;; + *) + die "bad number of arguments to $0" + ;; + esac + + local dependency=$(_ruby_atoms_samelib "$1") + + RDEPEND="${RDEPEND} $dependency" + + # Add the dependency as a test-dependency since we're going to + # execute the code during test phase. + DEPEND="${DEPEND} test? ( ${dependency} )" + has test "$IUSE" || IUSE="${IUSE} test" +} + +# @FUNCTION: ruby_add_bdepend +# @USAGE: dependencies +# @DESCRIPTION: +# Adds the specified dependencies, with use condition(s) to DEPEND, +# taking the current set of ruby targets into account. This makes sure +# that all ruby dependencies of the package are installed for the same +# ruby targets. Use this function for all ruby dependencies instead of +# setting DEPEND yourself. The list of atoms uses the same syntax as +# normal dependencies. +ruby_add_bdepend() { + case $# in + 1) ;; + 2) + [[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_bdepend for $CATEGORY/$PF" + ruby_add_bdepend "$(_ruby_wrap_conditions "$1" "$2")" + return + ;; + *) + die "bad number of arguments to $0" + ;; + esac + + local dependency=$(_ruby_atoms_samelib "$1") + + DEPEND="${DEPEND} $dependency" + RDEPEND="${RDEPEND}" +} + +# @FUNCTION: ruby_get_use_implementations +# @DESCRIPTION: +# Gets an array of ruby use targets enabled by the user +ruby_get_use_implementations() { + local i implementation + for implementation in $(_ruby_get_all_impls); do + use ruby_targets_${implementation} && i+=" ${implementation}" + done + echo $i +} + +# @FUNCTION: ruby_get_use_targets +# @DESCRIPTION: +# Gets an array of ruby use targets that the ebuild sets +ruby_get_use_targets() { + local t implementation + for implementation in $(_ruby_get_all_impls); do + t+=" ruby_targets_${implementation}" + done + echo $t +} + +# @FUNCTION: ruby_implementations_depend +# @RETURN: Dependencies suitable for injection into DEPEND and RDEPEND. +# @DESCRIPTION: +# Produces the dependency string for the various implementations of ruby +# which the package is being built against. This should not be used when +# RUBY_OPTIONAL is unset but must be used if RUBY_OPTIONAL=yes. Do not +# confuse this function with ruby_implementation_depend(). +# +# @EXAMPLE: +# EAPI=6 +# RUBY_OPTIONAL=yes +# +# inherit ruby-ng +# ... +# DEPEND="ruby? ( $(ruby_implementations_depend) )" +# RDEPEND="${DEPEND}" +ruby_implementations_depend() { + local depend + for _ruby_implementation in $(_ruby_get_all_impls); do + depend="${depend}${depend+ }ruby_targets_${_ruby_implementation}? ( $(ruby_implementation_depend $_ruby_implementation) )" + done + echo "${depend}" +} + +IUSE+=" $(ruby_get_use_targets)" +# If you specify RUBY_OPTIONAL you also need to take care of +# ruby useflag and dependency. +if [[ ${RUBY_OPTIONAL} != yes ]]; then + DEPEND="${DEPEND} $(ruby_implementations_depend)" + RDEPEND="${RDEPEND} $(ruby_implementations_depend)" + + case ${EAPI:-0} in + 4|5|6) + REQUIRED_USE+=" || ( $(ruby_get_use_targets) )" + ;; + esac +fi + +_ruby_invoke_environment() { + old_S=${S} + case ${EAPI} in + 4|5|6) + if [ -z "${RUBY_S}" ]; then + sub_S=${P} + else + sub_S=${RUBY_S} + fi + ;; + *) + sub_S=${S#${WORKDIR}/} + ;; + esac + + # Special case, for the always-lovely GitHub fetches. With this, + # we allow the star glob to just expand to whatever directory it's + # called. + if [[ "${sub_S}" = *"*"* ]]; then + case ${EAPI} in + 2|3) + #The old method of setting S depends on undefined package + # manager behaviour, so encourage upgrading to EAPI=4. + eqawarn "Using * expansion of S is deprecated. Use EAPI and RUBY_S instead." + ;; + esac + pushd "${WORKDIR}"/all &>/dev/null || die + # use an array to trigger filename expansion + # fun fact: this expansion fails in src_unpack() but the original + # code did not have any checks for failed expansion, so we can't + # really add one now without redesigning stuff hard. + sub_S=( ${sub_S} ) + if [[ ${#sub_S[@]} -gt 1 ]]; then + die "sub_S did expand to multiple paths: ${sub_S[*]}" + fi + popd &>/dev/null || die + fi + + environment=$1; shift + + my_WORKDIR="${WORKDIR}"/${environment} + S="${my_WORKDIR}"/"${sub_S}" + + if [[ -d "${S}" ]]; then + pushd "$S" &>/dev/null || die + elif [[ -d "${my_WORKDIR}" ]]; then + pushd "${my_WORKDIR}" &>/dev/null || die + else + pushd "${WORKDIR}" &>/dev/null || die + fi + + ebegin "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment" + "$@" + popd &>/dev/null || die + + S=${old_S} +} + +_ruby_each_implementation() { + local invoked=no + for _ruby_implementation in $(_ruby_get_all_impls); do + # only proceed if it's requested + use ruby_targets_${_ruby_implementation} || continue + + RUBY=$(ruby_implementation_command ${_ruby_implementation}) + invoked=yes + + if [[ -n "$1" ]]; then + _ruby_invoke_environment ${_ruby_implementation} "$@" + fi + + unset RUBY + done + + if [[ ${invoked} == "no" ]]; then + eerror "You need to select at least one compatible Ruby installation target via RUBY_TARGETS in make.conf." + eerror "Compatible targets for this package are: $(_ruby_get_all_impls)" + eerror + eerror "See https://www.gentoo.org/proj/en/prog_lang/ruby/index.xml#doc_chap3 for more information." + eerror + die "No compatible Ruby target selected." + fi +} + +# @FUNCTION: ruby-ng_pkg_setup +# @DESCRIPTION: +# Check whether at least one ruby target implementation is present. +ruby-ng_pkg_setup() { + # This only checks that at least one implementation is present + # before doing anything; by leaving the parameters empty we know + # it's a special case. + _ruby_each_implementation + + has ruby_targets_jruby ${IUSE} && use ruby_targets_jruby && java-pkg_setup-vm +} + +# @FUNCTION: ruby-ng_src_unpack +# @DESCRIPTION: +# Unpack the source archive. +ruby-ng_src_unpack() { + mkdir "${WORKDIR}"/all + pushd "${WORKDIR}"/all &>/dev/null || die + + # We don't support an each-unpack, it's either all or nothing! + if type all_ruby_unpack &>/dev/null; then + _ruby_invoke_environment all all_ruby_unpack + else + [[ -n ${A} ]] && unpack ${A} + fi + + popd &>/dev/null || die +} + +_ruby_apply_patches() { + case ${EAPI} in + 2|3|4|5) + for patch in "${RUBY_PATCHES[@]}"; do + if [ -f "${patch}" ]; then + epatch "${patch}" + elif [ -f "${FILESDIR}/${patch}" ]; then + epatch "${FILESDIR}/${patch}" + else + die "Cannot find patch ${patch}" + fi + done + ;; + 6) + if [[ -n ${RUBY_PATCHES[@]} ]]; then + eqawarn "RUBY_PATCHES is no longer supported, use PATCHES instead" + fi + ;; + esac + + # This is a special case: instead of executing just in the special + # "all" environment, this will actually copy the effects on _all_ + # the other environments, and is thus executed before the copy + type all_ruby_prepare &>/dev/null && all_ruby_prepare +} + +_ruby_source_copy() { + # Until we actually find a reason not to, we use hardlinks, this + # should reduce the amount of disk space that is wasted by this. + cp -prlP all ${_ruby_implementation} \ + || die "Unable to copy ${_ruby_implementation} environment" +} + +# @FUNCTION: ruby-ng_src_prepare +# @DESCRIPTION: +# Apply patches and prepare versions for each ruby target +# implementation. Also carry out common clean up tasks. +ruby-ng_src_prepare() { + # Way too many Ruby packages are prepared on OSX without removing + # the extra data forks, we do it here to avoid repeating it for + # almost every other ebuild. + find . -name '._*' -delete + + # Handle PATCHES and user supplied patches via the default phase + case ${EAPI} in + 6) + _ruby_invoke_environment all default + ;; + esac + + _ruby_invoke_environment all _ruby_apply_patches + + _PHASE="source copy" \ + _ruby_each_implementation _ruby_source_copy + + if type each_ruby_prepare &>/dev/null; then + _ruby_each_implementation each_ruby_prepare + fi +} + +# @FUNCTION: ruby-ng_src_configure +# @DESCRIPTION: +# Configure the package. +ruby-ng_src_configure() { + if type each_ruby_configure &>/dev/null; then + _ruby_each_implementation each_ruby_configure + fi + + type all_ruby_configure &>/dev/null && \ + _ruby_invoke_environment all all_ruby_configure +} + +# @FUNCTION: ruby-ng_src_compile +# @DESCRIPTION: +# Compile the package. +ruby-ng_src_compile() { + if type each_ruby_compile &>/dev/null; then + _ruby_each_implementation each_ruby_compile + fi + + type all_ruby_compile &>/dev/null && \ + _ruby_invoke_environment all all_ruby_compile +} + +# @FUNCTION: ruby-ng_src_test +# @DESCRIPTION: +# Run tests for the package. +ruby-ng_src_test() { + if type each_ruby_test &>/dev/null; then + _ruby_each_implementation each_ruby_test + fi + + type all_ruby_test &>/dev/null && \ + _ruby_invoke_environment all all_ruby_test +} + +_each_ruby_check_install() { + local scancmd=scanelf + # we have a Mach-O object here + [[ ${CHOST} == *-darwin ]] && scancmd=scanmacho + + has "${EAPI}" 2 && ! use prefix && EPREFIX= + + local libruby_basename=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBY_SO"]') + local libruby_soname=$(basename $(${scancmd} -F "%S#F" -qS "${EPREFIX}/usr/$(get_libdir)/${libruby_basename}") 2>/dev/null) + local sitedir=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["sitedir"]') + local sitelibdir=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') + + # Look for wrong files in sitedir + # if [[ -d "${D}${sitedir}" ]]; then + # local f=$(find "${D}${sitedir}" -mindepth 1 -maxdepth 1 -not -wholename "${D}${sitelibdir}") + # if [[ -n ${f} ]]; then + # eerror "Found files in sitedir, outsite sitelibdir:" + # eerror "${f}" + # die "Misplaced files in sitedir" + # fi + # fi + + # The current implementation lacks libruby (i.e.: jruby) + [[ -z ${libruby_soname} ]] && return 0 + + # Check also the gems directory, since we could be installing compiled + # extensions via ruby-fakegem; make sure to check only in sitelibdir, since + # that's what changes between two implementations (otherwise you'd get false + # positives now that Ruby 1.9.2 installs with the same sitedir as 1.8) + ${scancmd} -qnR "${D}${sitelibdir}" "${D}${sitelibdir/site_ruby/gems}" \ + | fgrep -v "${libruby_soname}" \ + | grep -E -v "${RUBY_QA_ALLOWED_LIBS}" \ + > "${T}"/ruby-ng-${_ruby_implementation}-mislink.log + + if [[ -s "${T}"/ruby-ng-${_ruby_implementation}-mislink.log ]]; then + ewarn "Extensions installed for ${_ruby_implementation} with missing links to ${libruby_soname}" + ewarn $(< "${T}"/ruby-ng-${_ruby_implementation}-mislink.log ) + die "Missing links to ${libruby_soname}" + fi +} + +# @FUNCTION: ruby-ng_src_install +# @DESCRIPTION: +# Install the package for each ruby target implementation. +ruby-ng_src_install() { + if type each_ruby_install &>/dev/null; then + _ruby_each_implementation each_ruby_install + fi + + type all_ruby_install &>/dev/null && \ + _ruby_invoke_environment all all_ruby_install + + _PHASE="check install" \ + _ruby_each_implementation _each_ruby_check_install +} + +# @FUNCTION: ruby_rbconfig_value +# @USAGE: rbconfig item +# @RETURN: Returns the value of the given rbconfig item of the Ruby interpreter in ${RUBY}. +ruby_rbconfig_value() { + echo $(${RUBY} -rrbconfig -e "puts RbConfig::CONFIG['$1']") +} + +# @FUNCTION: doruby +# @USAGE: file [file...] +# @DESCRIPTION: +# Installs the specified file(s) into the sitelibdir of the Ruby interpreter in ${RUBY}. +doruby() { + [[ -z ${RUBY} ]] && die "\$RUBY is not set" + has "${EAPI}" 2 && ! use prefix && EPREFIX= + ( # don't want to pollute calling env + sitelibdir=$(ruby_rbconfig_value 'sitelibdir') + insinto ${sitelibdir#${EPREFIX}} + insopts -m 0644 + doins "$@" + ) || die "failed to install $@" +} + +# @FUNCTION: ruby_get_libruby +# @RETURN: The location of libruby*.so belonging to the Ruby interpreter in ${RUBY}. +ruby_get_libruby() { + ${RUBY} -rrbconfig -e 'puts File.join(RbConfig::CONFIG["libdir"], RbConfig::CONFIG["LIBRUBY"])' +} + +# @FUNCTION: ruby_get_hdrdir +# @RETURN: The location of the header files belonging to the Ruby interpreter in ${RUBY}. +ruby_get_hdrdir() { + local rubyhdrdir=$(ruby_rbconfig_value 'rubyhdrdir') + + if [[ "${rubyhdrdir}" = "nil" ]] ; then + rubyhdrdir=$(ruby_rbconfig_value 'archdir') + fi + + echo "${rubyhdrdir}" +} + +# @FUNCTION: ruby_get_version +# @RETURN: The version of the Ruby interpreter in ${RUBY}, or what 'ruby' points to. +ruby_get_version() { + local ruby=${RUBY:-$(type -p ruby 2>/dev/null)} + + echo $(${ruby} -e 'puts RUBY_VERSION') +} + +# @FUNCTION: ruby_get_implementation +# @RETURN: The implementation of the Ruby interpreter in ${RUBY}, or what 'ruby' points to. +ruby_get_implementation() { + local ruby=${RUBY:-$(type -p ruby 2>/dev/null)} + + case $(${ruby} --version) in + *jruby*) + echo "jruby" + ;; + *rubinius*) + echo "rbx" + ;; + *) + echo "mri" + ;; + esac +} + +# @FUNCTION: ruby-ng_rspec <arguments> +# @DESCRIPTION: +# This is simply a wrapper around the rspec command (executed by $RUBY}) +# which also respects TEST_VERBOSE and NOCOLOR environment variables. +# Optionally takes arguments to pass on to the rspec invocation. The +# environment variable RSPEC_VERSION can be used to control the specific +# rspec version that must be executed. It defaults to 2 for historical +# compatibility. +ruby-ng_rspec() { + local version=${RSPEC_VERSION-2} + local files="$@" + + # Explicitly pass the expected spec directory since the versioned + # rspec wrappers don't handle this automatically. + if [ ${#@} -eq 0 ]; then + files="spec" + fi + + if [[ ${DEPEND} != *"dev-ruby/rspec"* ]]; then + ewarn "Missing dev-ruby/rspec in \${DEPEND}" + fi + + local rspec_params= + case ${NOCOLOR} in + 1|yes|true) + rspec_params+=" --no-color" + ;; + *) + rspec_params+=" --color" + ;; + esac + + case ${TEST_VERBOSE} in + 1|yes|true) + rspec_params+=" --format documentation" + ;; + *) + rspec_params+=" --format progress" + ;; + esac + + ${RUBY} -S rspec-${version} ${rspec_params} ${files} || die "rspec failed" +} + +# @FUNCTION: ruby-ng_cucumber +# @DESCRIPTION: +# This is simply a wrapper around the cucumber command (executed by $RUBY}) +# which also respects TEST_VERBOSE and NOCOLOR environment variables. +ruby-ng_cucumber() { + if [[ ${DEPEND} != *"dev-util/cucumber"* ]]; then + ewarn "Missing dev-util/cucumber in \${DEPEND}" + fi + + local cucumber_params= + case ${NOCOLOR} in + 1|yes|true) + cucumber_params+=" --no-color" + ;; + *) + cucumber_params+=" --color" + ;; + esac + + case ${TEST_VERBOSE} in + 1|yes|true) + cucumber_params+=" --format pretty" + ;; + *) + cucumber_params+=" --format progress" + ;; + esac + + if [[ ${RUBY} == *jruby ]]; then + ewarn "Skipping cucumber tests on JRuby (unsupported)." + return 0 + fi + + ${RUBY} -S cucumber ${cucumber_params} "$@" || die "cucumber failed" +} + +# @FUNCTION: ruby-ng_testrb-2 +# @DESCRIPTION: +# This is simply a replacement for the testrb command that load the test +# files and execute them, with test-unit 2.x. This actually requires +# either an old test-unit-2 version or 2.5.1-r1 or later, as they remove +# their script and we installed a broken wrapper for a while. +# This also respects TEST_VERBOSE and NOCOLOR environment variables. +ruby-ng_testrb-2() { + if [[ ${DEPEND} != *"dev-ruby/test-unit"* ]]; then + ewarn "Missing dev-ruby/test-unit in \${DEPEND}" + fi + + local testrb_params= + case ${NOCOLOR} in + 1|yes|true) + testrb_params+=" --no-use-color" + ;; + *) + testrb_params+=" --use-color=auto" + ;; + esac + + case ${TEST_VERBOSE} in + 1|yes|true) + testrb_params+=" --verbose=verbose" + ;; + *) + testrb_params+=" --verbose=normal" + ;; + esac + + ${RUBY} -S testrb-2 ${testrb_params} "$@" || die "testrb-2 failed" +} diff -uNr a/eclass/ruby-single.eclass b/eclass/ruby-single.eclass --- a/eclass/ruby-single.eclass false +++ b/eclass/ruby-single.eclass 84de89121f22be6fa0c463d3293df56a4f979db2cdda1e921f1a04339b954955f697beb09781df34a73d3e6e5d2619334754266f2b596322eda56bbbf2e21a83 @@ -0,0 +1,90 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ruby-single.eclass +# @MAINTAINER: +# Ruby team <ruby@gentoo.org> +# @AUTHOR: +# Author: Hans de Graaff <graaff@gentoo.org> +# Based on python-single-r1 by: Michał Górny <mgorny@gentoo.org> +# @BLURB: An eclass for Ruby packages not installed for multiple implementations. +# @DESCRIPTION: +# An eclass for packages which don't support being installed for +# multiple Ruby implementations. This mostly includes ruby-based +# scripts. Set USE_RUBY to include all the ruby targets that have been +# verified to work and include the eclass. RUBY_DEPS is now available to +# pull in the dependency on the requested ruby targets. +# +# @CODE +# USE_RUBY="ruby20 ruby21" +# inherit ruby-single +# RDEPEND="${RUBY_DEPS}" +# @CODE + +case "${EAPI:-0}" in + 0|1|2|3) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 4|5|6) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +if [[ ! ${_RUBY_SINGLE} ]]; then + +inherit ruby-utils + +# @ECLASS-VARIABLE: USE_RUBY +# @DEFAULT_UNSET +# @REQUIRED +# @DESCRIPTION: +# This variable contains a space separated list of targets (see above) a package +# is compatible to. It must be set before the `inherit' call. There is no +# default. All ebuilds are expected to set this variable. + + +# @ECLASS-VARIABLE: RUBY_DEPS +# @DEFAULT_UNSET +# @DESCRIPTION: +# +# This is an eclass-generated Ruby dependency string for all +# implementations listed in USE_RUBY. Any one of the supported ruby +# targets will satisfy this dependency. A dependency on +# virtual/rubygems is also added to ensure that this is installed +# in time for the package to use it. +# +# Example use: +# @CODE +# RDEPEND="${RUBY_DEPS} +# dev-foo/mydep" +# BDEPEND="${RDEPEND}" +# @CODE +# +# Example value: +# @CODE +# || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) virtual/rubygems +# @CODE +# +# The order of dependencies will change over time to best match the +# current state of ruby targets, e.g. stable version first. + +_ruby_single_implementations_depend() { + local depend + for _ruby_implementation in ${RUBY_TARGETS_PREFERENCE}; do + if [[ ${USE_RUBY} =~ ${_ruby_implementation} ]]; then + depend="${depend} $(_ruby_implementation_depend $_ruby_implementation)" + fi + done + echo "|| ( ${depend} ) virtual/rubygems" +} + +_ruby_single_set_globals() { + RUBY_DEPS=$(_ruby_single_implementations_depend) +} +_ruby_single_set_globals + + +_RUBY_SINGLE=1 +fi diff -uNr a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass --- a/eclass/ruby-utils.eclass false +++ b/eclass/ruby-utils.eclass d57ebf768d2943cc9f63d616ef05f052b1fe8be2d3dbd5860d4f5b8a7463f0cb288d6078d45269bdb2bc4668f2df55f1804aabe680fdb6ed41a7980b80d443ff @@ -0,0 +1,95 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ruby-utils.eclass +# @MAINTAINER: +# Ruby team <ruby@gentoo.org> +# @AUTHOR: +# Author: Hans de Graaff <graaff@gentoo.org> +# @BLURB: An eclass for supporting ruby scripts and bindings in non-ruby packages +# @DESCRIPTION: +# The ruby-utils eclass is designed to allow an easier installation of +# Ruby scripts and bindings for non-ruby packages. +# +# This eclass does not set any metadata variables nor export any phase +# functions. It can be inherited safely. + + +if [[ ! ${_RUBY_UTILS} ]]; then + + +# @ECLASS-VARIABLE: RUBY_TARGETS_PREFERENCE +# @INTERNAL +# @DESCRIPTION: +# This variable lists all the known ruby targets in preference of use as +# determined by the ruby team. By using this ordering rather than the +# USE_RUBY mandated ordering we have more control over which ruby +# implementation will be installed first (and thus eselected). This will +# provide for a better first installation experience. + +# All RUBY_TARGETS +RUBY_TARGETS_PREFERENCE="ruby23 ruby22 " + +# All other active ruby targets +RUBY_TARGETS_PREFERENCE+="ruby24 ruby25" + + +_ruby_implementation_depend() { + local rubypn= + local rubyslot= + + case $1 in + ruby18) + rubypn="dev-lang/ruby" + rubyslot=":1.8" + ;; + ruby19) + rubypn="dev-lang/ruby" + rubyslot=":1.9" + ;; + ruby20) + rubypn="dev-lang/ruby" + rubyslot=":2.0" + ;; + ruby21) + rubypn="dev-lang/ruby" + rubyslot=":2.1" + ;; + ruby22) + rubypn="dev-lang/ruby" + rubyslot=":2.2" + ;; + ruby23) + rubypn="dev-lang/ruby" + rubyslot=":2.3" + ;; + ruby24) + rubypn="dev-lang/ruby" + rubyslot=":2.4" + ;; + ruby25) + rubypn="dev-lang/ruby" + rubyslot=":2.5" + ;; + ree18) + rubypn="dev-lang/ruby-enterprise" + rubyslot=":1.8" + ;; + jruby) + rubypn="dev-java/jruby" + rubyslot="" + ;; + rbx) + rubypn="dev-lang/rubinius" + rubyslot="" + ;; + *) die "$1: unknown Ruby implementation" + esac + + echo "$2${rubypn}$3${rubyslot}" +} + + + +_RUBY_UTILS=1 +fi diff -uNr a/eclass/s6.eclass b/eclass/s6.eclass --- a/eclass/s6.eclass false +++ b/eclass/s6.eclass 16962210575c88deb8cd95be8969c49375ca6ff1822c0cde8adc88bbb07126d91e37a1afceea3755e3b1b7c546a2914cbf5ee48a83c02db3d4064f1ee2167ce0 @@ -0,0 +1,118 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: s6.eclass +# @MAINTAINER: +# William Hubbs <williamh@gentoo.org> +# @BLURB: helper functions to install s6 services +# @DESCRIPTION: +# This eclass provides helpers to install s6 services. +# @EXAMPLE: +# +# @CODE +# inherit s6 +# +# src_install() { +# ... +# s6_install_service myservice "${FILESDIR}"/run-s6 "${FILESDIR}"/finish-s6 +# ... +# If you want a service to be logged, install the log service as +# shown here. +# s6_install_service myservice/log "${FILESDIR}"/log-run-s6 \ +# "${FILESDIR}"/log-finish-s6 +# ... +# } +# @CODE + +case ${EAPI:-0} in + 5|6) ;; + *) die "${ECLASS}.eclass: API in EAPI ${EAPI} not yet established" ;; +esac + +# @FUNCTION: _s6_get_servicedir +# @INTERNAL +# @DESCRIPTION: +# Get unprefixed servicedir. +_s6_get_servicedir() { + echo /var/svc.d +} + +# @FUNCTION: s6_get_servicedir +# @DESCRIPTION: +# Output the path for the s6 service directory (not including ${D}). +s6_get_servicedir() { + debug-print-function ${FUNCNAME} "${@}" + + echo "${EPREFIX}$(_s6_get_servicedir)" +} + +# @FUNCTION: s6_install_service +# @USAGE: servicename run finish +# @DESCRIPTION: +# Install an s6 service. +# servicename is the name of the service. +# run is the run script for the service. +# finish is the optional finish script for the service. +s6_install_service() { + debug-print-function ${FUNCNAME} "${@}" + + local name="$1" + local run="$2" + local finish="$3" + + [[ $name ]] || + die "${ECLASS}.eclass: you must specify the s6 service name" + [[ $run ]] || + die "${ECLASS}.eclass: you must specify the s6 service run script" + + ( + local servicepath="$(_s6_get_servicedir)/$name" + exeinto "$servicepath" + newexe "$run" run + [[ $finish ]] && newexe "$finish" finish + ) +} + +# @FUNCTION: s6_service_down +# @USAGE: servicename +# @DESCRIPTION: +# Install the "down" flag so this service will not be started by +# default. +# servicename is the name of the service. +s6_service_down() { + debug-print-function ${FUNCNAME} "${@}" + + local name="$1" + + [[ $name ]] || + die "${ECLASS}.eclass: you must specify the s6 service name" + + ( + touch "$T"/down || die + local servicepath="$(_s6_get_servicedir)/$name" + insinto "$servicepath" + doins "$T"/down + ) +} + +# @FUNCTION: s6_service_nosetsid +# @USAGE: servicename +# @DESCRIPTION: +# Install the "nosetsid" flag so this service will not be made a session +# leader. +# servicename is the name of the service. +s6_service_nosetsid() { + debug-print-function ${FUNCNAME} "${@}" + + local name="$1" + + [[ $name ]] || + die "${ECLASS}.eclass: you must specify the s6 service name" + + ( + touch "$T"/nosetsid || die + local servicepath="$(_s6_get_servicedir)/$name" + insinto "$servicepath" + doins "$T"/nosetsid + ) +} diff -uNr a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass --- a/eclass/savedconfig.eclass false +++ b/eclass/savedconfig.eclass 9efd11125944acecb5dc53386a3c92d2e5d561b39f43a89e6952f808b8c54939eb0c1cad5d5fae8c8bd6ffd713db8b4a59551e8d69ce92ea9206ce7bb71cb14a @@ -0,0 +1,154 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: savedconfig.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: common API for saving/restoring complex configuration files +# @DESCRIPTION: +# It is not uncommon to come across a package which has a very fine +# grained level of configuration options that go way beyond what +# USE flags can properly describe. For this purpose, a common API +# of saving and restoring the configuration files was developed +# so users can modify these config files and the ebuild will take it +# into account as needed. +# +# @ROFF .nr step 1 1 +# Typically you can create your own configuration files quickly by +# doing: +# @ROFF .IP \n[step] 3 +# Build the package with FEATURES=noclean USE=savedconfig. +# @ROFF .IP \n+[step] +# Go into the build dir and edit the relevant configuration system +# (e.g. `make menuconfig` or `nano config-header.h`). You can look +# at the files in /etc/portage/savedconfig/ to see what files get +# loaded/restored. +# @ROFF .IP \n+[step] +# Copy the modified configuration files out of the workdir and to +# the paths in /etc/portage/savedconfig/. +# @ROFF .IP \n+[step] +# Emerge the package with just USE=savedconfig to get the custom build. + +inherit portability + +IUSE="savedconfig" + +# @FUNCTION: save_config +# @USAGE: <config files to save> +# @DESCRIPTION: +# Use this function to save the package's configuration file into the +# right location. You may specify any number of configuration files, +# but just make sure you call save_config with all of them at the same +# time in order for things to work properly. +save_config() { + if [[ ${EBUILD_PHASE} != "install" ]]; then + die "Bad package! save_config only for use in src_install functions!" + fi + [[ $# -eq 0 ]] && die "Usage: save_config <files>" + + # Be lazy in our EAPI compat + : ${ED:=${D}} + + local dest="/etc/portage/savedconfig/${CATEGORY}" + if [[ $# -eq 1 && -f $1 ]] ; then + # Just one file, so have the ${PF} be that config file + dodir "${dest}" + cp "$@" "${ED}/${dest}/${PF}" || die "failed to save $*" + else + # A dir, or multiple files, so have the ${PF} be a dir + # with all the saved stuff below it + dodir "${dest}/${PF}" + treecopy "$@" "${ED}/${dest}/${PF}" || die "failed to save $*" + fi + + elog "Your configuration for ${CATEGORY}/${PF} has been saved in " + elog "/etc/portage/savedconfig/${CATEGORY}/${PF} for your editing pleasure." + elog "You can edit these files by hand and remerge this package with" + elog "USE=savedconfig to customise the configuration." + elog "You can rename this file/directory to one of the following for" + elog "its configuration to apply to multiple versions:" + elog '${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/' + elog '[${CTARGET}|${CHOST}|""]/${CATEGORY}/[${PF}|${P}|${PN}]' +} + +# @FUNCTION: restore_config +# @USAGE: <config files to restore> +# @DESCRIPTION: +# Restores the configuation saved ebuild previously potentially with user edits. +# You can restore a single file or a whole bunch, just make sure you call +# restore_config with all of the files to restore at the same time. +# +# Config files can be laid out as: +# @CODE +# ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CTARGET}/${CATEGORY}/${PF} +# ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CHOST}/${CATEGORY}/${PF} +# ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${PF} +# ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CTARGET}/${CATEGORY}/${P} +# ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CHOST}/${CATEGORY}/${P} +# ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${P} +# ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CTARGET}/${CATEGORY}/${PN} +# ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CHOST}/${CATEGORY}/${PN} +# ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${PN} +# @CODE +restore_config() { + case ${EBUILD_PHASE} in + unpack|compile|configure|prepare) ;; + *) die "Bad package! restore_config only for use in src_{unpack,compile,configure,prepare} functions!" ;; + esac + + use savedconfig || return + + local found check configfile + local base=${PORTAGE_CONFIGROOT}/etc/portage/savedconfig + for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do + configfile=${base}/${CTARGET}/${check} + [[ -r ${configfile} ]] || configfile=${base}/${CHOST}/${check} + [[ -r ${configfile} ]] || configfile=${base}/${check} + einfo "Checking existence of ${configfile} ..." + if [[ -r "${configfile}" ]]; then + einfo "found ${configfile}" + found=${configfile}; + break; + fi + done + if [[ -f ${found} ]]; then + elog "Building using saved configfile ${found}" + if [ $# -gt 0 ]; then + cp -pPR "${found}" "$1" || die "Failed to restore ${found} to $1" + else + die "need to know the restoration filename" + fi + elif [[ -d ${found} ]]; then + elog "Building using saved config directory ${found}" + local dest=${PWD} + pushd "${found}" > /dev/null + treecopy . "${dest}" || die "Failed to restore ${found} to $1" + popd > /dev/null + else + # maybe the user is screwing around with perms they shouldnt #289168 + if [[ ! -r ${base} ]] ; then + eerror "Unable to read ${base} -- please check its permissions." + die "Reading config files failed" + fi + ewarn "No saved config to restore - please remove USE=savedconfig or" + ewarn "provide a configuration file in ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${PN}" + ewarn "Your config file(s) will not be used this time" + fi +} + +savedconfig_pkg_postinst() { + # If the user has USE=savedconfig, then chances are they + # are modifying these files, so keep them around. #396169 + # This might lead to cruft build up, but the alternatives + # are worse :/. + + if use savedconfig ; then + # Be lazy in our EAPI compat + : ${EROOT:=${ROOT}} + + find "${EROOT}/etc/portage/savedconfig/${CATEGORY}/${PF}" \ + -exec touch {} + 2>/dev/null + fi +} + +EXPORT_FUNCTIONS pkg_postinst diff -uNr a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass --- a/eclass/scons-utils.eclass false +++ b/eclass/scons-utils.eclass fdb858e6d7d574b052abb41d192ad6fbc5b286a95264a5186c4bc6a6539c50a20884cad61e8e1e1c353bc61e2b29f7373f2c8c12c3148c38041b75407aab919c @@ -0,0 +1,288 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: scons-utils.eclass +# @MAINTAINER: +# mgorny@gentoo.org +# @BLURB: helper functions to deal with SCons buildsystem +# @DESCRIPTION: +# This eclass provides a set of function to help developers sanely call +# dev-util/scons and pass parameters to it. +# +# Please note that SCons is more like a 'build system creation kit', +# and requires a lot of upstream customization to be used sanely. +# You will often need to request fixes upstream and/or patch the build +# system. In particular: +# +# 1. There are no 'standard' variables. To respect CC, CXX, CFLAGS, +# CXXFLAGS, CPPFLAGS, LDFLAGS, upstream needs to define appropriate +# variables explicitly. In some cases, upstreams respect envvars, +# in others you need to pass them as options. +# +# 2. SCons scrubs out environment by default and replaces it with some +# pre-defined values. To respect environment variables such as PATH, +# Upstreams need to explicitly get them from os.environ and copy them +# to the build environment. +# +# @EXAMPLE: +# @CODE +# inherit scons-utils toolchain-funcs +# +# EAPI=5 +# +# src_configure() { +# MYSCONS=( +# CC="$(tc-getCC)" +# ENABLE_NLS=$(usex nls) +# ) +# } +# +# src_compile() { +# escons "${MYSCONS[@]}" +# } +# +# src_install() { +# # note: this can be DESTDIR, INSTALL_ROOT, ... depending on package +# escons "${MYSCONS[@]}" DESTDIR="${D}" install +# } +# @CODE + +# -- public variables -- + +# @ECLASS-VARIABLE: SCONS_MIN_VERSION +# @DEFAULT_UNSET +# @DESCRIPTION: +# The minimal version of SCons required for the build to work. + +# @VARIABLE: myesconsargs +# @DEFAULT_UNSET +# @DESCRIPTION: +# DEPRECATED, EAPI 0..5 ONLY: pass options to escons instead +# +# List of package-specific options to pass to all SCons calls. Supposed to be +# set in src_configure(). + +# @ECLASS-VARIABLE: SCONSOPTS +# @DEFAULT_UNSET +# @DESCRIPTION: +# The default set of options to pass to scons. Similar to MAKEOPTS, +# supposed to be set in make.conf. If unset, escons() will use cleaned +# up MAKEOPTS instead. + +# @ECLASS-VARIABLE: EXTRA_ESCONS +# @DEFAULT_UNSET +# @DESCRIPTION: +# The additional parameters to pass to SCons whenever escons() is used. +# Much like EXTRA_EMAKE, this is not supposed to be used in make.conf +# and not in ebuilds! + +# @ECLASS-VARIABLE: USE_SCONS_TRUE +# @DESCRIPTION: +# DEPRECATED: use usex instead +# +# The default value for truth in scons-use() (1 by default). +: ${USE_SCONS_TRUE:=1} + +# @ECLASS-VARIABLE: USE_SCONS_FALSE +# @DESCRIPTION: +# DEPRECATED: use usex instead +# +# The default value for false in scons-use() (0 by default). +: ${USE_SCONS_FALSE:=0} + +# -- EAPI support check -- + +case ${EAPI:-0} in + 0|1|2|3|4|5|6) ;; + *) die "EAPI ${EAPI} unsupported." +esac + +inherit multiprocessing + +# -- ebuild variables setup -- + +if [[ -n ${SCONS_MIN_VERSION} ]]; then + BDEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}" +else + BDEPEND="dev-util/scons" +fi + +if [[ ${EAPI:-0} == [0123456] ]]; then + DEPEND=${BDEPEND} + unset BDEPEND +fi + +# -- public functions -- + +# @FUNCTION: escons +# @USAGE: [<args>...] +# @DESCRIPTION: +# Call scons, passing the supplied arguments. Like emake, this function +# does die on failure in EAPI 4. Respects nonfatal in EAPI 6 and newer. +escons() { + local ret + + debug-print-function ${FUNCNAME} "${@}" + + # Use myesconsargs in EAPI 5 and older + if [[ ${EAPI} == [012345] ]]; then + set -- "${myesconsargs[@]}" "${@}" + fi + + # if SCONSOPTS are _unset_, use cleaned MAKEOPTS + if [[ ! ${SCONSOPTS+set} ]]; then + local SCONSOPTS + _scons_clean_makeopts + fi + + # pass ebuild environment variables through! + local -x GENTOO_SCONS_ENV_PASSTHROUGH=1 + + set -- scons ${SCONSOPTS} ${EXTRA_ESCONS} "${@}" + echo "${@}" >&2 + "${@}" + ret=${?} + + if [[ ${ret} -ne 0 ]]; then + case "${EAPI:-0}" in + 0|1|2|3) # nonfatal in EAPIs 0 through 3 + ;; + 4|5) # 100% fatal in 4 & 5 + die "escons failed." + ;; + *) # respect nonfatal in 6 onwards + die -n "escons failed." + ;; + esac + fi + return ${ret} +} + +# @FUNCTION: _scons_clean_makeopts +# @INTERNAL +# @USAGE: [makeflags] [...] +# @DESCRIPTION: +# Strip the supplied makeflags (or ${MAKEOPTS} if called without +# an argument) of options not supported by SCons and make sure --jobs +# gets an argument. Output the resulting flag list (suitable +# for an assignment to SCONSOPTS). +_scons_clean_makeopts() { + local new_makeopts=() + + debug-print-function ${FUNCNAME} "${@}" + + if [[ ${#} -eq 0 ]]; then + debug-print "Using MAKEOPTS: [${MAKEOPTS}]" + set -- ${MAKEOPTS} + else + # unquote if necessary + set -- ${*} + fi + + # empty MAKEOPTS give out empty SCONSOPTS + # thus, we do need to worry about the initial setup + if [[ ${*} = ${_SCONS_CACHE_MAKEOPTS} ]]; then + SCONSOPTS=${_SCONS_CACHE_SCONSOPTS} + debug-print "Cache hit: [${SCONSOPTS}]" + return + fi + _SCONS_CACHE_MAKEOPTS=${*} + + while [[ ${#} -gt 0 ]]; do + case ${1} in + # clean, simple to check -- we like that + --jobs=*|--keep-going) + new_makeopts+=( ${1} ) + ;; + # need to take a look at the next arg and guess + --jobs) + if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then + new_makeopts+=( ${1} ${2} ) + shift + else + # no value means no limit, let's pass a default instead + new_makeopts+=( ${1}=$(( $(get_nproc) + 1 )) ) + fi + ;; + # strip other long options + --*) + ;; + # short option hell + -*) + local str new_optstr + new_optstr= + str=${1#-} + + while [[ -n ${str} ]]; do + case ${str} in + k*) + new_optstr+=k + ;; + # -j needs to come last + j) + if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then + new_optstr+="j ${2}" + shift + else + new_optstr+="j $(( $(get_nproc) + 1 ))" + fi + ;; + # otherwise, everything after -j is treated as an arg + j*) + new_optstr+=${str} + break + ;; + esac + str=${str#?} + done + + if [[ -n ${new_optstr} ]]; then + new_makeopts+=( -${new_optstr} ) + fi + ;; + esac + shift + done + + SCONSOPTS=${new_makeopts[*]} + _SCONS_CACHE_SCONSOPTS=${SCONSOPTS} + debug-print "New SCONSOPTS: [${SCONSOPTS}]" +} + +# @FUNCTION: use_scons +# @USAGE: <use-flag> [var-name] [var-opt-true] [var-opt-false] +# @DESCRIPTION: +# DEPRECATED, EAPI 0..5 ONLY: use usex instead +# +# Output a SCons parameter with value depending on the USE flag state. +# If the USE flag is set, output <var-name>=<var-opt-true>; otherwise +# <var-name>=<var-opt-false>. +# +# If <var-name> is omitted, <use-flag> will be used instead. However, +# if <use-flag> starts with an exclamation mark (!flag), 'no' will be +# prepended to the name (e.g. noflag). +# +# If <var-opt-true> and/or <var-opt-false> are omitted, +# ${USE_SCONS_TRUE} and/or ${USE_SCONS_FALSE} will be used instead. +use_scons() { + [[ ${EAPI} == [012345] ]] \ + || die "${FUNCNAME} is banned in EAPI ${EAPI}, use usex instead" + + local flag=${1} + local varname=${2:-${flag/\!/no}} + local vartrue=${3:-${USE_SCONS_TRUE}} + local varfalse=${4:-${USE_SCONS_FALSE}} + + debug-print-function ${FUNCNAME} "${@}" + + if [[ ${#} -eq 0 ]]; then + eerror "Usage: scons-use <use-flag> [var-name] [var-opt-true] [var-opt-false]" + die 'scons-use(): not enough arguments' + fi + + if use "${flag}"; then + echo "${varname}=${vartrue}" + else + echo "${varname}=${varfalse}" + fi +} diff -uNr a/eclass/scsh.eclass b/eclass/scsh.eclass --- a/eclass/scsh.eclass false +++ b/eclass/scsh.eclass 5fa8eb2ef25c23ece54be4b04d2f8e8f631a548a128ffe417910583b56365c1a1585ea88ae7fb07f4906460ca671fecd31d909503626f1734f70c66054e2e344 @@ -0,0 +1,72 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# + +inherit eutils multilib + +SLOT="0" +IUSE="scsh" + +scsh_scsh_path() { + echo /usr/$(get_libdir)/scsh +} + +set_layout() { + if use scsh; then + SCSH_LAYOUT=scsh + else + ewarn "No layout was specified via USE, defaulting to FHS." + SCSH_LAYOUT=fhs + fi + export SCSH_LAYOUT +} + +set_path_variables() { + SCSH_VERSION="$(best_version 'app-shells/scsh')" + SCSH_MV="${SCSH_VERSION%*.*}" + SCSH_MV="${SCSH_MV//app-shells\/scsh-}" + export SCSH_VERSION SCSH_MV + + case ${SCSH_LAYOUT} in + fhs) + SCSH_PREFIX=/usr + SCSH_MODULES_PATH=/usr/share/scsh-${SCSH_MV}/modules + ;; + scsh) + SCSH_PREFIX=/usr/$(get_libdir)/scsh/modules + SCSH_MODULES_PATH=/usr/$(get_libdir)/scsh/modules/${SCSH_MV} + ;; + esac + export SCSH_PREFIX SCSH_MODULES_PATH + + SCSH_LIB_DIRS='"'${SCSH_MODULES_PATH}'"'" "'"'$(scsh_scsh_path)'"'" "'"'.'"' + export SCSH_LIB_DIRS +} + +scsh_src_unpack() { + set_layout + set_path_variables + einfo "Using ${SCSH_LAYOUT} layout" + unpack ${A} +} + +scsh_get_layout_conf() { + SCSH_LAYOUT_CONF=" --build ${CHOST} + --force + --layout ${SCSH_LAYOUT} + --prefix ${SCSH_PREFIX} + --no-user-defaults + --dest-dir ${D}" + export SCSH_LAYOUT_CONF +} + +scsh_src_compile() { + scsh_get_layout_conf +} + +scsh_src_install() { + dodir ${SCSH_MODULES_PATH} + scsh-install-pkg ${SCSH_LAYOUT_CONF} || die "./scsh-install-pkg failed" +} + +EXPORT_FUNCTIONS src_unpack src_compile src_install diff -uNr a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass --- a/eclass/selinux-policy-2.eclass false +++ b/eclass/selinux-policy-2.eclass 743d2140ab43d9940539152d7dd93590ab12d01702312d85219370e75f1317800ddf73ecbea0a2566152457388940ca5b170f2e72a1a76e05b5b878b4bb867a7 @@ -0,0 +1,367 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Eclass for installing SELinux policy, and optionally +# reloading the reference-policy based modules. + +# @ECLASS: selinux-policy-2.eclass +# @MAINTAINER: +# selinux@gentoo.org +# @BLURB: This eclass supports the deployment of the various SELinux modules in sec-policy +# @DESCRIPTION: +# The selinux-policy-2.eclass supports deployment of the various SELinux modules +# defined in the sec-policy category. It is responsible for extracting the +# specific bits necessary for single-module deployment (instead of full-blown +# policy rebuilds) and applying the necessary patches. +# +# Also, it supports for bundling patches to make the whole thing just a bit more +# manageable. + +# @ECLASS-VARIABLE: MODS +# @DESCRIPTION: +# This variable contains the (upstream) module name for the SELinux module. +# This name is only the module name, not the category! +: ${MODS:="_illegal"} + +# @ECLASS-VARIABLE: BASEPOL +# @DESCRIPTION: +# This variable contains the version string of the selinux-base-policy package +# that this module build depends on. It is used to patch with the appropriate +# patch bundle(s) that are part of selinux-base-policy. +: ${BASEPOL:=${PVR}} + +# @ECLASS-VARIABLE: POLICY_PATCH +# @DESCRIPTION: +# This variable contains the additional patch(es) that need to be applied on top +# of the patchset already contained within the BASEPOL variable. The variable +# can be both a simple string (space-separated) or a bash array. +: ${POLICY_PATCH:=""} + +# @ECLASS-VARIABLE: POLICY_FILES +# @DESCRIPTION: +# When defined, this contains the files (located in the ebuilds' files/ +# directory) which should be copied as policy module files into the store. +# Generally, users would want to include at least a .te and .fc file, but .if +# files are supported as well. The variable can be both a simple string +# (space-separated) or a bash array. +: ${POLICY_FILES:=""} + +# @ECLASS-VARIABLE: POLICY_TYPES +# @DESCRIPTION: +# This variable informs the eclass for which SELinux policies the module should +# be built. Currently, Gentoo supports targeted, strict, mcs and mls. +# This variable is the same POLICY_TYPES variable that we tell SELinux +# users to set in make.conf. Therefore, it is not the module that should +# override it, but the user. +: ${POLICY_TYPES:="targeted strict mcs mls"} + +# @ECLASS-VARIABLE: SELINUX_GIT_REPO +# @DESCRIPTION: +# When defined, this variable overrides the default repository URL as used by +# this eclass. It allows end users to point to a different policy repository +# using a single variable, rather than having to set the packagename_LIVE_REPO +# variable for each and every SELinux policy module package they want to install. +# The default value is Gentoo's hardened-refpolicy repository. +: ${SELINUX_GIT_REPO:="https://anongit.gentoo.org/git/proj/hardened-refpolicy.git"}; + +# @ECLASS-VARIABLE: SELINUX_GIT_BRANCH +# @DESCRIPTION: +# When defined, this variable sets the Git branch to use of the repository. This +# allows for users and developers to use a different branch for the entire set of +# SELinux policy packages, rather than having to override them one by one with the +# packagename_LIVE_BRANCH variable. +# The default value is the 'master' branch. +: ${SELINUX_GIT_BRANCH:="master"}; + +case "${EAPI:-0}" in + 0|1|2|3|4) die "EAPI<5 is not supported";; + 5|6) : ;; + *) die "unknown EAPI" ;; +esac + +case ${BASEPOL} in + 9999) inherit git-r3 + EGIT_REPO_URI="${SELINUX_GIT_REPO}"; + EGIT_BRANCH="${SELINUX_GIT_BRANCH}"; + EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy";; +esac + +if [[ ${EAPI:-0} == 5 ]]; then + inherit eutils +fi + +IUSE="" + +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux" +if [[ -n ${BASEPOL} ]] && [[ "${BASEPOL}" != "9999" ]]; then + SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2 + https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2" +elif [[ "${BASEPOL}" != "9999" ]]; then + SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2" +else + SRC_URI="" +fi + +LICENSE="GPL-2" +SLOT="0" +S="${WORKDIR}/" +PATCHBUNDLE="${DISTDIR}/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2" + +# Modules should always depend on at least the first release of the +# selinux-base-policy for which they are generated. +if [[ -n ${BASEPOL} ]]; then + RDEPEND=">=sys-apps/policycoreutils-2.0.82 + >=sec-policy/selinux-base-policy-${BASEPOL}" +else + RDEPEND=">=sys-apps/policycoreutils-2.0.82 + >=sec-policy/selinux-base-policy-${PV}" +fi +DEPEND="${RDEPEND} + sys-devel/m4 + >=sys-apps/checkpolicy-2.0.21" + +EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm + +# @FUNCTION: selinux-policy-2_src_unpack +# @DESCRIPTION: +# Unpack the policy sources as offered by upstream (refpolicy). +selinux-policy-2_src_unpack() { + if [[ "${BASEPOL}" != "9999" ]]; then + unpack ${A} + else + git-r3_src_unpack + fi +} + +# @FUNCTION: selinux-policy-2_src_prepare +# @DESCRIPTION: +# Patch the reference policy sources with our set of enhancements. Start with +# the base patchbundle referred to by the ebuilds through the BASEPOL variable, +# then apply the additional patches as offered by the ebuild. +# +# Next, extract only those files needed for this particular module (i.e. the .te +# and .fc files for the given module in the MODS variable). +# +# Finally, prepare the build environments for each of the supported SELinux +# types (such as targeted or strict), depending on the POLICY_TYPES variable +# content. +selinux-policy-2_src_prepare() { + local modfiles + local add_interfaces=0; + + # Create 3rd_party location for user-contributed policies + cd "${S}/refpolicy/policy/modules" && mkdir 3rd_party; + + # Patch the sources with the base patchbundle + if [[ -n ${BASEPOL} ]] && [[ "${BASEPOL}" != "9999" ]]; then + cd "${S}" + if [[ ${EAPI:-0} == 5 ]]; then + EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \ + EPATCH_SUFFIX="patch" \ + EPATCH_SOURCE="${WORKDIR}" \ + EPATCH_FORCE="yes" \ + epatch + else + einfo "Applying SELinux policy updates ... " + eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch" + fi + fi + + # Call in epatch_user. We do this early on as we start moving + # files left and right hereafter. + if [[ ${EAPI:-0} == 5 ]]; then + epatch_user + else + eapply_user + fi + + # Copy additional files to the 3rd_party/ location + if [[ "$(declare -p POLICY_FILES 2>/dev/null 2>&1)" == "declare -a"* ]] || + [[ -n ${POLICY_FILES} ]]; then + add_interfaces=1; + cd "${S}/refpolicy/policy/modules" + for POLFILE in ${POLICY_FILES[@]}; + do + cp "${FILESDIR}/${POLFILE}" 3rd_party/ || die "Could not copy ${POLFILE} to 3rd_party/ location"; + done + fi + + # Apply the additional patches refered to by the module ebuild. + # But first some magic to differentiate between bash arrays and strings + if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]] || + [[ -n ${POLICY_PATCH} ]]; then + cd "${S}/refpolicy/policy/modules" + for POLPATCH in ${POLICY_PATCH[@]}; + do + if [[ ${EAPI:-0} == 5 ]]; then + epatch "${POLPATCH}" + else + eapply "${POLPATCH}" + fi + done + fi + + # Collect only those files needed for this particular module + for i in ${MODS}; do + modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles" + modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles" + modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.cil) $modfiles" + if [[ ${add_interfaces} -eq 1 ]]; then + modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.if) $modfiles" + fi + done + + for i in ${POLICY_TYPES}; do + mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}" + cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \ + || die "Failed to copy Makefile.example to ${S}/${i}/Makefile" + + cp ${modfiles} "${S}"/${i} \ + || die "Failed to copy the module files to ${S}/${i}" + done +} + +# @FUNCTION: selinux-policy-2_src_compile +# @DESCRIPTION: +# Build the SELinux policy module (.pp file) for just the selected module, and +# this for each SELinux policy mentioned in POLICY_TYPES +selinux-policy-2_src_compile() { + local makeuse="" + for useflag in ${IUSE}; + do + use ${useflag} && makeuse="${makeuse} -D use_${useflag}" + done + + for i in ${POLICY_TYPES}; do + # Support USE flags in builds + export M4PARAM="${makeuse}" + emake NAME=$i -C "${S}"/${i} || die "${i} compile failed" + done +} + +# @FUNCTION: selinux-policy-2_src_install +# @DESCRIPTION: +# Install the built .pp (or copied .cil) files in the correct subdirectory within +# /usr/share/selinux. +selinux-policy-2_src_install() { + local BASEDIR="/usr/share/selinux" + + for i in ${POLICY_TYPES}; do + for j in ${MODS}; do + einfo "Installing ${i} ${j} policy package" + insinto ${BASEDIR}/${i} + if [[ -f "${S}/${i}/${j}.pp" ]] ; then + doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}" + elif [[ -f "${S}/${i}/${j}.cil" ]] ; then + doins "${S}"/${i}/${j}.cil || die "Failed to add ${j}.cil to ${i}" + fi + + if [[ "${POLICY_FILES[@]}" == *"${j}.if"* ]]; then + insinto ${BASEDIR}/${i}/include/3rd_party + doins "${S}"/${i}/${j}.if || die "Failed to add ${j}.if to ${i}" + fi + done + done +} + +# @FUNCTION: selinux-policy-2_pkg_postinst +# @DESCRIPTION: +# Install the built .pp (or copied .cil) files in the SELinux policy stores, effectively +# activating the policy on the system. +selinux-policy-2_pkg_postinst() { + # build up the command in the case of multiple modules + local COMMAND + + for i in ${POLICY_TYPES}; do + if [[ "${i}" == "strict" ]] && [[ "${MODS}" = "unconfined" ]]; then + einfo "Ignoring loading of unconfined module in strict module store."; + continue; + fi + einfo "Inserting the following modules into the $i module store: ${MODS}" + + cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" + for j in ${MODS} ; do + if [[ -f "${j}.pp" ]] ; then + COMMAND="${j}.pp ${COMMAND}" + elif [[ -f "${j}.cil" ]] ; then + COMMAND="${j}.cil ${COMMAND}" + fi + done + + semodule -s ${i} -i ${COMMAND} + if [[ $? -ne 0 ]]; then + ewarn "SELinux module load failed. Trying full reload..."; + local COMMAND_base="-i base.pp" + if has_version "<sys-apps/policycoreutils-2.5"; then + COMMAND="-b base.pp" + fi + + if [[ "${i}" == "targeted" ]]; then + semodule -s ${i} ${COMMAND_base} -i $(ls *.pp | grep -v base.pp); + else + semodule -s ${i} ${COMMAND_base} -i $(ls *.pp | grep -v base.pp | grep -v unconfined.pp); + fi + if [[ $? -ne 0 ]]; then + ewarn "Failed to reload SELinux policies." + ewarn "" + ewarn "If this is *not* the last SELinux module package being installed," + ewarn "then you can safely ignore this as the reloads will be retried" + ewarn "with other, recent modules." + ewarn "" + ewarn "If it is the last SELinux module package being installed however," + ewarn "then it is advised to look at the error above and take appropriate" + ewarn "action since the new SELinux policies are not loaded until the" + ewarn "command finished succesfully." + ewarn "" + ewarn "To reload, run the following command from within /usr/share/selinux/${i}:" + ewarn " semodule ${COMMAND_base} -i \$(ls *.pp | grep -v base.pp)" + ewarn "or" + ewarn " semodule ${COMMAND_base} -i \$(ls *.pp | grep -v base.pp | grep -v unconfined.pp)" + ewarn "depending on if you need the unconfined domain loaded as well or not." + else + einfo "SELinux modules reloaded succesfully." + fi + else + einfo "SELinux modules loaded succesfully." + fi + COMMAND=""; + done + + # Relabel depending packages + local PKGSET=""; + if [[ -x /usr/bin/qdepends ]] ; then + PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v "sec-policy/selinux-"); + elif [[ -x /usr/bin/equery ]] ; then + PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v "sec-policy/selinux-"); + fi + if [[ -n "${PKGSET}" ]] ; then + rlpkg ${PKGSET}; + fi +} + +# @FUNCTION: selinux-policy-2_pkg_postrm +# @DESCRIPTION: +# Uninstall the module(s) from the SELinux policy stores, effectively +# deactivating the policy on the system. +selinux-policy-2_pkg_postrm() { + # Only if we are not upgrading + if [[ -z "${REPLACED_BY_VERSION}" ]]; then + # build up the command in the case of multiple modules + local COMMAND + for i in ${MODS}; do + COMMAND="-r ${i} ${COMMAND}" + done + + for i in ${POLICY_TYPES}; do + einfo "Removing the following modules from the $i module store: ${MODS}" + + semodule -s ${i} ${COMMAND} + if [[ $? -ne 0 ]]; then + ewarn "SELinux module unload failed."; + else + einfo "SELinux modules unloaded succesfully." + fi + done + fi +} + diff -uNr a/eclass/sgml-catalog.eclass b/eclass/sgml-catalog.eclass --- a/eclass/sgml-catalog.eclass false +++ b/eclass/sgml-catalog.eclass be6a794c63540abc572cadba87c8134b13041b52fc87bc5b0818ddc5c2dca80656997437fd046402e0d2fdba72af537d5f64a27c53fa1b7923da3b3c04aaff3f @@ -0,0 +1,100 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: sgml-catalog.eclass +# @MAINTAINER: +# No maintainer <maintainer-needed@gentoo.org> +# @AUTHOR: +# Author Matthew Turk <satai@gentoo.org> +# @BLURB: Functions for installing SGML catalogs + +inherit base + +DEPEND=">=app-text/sgml-common-0.6.3-r2" + +# @ECLASS-VARIABLE: SGML_TOINSTALL +# @DESCRIPTION: +# An array of catalogs, arranged in pairs. +# Each pair consists of a centralized catalog followed by an ordinary catalog. +SGML_TOINSTALL=() + +# @FUNCTION: sgml-catalog_cat_include +# @USAGE: <centralized catalog> <ordinary catalog> +# @DESCRIPTION: +# Appends a catalog pair to the SGML_TOINSTALL array. +sgml-catalog_cat_include() { + debug-print function $FUNCNAME $* + SGML_TOINSTALL+=("$1" "$2") +} + +# @FUNCTION: sgml-catalog_cat_doinstall +# @USAGE: <centralized catalog> <ordinary catalog> +# @DESCRIPTION: +# Adds an ordinary catalog to a centralized catalog. +sgml-catalog_cat_doinstall() { + debug-print function $FUNCNAME $* + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + "${EPREFIX}"/usr/bin/install-catalog --add "${EPREFIX}$1" "${EPREFIX}$2" &>/dev/null +} + +# @FUNCTION: sgml-catalog_cat_doremove +# @USAGE: <centralized catalog> <ordinary catalog> +# @DESCRIPTION: +# Removes an ordinary catalog from a centralized catalog. +sgml-catalog_cat_doremove() { + debug-print function $FUNCNAME $* + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + "${EPREFIX}"/usr/bin/install-catalog --remove "${EPREFIX}$1" "${EPREFIX}$2" &>/dev/null +} + +sgml-catalog_pkg_postinst() { + debug-print function $FUNCNAME $* + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + + set -- "${SGML_TOINSTALL[@]}" + + while (( $# )); do + if [[ ! -e "${EPREFIX}$2" ]]; then + ewarn "${EPREFIX}$2 doesn't appear to exist, although it ought to!" + shift 2 + continue + fi + einfo "Now adding ${EPREFIX}$2 to ${EPREFIX}$1 and ${EPREFIX}/etc/sgml/catalog" + sgml-catalog_cat_doinstall "$1" "$2" + shift 2 + done + sgml-catalog_cleanup +} + +sgml-catalog_pkg_prerm() { + sgml-catalog_cleanup +} + +sgml-catalog_pkg_postrm() { + debug-print function $FUNCNAME $* + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + + set -- "${SGML_TOINSTALL[@]}" + + while (( $# )); do + einfo "Now removing ${EPREFIX}$2 from ${EPREFIX}$1 and ${EPREFIX}/etc/sgml/catalog" + sgml-catalog_cat_doremove "$1" "$2" + shift 2 + done +} + +sgml-catalog_cleanup() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + if [ -e "${EPREFIX}/usr/bin/gensgmlenv" ] + then + einfo Regenerating SGML environment variables ... + gensgmlenv + grep -v export "${EPREFIX}/etc/sgml/sgml.env" > "${EPREFIX}/etc/env.d/93sgmltools-lite" + fi +} + +sgml-catalog_src_compile() { + return +} + +EXPORT_FUNCTIONS pkg_postrm pkg_postinst src_compile pkg_prerm diff -uNr a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass --- a/eclass/ssl-cert.eclass false +++ b/eclass/ssl-cert.eclass 40b3e961c9314e2d9867cb1dd7a350a0e58407e7ba4c249bd864de7e0a71dab6657bbfc7f50ff9d3424fca5ed7b5cc08e9829d2f67f3f62cfbe5c627d903bfbc @@ -0,0 +1,274 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ssl-cert.eclass +# @MAINTAINER: +# @AUTHOR: +# Max Kalika <max@gentoo.org> +# @BLURB: Eclass for SSL certificates +# @DESCRIPTION: +# This eclass implements a standard installation procedure for installing +# self-signed SSL certificates. +# @EXAMPLE: +# "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem} + +# Guard against unsupported EAPIs. We need EAPI >= 1 for slot dependencies. +case "${EAPI:-0}" in + 0) + die "${ECLASS}.eclass: EAPI=0 is not supported. Please upgrade to EAPI >= 1." + ;; + 1|2|3|4|5|6) + ;; + *) + die "${ECLASS}.eclass: EAPI=${EAPI} is not supported yet." + ;; +esac + +# @ECLASS-VARIABLE: SSL_CERT_MANDATORY +# @DESCRIPTION: +# Set to non zero if ssl-cert is mandatory for ebuild. +: ${SSL_CERT_MANDATORY:=0} + +# @ECLASS-VARIABLE: SSL_CERT_USE +# @DESCRIPTION: +# Use flag to append dependency to. +: ${SSL_CERT_USE:=ssl} + +# @ECLASS-VARIABLE: SSL_DEPS_SKIP +# @DESCRIPTION: +# Set to non zero to skip adding to DEPEND and IUSE. +: ${SSL_DEPS_SKIP:=0} + +if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then + if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then + DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )" + IUSE="${SSL_CERT_USE}" + else + DEPEND="|| ( dev-libs/openssl:0 dev-libs/libressl:0 )" + fi +fi + +# @FUNCTION: gen_cnf +# @USAGE: +# @DESCRIPTION: +# Initializes variables and generates the needed +# OpenSSL configuration file and a CA serial file +# +# Access: private +gen_cnf() { + # Location of the config file + SSL_CONF="${T}/${$}ssl.cnf" + # Location of the CA serial file + SSL_SERIAL="${T}/${$}ca.ser" + # Location of some random files OpenSSL can use: don't use + # /dev/u?random here -- doesn't work properly on all platforms + SSL_RANDOM="${T}/environment:${T}/eclass-debug.log:/etc/resolv.conf" + + # These can be overridden in the ebuild + SSL_DAYS="${SSL_DAYS:-730}" + SSL_BITS="${SSL_BITS:-4096}" + SSL_MD="${SSL_MD:-sha256}" + SSL_COUNTRY="${SSL_COUNTRY:-US}" + SSL_STATE="${SSL_STATE:-California}" + SSL_LOCALITY="${SSL_LOCALITY:-Santa Barbara}" + SSL_ORGANIZATION="${SSL_ORGANIZATION:-SSL Server}" + SSL_UNIT="${SSL_UNIT:-For Testing Purposes Only}" + SSL_COMMONNAME="${SSL_COMMONNAME:-localhost}" + SSL_EMAIL="${SSL_EMAIL:-root@localhost}" + + # Create the CA serial file + echo "01" > "${SSL_SERIAL}" + + # Create the config file + ebegin "Generating OpenSSL configuration${1:+ for CA}" + cat <<-EOF > "${SSL_CONF}" + [ req ] + prompt = no + default_bits = ${SSL_BITS} + distinguished_name = req_dn + [ req_dn ] + C = ${SSL_COUNTRY} + ST = ${SSL_STATE} + L = ${SSL_LOCALITY} + O = ${SSL_ORGANIZATION} + OU = ${SSL_UNIT} + CN = ${SSL_COMMONNAME}${1:+ CA} + emailAddress = ${SSL_EMAIL} + EOF + eend $? + + return $? +} + +# @FUNCTION: get_base +# @USAGE: [if_ca] +# @RETURN: <base path> +# @DESCRIPTION: +# Simple function to determine whether we're creating +# a CA (which should only be done once) or final part +# +# Access: private +get_base() { + if [ "${1}" ] ; then + echo "${T}/${$}ca" + else + echo "${T}/${$}server" + fi +} + +# @FUNCTION: gen_key +# @USAGE: <base path> +# @DESCRIPTION: +# Generates an RSA key +# +# Access: private +gen_key() { + local base=$(get_base "$1") + ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}" + if openssl version | grep -i libressl > /dev/null; then + openssl genrsa -out "${base}.key" "${SSL_BITS}" &> /dev/null + else + openssl genrsa -rand "${SSL_RANDOM}" \ + -out "${base}.key" "${SSL_BITS}" &> /dev/null + fi + eend $? + + return $? +} + +# @FUNCTION: gen_csr +# @USAGE: <base path> +# @DESCRIPTION: +# Generates a certificate signing request using +# the key made by gen_key() +# +# Access: private +gen_csr() { + local base=$(get_base "$1") + ebegin "Generating Certificate Signing Request${1:+ for CA}" + openssl req -config "${SSL_CONF}" -new \ + -key "${base}.key" -out "${base}.csr" &>/dev/null + eend $? + + return $? +} + +# @FUNCTION: gen_crt +# @USAGE: <base path> +# @DESCRIPTION: +# Generates either a self-signed CA certificate using +# the csr and key made by gen_csr() and gen_key() or +# a signed server certificate using the CA cert previously +# created by gen_crt() +# +# Access: private +gen_crt() { + local base=$(get_base "$1") + if [ "${1}" ] ; then + ebegin "Generating self-signed X.509 Certificate for CA" + openssl x509 -extfile "${SSL_CONF}" \ + -${SSL_MD} \ + -days ${SSL_DAYS} -req -signkey "${base}.key" \ + -in "${base}.csr" -out "${base}.crt" &>/dev/null + else + local ca=$(get_base 1) + ebegin "Generating authority-signed X.509 Certificate" + openssl x509 -extfile "${SSL_CONF}" \ + -days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \ + -CAkey "${ca}.key" -CA "${ca}.crt" -${SSL_MD} \ + -in "${base}.csr" -out "${base}.crt" &>/dev/null + fi + eend $? + + return $? +} + +# @FUNCTION: gen_pem +# @USAGE: <base path> +# @DESCRIPTION: +# Generates a PEM file by concatinating the key +# and cert file created by gen_key() and gen_cert() +# +# Access: private +gen_pem() { + local base=$(get_base "$1") + ebegin "Generating PEM Certificate" + (cat "${base}.key"; echo; cat "${base}.crt") > "${base}.pem" + eend $? + + return $? +} + +# @FUNCTION: install_cert +# @USAGE: <certificates> +# @DESCRIPTION: +# Uses all the private functions above to generate and install the +# requested certificates. +# <certificates> are full pathnames relative to ROOT, without extension. +# +# Example: "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem} +# +# Access: public +install_cert() { + if [ $# -lt 1 ] ; then + eerror "At least one argument needed" + return 1; + fi + + case ${EBUILD_PHASE} in + unpack|prepare|configure|compile|test|install) + die "install_cert cannot be called in ${EBUILD_PHASE}" + ;; + esac + + # Generate a CA environment #164601 + gen_cnf 1 || return 1 + gen_key 1 || return 1 + gen_csr 1 || return 1 + gen_crt 1 || return 1 + echo + + gen_cnf || return 1 + echo + + local count=0 + for cert in "$@" ; do + # Check the requested certificate + if [ -z "${cert##*/}" ] ; then + ewarn "Invalid certification requested, skipping" + continue + fi + + # Check for previous existence of generated files + for type in key csr crt pem ; do + if [ -e "${ROOT}${cert}.${type}" ] ; then + ewarn "${ROOT}${cert}.${type}: exists, skipping" + continue 2 + fi + done + + # Generate the requested files + gen_key || continue + gen_csr || continue + gen_crt || continue + gen_pem || continue + echo + + # Install the generated files and set sane permissions + local base=$(get_base) + install -d "${ROOT}${cert%/*}" + install -m0400 "${base}.key" "${ROOT}${cert}.key" + install -m0444 "${base}.csr" "${ROOT}${cert}.csr" + install -m0444 "${base}.crt" "${ROOT}${cert}.crt" + install -m0400 "${base}.pem" "${ROOT}${cert}.pem" + : $(( ++count )) + done + + # Resulting status + if [ ${count} = 0 ] ; then + eerror "No certificates were generated" + return 1 + elif [ ${count} != ${#} ] ; then + ewarn "Some requested certificates were not generated" + fi +} diff -uNr a/eclass/stardict.eclass b/eclass/stardict.eclass --- a/eclass/stardict.eclass false +++ b/eclass/stardict.eclass 4821dcfb8dc239d8657fd49214351e633b2ae3e1de9f6fb77049301a0c0e263a213c32f713cc0969335784422a696af69380a3992a73fa414e5352455743f9a1 @@ -0,0 +1,59 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Author : Alastair Tse <liquidx@gentoo.org> +# +# Convienence class to do stardict dictionary installations. +# +# Usage: +# - Variables to set : +# * FROM_LANG - From this language +# * TO_LANG - To this language +# * DICT_PREFIX - SRC_URI prefix, like "dictd_www.mova.org_" +# * DICT_SUFFIX - SRC_URI after the prefix. + +RESTRICT="strip" + +[ -z "${DICT_SUFFIX}" ] && DICT_SUFFIX=${PN#stardict-[[:lower:]]*-} +[ -z "${DICT_P}" ] && DICT_P=stardict-${DICT_PREFIX}${DICT_SUFFIX}-${PV} + +if [ -n "${FROM_LANG}" -a -n "${TO_LANG}" ]; then + DESCRIPTION="Stardict Dictionary ${FROM_LANG} to ${TO_LANG}" +elif [ -z "${DESCRIPTION}" ]; then + DESCRIPTION="Another Stardict Dictionary" +fi + +HOMEPAGE="http://stardict.sourceforge.net/" +SRC_URI="mirror://sourceforge/stardict/${DICT_P}.tar.bz2" + +IUSE="gzip" +SLOT="0" +LICENSE="GPL-2" + +DEPEND="|| ( >=app-text/stardict-2.4.2 + app-text/sdcv + app-text/goldendict ) + gzip? ( app-arch/gzip + app-text/dictd )" + +S=${WORKDIR}/${DICT_P} + +stardict_src_compile() { + if use gzip; then + for file in *.idx; do + [[ -f $file ]] && gzip ${file} + done + for file in *.dict; do + [[ -f $file ]] && dictzip ${file} + done + fi +} + +stardict_src_install() { + insinto /usr/share/stardict/dic + doins *.dict.dz* + doins *.idx* + doins *.ifo +} + +EXPORT_FUNCTIONS src_compile src_install diff -uNr a/eclass/subversion.eclass b/eclass/subversion.eclass --- a/eclass/subversion.eclass false +++ b/eclass/subversion.eclass 1c29bbc64476f7c7379443f4866ceb9d99167e4dfe143cc9f562776d2b7892c12b5d74f8ccb58d3e6fb9906cb979db2b0db9583408f4e7c0ef37c29286c36b72 @@ -0,0 +1,539 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: subversion.eclass +# @MAINTAINER: +# Akinori Hattori <hattya@gentoo.org> +# @AUTHOR: +# Original Author: Akinori Hattori <hattya@gentoo.org> +# @BLURB: The subversion eclass is written to fetch software sources from subversion repositories +# @DESCRIPTION: +# The subversion eclass provides functions to fetch, patch and bootstrap +# software sources from subversion repositories. + +inherit eutils + +ESVN="${ECLASS}" + +case "${EAPI:-0}" in + 0|1) + EXPORT_FUNCTIONS src_unpack pkg_preinst + DEPEND="dev-vcs/subversion" + ;; + 2|3|4|5) + EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst + DEPEND="|| ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] )" + ;; + 6) + EXPORT_FUNCTIONS src_unpack pkg_preinst + DEPEND="|| ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] )" + ;; + *) + die "EAPI ${EAPI} is not supported in subversion.eclass" + ;; +esac + +DEPEND+=" net-misc/rsync" + +# @ECLASS-VARIABLE: ESVN_STORE_DIR +# @DESCRIPTION: +# subversion sources store directory. Users may override this in /etc/portage/make.conf +[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src" + +# @ECLASS-VARIABLE: ESVN_FETCH_CMD +# @DESCRIPTION: +# subversion checkout command +ESVN_FETCH_CMD="svn checkout" + +# @ECLASS-VARIABLE: ESVN_UPDATE_CMD +# @DESCRIPTION: +# subversion update command +ESVN_UPDATE_CMD="svn update" + +# @ECLASS-VARIABLE: ESVN_SWITCH_CMD +# @DESCRIPTION: +# subversion switch command +ESVN_SWITCH_CMD="svn switch" + +# @ECLASS-VARIABLE: ESVN_OPTIONS +# @DESCRIPTION: +# the options passed to checkout or update. If you want a specific revision see +# ESVN_REPO_URI instead of using -rREV. +ESVN_OPTIONS="${ESVN_OPTIONS:-}" + +# @ECLASS-VARIABLE: ESVN_REPO_URI +# @DESCRIPTION: +# repository uri +# +# e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234 +# +# supported URI schemes: +# http:// +# https:// +# svn:// +# svn+ssh:// +# file:// +# +# to peg to a specific revision, append @REV to the repo's uri +ESVN_REPO_URI="${ESVN_REPO_URI:-}" + +# @ECLASS-VARIABLE: ESVN_REVISION +# @DESCRIPTION: +# User configurable revision checkout or update to from the repository +# +# Useful for live svn or trunk svn ebuilds allowing the user to peg +# to a specific revision +# +# Note: This should never be set in an ebuild! +ESVN_REVISION="${ESVN_REVISION:-}" + +# @ECLASS-VARIABLE: ESVN_USER +# @DESCRIPTION: +# User name +ESVN_USER="${ESVN_USER:-}" + +# @ECLASS-VARIABLE: ESVN_PASSWORD +# @DESCRIPTION: +# Password +ESVN_PASSWORD="${ESVN_PASSWORD:-}" + +# @ECLASS-VARIABLE: ESVN_PROJECT +# @DESCRIPTION: +# project name of your ebuild (= name space) +# +# subversion eclass will check out the subversion repository like: +# +# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/} +# +# so if you define ESVN_REPO_URI as http://svn.collab.net/repo/svn/trunk or +# http://svn.collab.net/repo/svn/trunk/. and PN is subversion-svn. +# it will check out like: +# +# ${ESVN_STORE_DIR}/subversion/trunk +# +# this is not used in order to declare the name of the upstream project. +# so that you can declare this like: +# +# # jakarta commons-loggin +# ESVN_PROJECT=commons/logging +# +# default: ${PN/-svn}. +ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}" + +# @ECLASS-VARIABLE: ESVN_BOOTSTRAP +# @DESCRIPTION: +# Bootstrap script or command like autogen.sh or etc.. +# Removed in EAPI 6 and later. +ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}" + +# @ECLASS-VARIABLE: ESVN_PATCHES +# @DESCRIPTION: +# subversion eclass can apply patches in subversion_bootstrap(). +# you can use regexp in this variable like *.diff or *.patch or etc. +# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed. +# +# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either +# location, the installation dies. +# +# Removed in EAPI 6 and later, use PATCHES instead. +ESVN_PATCHES="${ESVN_PATCHES:-}" + +# @ECLASS-VARIABLE: ESVN_RESTRICT +# @DESCRIPTION: +# this should be a space delimited list of subversion eclass features to +# restrict. +# export) +# don't export the working copy to S. +ESVN_RESTRICT="${ESVN_RESTRICT:-}" + +# @ECLASS-VARIABLE: ESVN_OFFLINE +# @DESCRIPTION: +# Set this variable to a non-empty value to disable the automatic updating of +# an svn source tree. This is intended to be set outside the subversion source +# tree by users. +ESVN_OFFLINE="${ESVN_OFFLINE:-${EVCS_OFFLINE}}" + +# @ECLASS-VARIABLE: ESVN_UMASK +# @DESCRIPTION: +# Set this variable to a custom umask. This is intended to be set by users. +# By setting this to something like 002, it can make life easier for people +# who do development as non-root (but are in the portage group), and then +# switch over to building with FEATURES=userpriv. Or vice-versa. Shouldn't +# be a security issue here as anyone who has portage group write access +# already can screw the system over in more creative ways. +ESVN_UMASK="${ESVN_UMASK:-${EVCS_UMASK}}" + +# @ECLASS-VARIABLE: ESVN_UP_FREQ +# @DESCRIPTION: +# Set the minimum number of hours between svn up'ing in any given svn module. This is particularly +# useful for split KDE ebuilds where we want to ensure that all submodules are compiled for the same +# revision. It should also be kept user overrideable. +ESVN_UP_FREQ="${ESVN_UP_FREQ:=}" + +# @ECLASS-VARIABLE: ESCM_LOGDIR +# @DESCRIPTION: +# User configuration variable. If set to a path such as e.g. /var/log/scm any +# package inheriting from subversion.eclass will record svn revision to +# ${CATEGORY}/${PN}.log in that path in pkg_preinst. This is not supposed to be +# set by ebuilds/eclasses. It defaults to empty so users need to opt in. +ESCM_LOGDIR="${ESCM_LOGDIR:=}" + +# @FUNCTION: subversion_fetch +# @USAGE: [repo_uri] [destination] +# @DESCRIPTION: +# Wrapper function to fetch sources from subversion via svn checkout or svn update, +# depending on whether there is an existing working copy in ${ESVN_STORE_DIR}. +# +# Can take two optional parameters: +# repo_uri - a repository URI. default is ESVN_REPO_URI. +# destination - a check out path in S. +subversion_fetch() { + local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")" + local revision="$(subversion__get_peg_revision "${1:-${ESVN_REPO_URI}}")" + local S_dest="${2}" + + if [[ -z ${repo_uri} ]]; then + die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." + fi + + [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}" + + # check for the scheme + local scheme="${repo_uri%%:*}" + case "${scheme}" in + http|https) + ;; + svn|svn+ssh) + ;; + file) + ;; + *) + die "${ESVN}: fetch from '${scheme}' is not yet implemented." + ;; + esac + + addread "/etc/subversion" + addwrite "${ESVN_STORE_DIR}" + + if [[ -n "${ESVN_UMASK}" ]]; then + eumask_push "${ESVN_UMASK}" + fi + + if [[ ! -d ${ESVN_STORE_DIR} ]]; then + debug-print "${FUNCNAME}: initial checkout. creating subversion directory" + mkdir -m 775 -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}." + fi + + pushd "${ESVN_STORE_DIR}" >/dev/null || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}" + + local wc_path="$(subversion__get_wc_path "${repo_uri}")" + local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" + + [[ -n "${revision}" ]] && options="${options} -r ${revision}" + + if [[ "${ESVN_OPTIONS}" = *-r* ]]; then + ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please" + ewarn "see \${ESVN_REPO_URI}" + fi + + if has_version ">=dev-vcs/subversion-1.6.0"; then + options="${options} --config-option=config:auth:password-stores=" + fi + + debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" + debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" + debug-print "${FUNCNAME}: options = \"${options}\"" + + if [[ ! -d ${wc_path}/.svn ]]; then + if [[ -n ${ESVN_OFFLINE} ]]; then + ewarn "ESVN_OFFLINE cannot be used when there is no existing checkout." + fi + # first check out + einfo "subversion check out start -->" + einfo " repository: ${repo_uri}${revision:+@}${revision}" + + debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" + + mkdir -m 775 -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." + cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" + if [[ -n "${ESVN_USER}" ]]; then + ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}." + else + ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}." + fi + + elif [[ -n ${ESVN_OFFLINE} ]]; then + svn upgrade "${wc_path}" &>/dev/null + svn cleanup "${wc_path}" &>/dev/null + subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." + + if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then + die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally." + fi + einfo "Fetching disabled: Using existing repository copy at revision ${ESVN_WC_REVISION}." + else + svn upgrade "${wc_path}" &>/dev/null + svn cleanup "${wc_path}" &>/dev/null + subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." + + local esvn_up_freq= + if [[ -n ${ESVN_UP_FREQ} ]]; then + if [[ -n ${ESVN_UP_FREQ//[[:digit:]]} ]]; then + die "${ESVN}: ESVN_UP_FREQ must be an integer value corresponding to the minimum number of hours between svn up." + elif [[ -z $(find "${wc_path}/.svn/entries" -mmin "+$((ESVN_UP_FREQ*60))") ]]; then + einfo "Fetching disabled since ${ESVN_UP_FREQ} hours has not passed since last update." + einfo "Using existing repository copy at revision ${ESVN_WC_REVISION}." + esvn_up_freq=no_update + fi + fi + + if [[ -z ${esvn_up_freq} ]]; then + if [[ ${ESVN_WC_UUID} != $(subversion__svn_info "${repo_uri}" "Repository UUID") ]]; then + # UUID mismatch. Delete working copy and check out it again. + einfo "subversion recheck out start -->" + einfo " old UUID: ${ESVN_WC_UUID}" + einfo " new UUID: $(subversion__svn_info "${repo_uri}" "Repository UUID")" + einfo " repository: ${repo_uri}${revision:+@}${revision}" + + rm -fr "${ESVN_PROJECT}" || die + + debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" + + mkdir -m 775 -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." + cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" + if [[ -n "${ESVN_USER}" ]]; then + ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}." + else + ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}." + fi + elif [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then + einfo "subversion switch start -->" + einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}" + einfo " new repository: ${repo_uri}${revision:+@}${revision}" + + debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}" + + cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" + if [[ -n "${ESVN_USER}" ]]; then + ${ESVN_SWITCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}." + else + ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}." + fi + else + # update working copy + einfo "subversion update start -->" + einfo " repository: ${repo_uri}${revision:+@}${revision}" + + debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" + + cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" + if [[ -n "${ESVN_USER}" ]]; then + ${ESVN_UPDATE_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" || die "${ESVN}: can't update ${wc_path} from ${repo_uri}." + else + ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}." + fi + fi + + # export updated information for the working copy + subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." + fi + fi + + if [[ -n "${ESVN_UMASK}" ]]; then + eumask_pop + fi + + einfo " working copy: ${wc_path}" + + if ! has "export" ${ESVN_RESTRICT}; then + cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" + + local S="${S}/${S_dest}" + mkdir -p "${S}" + + # export to the ${WORKDIR} + #* "svn export" has a bug. see https://bugs.gentoo.org/119236 + #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." + rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}." + fi + + popd >/dev/null + echo +} + +# @FUNCTION: subversion_bootstrap +# @DESCRIPTION: +# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified. +# Removed in EAPI 6 and later. +subversion_bootstrap() { + [[ ${EAPI} == [012345] ]] || die "${FUNCNAME} is removed from subversion.eclass in EAPI 6 and later" + + if has "export" ${ESVN_RESTRICT}; then + return + fi + + cd "${S}" + + if [[ -n ${ESVN_PATCHES} ]]; then + local patch fpatch + einfo "apply patches -->" + for patch in ${ESVN_PATCHES}; do + if [[ -f ${patch} ]]; then + epatch "${patch}" + else + for fpatch in ${FILESDIR}/${patch}; do + if [[ -f ${fpatch} ]]; then + epatch "${fpatch}" + else + die "${ESVN}: ${patch} not found" + fi + done + fi + done + echo + fi + + if [[ -n ${ESVN_BOOTSTRAP} ]]; then + einfo "begin bootstrap -->" + if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then + einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" + eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." + else + einfo " bootstrap with command: ${ESVN_BOOTSTRAP}" + eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." + fi + fi +} + +# @FUNCTION: subversion_wc_info +# @USAGE: [repo_uri] +# @RETURN: ESVN_WC_URL, ESVN_WC_ROOT, ESVN_WC_UUID, ESVN_WC_REVISION and ESVN_WC_PATH +# @DESCRIPTION: +# Get svn info for the specified repo_uri. The default repo_uri is ESVN_REPO_URI. +# +# The working copy information on the specified repository URI are set to +# ESVN_WC_* variables. +subversion_wc_info() { + local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")" + local wc_path="$(subversion__get_wc_path "${repo_uri}")" + + debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" + debug-print "${FUNCNAME}: wc_path = ${wc_path}" + + if [[ ! -d ${wc_path} ]]; then + return 1 + fi + + export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")" + export ESVN_WC_ROOT="$(subversion__svn_info "${wc_path}" "Repository Root")" + export ESVN_WC_UUID="$(subversion__svn_info "${wc_path}" "Repository UUID")" + export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")" + export ESVN_WC_PATH="${wc_path}" +} + +# @FUNCTION: subversion_src_unpack +# @DESCRIPTION: +# Default src_unpack. Fetch and, in older EAPIs, bootstrap. +subversion_src_unpack() { + subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." + if has "${EAPI:-0}" 0 1; then + subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." + fi +} + +# @FUNCTION: subversion_src_prepare +# @DESCRIPTION: +# Default src_prepare. Bootstrap. +# Removed in EAPI 6 and later. +subversion_src_prepare() { + [[ ${EAPI} == [012345] ]] || die "${FUNCNAME} is removed from subversion.eclass in EAPI 6 and later" + subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." +} + +# @FUNCTION: subversion_pkg_preinst +# @USAGE: [repo_uri] +# @DESCRIPTION: +# Log the svn revision of source code. Doing this in pkg_preinst because we +# want the logs to stick around if packages are uninstalled without messing with +# config protection. +subversion_pkg_preinst() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" + local pkgdate=$(date "+%Y%m%d %H:%M:%S") + if [[ -n ${ESCM_LOGDIR} ]]; then + local dir="${EROOT}/${ESCM_LOGDIR}/${CATEGORY}" + if [[ ! -d ${dir} ]]; then + mkdir -p "${dir}" || eerror "Failed to create '${dir}' for logging svn revision" + fi + local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}" + if [[ -d ${dir} ]]; then + echo "${logmessage}" >>"${dir}/${PN}.log" + else + eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'" + fi + fi +} + +## -- Private Functions + +## -- subversion__svn_info() ------------------------------------------------- # +# +# param $1 - a target. +# param $2 - a key name. +# +subversion__svn_info() { + local target="${1}" + local key="${2}" + + env LC_ALL=C svn info ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${target}" \ + | grep -i "^${key}" \ + | cut -d" " -f2- +} + +## -- subversion__get_repository_uri() --------------------------------------- # +# +# param $1 - a repository URI. +subversion__get_repository_uri() { + local repo_uri="${1}" + + debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" + if [[ -z ${repo_uri} ]]; then + die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." + fi + # delete trailing slash + if [[ -z ${repo_uri##*/} ]]; then + repo_uri="${repo_uri%/}" + fi + repo_uri="${repo_uri%@*}" + + echo "${repo_uri}" +} + +## -- subversion__get_wc_path() ---------------------------------------------- # +# +# param $1 - a repository URI. +subversion__get_wc_path() { + local repo_uri="$(subversion__get_repository_uri "${1}")" + + debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" + + echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" +} + +## -- subversion__get_peg_revision() ----------------------------------------- # +# +# param $1 - a repository URI. +subversion__get_peg_revision() { + local repo_uri="${1}" + local peg_rev= + + debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" + # repo_uri has peg revision? + if [[ ${repo_uri} = *@* ]]; then + peg_rev="${repo_uri##*@}" + debug-print "${FUNCNAME}: peg_rev = ${peg_rev}" + else + debug-print "${FUNCNAME}: repo_uri does not have a peg revision." + fi + + echo "${peg_rev}" +} diff -uNr a/eclass/sword-module.eclass b/eclass/sword-module.eclass --- a/eclass/sword-module.eclass false +++ b/eclass/sword-module.eclass 6647aaa94668c17aec7614a68d208e8c3dcfd5c9f0f1ef8dcf32b6b47b5b23ab6ed61534137f2f04b96db8dfc2a22f3492fc38193989f64ffa0de5279626d6ed @@ -0,0 +1,33 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# +# eclass to simplify installation of Sword modules +# Bugs to theology@gentoo.org +# + +HOMEPAGE="http://www.crosswire.org/sword/modules/" + +# Sword packages are generally released as FooBar.zip in their 'rawzip' form +# The files are also unversioned, so the packager will need to rename the +# original file to something else and host it somewhere to avoid breaking +# the digest when new versions are released. + +SRC_URI="mirror://gentoo/${SWORD_MODULE}-${PV}.zip" + +SLOT="0" +IUSE="" + +S="${WORKDIR}" + +RDEPEND="app-text/sword" +DEPEND="app-arch/unzip" + +sword-module_src_install() { + insinto /usr/share/sword/modules + doins -r "${S}"/modules/* + insinto /usr/share/sword/mods.d + doins "${S}"/mods.d/* +} + +EXPORT_FUNCTIONS src_install diff -uNr a/eclass/systemd.eclass b/eclass/systemd.eclass --- a/eclass/systemd.eclass false +++ b/eclass/systemd.eclass 26c0f57681d8cfb7c1aa62f8f1e068d77b7f12e93c37acadc74316f609b7c630c900b69740a27c78f4bd66631f8776eafda3f8272e948547b21681df5a0c31ad @@ -0,0 +1,462 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: systemd.eclass +# @MAINTAINER: +# systemd@gentoo.org +# @BLURB: helper functions to install systemd units +# @DESCRIPTION: +# This eclass provides a set of functions to install unit files for +# sys-apps/systemd within ebuilds. +# @EXAMPLE: +# +# @CODE +# inherit systemd +# +# src_configure() { +# local myconf=( +# --enable-foo +# --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" +# ) +# +# econf "${myconf[@]}" +# } +# @CODE + +inherit toolchain-funcs + +case ${EAPI:-0} in + 0|1|2|3|4|5|6) ;; + *) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established." +esac + +DEPEND="virtual/pkgconfig" + +# @FUNCTION: _systemd_get_dir +# @USAGE: <variable-name> <fallback-directory> +# @INTERNAL +# @DESCRIPTION: +# Try to obtain the <variable-name> variable from systemd.pc. +# If pkg-config or systemd is not installed, return <fallback-directory> +# instead. +_systemd_get_dir() { + [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <variable-name> <fallback-directory>" + local variable=${1} fallback=${2} d + + if $(tc-getPKG_CONFIG) --exists systemd; then + d=$($(tc-getPKG_CONFIG) --variable="${variable}" systemd) || die + d=${d#${EPREFIX}} + else + d=${fallback} + fi + + echo "${d}" +} + +# @FUNCTION: _systemd_get_unitdir +# @INTERNAL +# @DESCRIPTION: +# Get unprefixed unitdir. +_systemd_get_systemunitdir() { + _systemd_get_dir systemdsystemunitdir /lib/systemd/system +} + +# @FUNCTION: systemd_get_systemunitdir +# @DESCRIPTION: +# Output the path for the systemd system unit directory (not including +# ${D}). This function always succeeds, even if systemd is not +# installed. +systemd_get_systemunitdir() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + debug-print-function ${FUNCNAME} "${@}" + + echo "${EPREFIX}$(_systemd_get_systemunitdir)" +} + +# @FUNCTION: systemd_get_unitdir +# @DESCRIPTION: +# Deprecated alias for systemd_get_systemunitdir. +systemd_get_unitdir() { + [[ ${EAPI} == [012345] ]] || die "${FUNCNAME} is banned in EAPI 6, use systemd_get_systemunitdir instead" + + systemd_get_systemunitdir +} + +# @FUNCTION: _systemd_get_userunitdir +# @INTERNAL +# @DESCRIPTION: +# Get unprefixed userunitdir. +_systemd_get_userunitdir() { + _systemd_get_dir systemduserunitdir /usr/lib/systemd/user +} + +# @FUNCTION: systemd_get_userunitdir +# @DESCRIPTION: +# Output the path for the systemd user unit directory (not including +# ${D}). This function always succeeds, even if systemd is not +# installed. +systemd_get_userunitdir() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + debug-print-function ${FUNCNAME} "${@}" + + echo "${EPREFIX}$(_systemd_get_userunitdir)" +} + +# @FUNCTION: _systemd_get_utildir +# @INTERNAL +# @DESCRIPTION: +# Get unprefixed utildir. +_systemd_get_utildir() { + _systemd_get_dir systemdutildir /lib/systemd +} + +# @FUNCTION: systemd_get_utildir +# @DESCRIPTION: +# Output the path for the systemd utility directory (not including +# ${D}). This function always succeeds, even if systemd is not +# installed. +systemd_get_utildir() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + debug-print-function ${FUNCNAME} "${@}" + + echo "${EPREFIX}$(_systemd_get_utildir)" +} + +# @FUNCTION: _systemd_get_systemgeneratordir +# @INTERNAL +# @DESCRIPTION: +# Get unprefixed systemgeneratordir. +_systemd_get_systemgeneratordir() { + _systemd_get_dir systemdsystemgeneratordir /lib/systemd/system-generators +} + +# @FUNCTION: systemd_get_systemgeneratordir +# @DESCRIPTION: +# Output the path for the systemd system generator directory (not including +# ${D}). This function always succeeds, even if systemd is not +# installed. +systemd_get_systemgeneratordir() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + debug-print-function ${FUNCNAME} "${@}" + + echo "${EPREFIX}$(_systemd_get_systemgeneratordir)" +} + +# @FUNCTION: systemd_dounit +# @USAGE: <unit>... +# @DESCRIPTION: +# Install systemd unit(s). Uses doins, thus it is fatal in EAPI 4 +# and non-fatal in earlier EAPIs. +systemd_dounit() { + debug-print-function ${FUNCNAME} "${@}" + + ( + insinto "$(_systemd_get_systemunitdir)" + doins "${@}" + ) +} + +# @FUNCTION: systemd_newunit +# @USAGE: <old-name> <new-name> +# @DESCRIPTION: +# Install systemd unit with a new name. Uses newins, thus it is fatal +# in EAPI 4 and non-fatal in earlier EAPIs. +systemd_newunit() { + debug-print-function ${FUNCNAME} "${@}" + + ( + insinto "$(_systemd_get_systemunitdir)" + newins "${@}" + ) +} + +# @FUNCTION: systemd_douserunit +# @USAGE: <unit>... +# @DESCRIPTION: +# Install systemd user unit(s). Uses doins, thus it is fatal in EAPI 4 +# and non-fatal in earlier EAPIs. +systemd_douserunit() { + debug-print-function ${FUNCNAME} "${@}" + + ( + insinto "$(_systemd_get_userunitdir)" + doins "${@}" + ) +} + +# @FUNCTION: systemd_newuserunit +# @USAGE: <old-name> <new-name> +# @DESCRIPTION: +# Install systemd user unit with a new name. Uses newins, thus it +# is fatal in EAPI 4 and non-fatal in earlier EAPIs. +systemd_newuserunit() { + debug-print-function ${FUNCNAME} "${@}" + + ( + insinto "$(_systemd_get_userunitdir)" + newins "${@}" + ) +} + +# @FUNCTION: systemd_install_serviced +# @USAGE: <conf-file> [<service>] +# @DESCRIPTION: +# Install <conf-file> as the template <service>.d/00gentoo.conf. +# If <service> is not specified +# <conf-file> with the .conf suffix stripped is used +# (e.g. foo.service.conf -> foo.service.d/00gentoo.conf). +systemd_install_serviced() { + debug-print-function ${FUNCNAME} "${@}" + + local src=${1} + local service=${2} + + [[ ${src} ]] || die "No file specified" + + if [[ ! ${service} ]]; then + [[ ${src} == *.conf ]] || die "Source file needs .conf suffix" + service=${src##*/} + service=${service%.conf} + fi + # avoid potentially common mistake + [[ ${service} == *.d ]] && die "Service must not have .d suffix" + + ( + insinto /etc/systemd/system/"${service}".d + newins "${src}" 00gentoo.conf + ) +} + +# @FUNCTION: systemd_dotmpfilesd +# @USAGE: <tmpfilesd>... +# @DESCRIPTION: +# Install systemd tmpfiles.d files. Uses doins, thus it is fatal +# in EAPI 4 and non-fatal in earlier EAPIs. +systemd_dotmpfilesd() { + debug-print-function ${FUNCNAME} "${@}" + + for f; do + [[ ${f} == *.conf ]] \ + || die 'tmpfiles.d files need to have .conf suffix.' + done + + ( + insinto /usr/lib/tmpfiles.d/ + doins "${@}" + ) +} + +# @FUNCTION: systemd_newtmpfilesd +# @USAGE: <old-name> <new-name>.conf +# @DESCRIPTION: +# Install systemd tmpfiles.d file under a new name. Uses newins, thus it +# is fatal in EAPI 4 and non-fatal in earlier EAPIs. +systemd_newtmpfilesd() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${2} == *.conf ]] \ + || die 'tmpfiles.d files need to have .conf suffix.' + + ( + insinto /usr/lib/tmpfiles.d/ + newins "${@}" + ) +} + +# @FUNCTION: systemd_enable_service +# @USAGE: <target> <service> +# @DESCRIPTION: +# Enable service in desired target, e.g. install a symlink for it. +# Uses dosym, thus it is fatal in EAPI 4 and non-fatal in earlier +# EAPIs. +systemd_enable_service() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${#} -eq 2 ]] || die "Synopsis: systemd_enable_service target service" + + local target=${1} + local service=${2} + local ud=$(_systemd_get_systemunitdir) + local destname=${service##*/} + + dodir "${ud}"/"${target}".wants && \ + dosym ../"${service}" "${ud}"/"${target}".wants/"${destname}" +} + +# @FUNCTION: systemd_enable_ntpunit +# @USAGE: <NN-name> <service>... +# @DESCRIPTION: +# Add an NTP service provider to the list of implementations +# in timedated. <NN-name> defines the newly-created ntp-units.d priority +# and name, while the remaining arguments list service units that will +# be added to that file. +# +# Uses doins, thus it is fatal in EAPI 4 and non-fatal in earlier +# EAPIs. +# +# Doc: https://www.freedesktop.org/wiki/Software/systemd/timedated/ +systemd_enable_ntpunit() { + debug-print-function ${FUNCNAME} "${@}" + if [[ ${#} -lt 2 ]]; then + die "Usage: systemd_enable_ntpunit <NN-name> <service>..." + fi + + local ntpunit_name=${1} + local services=( "${@:2}" ) + + if [[ ${ntpunit_name} != [0-9][0-9]-* ]]; then + die "ntpunit.d file must be named NN-name where NN are digits." + elif [[ ${ntpunit_name} == *.list ]]; then + die "The .list suffix is appended implicitly to ntpunit.d name." + fi + + local unitdir=$(systemd_get_systemunitdir) + local s + for s in "${services[@]}"; do + if [[ ! -f "${D}${unitdir}/${s}" ]]; then + die "ntp-units.d provider ${s} not installed (yet?) in \${D}." + fi + echo "${s}" >> "${T}"/${ntpunit_name}.list || die + done + + ( + insinto "$(_systemd_get_utildir)"/ntp-units.d + doins "${T}"/${ntpunit_name}.list + ) + local ret=${?} + + rm "${T}"/${ntpunit_name}.list || die + + return ${ret} +} + +# @FUNCTION: systemd_with_unitdir +# @USAGE: [<configure-option-name>] +# @DESCRIPTION: +# Note: deprecated and banned in EAPI 6. Please use full --with-...= +# parameter for improved ebuild readability. +# +# Output '--with-systemdsystemunitdir' as expected by systemd-aware configure +# scripts. This function always succeeds. Its output may be quoted in order +# to preserve whitespace in paths. systemd_to_myeconfargs() is preferred over +# this function. +# +# If upstream does use invalid configure option to handle installing systemd +# units (e.g. `--with-systemdunitdir'), you can pass the 'suffix' as an optional +# argument to this function (`$(systemd_with_unitdir systemdunitdir)'). Please +# remember to report a bug upstream as well. +systemd_with_unitdir() { + [[ ${EAPI:-0} != [012345] ]] && die "${FUNCNAME} is banned in EAPI ${EAPI}, use --with-${1:-systemdsystemunitdir}=\"\$(systemd_get_systemunitdir)\" instead" + + debug-print-function ${FUNCNAME} "${@}" + local optname=${1:-systemdsystemunitdir} + + echo --with-${optname}="$(systemd_get_systemunitdir)" +} + +# @FUNCTION: systemd_with_utildir +# @DESCRIPTION: +# Note: deprecated and banned in EAPI 6. Please use full --with-...= +# parameter for improved ebuild readability. +# +# Output '--with-systemdsystemutildir' as used by some packages to install +# systemd helpers. This function always succeeds. Its output may be quoted +# in order to preserve whitespace in paths. +systemd_with_utildir() { + [[ ${EAPI:-0} != [012345] ]] && die "${FUNCNAME} is banned in EAPI ${EAPI}, use --with-systemdutildir=\"\$(systemd_get_utildir)\" instead" + + debug-print-function ${FUNCNAME} "${@}" + + echo --with-systemdutildir="$(systemd_get_utildir)" +} + +# @FUNCTION: systemd_update_catalog +# @DESCRIPTION: +# Update the journald catalog. This needs to be called after installing +# or removing catalog files. This must be called in pkg_post* phases. +# +# If systemd is not installed, no operation will be done. The catalog +# will be (re)built once systemd is installed. +# +# See: https://www.freedesktop.org/wiki/Software/systemd/catalog +systemd_update_catalog() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EBUILD_PHASE} == post* ]] \ + || die "${FUNCNAME} disallowed during ${EBUILD_PHASE_FUNC:-${EBUILD_PHASE}}" + + # Make sure to work on the correct system. + + local journalctl=${EPREFIX}/usr/bin/journalctl + if [[ -x ${journalctl} ]]; then + ebegin "Updating systemd journal catalogs" + journalctl --update-catalog + eend $? + else + debug-print "${FUNCNAME}: journalctl not found." + fi +} + +# @FUNCTION: systemd_is_booted +# @DESCRIPTION: +# Check whether the system was booted using systemd. +# +# This should be used purely for informational purposes, e.g. warning +# user that he needs to use systemd. Installed files or application +# behavior *must not* rely on this. Please remember to check MERGE_TYPE +# to not trigger the check on binary package build hosts! +# +# Returns 0 if systemd is used to boot the system, 1 otherwise. +# +# See: man sd_booted +systemd_is_booted() { + debug-print-function ${FUNCNAME} "${@}" + + [[ -d /run/systemd/system ]] + local ret=${?} + + debug-print "${FUNCNAME}: [[ -d /run/systemd/system ]] -> ${ret}" + return ${ret} +} + +# @FUNCTION: systemd_tmpfiles_create +# @USAGE: <tmpfilesd> ... +# @DESCRIPTION: +# Invokes systemd-tmpfiles --create with given arguments. +# Does nothing if ROOT != / or systemd-tmpfiles is not in PATH. +# This function should be called from pkg_postinst. +# +# Generally, this function should be called with the names of any tmpfiles +# fragments which have been installed, either by the build system or by a +# previous call to systemd_dotmpfilesd. This ensures that any tmpfiles are +# created without the need to reboot the system. +systemd_tmpfiles_create() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${EBUILD_PHASE} == postinst ]] || die "${FUNCNAME}: Only valid in pkg_postinst" + [[ ${#} -gt 0 ]] || die "${FUNCNAME}: Must specify at least one filename" + [[ ${ROOT} == / ]] || return 0 + type systemd-tmpfiles &> /dev/null || return 0 + systemd-tmpfiles --create "${@}" +} + +# @FUNCTION: systemd_reenable +# @USAGE: <unit> ... +# @DESCRIPTION: +# Re-enables units if they are currently enabled. This resets symlinks to the +# defaults specified in the [Install] section. +# +# This function is intended to fix broken symlinks that result from moving +# the systemd system unit directory. It should be called from pkg_postinst +# for system units that define the 'Alias' option in their [Install] section. +# It is not necessary to call this function to fix dependency symlinks +# generated by the 'WantedBy' and 'RequiredBy' options. +systemd_reenable() { + type systemctl &>/dev/null || return 0 + local x + for x; do + if systemctl --quiet --root="${ROOT}" is-enabled "${x}"; then + systemctl --root="${ROOT}" reenable "${x}" + fi + done +} diff -uNr a/eclass/tests/autotools_eaclocal_amflags.sh b/eclass/tests/autotools_eaclocal_amflags.sh --- a/eclass/tests/autotools_eaclocal_amflags.sh false +++ b/eclass/tests/autotools_eaclocal_amflags.sh df754c62daa7a0993dcd7ffa034044472f14d2b08523435a11049cd3e7857399e1953598d83eb706e317bad5ccc9b2ac28e6806f54c96adbe8c14d453effe75e @@ -0,0 +1,31 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit autotools + +test-it() { + tbegin "eaclocal_amflags $1: $2" + printf "ACLOCAL_AMFLAGS = %b\n" "$2" > Makefile.am + local flags=$(eaclocal_amflags) exp=${3:-$2} + [[ "${flags}" == "${exp}" ]] + if ! tend $? ; then + printf '### INPUT:\n%s\n' "$2" + printf '### FILE:\n%s\n' "$(<Makefile.am)" + printf '### EXPECTED:\n%s\n' "${exp}" + printf '### ACTUAL:\n%s\n' "${flags}" + fi + rm Makefile.am +} + +test-it simple "-Im4" +test-it simple "-I m4 -I lakdjfladsfj /////" + +test-it shell-exec '`echo hi`' "hi" +test-it shell-exec '`echo {0..3}`' "0 1 2 3" + +test-it multiline '-I oneline \\\n\t-I twoline' "-I oneline -I twoline" + +texit diff -uNr a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh --- a/eclass/tests/distutils-r1.sh false +++ b/eclass/tests/distutils-r1.sh 5aa43fff0f23326f0d5a676103c479f1bd6d3a640c63a02fa360aa115e15d0c6ac8d9c06b096a3a4e60875e0d5e83aca1550281e553461dd93e1d4ae271fa751 @@ -0,0 +1,32 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +source tests-common.sh + +test-phase_name_free() { + local ph=${1} + + if declare -f "${ph}"; then + die "${ph} function declared while name reserved for phase!" + fi + if declare -f "${ph}_all"; then + die "${ph}_all function declared while name reserved for phase!" + fi +} + +inherit distutils-r1 + +tbegin "sane function names" + +test-phase_name_free python_prepare +test-phase_name_free python_configure +test-phase_name_free python_compile +test-phase_name_free python_test +test-phase_name_free python_install + +tend ${failed} + +texit diff -uNr a/eclass/tests/eapi7-ver.sh b/eclass/tests/eapi7-ver.sh --- a/eclass/tests/eapi7-ver.sh false +++ b/eclass/tests/eapi7-ver.sh 3a276c32208b16493cc4f46a622bd30c21364fef8866680ae871c89b939e73b7d999edf7736433789d36cff31f109ef86f38784f9b93b84a76928e70674dd540 @@ -0,0 +1,177 @@ +#!/bin/bash +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +source tests-common.sh + +inherit eapi7-ver + +teq() { + local expected=${1}; shift + + tbegin "${*} -> ${expected}" + local got=$("${@}") + [[ ${got} == ${expected} ]] + tend ${?} "returned: ${got}" +} + +teqr() { + local expected=$1; shift + tbegin "$* -> ${expected}" + "$@" + local ret=$? + [[ ${ret} -eq ${expected} ]] + tend $? "returned: ${ret}" +} + +txf() { + tbegin "XFAIL: ${*}" + local got=$("${@}" 2>&1) + [[ ${got} == die:* ]] + tend ${?} "function did not die" +} + +teq 1 ver_cut 1 1.2.3 +teq 1 ver_cut 1-1 1.2.3 +teq 1.2 ver_cut 1-2 1.2.3 +teq 2.3 ver_cut 2- 1.2.3 +teq 1.2.3 ver_cut 1- 1.2.3 +teq 3b ver_cut 3-4 1.2.3b_alpha4 +teq alpha ver_cut 5 1.2.3b_alpha4 +teq 1.2 ver_cut 1-2 .1.2.3 +teq .1.2 ver_cut 0-2 .1.2.3 +teq 2.3 ver_cut 2-3 1.2.3. +teq 2.3. ver_cut 2- 1.2.3. +teq 2.3. ver_cut 2-4 1.2.3. + +teq 1-2.3 ver_rs 1 - 1.2.3 +teq 1.2-3 ver_rs 2 - 1.2.3 +teq 1-2-3.4 ver_rs 1-2 - 1.2.3.4 +teq 1.2-3-4 ver_rs 2- - 1.2.3.4 +teq 1.2.3 ver_rs 2 . 1.2-3 +teq 1.2.3.a ver_rs 3 . 1.2.3a +teq 1.2-alpha-4 ver_rs 2-3 - 1.2_alpha4 +teq 1.23-b_alpha4 ver_rs 3 - 2 "" 1.2.3b_alpha4 +teq a1b_2-c-3-d4e5 ver_rs 3-5 _ 4-6 - a1b2c3d4e5 +teq .1-2.3 ver_rs 1 - .1.2.3 +teq -1.2.3 ver_rs 0 - .1.2.3 + +# truncating range +teq 1.2 ver_cut 0-2 1.2.3 +teq 2.3 ver_cut 2-5 1.2.3 +teq "" ver_cut 4 1.2.3 +teq "" ver_cut 0 1.2.3 +teq "" ver_cut 4- 1.2.3 +teq 1.2.3 ver_rs 0 - 1.2.3 +teq 1.2.3 ver_rs 3 . 1.2.3 +teq 1.2.3 ver_rs 3- . 1.2.3 +teq 1.2.3 ver_rs 3-5 . 1.2.3 + +txf ver_cut foo 1.2.3 +txf ver_rs -3 _ a1b2c3d4e5 +txf ver_rs 5-3 _ a1b2c3d4e5 + +# Tests from Portage's test_vercmp.py +teqr 0 ver_test 6.0 -gt 5.0 +teqr 0 ver_test 5.0 -gt 5 +teqr 0 ver_test 1.0-r1 -gt 1.0-r0 +teqr 0 ver_test 999999999999999999 -gt 999999999999999998 # 18 digits +teqr 0 ver_test 1.0.0 -gt 1.0 +teqr 0 ver_test 1.0.0 -gt 1.0b +teqr 0 ver_test 1b -gt 1 +teqr 0 ver_test 1b_p1 -gt 1_p1 +teqr 0 ver_test 1.1b -gt 1.1 +teqr 0 ver_test 12.2.5 -gt 12.2b +teqr 0 ver_test 4.0 -lt 5.0 +teqr 0 ver_test 5 -lt 5.0 +teqr 0 ver_test 1.0_pre2 -lt 1.0_p2 +teqr 0 ver_test 1.0_alpha2 -lt 1.0_p2 +teqr 0 ver_test 1.0_alpha1 -lt 1.0_beta1 +teqr 0 ver_test 1.0_beta3 -lt 1.0_rc3 +teqr 0 ver_test 1.001000000000000001 -lt 1.001000000000000002 +teqr 0 ver_test 1.00100000000 -lt 1.001000000000000001 +teqr 0 ver_test 999999999999999998 -lt 999999999999999999 +teqr 0 ver_test 1.01 -lt 1.1 +teqr 0 ver_test 1.0-r0 -lt 1.0-r1 +teqr 0 ver_test 1.0 -lt 1.0-r1 +teqr 0 ver_test 1.0 -lt 1.0.0 +teqr 0 ver_test 1.0b -lt 1.0.0 +teqr 0 ver_test 1_p1 -lt 1b_p1 +teqr 0 ver_test 1 -lt 1b +teqr 0 ver_test 1.1 -lt 1.1b +teqr 0 ver_test 12.2b -lt 12.2.5 +teqr 0 ver_test 4.0 -eq 4.0 +teqr 0 ver_test 1.0 -eq 1.0 +teqr 0 ver_test 1.0-r0 -eq 1.0 +teqr 0 ver_test 1.0 -eq 1.0-r0 +teqr 0 ver_test 1.0-r0 -eq 1.0-r0 +teqr 0 ver_test 1.0-r1 -eq 1.0-r1 +teqr 1 ver_test 1 -eq 2 +teqr 1 ver_test 1.0_alpha -eq 1.0_pre +teqr 1 ver_test 1.0_beta -eq 1.0_alpha +teqr 1 ver_test 1 -eq 0.0 +teqr 1 ver_test 1.0-r0 -eq 1.0-r1 +teqr 1 ver_test 1.0-r1 -eq 1.0-r0 +teqr 1 ver_test 1.0 -eq 1.0-r1 +teqr 1 ver_test 1.0-r1 -eq 1.0 +teqr 1 ver_test 1.0 -eq 1.0.0 +teqr 1 ver_test 1_p1 -eq 1b_p1 +teqr 1 ver_test 1b -eq 1 +teqr 1 ver_test 1.1b -eq 1.1 +teqr 1 ver_test 12.2b -eq 12.2 + +# A subset of tests from Paludis +teqr 0 ver_test 1.0_alpha -gt 1_alpha +teqr 0 ver_test 1.0_alpha -gt 1 +teqr 0 ver_test 1.0_alpha -lt 1.0 +teqr 0 ver_test 1.2.0.0_alpha7-r4 -gt 1.2_alpha7-r4 +teqr 0 ver_test 0001 -eq 1 +teqr 0 ver_test 01 -eq 001 +teqr 0 ver_test 0001.1 -eq 1.1 +teqr 0 ver_test 01.01 -eq 1.01 +teqr 0 ver_test 1.010 -eq 1.01 +teqr 0 ver_test 1.00 -eq 1.0 +teqr 0 ver_test 1.0100 -eq 1.010 +teqr 0 ver_test 1-r00 -eq 1-r0 + +# Additional tests +teqr 0 ver_test 0_rc99 -lt 0 +teqr 0 ver_test 011 -eq 11 +teqr 0 ver_test 019 -eq 19 +teqr 0 ver_test 1.2 -eq 001.2 +teqr 0 ver_test 1.2 -gt 1.02 +teqr 0 ver_test 1.2a -lt 1.2b +teqr 0 ver_test 1.2_pre1 -gt 1.2_pre1_beta2 +teqr 0 ver_test 1.2_pre1 -lt 1.2_pre1_p2 +teqr 0 ver_test 1.00 -lt 1.0.0 +teqr 0 ver_test 1.010 -eq 1.01 +teqr 0 ver_test 1.01 -lt 1.1 +teqr 0 ver_test 1.2_pre08-r09 -eq 1.2_pre8-r9 +teqr 0 ver_test 0 -lt 576460752303423488 # 2**59 +teqr 0 ver_test 0 -lt 9223372036854775808 # 2**63 + +# Bad number or ordering of arguments +txf ver_test 1 +txf ver_test 1 -lt 2 3 +txf ver_test -lt 1 2 + +# Bad operators +txf ver_test 1 "<" 2 +txf ver_test 1 lt 2 +txf ver_test 1 -foo 2 + +# Malformed versions +txf ver_test "" -ne 1 +txf ver_test 1. -ne 1 +txf ver_test 1ab -ne 1 +txf ver_test b -ne 1 +txf ver_test 1-r1_pre -ne 1 +txf ver_test 1-pre1 -ne 1 +txf ver_test 1_foo -ne 1 +txf ver_test 1_pre1.1 -ne 1 +txf ver_test 1-r1.0 -ne 1 +txf ver_test cvs.9999 -ne 9999 + +texit diff -uNr a/eclass/tests/eapi7-ver_benchmark.sh b/eclass/tests/eapi7-ver_benchmark.sh --- a/eclass/tests/eapi7-ver_benchmark.sh false +++ b/eclass/tests/eapi7-ver_benchmark.sh 234471fd7b3cf0d9813af8cfa137730440eb093464807ea5dea33c39ee60c9e3d0696df0b35ba788e25a2e847846e3acea6349d78bd1f2605b89a6dabf3201d4 @@ -0,0 +1,147 @@ +#!/bin/bash +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +source tests-common.sh + +inherit eapi7-ver versionator + +cutting() { + local x + for x in {1..1000}; do + ver_cut 1 1.2.3 + ver_cut 1-2 1.2.3 + ver_cut 2- 1.2.3 + ver_cut 1- 1.2.3 + ver_cut 3-4 1.2.3b_alpha4 + ver_cut 5 1.2.3b_alpha4 + ver_cut 1-2 .1.2.3 + ver_cut 0-2 .1.2.3 + ver_cut 2-3 1.2.3. + ver_cut 2- 1.2.3. + ver_cut 2-4 1.2.3. + done >/dev/null +} + +cutting_versionator() { + local x + for x in {1..100}; do + get_version_component_range 1 1.2.3 + get_version_component_range 1-2 1.2.3 + get_version_component_range 2- 1.2.3 + get_version_component_range 1- 1.2.3 + get_version_component_range 3-4 1.2.3b_alpha4 + get_version_component_range 5 1.2.3b_alpha4 + get_version_component_range 1-2 .1.2.3 + get_version_component_range 0-2 .1.2.3 + get_version_component_range 2-3 1.2.3. + get_version_component_range 2- 1.2.3. + get_version_component_range 2-4 1.2.3. + done >/dev/null +} + +replacing() { + local x + for x in {1..1000}; do + ver_rs 1 - 1.2.3 + ver_rs 2 - 1.2.3 + ver_rs 1-2 - 1.2.3.4 + ver_rs 2- - 1.2.3.4 + ver_rs 2 . 1.2-3 + ver_rs 3 . 1.2.3a + ver_rs 2-3 - 1.2_alpha4 + #ver_rs 3 - 2 "" 1.2.3b_alpha4 + #ver_rs 3-5 _ 4-6 - a1b2c3d4e5 + ver_rs 1 - .1.2.3 + ver_rs 0 - .1.2.3 + done >/dev/null +} + +replacing_versionator() { + local x + for x in {1..100}; do + replace_version_separator 1 - 1.2.3 + replace_version_separator 2 - 1.2.3 + replace_version_separator 1-2 - 1.2.3.4 + replace_version_separator 2- - 1.2.3.4 + replace_version_separator 2 . 1.2-3 + replace_version_separator 3 . 1.2.3a + replace_version_separator 2-3 - 1.2_alpha4 + #replace_version_separator 3 - 2 "" 1.2.3b_alpha4 + #replace_version_separator 3-5 _ 4-6 - a1b2c3d4e5 + replace_version_separator 1 - .1.2.3 + replace_version_separator 0 - .1.2.3 + done >/dev/null +} + +comparing() { + local x + for x in {1..1000}; do + ver_test 1b_p1 -le 1_p1 + ver_test 1.1b -le 1.1 + ver_test 12.2.5 -le 12.2b + ver_test 4.0 -le 5.0 + ver_test 5 -le 5.0 + ver_test 1.0_pre2 -le 1.0_p2 + ver_test 1.0_alpha2 -le 1.0_p2 + ver_test 1.0_alpha1 -le 1.0_beta1 + ver_test 1.0_beta3 -le 1.0_rc3 + ver_test 1.001000000000000001 -le 1.001000000000000002 + done +} + +comparing_versionator() { + local x + for x in {1..100}; do + version_is_at_least 1b_p1 1_p1 + version_is_at_least 1.1b 1.1 + version_is_at_least 12.2.5 12.2b + version_is_at_least 4.0 5.0 + version_is_at_least 5 5.0 + version_is_at_least 1.0_pre2 1.0_p2 + version_is_at_least 1.0_alpha2 1.0_p2 + version_is_at_least 1.0_alpha1 1.0_beta1 + version_is_at_least 1.0_beta3 1.0_rc3 + version_is_at_least 1.001000000000000001 1.001000000000000002 + done +} + +get_times() { + local factor=${1}; shift + echo "${*}" + local real=() + local user=() + + for x in {1..5}; do + while read tt tv; do + case ${tt} in + real) real+=( $(dc -e "${tv} ${factor} * p") );; + user) user+=( $(dc -e "${tv} ${factor} * p") );; + esac + done < <( ( time -p "${@}" ) 2>&1 ) + done + + [[ ${#real[@]} == 5 ]] || die "Did not get 5 real times" + [[ ${#user[@]} == 5 ]] || die "Did not get 5 user times" + + local sum + for v in real user; do + vr="${v}[*]" + sum=$(dc -e "${!vr} + + + + 3 k 5 / p") + + vr="${v}[@]" + printf '%s %4.2f %4.2f %4.2f %4.2f %4.2f => %4.2f avg\n' \ + "${v}" "${!vr}" "${sum}" + done +} + +export LC_ALL=C + +get_times 1 cutting +get_times 10 cutting_versionator +get_times 1 replacing +get_times 10 replacing_versionator +get_times 1 comparing +get_times 10 comparing_versionator diff -uNr a/eclass/tests/estack_eshopts.sh b/eclass/tests/estack_eshopts.sh --- a/eclass/tests/estack_eshopts.sh false +++ b/eclass/tests/estack_eshopts.sh 0351d8b748c0e27a915edac6e32c0388bd46b676180ce89e3d7c5eb2cc8078b6b115ef33accfe834907df19e1f48710056369b0f4d097ede4077e7945fe9fe20 @@ -0,0 +1,69 @@ +#!/bin/bash +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit estack + +test-it() { + local s0 s1 s2 + + tbegin "push/pop '$*'" + s0=$(shopt -p) + t eshopts_push $* + s1=$(shopt -p) + t eshopts_pop + s2=$(shopt -p) + [[ ${s0} == "${s2}" ]] && \ + [[ ${s1} == *"shopt $*"* ]] + tend $? +} + +# should handle bug #395025 +for arg in nullglob dotglob extglob ; do + for flag in s u ; do + test-it -${flag} ${arg} + done +done + +# test 'set' options +set -f +tbegin "set +f" +s0=$- +t eshopts_push +f +s1=$- +t eshopts_pop +s2=$- +[[ ${s0} == "${s2}" ]] && +[[ ${s1} != *f* ]] +tend $? + +set +f +tbegin "set -f" +s0=$- +t eshopts_push -f +s1=$- +t eshopts_pop +s2=$- +[[ ${s0} == "${s2}" ]] && +[[ ${s1} == *f* ]] +tend $? + +tbegin "multi push/pop" +s0=$(shopt -p) +t eshopts_push -s dotglob +t eshopts_push -u dotglob +t eshopts_push -s extglob +t eshopts_push -u dotglob +t eshopts_push -s dotglob +t eshopts_pop +t eshopts_pop +t eshopts_pop +t eshopts_pop +t eshopts_pop +s1=$(shopt -p) +[[ ${s0} == "${s1}" ]] +tend $? + +texit diff -uNr a/eclass/tests/estack_estack.sh b/eclass/tests/estack_estack.sh --- a/eclass/tests/estack_estack.sh false +++ b/eclass/tests/estack_estack.sh 3c56c9da2555530a2094e4d369f9bc2d79e7ecc13c3e45c573786a4bbb13004fb59dff99e30ccb209d08ece38f826075a288a3267251814780131fcf41cc40db @@ -0,0 +1,52 @@ +#!/bin/bash +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit estack + +tbegin "initial stack state" +estack_pop teststack +# Should be empty and thus return 1 +[[ $? -eq 1 ]] +tend $? + +tbegin "simple push/pop" +estack_push ttt 1 +pu=$? +estack_pop ttt +po=$? +[[ ${pu}${po} == "00" ]] +tend $? + +tbegin "simple push/pop var" +estack_push xxx "boo ga boo" +pu=$? +estack_pop xxx i +po=$? +[[ ${pu}${po} == "00" ]] && [[ ${i} == "boo ga boo" ]] +tend $? + +tbegin "multi push/pop" +estack_push yyy {1..10} +pu=$? +i=0 +while estack_pop yyy ; do + : $(( i++ )) +done +[[ ${pu} -eq 0 && ${i} -eq 10 ]] +tend $? + +tbegin "umask push/pop" +u0=$(umask) +eumask_push 0000 +pu=$? +u1=$(umask) +eumask_pop +po=$? +u2=$(umask) +[[ ${pu}${po}:${u0}:${u1}:${u2} == "00:${u0}:0000:${u0}" ]] +tend $? + +texit diff -uNr a/eclass/tests/estack_evar.sh b/eclass/tests/estack_evar.sh --- a/eclass/tests/estack_evar.sh false +++ b/eclass/tests/estack_evar.sh c69e024386b8d216f92bcbb4ec7fe65ea5d55ec5d08eeb1ce9aef89c2b9a24d4ef759c2baae8d1fe9d50fe8e199dc0dbdb5bb538a722fb82148cae9711b22362 @@ -0,0 +1,99 @@ +#!/bin/bash +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit estack + +tbegin "simple push/pop" +VAR=1 +evar_push VAR +pu=$? +VAR=2 +evar_pop +po=$? +[[ ${pu}${po}${VAR} == "001" ]] +tend $? + +tbegin "unset push/pop" +unset VAR +evar_push VAR +pu=$? +VAR=2 +evar_pop +po=$? +[[ ${pu}${po}${VAR+set} == "00" ]] +tend $? + +tbegin "empty push/pop" +VAR= +evar_push VAR +pu=$? +VAR=2 +evar_pop +po=$? +[[ ${pu}${po}${VAR+set}${VAR} == "00set" ]] +tend $? + +tbegin "export push/pop" +export VAR=exported +evar_push VAR +pu=$? +VAR=2 +evar_pop +po=$? +var=$(bash -c 'echo ${VAR}') +[[ ${pu}${po}${var} == "00exported" ]] +tend $? + +tbegin "unexport push/pop" +unset VAR +VAR=not-exported +evar_push VAR +pu=$? +VAR=2 +evar_pop +po=$? +var=$(bash -c 'echo ${VAR+set}') +[[ ${pu}${po}${VAR}${var} == "00not-exported" ]] +tend $? + +tbegin "multi push/pop" +A=a B=b C=c +evar_push A B C +pu=$? +A=A B=B C=C +evar_pop 1 +po1=$? +[[ ${A}${B}${C} == "ABc" ]] +po2=$? +evar_pop 2 +po3=$? +var=$(bash -c 'echo ${VAR+set}') +[[ ${pu}${po1}${po2}${po3}${A}${B}${C} == "0000abc" ]] +tend $? + +tbegin "simple push_set/pop" +VAR=1 +evar_push_set VAR 2 +pu=$? +[[ ${VAR} == "2" ]] +po1=$? +evar_pop +po2=$? +[[ ${pu}${po1}${po2}${VAR} == "0001" ]] +tend $? + +tbegin "unset push_set/pop" +VAR=1 +evar_push_set VAR +pu=$? +[[ ${VAR+set} != "set" ]] +po1=$? +evar_pop +po2=$? +[[ ${pu}${po1}${po2}${VAR} == "0001" ]] +tend $? + +texit diff -uNr a/eclass/tests/eutils_path_exists.sh b/eclass/tests/eutils_path_exists.sh --- a/eclass/tests/eutils_path_exists.sh false +++ b/eclass/tests/eutils_path_exists.sh 715ec3f72cb622ec39ded7089c4f7dddd8f2317ed73a455dd6ca819ebe0075ef17ad7fcc4c15adf80b413874bad96072cc8a98ea90bf4464f9084c7bf047ccda @@ -0,0 +1,35 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit eutils + +test-path_exists() { + local exp=$1; shift + tbegin "path_exists($*) == ${exp}" + path_exists "$@" + [[ ${exp} -eq $? ]] + tend $? +} + +test-path_exists 1 +test-path_exists 1 -a +test-path_exists 1 -o + +good="/ . tests-common.sh /bin/bash" +test-path_exists 0 ${good} +test-path_exists 0 -a ${good} +test-path_exists 0 -o ${good} + +bad="/asjdkfljasdlfkja jlakjdsflkasjdflkasdjflkasdjflaskdjf" +test-path_exists 1 ${bad} +test-path_exists 1 -a ${bad} +test-path_exists 1 -o ${bad} + +test-path_exists 1 ${good} ${bad} +test-path_exists 1 -a ${good} ${bad} +test-path_exists 0 -o ${good} ${bad} + +texit diff -uNr a/eclass/tests/flag-o-matic.sh b/eclass/tests/flag-o-matic.sh --- a/eclass/tests/flag-o-matic.sh false +++ b/eclass/tests/flag-o-matic.sh 82070d5322c487813f356162d2e178210ed0e859bbde543df674a22ee53e61af50c72eb923cd594a88d89884f7fcd288283a24a1b573df2f706184c790fe0d19 @@ -0,0 +1,153 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit flag-o-matic + +CFLAGS="-a -b -c=1 --param l1-cache-size=32" +CXXFLAGS="-x -y -z=2" +LDFLAGS="-l -m -n=3" +ftend() { + local ret=$? + local msg="Failed; flags are:" + local flag + for flag in $(all-flag-vars) ; do + msg+=$'\n\t'"${flag}=${!flag}" + done + tend ${ret} "${msg}" +} + +tbegin "is-flag" +! (is-flag 1 2 3) 2>/dev/null +ftend + +tbegin "is-ldflag" +! (is-ldflag 1 2 3) 2>/dev/null +ftend + +while read exp flag ; do + [[ -z ${exp}${flag} ]] && continue + + tbegin "is-flagq ${flag}" + is-flagq ${flag} + [[ ${exp} -eq $? ]] + ftend +done <<<" + 1 -L + 0 -a + 0 -x +" + +while read exp flag ; do + [[ -z ${exp}${flag} ]] && continue + + tbegin "is-ldflagq ${flag}" + is-ldflagq "${flag}" + [[ ${exp} -eq $? ]] + ftend +done <<<" + 1 -a + 0 -n=* + 1 -n +" + +tbegin "strip-unsupported-flags" +strip-unsupported-flags +[[ ${CFLAGS} == "--param l1-cache-size=32" ]] && [[ ${CXXFLAGS} == "-z=2" ]] && [[ ${LDFLAGS} == "" ]] +ftend + +for var in $(all-flag-vars) ; do + eval ${var}=\"-filter -filter-glob -foo-${var%FLAGS}\" +done + +tbegin "filter-flags basic" +filter-flags -filter +( +for var in $(all-flag-vars) ; do + val=${!var} + [[ ${val} == "-filter-glob -foo-${var%FLAGS}" ]] || exit 1 +done +) +ftend + +tbegin "filter-flags glob" +filter-flags '-filter-*' +( +for var in $(all-flag-vars) ; do + val=${!var} + [[ ${val} == "-foo-${var%FLAGS}" ]] || exit 1 +done +) +ftend + +tbegin "strip-flags basic" +CXXFLAGS+=" -O999 " +strip-flags +[[ -z ${CFLAGS}${LDFLAGS}${CPPFLAGS} && ${CXXFLAGS} == "-O2" ]] +ftend + +tbegin "replace-flags basic" +CFLAGS="-O0 -foo" +replace-flags -O0 -O1 +[[ ${CFLAGS} == "-O1 -foo" ]] +ftend + +tbegin "replace-flags glob" +CXXFLAGS="-O0 -mcpu=bad -cow" +replace-flags '-mcpu=*' -mcpu=good +[[ ${CXXFLAGS} == "-O0 -mcpu=good -cow" ]] +ftend + +tbegin "append-cflags basic" +CFLAGS= +append-cflags -O0 +[[ ${CFLAGS} == " -O0" ]] +ftend + +tbegin "append-cflags -DFOO='a b c'" +CFLAGS= +append-cflags '-DFOO="a b c"' +[[ ${CFLAGS} == ' -DFOO="a b c"' ]] +ftend + +tbegin "raw-ldflags" +LDFLAGS='-Wl,-O1 -Wl,--as-needed -Wl,-z,now -flto' +LDFLAGS=$(raw-ldflags) +[[ ${LDFLAGS} == '-O1 --as-needed -z now' ]] +ftend + +tbegin "test-flags-CC (valid flags)" +out=$(test-flags-CC -O3) +[[ $? -eq 0 && ${out} == "-O3" ]] +ftend + +tbegin "test-flags-CC (invalid flags)" +out=$(test-flags-CC -finvalid-flag) +[[ $? -ne 0 && -z ${out} ]] +ftend + +if type -P clang >/dev/null ; then +tbegin "test-flags-CC (valid flags w/clang)" +out=$(CC=clang test-flags-CC -O3) +[[ $? -eq 0 && ${out} == "-O3" ]] +ftend + +tbegin "test-flags-CC (invalid flags w/clang)" +out=$(CC=clang test-flags-CC -finvalid-flag) +[[ $? -ne 0 && -z ${out} ]] +ftend + +tbegin "test-flags-CC (gcc-valid but clang-invalid flags)" +out=$(CC=clang test-flags-CC -finline-limit=1200) +[[ $? -ne 0 && -z ${out} ]] +ftend + +tbegin "test-flags-CC (unused flags w/clang)" +out=$(CC=clang test-flags-CC -Wl,-O1) +[[ $? -eq 0 && ${out} == "-Wl,-O1" ]] +ftend +fi + +texit diff -uNr a/eclass/tests/git-r3.sh b/eclass/tests/git-r3.sh --- a/eclass/tests/git-r3.sh false +++ b/eclass/tests/git-r3.sh 55d9c94389468d0b6571be87aef850aed6a57205b52f64425bb33bdfbb9c5a1c0e0c95e1fccccc79c05ebf1085e2e6767951f416a612c5ec7d0f79a26cf4c575 @@ -0,0 +1,203 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit git-r3 + +testdir=${pkg_root}/git +mkdir "${testdir}" || die "unable to mkdir testdir" +cd "${testdir}" || die "unable to cd to testdir" + +EGIT3_STORE_DIR=store +mkdir "${EGIT3_STORE_DIR}" || die "unable to mkdir store" + +test_file() { + local fn=${1} + local expect=${2} + + if [[ ! -f ${fn} ]]; then + eerror "${fn} does not exist (not checked out?)" + else + local got=$(<"${fn}") + + if [[ ${got} != ${expect} ]]; then + eerror "${fn}, expected: ${expect}, got: ${got}" + else + return 0 + fi + fi + return 1 +} + +test_no_file() { + local fn=${1} + + if [[ -f ${fn} ]]; then + eerror "${fn} exists (wtf?!)" + else + return 0 + fi + return 1 +} + +test_repo_clean() { + local P=${P}_${FUNCNAME#test_} + + ( + mkdir repo + cd repo + git init -q + echo test > file + git add file + git commit -m 1 -q + echo other-text > file2 + git add file2 + git commit -m 2 -q + ) || die "unable to prepare repo" + + # we need to use an array to preserve whitespace + local EGIT_REPO_URI=( + "ext::git daemon --export-all --base-path=. --inetd %G/repo" + ) + + tbegin "fetching from a simple repo" + ( + git-r3_src_unpack + test_file "${WORKDIR}/${P}/file" test && \ + test_file "${WORKDIR}/${P}/file2" other-text + ) &>fetch.log + + eend ${?} || cat fetch.log +} + +test_repo_revert() { + local P=${P}_${FUNCNAME#test_} + + ( + cd repo + git revert -n HEAD^ + git commit -m r1 -q + ) || die "unable to prepare repo" + + # we need to use an array to preserve whitespace + local EGIT_REPO_URI=( + "ext::git daemon --export-all --base-path=. --inetd %G/repo" + ) + + tbegin "fetching revert" + ( + git-r3_src_unpack + test_no_file "${WORKDIR}/${P}/file" && \ + test_file "${WORKDIR}/${P}/file2" other-text + ) &>fetch.log + + eend ${?} || cat fetch.log +} + +test_repo_branch() { + local P=${P}_${FUNCNAME#test_} + + ( + cd repo + git branch -q other-branch HEAD^ + git checkout -q other-branch + echo one-more > file3 + git add file3 + git commit -m 3 -q + git checkout -q master + ) || die "unable to prepare repo" + + # we need to use an array to preserve whitespace + local EGIT_REPO_URI=( + "ext::git daemon --export-all --base-path=. --inetd %G/repo" + ) + local EGIT_BRANCH=other-branch + + tbegin "switching branches" + ( + git-r3_src_unpack + test_file "${WORKDIR}/${P}/file" test && \ + test_file "${WORKDIR}/${P}/file2" other-text && \ + test_file "${WORKDIR}/${P}/file3" one-more + ) &>fetch.log + + eend ${?} || cat fetch.log +} + +test_repo_merge() { + local P=${P}_${FUNCNAME#test_} + + ( + cd repo + git branch -q one-more-branch HEAD^ + git checkout -q one-more-branch + echo foobarbaz > file3 + git add file3 + git commit -m 3b -q + git checkout -q master + git merge -m 4 -q one-more-branch + ) || die "unable to prepare repo" + + # we need to use an array to preserve whitespace + local EGIT_REPO_URI=( + "ext::git daemon --export-all --base-path=. --inetd %G/repo" + ) + + tbegin "fetching a merge commit" + ( + git-r3_src_unpack + test_no_file "${WORKDIR}/${P}/file" && \ + test_file "${WORKDIR}/${P}/file2" other-text && \ + test_file "${WORKDIR}/${P}/file3" foobarbaz + ) &>fetch.log + + eend ${?} || cat fetch.log +} + +test_repo_revert_merge() { + local P=${P}_${FUNCNAME#test_} + + ( + cd repo + git branch -q to-be-reverted + git checkout -q to-be-reverted + echo trrm > file3 + git add file3 + git commit -m 5b -q + git checkout -q master + echo trrm > file2 + git add file2 + git commit -m 5 -q + git merge -m 6 -q to-be-reverted + echo trrm > file + git add file + git commit -m 7 -q + git revert -m 1 -n HEAD^ + git commit -m 7r -q + ) || die "unable to prepare repo" + + # we need to use an array to preserve whitespace + local EGIT_REPO_URI=( + "ext::git daemon --export-all --base-path=. --inetd %G/repo" + ) + + tbegin "fetching a revert of a merge commit" + ( + git-r3_src_unpack + test_file "${WORKDIR}/${P}/file" trrm && \ + test_file "${WORKDIR}/${P}/file2" trrm && \ + test_file "${WORKDIR}/${P}/file3" foobarbaz + ) &>fetch.log + + eend ${?} || cat fetch.log +} + +test_repo_clean +test_repo_revert +test_repo_branch +test_repo_merge +test_repo_revert_merge + +texit diff -uNr a/eclass/tests/git-r3_GIT_DIR.sh b/eclass/tests/git-r3_GIT_DIR.sh --- a/eclass/tests/git-r3_GIT_DIR.sh false +++ b/eclass/tests/git-r3_GIT_DIR.sh e6b17da311b4ca4727463afa3a2cfe2bc2f327e5a431a207752edcc953594801d50c1eed5b5401d78f14548992ca3d36463df758652597c03145f39a2128a571 @@ -0,0 +1,60 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit git-r3 + +testdir=${pkg_root}/git +mkdir "${testdir}" || die "unable to mkdir testdir" +cd "${testdir}" || die "unable to cd to testdir" + +EGIT3_STORE_DIR=store +mkdir "${EGIT3_STORE_DIR}" || die "unable to mkdir store" + +# Test cleaning up canonical repo URI +test_repouri() { + local uri=${1} + local expect=${2} + local -x GIT_DIR + + tbegin "GIT_DIR for ${uri}" + + _git-r3_set_gitdir "${uri}" &>/dev/null + local got=${GIT_DIR#${EGIT3_STORE_DIR}/} + + [[ ${expect} == ${got} ]] + tend ${?} || eerror "Expected: ${expect}, got: ${got}" +} + +test_repouri git://git.overlays.gentoo.org/proj/portage.git proj_portage.git +test_repouri https://git.overlays.gentoo.org/gitroot/proj/portage.git proj_portage.git +test_repouri git+ssh://git@git.overlays.gentoo.org/proj/portage.git proj_portage.git + +test_repouri git://anongit.freedesktop.org/mesa/mesa mesa_mesa.git +test_repouri ssh://git.freedesktop.org/git/mesa/mesa mesa_mesa.git +test_repouri http://anongit.freedesktop.org/git/mesa/mesa.git mesa_mesa.git +test_repouri http://cgit.freedesktop.org/mesa/mesa/ mesa_mesa.git + +test_repouri https://code.google.com/p/snakeoil/ snakeoil.git + +test_repouri git://git.code.sf.net/p/xournal/code xournal_code.git +test_repouri http://git.code.sf.net/p/xournal/code xournal_code.git + +test_repouri git://git.gnome.org/glibmm glibmm.git +test_repouri https://git.gnome.org/browse/glibmm glibmm.git +test_repouri ssh://USERNAME@git.gnome.org/git/glibmm glibmm.git + +test_repouri git://git.kernel.org/pub/scm/git/git.git git_git.git +test_repouri http://git.kernel.org/pub/scm/git/git.git git_git.git +test_repouri https://git.kernel.org/pub/scm/git/git.git git_git.git +test_repouri https://git.kernel.org/cgit/git/git.git/ git_git.git + +#test_repouri git@github.com:gentoo/identity.gentoo.org.git gentoo_identity.gentoo.org.git +test_repouri https://github.com/gentoo/identity.gentoo.org.git gentoo_identity.gentoo.org.git + +#test_repouri git@bitbucket.org:mgorny/python-exec.git mgorny_python-exec.git +test_repouri https://mgorny@bitbucket.org/mgorny/python-exec.git mgorny_python-exec.git + +texit diff -uNr a/eclass/tests/git-r3_subrepos.sh b/eclass/tests/git-r3_subrepos.sh --- a/eclass/tests/git-r3_subrepos.sh false +++ b/eclass/tests/git-r3_subrepos.sh 3676184f89f591a40e567bd45d2704e48d1b3a80fb689ac75b452a0789268d0567a807aa54a9ad72e96647b8cc569efd59db973e7d7263c8cc93ad25ae48ecbb @@ -0,0 +1,37 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit git-r3 + +# Test getting submodule URIs +test_subrepos() { + local suburi=${1} + local expect=( "${@:2}" ) + + tbegin "subrepos for ${suburi} -> ${expect[0]}${expect[1]+...}" + + local subrepos + _git-r3_set_subrepos "${suburi}" "${repos[@]}" + + [[ ${expect[@]} == ${subrepos[@]} ]] + tend ${?} || eerror "Expected: ${expect[@]}, got: ${subrepos[@]}" +} + +# parent repos +repos=( http://foohub/fooman/foo.git git://foohub/fooman/foo.git ) + +# absolute URI +test_subrepos http://foo/bar http://foo/bar +test_subrepos /foo/bar /foo/bar + +# plain relative URI +test_subrepos ./baz http://foohub/fooman/foo.git/baz git://foohub/fooman/foo.git/baz + +# backward relative URIs +test_subrepos ../baz.git http://foohub/fooman/baz.git git://foohub/fooman/baz.git +test_subrepos ../../bazman/baz.git http://foohub/bazman/baz.git git://foohub/bazman/baz.git + +texit diff -uNr a/eclass/tests/linux-info_get_running_version.sh b/eclass/tests/linux-info_get_running_version.sh --- a/eclass/tests/linux-info_get_running_version.sh false +++ b/eclass/tests/linux-info_get_running_version.sh 6b52ea7f239fb0b06ae2414f0b436df3963c94b0b60c3731ddf7ddbf51cf02c53fe120fcc3018290a388ef7d7c2e309d19869168cced9292960790f65b9d627b @@ -0,0 +1,38 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit linux-info + +test_get_running_version() { + local test_kv=$1 major=$2 minor=$3 patch=$4 extra=$5 + tbegin "get_running_version ${test_kv}" + uname() { echo "${test_kv}" ; } + ROOT=/:/:/:/: get_running_version + local r=$? + [[ ${r} -eq 0 && + ${major} == "${KV_MAJOR}" && + ${minor} == "${KV_MINOR}" && + ${patch} == "${KV_PATCH}" && + ${extra} == "${KV_EXTRA}" ]] + tend $? "FAIL: {ret: ${r}==0} {major: ${major}==${KV_MAJOR}} {minor: ${minor}==${KV_MINOR}} {patch: ${patch}==${KV_PATCH}} {extra: ${extra}==${KV_EXTRA}}" +} + +tests=( + # KV_FULL MAJOR MINOR PATCH EXTRA + 1.2.3 1 2 3 '' + 1.2.3.4 1 2 3 .4 + 1.2.3-ver+1.4 1 2 3 -ver+1.4 + 1.2-kern.3 1 2 0 -kern.3 + 1.2+kern.5 1 2 0 +kern.5 + 1.2.3_blah 1 2 3 _blah + 3.2.1-zen-vs2.3.2.5+ 3 2 1 -zen-vs2.3.2.5+ +) + +for (( i = 0; i < ${#tests[@]}; i += 5 )) ; do + test_get_running_version "${tests[@]:i:5}" +done + +texit diff -uNr a/eclass/tests/multiprocessing_makeopts_jobs.sh b/eclass/tests/multiprocessing_makeopts_jobs.sh --- a/eclass/tests/multiprocessing_makeopts_jobs.sh false +++ b/eclass/tests/multiprocessing_makeopts_jobs.sh 206a742f9964bed547457a4434d678990678a98307b7ef5f40f283fbb35a5f0b5cac5faeb9849db0a27b30b74c7ed71b042a7ba23f2308b2aeb4a31c3cf50ec0 @@ -0,0 +1,50 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit multiprocessing + +test-makeopts_jobs() { + local exp=$1; shift + tbegin "makeopts_jobs($1${2+; inf=${2}}) == ${exp}" + local indirect=$(MAKEOPTS="$*" makeopts_jobs) + local direct=$(makeopts_jobs "$@") + if [[ "${direct}" != "${indirect}" ]] ; then + tend 1 "Mismatch between MAKEOPTS/cli: '${indirect}' != '${direct}'" + else + [[ ${direct} == "${exp}" ]] + tend $? "Got back: ${act}" + fi +} + +tests=( + 999 "-j" + 999 "--jobs" + 999 "-j -l9" + 1 "" + 1 "-l9 -w" + 1 "-l9 -w-j4" + 1 "-l9--jobs=3" + 1 "-l9--jobs=8" + 2 "-j2" + 3 "-j 3" + 4 "-l3 -j 4 -w" + 5 "--jobs=5" + 6 "--jobs 6" + 7 "-l3 --jobs 7 -w" + 4 "-j1 -j 2 --jobs 3 --jobs=4" + 8 " -j 8 " + 999 "-kj" + 4 "-kj4" + 5 "-kj 5" +) +for (( i = 0; i < ${#tests[@]}; i += 2 )) ; do + test-makeopts_jobs "${tests[i]}" "${tests[i+1]}" +done + +# test custom inf value +test-makeopts_jobs 645 "-j" 645 + +texit diff -uNr a/eclass/tests/multiprocessing_makeopts_loadavg.sh b/eclass/tests/multiprocessing_makeopts_loadavg.sh --- a/eclass/tests/multiprocessing_makeopts_loadavg.sh false +++ b/eclass/tests/multiprocessing_makeopts_loadavg.sh f3a21e6ee6cd4c447fc63b14339fddfaa597b33d2d7700e8691d58ea030328f0e3769223636d5cf4c3b0b8688cbea21392ea3fa13485ab9a5642aa23059bc288 @@ -0,0 +1,48 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit multiprocessing + +test-makeopts_loadavg() { + local exp=$1; shift + tbegin "makeopts_loadavg($1${2+; inf=${2}}) == ${exp}" + local indirect=$(MAKEOPTS="$*" makeopts_loadavg) + local direct=$(makeopts_loadavg "$@") + if [[ "${direct}" != "${indirect}" ]] ; then + tend 1 "Mismatch between MAKEOPTS/cli: '${indirect}' != '${direct}'" + else + [[ ${direct} == "${exp}" ]] + tend $? "Got back: ${direct}" + fi +} + +tests=( + 999 "-j" + 999 "-l" + 999 "" + 9 "-l9 -w" + 9 "-l 9 -w-j4" + 3 "-l3 -j 4 -w" + 5 "--load-average=5" + 6 "--load-average 6" + 7 "-l3 --load-average 7 -w" + 4 "-j1 -j 2 --load-average 3 --load-average=4" + 3 " --max-load=3 -x" + 8 " -l 8 " + 999 "-kl" + 4 "-kl4" + 5 "-kl 5" + 2.3 "-l 2.3" + 999 "-l 2.3.4" +) +for (( i = 0; i < ${#tests[@]}; i += 2 )) ; do + test-makeopts_loadavg "${tests[i]}" "${tests[i+1]}" +done + +# test custom inf value +test-makeopts_loadavg 645 "-l" 645 + +texit diff -uNr a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh --- a/eclass/tests/python-utils-r1.sh false +++ b/eclass/tests/python-utils-r1.sh 696cc3e5867b2639fd038df39141a5abde6727f01fc18c229cbbf906169b911d49c9268da17bafa663c152b59dc1292f12cdc8c97f620bba5f4758db06d88540 @@ -0,0 +1,183 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +source tests-common.sh + +test_var() { + local var=${1} + local impl=${2} + local expect=${3} + + tbegin "${var} for ${impl}" + + local ${var} + python_export ${impl} PYTHON ${var} + [[ ${!var} == ${expect} ]] || eerror "(${impl}: ${var}: ${!var} != ${expect}" + + tend ${?} +} + +test_is() { + local func=${1} + local expect=${2} + + tbegin "${func} (expecting: ${expect})" + + ${func} + [[ ${?} == ${expect} ]] + + tend ${?} +} + +test_fix_shebang() { + local from=${1} + local to=${2} + local expect=${3} + local args=( "${@:4}" ) + + tbegin "python_fix_shebang${args[@]+ ${args[*]}} from ${from} to ${to} (exp: ${expect})" + + echo "${from}" > "${tmpfile}" + output=$( EPYTHON=${to} python_fix_shebang "${args[@]}" -q "${tmpfile}" 2>&1 ) + + if [[ ${?} != 0 ]]; then + if [[ ${expect} != FAIL ]]; then + echo "${output}" + tend 1 + else + tend 0 + fi + else + [[ $(<"${tmpfile}") == ${expect} ]] \ + || eerror "${from} -> ${to}: $(<"${tmpfile}") != ${expect}" + tend ${?} + fi +} + +tmpfile=$(mktemp) + +inherit python-utils-r1 + +test_var EPYTHON python2_7 python2.7 +test_var PYTHON python2_7 /usr/bin/python2.7 +if [[ -x /usr/bin/python2.7 ]]; then + test_var PYTHON_SITEDIR python2_7 "/usr/lib*/python2.7/site-packages" + test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7 + test_var PYTHON_LIBPATH python2_7 "/usr/lib*/libpython2.7$(get_libname)" + test_var PYTHON_CONFIG python2_7 /usr/bin/python2.7-config +fi +test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7' +test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7 + +test_var EPYTHON python3_4 python3.4 +test_var PYTHON python3_4 /usr/bin/python3.4 +if [[ -x /usr/bin/python3.4 ]]; then + abiflags=$(/usr/bin/python3.4 -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS"))') + test_var PYTHON_SITEDIR python3_4 "/usr/lib*/python3.4/site-packages" + test_var PYTHON_INCLUDEDIR python3_4 "/usr/include/python3.4${abiflags}" + test_var PYTHON_LIBPATH python3_4 "/usr/lib*/libpython3.4${abiflags}$(get_libname)" + test_var PYTHON_CONFIG python3_4 "/usr/bin/python3.4${abiflags}-config" +fi +test_var PYTHON_PKG_DEP python3_4 '*dev-lang/python*:3.4' +test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4 + +test_var EPYTHON jython2_7 jython2.7 +test_var PYTHON jython2_7 /usr/bin/jython2.7 +if [[ -x /usr/bin/jython2.7 ]]; then + test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages +fi +test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7' +test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7 + +test_var EPYTHON pypy pypy +test_var PYTHON pypy /usr/bin/pypy +if [[ -x /usr/bin/pypy ]]; then + test_var PYTHON_SITEDIR pypy "/usr/lib*/pypy/site-packages" + test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy/include" +fi +test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0=' +test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy + +test_var EPYTHON pypy3 pypy3 +test_var PYTHON pypy3 /usr/bin/pypy3 +if [[ -x /usr/bin/pypy3 ]]; then + test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3/site-packages" + test_var PYTHON_INCLUDEDIR pypy3 "/usr/lib*/pypy3/include" +fi +test_var PYTHON_PKG_DEP pypy3 '*virtual/pypy3*:0=' +test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3 + +test_is "python_is_python3 python2.7" 1 +test_is "python_is_python3 python3.2" 0 +test_is "python_is_python3 jython2.7" 1 +test_is "python_is_python3 pypy" 1 +test_is "python_is_python3 pypy3" 0 + +# generic shebangs +test_fix_shebang '#!/usr/bin/python' python2.7 '#!/usr/bin/python2.7' +test_fix_shebang '#!/usr/bin/python' python3.4 '#!/usr/bin/python3.4' +test_fix_shebang '#!/usr/bin/python' pypy '#!/usr/bin/pypy' +test_fix_shebang '#!/usr/bin/python' pypy3 '#!/usr/bin/pypy3' +test_fix_shebang '#!/usr/bin/python' jython2.7 '#!/usr/bin/jython2.7' + +# python2/python3 matching +test_fix_shebang '#!/usr/bin/python2' python2.7 '#!/usr/bin/python2.7' +test_fix_shebang '#!/usr/bin/python3' python2.7 FAIL +test_fix_shebang '#!/usr/bin/python3' python2.7 '#!/usr/bin/python2.7' --force +test_fix_shebang '#!/usr/bin/python3' python3.4 '#!/usr/bin/python3.4' +test_fix_shebang '#!/usr/bin/python2' python3.4 FAIL +test_fix_shebang '#!/usr/bin/python2' python3.4 '#!/usr/bin/python3.4' --force + +# pythonX.Y matching (those mostly test the patterns) +test_fix_shebang '#!/usr/bin/python2.7' python2.7 '#!/usr/bin/python2.7' +test_fix_shebang '#!/usr/bin/python2.7' python3.2 FAIL +test_fix_shebang '#!/usr/bin/python2.7' python3.2 '#!/usr/bin/python3.2' --force +test_fix_shebang '#!/usr/bin/python3.2' python3.2 '#!/usr/bin/python3.2' +test_fix_shebang '#!/usr/bin/python3.2' python2.7 FAIL +test_fix_shebang '#!/usr/bin/python3.2' python2.7 '#!/usr/bin/python2.7' --force +test_fix_shebang '#!/usr/bin/pypy' pypy '#!/usr/bin/pypy' +test_fix_shebang '#!/usr/bin/pypy' python2.7 FAIL +test_fix_shebang '#!/usr/bin/pypy' python2.7 '#!/usr/bin/python2.7' --force +test_fix_shebang '#!/usr/bin/jython2.7' jython2.7 '#!/usr/bin/jython2.7' +test_fix_shebang '#!/usr/bin/jython2.7' jython3.2 FAIL +test_fix_shebang '#!/usr/bin/jython2.7' jython3.2 '#!/usr/bin/jython3.2' --force + +# fancy path handling +test_fix_shebang '#!/mnt/python2/usr/bin/python' python3.4 \ + '#!/mnt/python2/usr/bin/python3.4' +test_fix_shebang '#!/mnt/python2/usr/bin/python2' python2.7 \ + '#!/mnt/python2/usr/bin/python2.7' +test_fix_shebang '#!/mnt/python2/usr/bin/env python' python2.7 \ + '#!/mnt/python2/usr/bin/env python2.7' +test_fix_shebang '#!/mnt/python2/usr/bin/python2 python2' python2.7 \ + '#!/mnt/python2/usr/bin/python2.7 python2' +test_fix_shebang '#!/mnt/python2/usr/bin/python3 python2' python2.7 FAIL +test_fix_shebang '#!/mnt/python2/usr/bin/python3 python2' python2.7 \ + '#!/mnt/python2/usr/bin/python2.7 python2' --force +test_fix_shebang '#!/usr/bin/foo' python2.7 FAIL + +# regression test for bug #522080 +test_fix_shebang '#!/usr/bin/python ' python2.7 '#!/usr/bin/python2.7 ' + +# make sure we don't break pattern matching +test_is "_python_impl_supported python2_5" 1 +test_is "_python_impl_supported python2_6" 1 +test_is "_python_impl_supported python2_7" 0 +test_is "_python_impl_supported python3_1" 1 +test_is "_python_impl_supported python3_2" 1 +test_is "_python_impl_supported python3_3" 1 +test_is "_python_impl_supported python3_4" 0 +test_is "_python_impl_supported python3_5" 0 +test_is "_python_impl_supported python3_6" 0 +test_is "_python_impl_supported pypy1_8" 1 +test_is "_python_impl_supported pypy1_9" 1 +test_is "_python_impl_supported pypy2_0" 1 +test_is "_python_impl_supported pypy" 0 +test_is "_python_impl_supported pypy3" 0 +test_is "_python_impl_supported jython2_7" 0 + +rm "${tmpfile}" + +texit diff -uNr a/eclass/tests/rebar_fix_include_path.sh b/eclass/tests/rebar_fix_include_path.sh --- a/eclass/tests/rebar_fix_include_path.sh false +++ b/eclass/tests/rebar_fix_include_path.sh f6d5771c3aa45d4ee33e5c045c4689cf970a814537a39b8fe5beb1c8eeececa66657328ee89991468df7ce1f3ae098bf092b65feeb6421a9ff114a7f39d8588f @@ -0,0 +1,181 @@ +#!/bin/bash +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +EAPI=6 + +inherit rebar + +EPREFIX="${tmpdir}/fakeroot" +S="${WORKDIR}/${P}" + +setup() { + mkdir -p "${S}" || die + + for pkg in foo-0.1.0 bar-0.1.0; do + mkdir -p "${EPREFIX}$(get_erl_libs)/${pkg}/include" || die + done + + cat <<EOF >"${S}/typical.config" || die +%%% Comment + +{erl_opts, [debug_info, {src_dirs, ["src"]}, + {i, "include"}, + {i, "deps/foo/include"}, + {i, "../foo/include"}]}. + +{port_env, [{"CFLAGS", "\$CFLAGS"}, {"LDFLAGS", "\$LDFLAGS"}]}. +EOF + + cat <<EOF >"${S}/typical.config.expected" || die +%%% Comment + +{erl_opts, [debug_info, {src_dirs, ["src"]}, + {i, "include"}, + {i, "${EPREFIX}$(get_erl_libs)/foo-0.1.0/include"}, + {i, "../foo/include"}]}. + +{port_env, [{"CFLAGS", "\$CFLAGS"}, {"LDFLAGS", "\$LDFLAGS"}]}. +EOF + + cat <<EOF >"${S}/inc_one_line.config" || die +%%% Comment + +{erl_opts, [debug_info, {src_dirs, ["src"]}, {i, "include"}, {i, "deps/foo/include"}, {i, "../foo/include"}]}. + +{port_env, [{"CFLAGS", "\$CFLAGS"}, {"LDFLAGS", "\$LDFLAGS"}]}. +EOF + + cat <<EOF >"${S}/inc_one_line.config.expected" || die +%%% Comment + +{erl_opts, [debug_info, {src_dirs, ["src"]}, {i, "include"}, {i, "${EPREFIX}$(get_erl_libs)/foo-0.1.0/include"}, {i, "../foo/include"}]}. + +{port_env, [{"CFLAGS", "\$CFLAGS"}, {"LDFLAGS", "\$LDFLAGS"}]}. +EOF +} + +test_typical_config() { + local diff_rc + local unit_rc + + # Prepare + cd "${S}" || die + cp typical.config rebar.config || die + + # Run unit + (rebar_fix_include_path foo) + unit_rc=$? + + # Test result + diff rebar.config typical.config.expected + diff_rc=$? + + [[ ${unit_rc}${diff_rc} = 00 ]] +} + +test_typical_config_with_different_name() { + local diff_rc + local unit_rc + + # Prepare + cd "${S}" || die + cp typical.config other.config || die + + # Run unit + (rebar_fix_include_path foo other.config) + unit_rc=$? + + # Test result + diff other.config typical.config.expected + diff_rc=$? + + [[ ${unit_rc}${diff_rc} = 00 ]] +} + +test_multiple_versions() { + local diff_rc + local unit_rc + + # Prepare + cd "${S}" || die + cp typical.config rebar.config || die + mkdir -p "${EPREFIX}$(get_erl_libs)/foo-1.0.0/include" || die + + # Run unit + (rebar_fix_include_path foo 2>/dev/null) + unit_rc=$? + + # Test result + diff rebar.config typical.config + diff_rc=$? + + # Clean up + rm -r "${EPREFIX}$(get_erl_libs)/foo-1.0.0" || die + + [[ ${unit_rc}${diff_rc} = 10 ]] +} + +test_not_found() { + local diff_rc + local unit_rc + + # Prepare + cd "${S}" || die + cp typical.config rebar.config || die + + # Run unit + (rebar_fix_include_path fo 2>/dev/null) + unit_rc=$? + + # Test result + diff rebar.config typical.config + diff_rc=$? + + [[ ${unit_rc}${diff_rc} = 10 ]] +} + +test_includes_in_one_line() { + local diff_rc + local unit_rc + + # Prepare + cd "${S}" || die + cp inc_one_line.config rebar.config || die + + # Run unit + (rebar_fix_include_path foo) + unit_rc=$? + + # Test result + diff rebar.config inc_one_line.config.expected + diff_rc=$? + + [[ ${unit_rc}${diff_rc} = 00 ]] +} + +setup + +tbegin "rebar_fix_include_path deals with typical config" +test_typical_config +tend $? + +tbegin "rebar_fix_include_path deals with typical config with different name" +test_typical_config_with_different_name +tend $? + +tbegin "rebar_fix_include_path fails on multiple versions of dependency" +test_multiple_versions +tend $? + +tbegin "rebar_fix_include_path fails if dependency is not found" +test_not_found +tend $? + +tbegin "rebar_fix_include_path deals with all includes in one line" +test_includes_in_one_line +tend $? + +texit diff -uNr a/eclass/tests/rebar_remove_deps.sh b/eclass/tests/rebar_remove_deps.sh --- a/eclass/tests/rebar_remove_deps.sh false +++ b/eclass/tests/rebar_remove_deps.sh a6f4fcba3a84a86edff96a9e89a22bf261565017e56e9cd7b345e7ae111d4d4ccd56c0d3874909fc9a9e8c10d55040cc0d8d5a3ce481da9802d59cb82d03a059 @@ -0,0 +1,121 @@ +#!/bin/bash +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +EAPI=6 + +inherit rebar + +EPREFIX="${tmpdir}/fakeroot" +S="${WORKDIR}/${P}" + +setup() { + mkdir -p "${S}" || die + + cat <<EOF >"${S}/rebar.config.expected" || die +%%% Comment + +{port_specs, [{"priv/lib/esip_drv.so", ["c_src/esip_codec.c"]}]}. + +{deps, []}. + +{clean_files, ["c_src/esip_codec.gcda", "c_src/esip_codec.gcno"]}. +EOF + + cat <<EOF >"${S}/typical.config" || die +%%% Comment + +{port_specs, [{"priv/lib/esip_drv.so", ["c_src/esip_codec.c"]}]}. + +{deps, [{stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.3"}}}, + {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.3"}}}, + {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.3"}}}]}. + +{clean_files, ["c_src/esip_codec.gcda", "c_src/esip_codec.gcno"]}. +EOF + + cat <<EOF >"${S}/deps_one_line.config" || die +%%% Comment + +{port_specs, [{"priv/lib/esip_drv.so", ["c_src/esip_codec.c"]}]}. + +{deps, [{stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.3"}}}, {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.3"}}}, {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.3"}}}]}. + +{clean_files, ["c_src/esip_codec.gcda", "c_src/esip_codec.gcno"]}. +EOF +} + +test_typical_config() { + local diff_rc + local unit_rc + + # Prepare + cd "${S}" || die + cp typical.config rebar.config || die + + # Run unit + (rebar_remove_deps) + unit_rc=$? + + # Test result + diff rebar.config rebar.config.expected + diff_rc=$? + + [[ ${unit_rc}${diff_rc} = 00 ]] +} + +test_typical_config_with_different_name() { + local diff_rc + local unit_rc + + # Prepare + cd "${S}" || die + cp typical.config other.config || die + + # Run unit + (rebar_remove_deps other.config) + unit_rc=$? + + # Test result + diff other.config rebar.config.expected + diff_rc=$? + + [[ ${unit_rc}${diff_rc} = 00 ]] +} + +test_deps_in_one_line() { + local diff_rc + local unit_rc + + # Prepare + cd "${S}" || die + cp deps_one_line.config rebar.config || die + + # Run unit + (rebar_remove_deps) + unit_rc=$? + + # Test result + diff rebar.config rebar.config.expected + diff_rc=$? + + [[ ${unit_rc}${diff_rc} = 00 ]] +} + +setup + +tbegin "rebar_remove_deps deals with typical config" +test_typical_config +tend $? + +tbegin "rebar_remove_deps deals with typical config with different name" +test_typical_config_with_different_name +tend $? + +tbegin "rebar_remove_deps deals with all deps in one line" +test_deps_in_one_line +tend $? + +texit diff -uNr a/eclass/tests/rebar_set_vsn.sh b/eclass/tests/rebar_set_vsn.sh --- a/eclass/tests/rebar_set_vsn.sh false +++ b/eclass/tests/rebar_set_vsn.sh c6a64a801fc5749e75c4cd7bc4b587af48ceed1e7e36dd43c5c249a0f51724a96e02ec9fdc4b9e60ed4c2dff670d65f3a42e868de01ee41cb894014d0d5ada8e @@ -0,0 +1,114 @@ +#!/bin/bash +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +EAPI=6 + +inherit rebar + +EPREFIX="${tmpdir}/fakeroot" +S="${WORKDIR}/${P}" + +setup() { + mkdir -p "${S}/src" || die + + cat <<EOF >"${S}/app.src.expected" || die +%%% Comment + +{application, esip, + [{description, "ProcessOne SIP server component in Erlang"}, + {vsn, "0"}, + {modules, []}, + {registered, []}, +EOF + + cat <<EOF >"${S}/app.src" || die +%%% Comment + +{application, esip, + [{description, "ProcessOne SIP server component in Erlang"}, + {vsn, git}, + {modules, []}, + {registered, []}, +EOF +} + +test_typical_app_src() { + local diff_rc + local unit_rc + + # Prepare + cd "${S}" || die + cp app.src "src/${PN}.app.src" || die + + # Run unit + (rebar_set_vsn) + unit_rc=$? + + # Test result + diff "src/${PN}.app.src" app.src.expected + diff_rc=$? + + [[ ${unit_rc}${diff_rc} = 00 ]] +} + +test_app_src_missing() { + local unit_rc + + # Prepare + cd "${S}" || die + rm -f "src/${PN}.app.src" || die + + # Run unit + (rebar_set_vsn 2>/dev/null) + unit_rc=$? + + [[ ${unit_rc} = 1 ]] +} + +test_set_custom_version() { + local diff_rc + local unit_rc + + # Prepare + cd "${S}" || die + cp app.src "src/${PN}.app.src" || die + cat <<EOF >"${S}/custom_app.src.expected" || die +%%% Comment + +{application, esip, + [{description, "ProcessOne SIP server component in Erlang"}, + {vsn, "1.2.3"}, + {modules, []}, + {registered, []}, +EOF + + # Run unit + (rebar_set_vsn 1.2.3) + unit_rc=$? + + # Test result + diff "src/${PN}.app.src" custom_app.src.expected + diff_rc=$? + + [[ ${unit_rc}${diff_rc} = 00 ]] +} + + +setup + +tbegin "rebar_set_vsn deals with typical app.src" +test_typical_app_src +tend $? + +tbegin "rebar_set_vsn fails when app.src is missing" +test_app_src_missing +tend $? + +tbegin "rebar_set_vsn sets custom version in app.src" +test_set_custom_version +tend $? + +texit diff -uNr a/eclass/tests/savedconfig.sh b/eclass/tests/savedconfig.sh --- a/eclass/tests/savedconfig.sh false +++ b/eclass/tests/savedconfig.sh cf2ca05ca5e4a7e8c75c7147513d08ed9deefb602d4d93db9b9f94168a0b5782252e0c8384ca17c2c8e7d58060fd5829ef5abf2c0d3783773ddc5e3370a4750b @@ -0,0 +1,78 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit savedconfig + +quiet() { + local out ret + out=$("$@" 2>&1) + ret=$? + [[ ${ret} -eq 0 ]] || echo "${out}" + return ${ret} +} +sc() { EBUILD_PHASE=install quiet save_config "$@" ; } +rc() { EBUILD_PHASE=prepare quiet restore_config "$@" ; } + +cleanup() { rm -rf "${ED}"/* "${T}"/* "${WORKDIR}"/* ; } +test-it() { + local ret=0 + tbegin "$@" + mkdir -p "${ED}"/etc/portage/savedconfig + : $(( ret |= $? )) + pushd "${WORKDIR}" >/dev/null + : $(( ret |= $? )) + test + : $(( ret |= $? )) + popd >/dev/null + : $(( ret |= $? )) + tend ${ret} + cleanup +} + +test() { + touch f || return 1 + sc f || return 1 + [[ -f ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] +} +test-it "simple save_config" + +test() { + touch a b c || return 1 + sc a b c || return 1 + [[ -d ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] +} +test-it "multi save_config" + +test() { + mkdir dir || return 1 + touch dir/{a,b,c} || return 1 + sc dir || return 1 + [[ -d ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] +} +test-it "dir save_config" + +PORTAGE_CONFIGROOT=${D} + +test() { + echo "ggg" > f || return 1 + rc f || return 1 + [[ $(<f) == "ggg" ]] +} +test-it "simple restore_config" + +test() { + echo "ggg" > f || return 1 + rc f || return 1 + [[ $(<f) == "ggg" ]] || return 1 + sc f || return 1 + + echo "hhh" > f || return 1 + rc f || return 1 + [[ $(<f) == "ggg" ]] +} +test-it "simple restore+save config" + +texit diff -uNr a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh --- a/eclass/tests/scons-utils.sh false +++ b/eclass/tests/scons-utils.sh 4553bd0488dab8646fc824616f36aeac373ebb96cb5e32a23029127f2d4da185bd5dca16216889d6618983835e1cae235a154fb344372f27853e4b040c2d0661 @@ -0,0 +1,62 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit scons-utils + +test-scons_clean_makeopts() { + tbegin "scons_clean_makeopts() for ${1}" + + local SCONSOPTS ret=0 + _scons_clean_makeopts ${1} + + if [[ ${SCONSOPTS} != ${2-${1}} ]]; then + eerror "Self-test failed:" + eindent + eerror "MAKEOPTS: ${1}" + eerror "Expected: ${2-${1}}" + eerror "Actual: ${SCONSOPTS}" + eoutdent + ret=1 + fi + + tend ${ret} + return ${ret} +} + +# jobcount expected for non-specified state +jc=$(_scons_get_default_jobs) +# failed test counter +failed=0 + +# sane MAKEOPTS +test-scons_clean_makeopts '--jobs=14 -k' +test-scons_clean_makeopts '--jobs=14 -k' +test-scons_clean_makeopts '--jobs 15 -k' +test-scons_clean_makeopts '--jobs=16 --keep-going' +test-scons_clean_makeopts '-j17 --keep-going' +test-scons_clean_makeopts '-j 18 --keep-going' + +# needing cleaning +test-scons_clean_makeopts '--jobs -k' "--jobs=${jc} -k" +test-scons_clean_makeopts '--jobs --keep-going' "--jobs=${jc} --keep-going" +test-scons_clean_makeopts '-kj' "-kj ${jc}" + +# broken by definition (but passed as it breaks make as well) +test-scons_clean_makeopts '-jk' +test-scons_clean_makeopts '--jobs=randum' +test-scons_clean_makeopts '-kjrandum' + +# needing stripping +test-scons_clean_makeopts '--load-average=25 -kj16' '-kj16' +test-scons_clean_makeopts '--load-average 25 -k -j17' '-k -j17' +test-scons_clean_makeopts '-j2 HOME=/tmp' '-j2' +test-scons_clean_makeopts '--jobs funnystuff -k' "--jobs=${jc} -k" + +# bug #388961 +test-scons_clean_makeopts '--jobs -l3' "--jobs=${jc}" +test-scons_clean_makeopts '-j -l3' "-j ${jc}" + +texit diff -uNr a/eclass/tests/tests-common.sh b/eclass/tests/tests-common.sh --- a/eclass/tests/tests-common.sh false +++ b/eclass/tests/tests-common.sh 57b2847e6202fe80b842202a1332f9fcfdfdbbc4ed0abe8a16c97cbcb21815b520466e1adc7801dd642af687135ee8c1339d0c0e074edceb688e5728436f05c0 @@ -0,0 +1,105 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +if ! source /lib/gentoo/functions.sh ; then + echo "Missing functions.sh. Please install sys-apps/gentoo-functions!" 1>&2 + exit 1 +fi + +# Let overlays override this so they can add their own testsuites. +TESTS_ECLASS_SEARCH_PATHS=( .. ) + +inherit() { + local e path + for e in "$@" ; do + for path in "${TESTS_ECLASS_SEARCH_PATHS[@]}" ; do + local eclass=${path}/${e}.eclass + if [[ -e "${eclass}" ]] ; then + source "${eclass}" + continue 2 + fi + done + die "could not find ${e}.eclass" + done +} +EXPORT_FUNCTIONS() { :; } + +debug-print() { + [[ ${#} -eq 0 ]] && return + + if [[ ${ECLASS_DEBUG_OUTPUT} == on ]]; then + printf 'debug: %s\n' "${@}" >&2 + elif [[ -n ${ECLASS_DEBUG_OUTPUT} ]]; then + printf 'debug: %s\n' "${@}" >> "${ECLASS_DEBUG_OUTPUT}" + fi +} + +debug-print-function() { + debug-print "${1}, parameters: ${*:2}" +} + +debug-print-section() { + debug-print "now in section ${*}" +} + +has() { + local needle=$1 + shift + + local x + for x in "$@"; do + [ "${x}" = "${needle}" ] && return 0 + done + return 1 +} +use() { has "$1" ${IUSE} ; } + +die() { + echo "die: $*" 1>&2 + exit 1 +} + +has_version() { + portageq has_version / "$@" +} + +tret=0 +tbegin() { + ebegin "Testing $*" +} +texit() { + rm -rf "${tmpdir}" + exit ${tret} +} +tend() { + t eend "$@" +} +t() { + "$@" + local ret=$? + : $(( tret |= ${ret} )) + return ${ret} +} + +tmpdir="${PWD}/tmp" +pkg_root="${tmpdir}/$0/${RANDOM}" +T="${pkg_root}/temp" +D="${pkg_root}/image" +WORKDIR="${pkg_root}/work" +ED=${D} +mkdir -p "${D}" "${T}" "${WORKDIR}" + +dodir() { + mkdir -p "${@/#/${ED}/}" +} + +elog() { einfo "$@" ; } + +IUSE="" +CATEGORY="dev-eclass" +PN="tests" +PV="0" +P="${PN}-${PV}" +PF=${P} +SLOT=0 diff -uNr a/eclass/tests/toolchain-funcs.sh b/eclass/tests/toolchain-funcs.sh --- a/eclass/tests/toolchain-funcs.sh false +++ b/eclass/tests/toolchain-funcs.sh 37bd464ac376a8e5f3ff7f00a094c3bdb25f803c0bad19012dc5f6d15836a62c353496de2eb0a3472745d49bce47d15c858fd2c47c4c315e9c8fe556cf3a77e0 @@ -0,0 +1,175 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit toolchain-funcs + +# +# TEST: tc-arch-kernel +# +test-tc-arch-kernel() { + local ret=0 + KV=$1 ; shift + for CHOST in "$@" ; do + exp=${CHOST##*:} + CHOST=${CHOST%%:*} + actual=$(tc-arch-kernel) + + if [[ ${actual} != ${exp:-${CHOST}} ]] ; then + eerror "Failure for CHOST: ${CHOST} Expected: ${exp} != Actual: ${actual}" + ((++ret)) + fi + done + return ${ret} +} +tbegin "tc-arch-kernel() (KV=2.6.30)" +test-tc-arch-kernel 2.6.30 \ + i{3..6}86:x86 x86_64:x86 \ + powerpc{,64}:powerpc i{3..6}86-gentoo-freebsd:i386 +tend $? + +# +# TEST: tc-arch +# +tbegin "tc-arch" +ret=0 +for CHOST in \ + alpha arm{,eb}:arm avr32:avr bfin cris hppa i{3..6}86:x86 ia64 m68k \ + mips{,eb}:mips nios2 powerpc:ppc powerpc64:ppc64 s390{,x}:s390 \ + sh{1..4}{,eb}:sh sparc{,64}:sparc vax x86_64:amd64 +do + exp=${CHOST##*:} + CHOST=${CHOST%%:*} + actual=$(tc-arch) + + if [[ ${actual} != ${exp:-${CHOST}} ]] ; then + eerror "Failure for CHOST: ${CHOST} Expected: ${exp} != Actual: ${actual}" + : $((++ret)) + fi +done +tend ${ret} + +# +# TEST: tc-ld-is-gold +# +tbegin "tc-ld-is-gold (bfd selected)" +LD=ld.bfd tc-ld-is-gold && ret=1 || ret=0 +tend ${ret} + +tbegin "tc-ld-is-gold (gold selected)" +LD=ld.gold tc-ld-is-gold +ret=$? +tend ${ret} + +tbegin "tc-ld-is-gold (bfd selected via flags)" +LD=ld.gold LDFLAGS=-fuse-ld=bfd tc-ld-is-gold +ret=$? +tend ${ret} + +tbegin "tc-ld-is-gold (gold selected via flags)" +LD=ld.bfd LDFLAGS=-fuse-ld=gold tc-ld-is-gold +ret=$? +tend ${ret} + +# +# TEST: tc-ld-disable-gold +# +tbegin "tc-ld-disable-gold (bfd selected)" +( +export LD=ld.bfd LDFLAGS= +ewarn() { :; } +tc-ld-disable-gold +[[ ${LD} == "ld.bfd" && -z ${LDFLAGS} ]] +) +tend $? + +tbegin "tc-ld-disable-gold (gold selected)" +( +export LD=ld.gold LDFLAGS= +ewarn() { :; } +tc-ld-disable-gold +[[ ${LD} == "ld.bfd" || ${LDFLAGS} == *"-fuse-ld=bfd"* ]] +) +tend $? + +tbegin "tc-ld-disable-gold (gold selected via flags)" +( +export LD= LDFLAGS="-fuse-ld=gold" +ewarn() { :; } +tc-ld-disable-gold +[[ ${LD} == *"/ld.bfd" || ${LDFLAGS} == "-fuse-ld=gold -fuse-ld=bfd" ]] +) +tend $? + +unset CPP + +tbegin "tc-get-compiler-type (gcc)" +( +export CC=gcc +[[ $(tc-get-compiler-type) == gcc ]] +) +tend $? + +tbegin "tc-is-gcc (gcc)" +( +export CC=gcc +tc-is-gcc +) +tend $? + +tbegin "! tc-is-clang (gcc)" +( +export CC=gcc +! tc-is-clang +) +tend $? + +if type -P clang &>/dev/null; then + tbegin "tc-get-compiler-type (clang)" + ( + export CC=clang + [[ $(tc-get-compiler-type) == clang ]] + ) + tend $? + + tbegin "! tc-is-gcc (clang)" + ( + export CC=clang + ! tc-is-gcc + ) + tend $? + + tbegin "tc-is-clang (clang)" + ( + export CC=clang + tc-is-clang + ) + tend $? +fi + +if type -P pathcc &>/dev/null; then + tbegin "tc-get-compiler-type (pathcc)" + ( + export CC=pathcc + [[ $(tc-get-compiler-type) == pathcc ]] + ) + tend $? + + tbegin "! tc-is-gcc (pathcc)" + ( + export CC=pathcc + ! tc-is-gcc + ) + tend $? + + tbegin "! tc-is-clang (pathcc)" + ( + export CC=pathcc + ! tc-is-clang + ) + tend $? +fi + +texit diff -uNr a/eclass/tests/toolchain.sh b/eclass/tests/toolchain.sh --- a/eclass/tests/toolchain.sh false +++ b/eclass/tests/toolchain.sh 791f9f7fe524a6f6c0501b1f4e1bd244826b57b94aef14bded0ac9a4393ddb5e6af86c1fb1a96e43c3fbc6edd58c293361022c469d35d6e8dd4522515ff5e863 @@ -0,0 +1,82 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit toolchain + +test_downgrade_arch_flags() { + local exp msg ret=0 ver + + ver=${1} + exp=${2} + shift 2 + CFLAGS=${@} + + tbegin "${ver} ${CFLAGS} => ${exp}" + + CHOST=x86_64 # needed for tc-arch + downgrade_arch_flags ${ver} + + if [[ ${CFLAGS} != ${exp} ]]; then + msg="Failure - Expected: \"${exp}\" Got: \"${CFLAGS}\"" + ret=1 + fi + tend ${ret} ${msg} +} + +# ver expected given +test_downgrade_arch_flags 4.9 "-march=haswell" "-march=haswell" +test_downgrade_arch_flags 4.8 "-march=core-avx2" "-march=haswell" +test_downgrade_arch_flags 4.7 "-march=core-avx2" "-march=haswell" +test_downgrade_arch_flags 4.6 "-march=core-avx-i" "-march=haswell" +test_downgrade_arch_flags 4.5 "-march=core2" "-march=haswell" +test_downgrade_arch_flags 4.4 "-march=core2" "-march=haswell" +test_downgrade_arch_flags 4.3 "-march=core2" "-march=haswell" +test_downgrade_arch_flags 4.2 "-march=nocona" "-march=haswell" +test_downgrade_arch_flags 4.1 "-march=nocona" "-march=haswell" +test_downgrade_arch_flags 4.0 "-march=nocona" "-march=haswell" +test_downgrade_arch_flags 3.4 "-march=nocona" "-march=haswell" +test_downgrade_arch_flags 3.3 "-march=nocona" "-march=haswell" + +test_downgrade_arch_flags 4.9 "-march=bdver4" "-march=bdver4" +test_downgrade_arch_flags 4.8 "-march=bdver3" "-march=bdver4" +test_downgrade_arch_flags 4.7 "-march=bdver2" "-march=bdver4" +test_downgrade_arch_flags 4.6 "-march=bdver1" "-march=bdver4" +test_downgrade_arch_flags 4.5 "-march=amdfam10" "-march=bdver4" +test_downgrade_arch_flags 4.4 "-march=amdfam10" "-march=bdver4" +test_downgrade_arch_flags 4.3 "-march=amdfam10" "-march=bdver4" +test_downgrade_arch_flags 4.2 "-march=k8" "-march=bdver4" +test_downgrade_arch_flags 4.1 "-march=k8" "-march=bdver4" +test_downgrade_arch_flags 4.0 "-march=k8" "-march=bdver4" +test_downgrade_arch_flags 3.4 "-march=k8" "-march=bdver4" +test_downgrade_arch_flags 3.3 "-march=x86-64" "-march=bdver4" + +test_downgrade_arch_flags 3.4 "-march=c3-2" "-march=c3-2" +test_downgrade_arch_flags 3.3 "-march=c3" "-march=c3-2" + +test_downgrade_arch_flags 4.5 "-march=garbage" "-march=garbage" + +test_downgrade_arch_flags 4.9 "-mtune=intel" "-mtune=intel" +test_downgrade_arch_flags 4.8 "-mtune=generic" "-mtune=intel" +test_downgrade_arch_flags 3.4 "" "-mtune=generic" +test_downgrade_arch_flags 3.4 "" "-mtune=x86-64" +test_downgrade_arch_flags 3.3 "" "-mtune=anything" + +test_downgrade_arch_flags 4.5 "-march=amdfam10 -mtune=generic" "-march=btver2 -mtune=generic" +test_downgrade_arch_flags 3.3 "-march=k6-2" "-march=geode -mtune=barcelona" +test_downgrade_arch_flags 3.4 "-march=k8" "-march=btver2 -mtune=generic" + +test_downgrade_arch_flags 4.2 "-march=native" "-march=native" +test_downgrade_arch_flags 4.1 "-march=nocona" "-march=native" + +test_downgrade_arch_flags 4.9 "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" +test_downgrade_arch_flags 4.8 "-march=foo -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" +test_downgrade_arch_flags 4.7 "-march=foo -mno-avx2 -mno-avx -mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" +test_downgrade_arch_flags 4.6 "-march=foo -mno-avx -mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" +test_downgrade_arch_flags 4.3 "-march=foo -mno-sse4.1" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" +test_downgrade_arch_flags 4.2 "-march=foo" "-march=foo -mno-sha -mno-rtm -mno-avx2 -mno-avx -mno-sse4.1" + +test_downgrade_arch_flags 4.4 "-O2 -march=core2 -ffoo -fblah" "-O2 -march=atom -mno-sha -ffoo -mno-rtm -fblah" +texit diff -uNr a/eclass/tests/versionator_version_compare.sh b/eclass/tests/versionator_version_compare.sh --- a/eclass/tests/versionator_version_compare.sh false +++ b/eclass/tests/versionator_version_compare.sh 276e31f19f8e741b2bb47c8b375c0c022f70778f9a088d9e4b4b8b78b4b37acfe10c792f6752d9f3dcd6095cebebff348b2b090d978422b70c16abd3d7806a2d @@ -0,0 +1,199 @@ +#!/bin/bash +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +source tests-common.sh + +inherit versionator + +eshopts_push -s extglob +ver=( "" "lt" "eq" "gt" ) +lt=1 eq=2 gt=3 + +test_version_compare() { + tbegin "version_compare ${1} -${ver[${2}]} ${3}" + version_compare "${1}" "${3}" + local r=$? + [[ ${r} -eq ${2} ]] + tend $? "FAIL: ${@} (got ${r} exp ${2})" +} + +echo " + 0 $lt 1 + 1 $lt 2 + 2 $gt 1 + 2 $eq 2 + 0 $eq 0 + 10 $lt 20 + 68 $eq 068 + 068 $gt 67 + 068 $lt 69 + + 1.0 $lt 2.0 + 2.0 $eq 2.0 + 2.0 $gt 1.0 + + 1.0 $gt 0.0 + 0.0 $eq 0.0 + 0.0 $lt 1.0 + + 0.1 $lt 0.2 + 0.2 $eq 0.2 + 0.3 $gt 0.2 + + 1.2 $lt 2.1 + 2.1 $gt 1.2 + + 1.2.3 $lt 1.2.4 + 1.2.4 $gt 1.2.3 + + 1.2.0 $gt 1.2 + 1.2.1 $gt 1.2 + 1.2 $lt 1.2.1 + + 1.2b $eq 1.2b + 1.2b $lt 1.2c + 1.2b $gt 1.2a + 1.2b $gt 1.2 + 1.2 $lt 1.2a + + 1.3 $gt 1.2a + 1.3 $lt 1.3a + + 1.0_alpha7 $lt 1.0_beta7 + 1.0_beta $lt 1.0_pre + 1.0_pre5 $lt 1.0_rc2 + 1.0_rc2 $lt 1.0 + + 1.0_p1 $gt 1.0 + 1.0_p1-r1 $gt 1.0_p1 + + 1.0_alpha6-r1 $gt 1.0_alpha6 + 1.0_beta6-r1 $gt 1.0_alpha6-r2 + + 1.0_pre1 $lt 1.0_p1 + + 1.0p $gt 1.0_p1 + 1.0r $gt 1.0-r1 + 1.6.15 $gt 1.6.10-r2 + 1.6.10-r2 $lt 1.6.15 + +" | while read a b c ; do + [[ -z "${a}${b}${c}" ]] && continue + test_version_compare "${a}" "${b}" "${c}" +done + + +for q in "alpha beta pre rc=${lt};${gt}" "p=${gt};${lt}" ; do + for p in ${q%%=*} ; do + c=${q##*=} + alt=${c%%;*} agt=${c##*;} + test_version_compare "1.0" $agt "1.0_${p}" + test_version_compare "1.0" $agt "1.0_${p}1" + test_version_compare "1.0" $agt "1.0_${p}068" + + test_version_compare "2.0_${p}" $alt "2.0" + test_version_compare "2.0_${p}1" $alt "2.0" + test_version_compare "2.0_${p}068" $alt "2.0" + + test_version_compare "1.0_${p}" $eq "1.0_${p}" + test_version_compare "0.0_${p}" $lt "0.0_${p}1" + test_version_compare "666_${p}3" $gt "666_${p}" + + test_version_compare "1_${p}7" $lt "1_${p}8" + test_version_compare "1_${p}7" $eq "1_${p}7" + test_version_compare "1_${p}7" $gt "1_${p}6" + test_version_compare "1_${p}09" $eq "1_${p}9" + + test_version_compare "1_${p}7-r0" $eq "1_${p}7" + test_version_compare "1_${p}7-r0" $lt "1_${p}7-r1" + test_version_compare "1_${p}7-r0" $lt "1_${p}7-r01" + test_version_compare "1_${p}7-r01" $eq "1_${p}7-r1" + test_version_compare "1_${p}8-r1" $gt "1_${p}7-r100" + + test_version_compare "1_${p}_alpha" $lt "1_${p}_beta" + done +done + +for p in "-r" "_p" ; do + test_version_compare "7.2${p}1" $lt "7.2${p}2" + test_version_compare "7.2${p}2" $gt "7.2${p}1" + test_version_compare "7.2${p}3" $gt "7.2${p}2" + test_version_compare "7.2${p}2" $lt "7.2${p}3" +done + +# The following tests all come from portage's test cases: +test_version_compare "6.0" $gt "5.0" +test_version_compare "5.0" $gt "5" +test_version_compare "1.0-r1" $gt "1.0-r0" +test_version_compare "1.0-r1" $gt "1.0" +test_version_compare "999999999999999999999999999999" $gt "999999999999999999999999999998" +test_version_compare "1.0.0" $gt "1.0" +test_version_compare "1.0.0" $gt "1.0b" +test_version_compare "1b" $gt "1" +test_version_compare "1b_p1" $gt "1_p1" +test_version_compare "1.1b" $gt "1.1" +test_version_compare "12.2.5" $gt "12.2b" + +test_version_compare "4.0" $lt "5.0" +test_version_compare "5" $lt "5.0" +test_version_compare "1.0_pre2" $lt "1.0_p2" +test_version_compare "1.0_alpha2" $lt "1.0_p2" +test_version_compare "1.0_alpha1" $lt "1.0_beta1" +test_version_compare "1.0_beta3" $lt "1.0_rc3" +test_version_compare "1.001000000000000000001" $lt "1.001000000000000000002" +test_version_compare "1.00100000000" $lt "1.0010000000000000001" +test_version_compare "999999999999999999999999999998" $lt "999999999999999999999999999999" +test_version_compare "1.01" $lt "1.1" +test_version_compare "1.0-r0" $lt "1.0-r1" +test_version_compare "1.0" $lt "1.0-r1" +test_version_compare "1.0" $lt "1.0.0" +test_version_compare "1.0b" $lt "1.0.0" +test_version_compare "1_p1" $lt "1b_p1" +test_version_compare "1" $lt "1b" +test_version_compare "1.1" $lt "1.1b" +test_version_compare "12.2b" $lt "12.2.5" + +test_version_compare "4.0" $eq "4.0" +test_version_compare "1.0" $eq "1.0" +test_version_compare "1.0-r0" $eq "1.0" +test_version_compare "1.0" $eq "1.0-r0" +test_version_compare "1.0-r0" $eq "1.0-r0" +test_version_compare "1.0-r1" $eq "1.0-r1" + +# The following were just tests for != in portage, we need something a bit +# more precise +test_version_compare "1" $lt "2" +test_version_compare "1.0_alpha" $lt "1.0_pre" +test_version_compare "1.0_beta" $gt "1.0_alpha" +test_version_compare "0" $lt "0.0" +test_version_compare "1.0-r0" $lt "1.0-r1" +test_version_compare "1.0-r1" $gt "1.0-r0" +test_version_compare "1.0" $lt "1.0-r1" +test_version_compare "1.0-r1" $gt "1.0" +test_version_compare "1_p1" $lt "1b_p1" +test_version_compare "1b" $gt "1" +test_version_compare "1.1b" $gt "1.1" +test_version_compare "12.2b" $gt "12.2" + +# The following tests all come from paludis's test cases: +test_version_compare "1.0" $gt "1" +test_version_compare "1" $lt "1.0" +test_version_compare "1.0_alpha" $gt "1_alpha" +test_version_compare "1.0_alpha" $gt "1" +test_version_compare "1.0_alpha" $lt "1.0" +test_version_compare "1.2.0.0_alpha7-r4" $gt "1.2_alpha7-r4" + +test_version_compare "0001" $eq "1" +test_version_compare "01" $eq "001" +test_version_compare "0001.1" $eq "1.1" +test_version_compare "01.01" $eq "1.01" +test_version_compare "1.010" $eq "1.01" +test_version_compare "1.00" $eq "1.0" +test_version_compare "1.0100" $eq "1.010" +test_version_compare "1" $eq "1-r0" +test_version_compare "1-r00" $eq "1-r0" + +eshopts_pop + +texit diff -uNr a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass --- a/eclass/texlive-common.eclass false +++ b/eclass/texlive-common.eclass dbbfca855e591495281b74e5eaa3fcb9404cb7f2b2c1e1386659a395338b2f17ced4b207e2b551c08a91ace1ee04bbaff290cc576548d649700393d8768eecda @@ -0,0 +1,169 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: texlive-common.eclass +# @MAINTAINER: +# tex@gentoo.org +# @AUTHOR: +# Original Author: Alexis Ballier <aballier@gentoo.org> +# @BLURB: Provide various functions used by both texlive-core and texlive modules +# @DESCRIPTION: +# Purpose: Provide various functions used by both texlive-core and texlive +# modules. +# +# Note that this eclass *must* not assume the presence of any standard tex tool + +case "${EAPI:-0}" in + 0|1|2) + die "EAPI='${EAPI}' is not supported anymore" + ;; + *) + ;; +esac + +TEXMF_PATH=/usr/share/texmf +TEXMF_DIST_PATH=/usr/share/texmf-dist +TEXMF_VAR_PATH=/var/lib/texmf + +# @FUNCTION: texlive-common_handle_config_files +# @DESCRIPTION: +# Has to be called in src_install after having installed the files in ${D} +# This function will move the relevant files to /etc/texmf and symling them +# from their original location. This is to allow easy update of texlive's +# configuration + +texlive-common_handle_config_files() { + # Handle config files properly + [ -d "${ED}${TEXMF_PATH}" ] || return + cd "${ED}${TEXMF_PATH}" + for f in $(find . -name '*.cnf' -type f -o -name '*.cfg' -type f | sed -e "s:\./::g") ; do + if [ "${f#*config}" != "${f}" -o "${f#doc}" != "${f}" -o "${f#source}" != "${f}" -o "${f#tex}" != "${f}" ] ; then + continue + fi + dodir /etc/texmf/$(dirname ${f}).d + einfo "Moving (and symlinking) ${EPREFIX}${TEXMF_PATH}/${f} to ${EPREFIX}/etc/texmf/$(dirname ${f}).d" + mv "${ED}/${TEXMF_PATH}/${f}" "${ED}/etc/texmf/$(dirname ${f}).d" || die "mv ${f} failed." + dosym /etc/texmf/$(dirname ${f}).d/$(basename ${f}) ${TEXMF_PATH}/${f} + done +} + +# @FUNCTION: texlive-common_is_file_present_in_texmf +# @DESCRIPTION: +# Return if a file is present in the texmf tree +# Call it from the directory containing texmf and texmf-dist + +texlive-common_is_file_present_in_texmf() { + local mark="${T}/$1.found" + [ -d texmf ] && find texmf -name $1 -exec touch "${mark}" \; + [ -d texmf-dist ] && find texmf-dist -name $1 -exec touch "${mark}" \; + [ -f "${mark}" ] +} + +# @FUNCTION: texlive-common_do_symlinks +# @USAGE: < src > < dest > +# @DESCRIPTION: +# Mimic the install_link function of texlinks +# +# Should have the same behavior as the one in /usr/bin/texlinks +# except that it is under the control of the package manager +# Note that $1 corresponds to $src and $2 to $dest in this function +# ( Arguments are switched because texlinks main function sends them switched ) +# This function should not be called from an ebuild, prefer etexlinks that will +# also do the fmtutil file parsing. + +texlive-common_do_symlinks() { + while [ $# != 0 ]; do + case $1 in + cont-??|metafun|mptopdf) + einfo "Symlink $1 skipped (special case)" + ;; + mf) + einfo "Symlink $1 -> $2 skipped (texlive-core takes care of it)" + ;; + *) + if [ $1 = $2 ]; + then + einfo "Symlink $1 -> $2 skipped" + elif [ -e "${ED}/usr/bin/$1" -o -L "${ED}/usr/bin/$1" ]; + then + einfo "Symlink $1 skipped (file exists)" + else + einfo "Making symlink from $1 to $2" + dosym $2 /usr/bin/$1 + fi + ;; + esac + shift; shift; + done +} + +# @FUNCTION: etexlinks +# @USAGE: < file > +# @DESCRIPTION: +# Mimic texlinks on a fmtutil format file +# +# $1 has to be a fmtutil format file like fmtutil.cnf +# etexlinks foo will install the symlinks that texlinks --cnffile foo would have +# created. We cannot use texlinks with portage as it is not DESTDIR aware. +# (It would not fail but will not create the symlinks if the target is not in +# the same dir as the source) +# Also, as this eclass must not depend on a tex distribution to be installed we +# cannot use texlinks from here. + +etexlinks() { + # Install symlinks from formats to engines + texlive-common_do_symlinks $(sed '/^[ ]*#/d; /^[ ]*$/d' "$1" | awk '{print $1, $2}') +} + +# @FUNCTION: dobin_texmf_scripts +# @USAGE: < file1 file2 ... > +# @DESCRIPTION: +# Symlinks a script from the texmf tree to /usr/bin. Requires permissions to be +# correctly set for the file that it will point to. + +dobin_texmf_scripts() { + while [ $# -gt 0 ] ; do + local trg=$(basename ${1} | sed 's,\.[^/]*$,,' | tr '[:upper:]' '[:lower:]') + einfo "Installing ${1} as ${trg} bin wrapper" + [ -x "${ED}/usr/share/${1}" ] || die "Trying to install a non existing or non executable symlink to /usr/bin: ${1}" + dosym ../share/${1} /usr/bin/${trg} || die "failed to install ${1} as $trg" + shift + done +} + +# @FUNCTION: etexmf-update +# @USAGE: In ebuilds' pkg_postinst and pkg_postrm phases +# @DESCRIPTION: +# Runs texmf-update if it is available and prints a warning otherwise. This +# function helps in factorizing some code. + +etexmf-update() { + if has_version 'app-text/texlive-core' ; then + if [ "$ROOT" = "/" ] && [ -x "${EPREFIX}"/usr/sbin/texmf-update ] ; then + "${EPREFIX}"/usr/sbin/texmf-update + else + ewarn "Cannot run texmf-update for some reason." + ewarn "Your texmf tree might be inconsistent with your configuration" + ewarn "Please try to figure what has happened" + fi + fi +} + +# @FUNCTION: efmtutil-sys +# @USAGE: In ebuilds' pkg_postinst to force a rebuild of TeX formats. +# @DESCRIPTION: +# Runs fmtutil-sys if it is available and prints a warning otherwise. This +# function helps in factorizing some code. + +efmtutil-sys() { + if has_version 'app-text/texlive-core' ; then + if [ "$ROOT" = "/" ] && [ -x "${EPREFIX}"/usr/bin/fmtutil-sys ] ; then + einfo "Rebuilding formats" + "${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null + else + ewarn "Cannot run fmtutil-sys for some reason." + ewarn "Your formats might be inconsistent with your installed ${PN} version" + ewarn "Please try to figure what has happened" + fi + fi +} diff -uNr a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass --- a/eclass/texlive-module.eclass false +++ b/eclass/texlive-module.eclass 84a56c1e0763d5a2613fd98743285296306667100d8a0f8ba6a55057526a5d24ffd75795d984c9fcbbc0f61c325c29175b78a3602504b5d0d77575d96e5553e7 @@ -0,0 +1,400 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: texlive-module.eclass +# @MAINTAINER: +# tex@gentoo.org +# @AUTHOR: +# Original Author: Alexis Ballier <aballier@gentoo.org> +# @BLURB: Provide generic install functions so that modular texlive's texmf ebuild will only have to inherit this eclass +# @DESCRIPTION: +# Purpose: Provide generic install functions so that modular texlive's texmf ebuilds will +# only have to inherit this eclass. +# Ebuilds have to provide TEXLIVE_MODULE_CONTENTS variable that contains the list +# of packages that it will install. (See below) +# +# For TeX Live versions prior to 2009, the ebuild was supposed to unpack the +# texmf and texmf-dist directories to ${WORKDIR} (which is what the default +# src_unpack does). +# Starting from TeX Live 2009, the eclass provides a src_unpack function taking +# care of unpacking and relocating the files that need it. +# +# It inherits texlive-common. Patching is supported via the PATCHES +# bash array. + +# @ECLASS-VARIABLE: TEXLIVE_MODULE_CONTENTS +# @DESCRIPTION: +# The list of packages that will be installed. This variable will be expanded to +# SRC_URI: +# foo -> texlive-module-foo-${PV}.tar.xz + +# @ECLASS-VARIABLE: TEXLIVE_MODULE_DOC_CONTENTS +# @DESCRIPTION: +# The list of packages that will be installed if the doc useflag is enabled. +# Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS. + +# @ECLASS-VARIABLE: TEXLIVE_MODULE_SRC_CONTENTS +# @DESCRIPTION: +# The list of packages that will be installed if the source useflag is enabled. +# Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS. + +# @ECLASS-VARIABLE: TEXLIVE_MODULE_BINSCRIPTS +# @DESCRIPTION: +# A space separated list of files that are in fact scripts installed in the +# texmf tree and that we want to be available directly. They will be installed in +# /usr/bin. + +# @ECLASS-VARIABLE: TEXLIVE_MODULE_BINLINKS +# @DESCRIPTION: +# A space separated list of links to add for BINSCRIPTS. +# The systax is: foo:bar to create a symlink bar -> foo. + +# @ECLASS-VARIABLE: TL_PV +# @DESCRIPTION: +# Normally the module's PV reflects the TeXLive release it belongs to. +# If this is not the case, TL_PV takes the version number for the +# needed app-text/texlive-core. + +# @ECLASS-VARIABLE: TL_MODULE_INFORMATION +# @DESCRIPTION: +# Information to display about the package. +# e.g. for enabling/disabling a feature + +# @ECLASS-VARIABLE: PATCHES +# @DESCRIPTION: +# Array variable specifying any patches to be applied. + +inherit texlive-common eutils + +case "${EAPI:-0}" in + 0|1|2) + die "EAPI='${EAPI}' is not supported anymore" + ;; + *) + ;; +esac + +HOMEPAGE="http://www.tug.org/texlive/" + +COMMON_DEPEND=">=app-text/texlive-core-${TL_PV:-${PV}}" + +IUSE="source" + +# Starting from TeX Live 2009, upstream provides .tar.xz modules. +PKGEXT=tar.xz +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils" + +for i in ${TEXLIVE_MODULE_CONTENTS}; do + SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}" +done + +# Forge doc SRC_URI +[ -n "${PN##*documentation*}" ] && [ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && SRC_URI="${SRC_URI} doc? (" +for i in ${TEXLIVE_MODULE_DOC_CONTENTS}; do + SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}" +done +[ -n "${PN##*documentation*}" ] && [ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && SRC_URI="${SRC_URI} )" + +# Forge source SRC_URI +if [ -n "${TEXLIVE_MODULE_SRC_CONTENTS}" ] ; then + SRC_URI="${SRC_URI} source? (" + for i in ${TEXLIVE_MODULE_SRC_CONTENTS}; do + SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}" + done + SRC_URI="${SRC_URI} )" +fi + +RDEPEND="${COMMON_DEPEND}" + +[ -z "${PN##*documentation*}" ] || IUSE="${IUSE} doc" + +# @ECLASS-VARIABLE: TEXLIVE_MODULE_OPTIONAL_ENGINE +# @DESCRIPTION: +# A space separated list of Tex engines that can be made optional. +# e.g. "luatex luajittex" + +if [ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ] ; then + for engine in ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ; do + IUSE="${IUSE} +${engine}" + done +fi + +S="${WORKDIR}" + +# @FUNCTION: texlive-module_src_unpack +# @DESCRIPTION: +# Only for TeX Live 2009 and later. +# After unpacking, the files that need to be relocated are moved accordingly. + +RELOC_TARGET=texmf-dist + +texlive-module_src_unpack() { + unpack ${A} + + grep RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist" + { for i in $(<"${T}/reloclist"); do dirname $i; done; } | uniq > "${T}/dirlist" + for i in $(<"${T}/dirlist"); do + [ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}" + done + for i in $(<"${T}/reloclist"); do + mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})" + done +} + +# @FUNCTION: texlive-module_src_prepare +# @DESCRIPTION: +# Apply patches from the PATCHES array and user patches, if any. + +texlive-module_src_prepare() { + [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}" + epatch_user +} + +# @FUNCTION: texlive-module_add_format +# @DESCRIPTION: +# Creates/appends to a format.${PN}.cnf file for fmtutil. +# It parses the AddFormat directive of tlpobj files to create it. +# This will make fmtutil generate the formats when asked and allow the remaining +# src_compile phase to build the formats. + +texlive-module_add_format() { + local name engine mode patterns options + eval $@ + einfo "Appending to format.${PN}.cnf for $@" + [ -d texmf-dist/fmtutil ] || mkdir -p texmf-dist/fmtutil + [ -f texmf-dist/fmtutil/format.${PN}.cnf ] || { echo "# Generated for ${PN} by texlive-module.eclass" > texmf-dist/fmtutil/format.${PN}.cnf; } + [ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ] && has ${engine} ${TEXLIVE_MODULE_OPTIONAL_ENGINE} && use !${engine} && mode="disabled" + if [ "${mode}" = "disabled" ]; then + printf "#! " >> texmf-dist/fmtutil/format.${PN}.cnf + fi + [ -z "${patterns}" ] && patterns="-" + printf "${name}\t${engine}\t${patterns}\t${options}\n" >> texmf-dist/fmtutil/format.${PN}.cnf +} + +# @FUNCTION: texlive-module_make_language_def_lines +# @DESCRIPTION: +# Creates a language.${PN}.def entry to put in /etc/texmf/language.def.d. +# It parses the AddHyphen directive of tlpobj files to create it. + +texlive-module_make_language_def_lines() { + local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial + eval $@ + einfo "Generating language.def entry for $@" + [ -z "$lefthyphenmin" ] && lefthyphenmin="2" + [ -z "$righthyphenmin" ] && righthyphenmin="3" + echo "\\addlanguage{$name}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" + if [ -n "$synonyms" ] ; then + for i in $(echo $synonyms | tr ',' ' ') ; do + einfo "Generating language.def synonym $i for $@" + echo "\\addlanguage{$i}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" + done + fi +} + +# @FUNCTION: texlive-module_make_language_dat_lines +# @DESCRIPTION: +# Creates a language.${PN}.dat entry to put in /etc/texmf/language.dat.d. +# It parses the AddHyphen directive of tlpobj files to create it. + +texlive-module_make_language_dat_lines() { + local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial + eval $@ + einfo "Generating language.dat entry for $@" + echo "$name $file" >> "${S}/language.${PN}.dat" + if [ -n "$synonyms" ] ; then + for i in $(echo $synonyms | tr ',' ' ') ; do + einfo "Generating language.dat synonym $i for $@" + echo "=$i" >> "${S}/language.${PN}.dat" + done + fi +} + +# @FUNCTION: texlive-module_synonyms_to_language_lua_line +# @DESCRIPTION: +# Helper function for texlive-module_make_language_lua_lines to generate a +# correctly formatted synonyms entry for language.dat.lua. + +texlive-module_synonyms_to_language_lua_line() { + local prev="" + for i in $(echo $@ | tr ',' ' ') ; do + printf "${prev} '%s'" $i + prev="," + done +} + +# @FUNCTION: texlive-module_make_language_lua_lines +# @DESCRIPTION: +# Only valid for TeXLive 2010 and later. +# Creates a language.${PN}.dat.lua entry to put in +# /etc/texmf/language.dat.lua.d. +# It parses the AddHyphen directive of tlpobj files to create it. + +texlive-module_make_language_lua_lines() { + local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial + local dest="${S}/language.${PN}.dat.lua" + eval $@ + [ -z "$lefthyphenmin" ] && lefthyphenmin="2" + [ -z "$righthyphenmin" ] && righthyphenmin="3" + einfo "Generating language.dat.lua entry for $@" + printf "\t['%s'] = {\n" "$name" >> "$dest" + printf "\t\tloader = '%s',\n" "$file" >> "$dest" + printf "\t\tlefthyphenmin = %s,\n\t\trighthyphenmin = %s,\n" "$lefthyphenmin" "$righthyphenmin" >> "$dest" + printf "\t\tsynonyms = {%s },\n" "$(texlive-module_synonyms_to_language_lua_line "$synonyms")" >> "$dest" + [ -n "$file_patterns" ] && printf "\t\tpatterns = '%s',\n" "$file_patterns" >> "$dest" + [ -n "$file_exceptions" ] && printf "\t\thyphenation = '%s',\n" "$file_exceptions" >> "$dest" + [ -n "$luaspecial" ] && printf "\t\tspecial = '%s',\n" "$luaspecial" >> "$dest" + printf "\t},\n" >> "$dest" +} + +# @FUNCTION: texlive-module_src_compile +# @DESCRIPTION: +# exported function: +# Generates the config files that are to be installed in /etc/texmf; +# texmf-update script will take care of merging the different config files for +# different packages in a single one used by the whole tex installation. +# +# Once the config files are generated, we build the format files using fmtutil +# (provided by texlive-core). The compiled format files will be sent to +# texmf-var/web2c, like fmtutil defaults to but with some trick to stay in the +# sandbox. + +texlive-module_src_compile() { + # Generate config files from the tlpobj files provided by TeX Live 2008 and + # later + for i in "${S}"/tlpkg/tlpobj/*; + do + grep '^execute ' "${i}" | sed -e 's/^execute //' | tr ' \t' '##' >> "${T}/jobs" + done + + for i in $(<"${T}/jobs"); + do + j="$(echo $i | tr '#' ' ')" + command=${j%% *} + parameter=${j#* } + case "${command}" in + addMap) + echo "Map ${parameter}" >> "${S}/${PN}.cfg";; + addMixedMap) + echo "MixedMap ${parameter}" >> "${S}/${PN}.cfg";; + addKanjiMap) + echo "KanjiMap ${parameter}" >> "${S}/${PN}.cfg";; + addDvipsMap) + echo "p +${parameter}" >> "${S}/${PN}-config.ps";; + addDvipdfmMap) + echo "f ${parameter}" >> "${S}/${PN}-config";; + AddHyphen) + texlive-module_make_language_def_lines "$parameter" + texlive-module_make_language_dat_lines "$parameter" + texlive-module_make_language_lua_lines "$parameter" + ;; + AddFormat) + texlive-module_add_format "$parameter";; + BuildFormat) + einfo "Format $parameter already built.";; + BuildLanguageDat) + einfo "Language file $parameter already generated.";; + *) + die "No rule to proccess ${command}. Please file a bug." + esac + done + + # Build format files + for i in texmf-dist/fmtutil/format*.cnf; do + if [ -f "${i}" ]; then + einfo "Building format ${i}" + [ -d texmf-var ] || mkdir texmf-var + [ -d texmf-var/web2c ] || mkdir texmf-var/web2c + VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}/texmf:${S}/texmf-dist:${S}/texmf-var"\ + env -u TEXINPUTS fmtutil --cnffile "${i}" --fmtdir "${S}/texmf-var/web2c" --all\ + || die "failed to build format ${i}" + fi + done + + # Delete ls-R files, these should not be created but better be certain they + # do not end up being installed. + find . -name 'ls-R' -delete +} + +# @FUNCTION: texlive-module_src_install +# @DESCRIPTION: +# exported function: +# Installs texmf and config files to the system. + +texlive-module_src_install() { + for i in texmf-dist/fmtutil/format*.cnf; do + [ -f "${i}" ] && etexlinks "${i}" + done + + dodir /usr/share + if [ -z "${PN##*documentation*}" ] || use doc; then + [ -d texmf-doc ] && cp -pR texmf-doc "${ED}/usr/share/" + else + [ -d texmf/doc ] && rm -rf texmf/doc + [ -d texmf-dist/doc ] && rm -rf texmf-dist/doc + fi + + [ -d texmf ] && cp -pR texmf "${ED}/usr/share/" + [ -d texmf-dist ] && cp -pR texmf-dist "${ED}/usr/share/" + [ -d tlpkg ] && use source && cp -pR tlpkg "${ED}/usr/share/" + + insinto /var/lib/texmf + [ -d texmf-var ] && doins -r texmf-var/* + + insinto /etc/texmf/updmap.d + [ -f "${S}/${PN}.cfg" ] && doins "${S}/${PN}.cfg" + insinto /etc/texmf/dvips.d + [ -f "${S}/${PN}-config.ps" ] && doins "${S}/${PN}-config.ps" + insinto /etc/texmf/dvipdfm/config + [ -f "${S}/${PN}-config" ] && doins "${S}/${PN}-config" + + if [ -f "${S}/language.${PN}.def" ] ; then + insinto /etc/texmf/language.def.d + doins "${S}/language.${PN}.def" + fi + + if [ -f "${S}/language.${PN}.dat" ] ; then + insinto /etc/texmf/language.dat.d + doins "${S}/language.${PN}.dat" + fi + + if [ -f "${S}/language.${PN}.dat.lua" ] ; then + insinto /etc/texmf/language.dat.lua.d + doins "${S}/language.${PN}.dat.lua" + fi + + [ -n "${TEXLIVE_MODULE_BINSCRIPTS}" ] && dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS} + if [ -n "${TEXLIVE_MODULE_BINLINKS}" ] ; then + for i in ${TEXLIVE_MODULE_BINLINKS} ; do + [ -f "${ED}/usr/bin/${i%:*}" ] || die "Trying to install an invalid BINLINK. This should not happen. Please file a bug." + dosym ${i%:*} /usr/bin/${i#*:} + done + fi + + texlive-common_handle_config_files + TEXMF_PATH=${TEXMF_DIST_PATH} texlive-common_handle_config_files +} + +# @FUNCTION: texlive-module_pkg_postinst +# @DESCRIPTION: +# exported function: +# Run texmf-update to ensure the tex installation is consistent with the +# installed texmf trees. + +texlive-module_pkg_postinst() { + etexmf-update + [ -n "${TL_MODULE_INFORMATION}" ] && elog "${TL_MODULE_INFORMATION}" +} + +# @FUNCTION: texlive-module_pkg_postrm +# @DESCRIPTION: +# exported function: +# Run texmf-update to ensure the tex installation is consistent with the +# installed texmf trees. + +texlive-module_pkg_postrm() { + etexmf-update +} + +EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install \ + pkg_postinst pkg_postrm diff -uNr a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass --- a/eclass/tmpfiles.eclass false +++ b/eclass/tmpfiles.eclass e5241dd962d45211def2634050b1b1f9a99dc75f2620285ddf5dfb03d4d620996fa63f6b64f903ccf25bfdf252ea8213650343bb1b91c40d8dfd8e1b613ed042 @@ -0,0 +1,136 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: tmpfiles.eclass +# @MAINTAINER: +# Gentoo systemd project <systemd@gentoo.org> +# William Hubbs <williamh@gentoo.org> +# @AUTHOR: +# Mike Gilbert <floppym@gentoo.org> +# William Hubbs <williamh@gentoo.org> +# @BLURB: Functions related to tmpfiles.d files +# @DESCRIPTION: +# This eclass provides functionality related to installing and +# creating volatile and temporary files based on configuration files$and +# locations defined at this URL: +# +# https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html +# +# The dotmpfiles and newtmpfiles functions are used to install +# configuration files into /usr/lib/tmpfiles.d, then in pkg_postinst, +# the tmpfiles_process function must be called to process the newly +# installed tmpfiles.d entries. +# +# The tmpfiles.d files can be used by service managers to recreate/clean +# up temporary directories on boot or periodically. Additionally, +# the pkg_postinst() call ensures that the directories are created +# on systems that do not support tmpfiles.d natively, without a need +# for explicit fallback. +# +# @EXAMPLE: +# Typical usage of this eclass: +# +# @CODE +# EAPI=6 +# inherit tmpfiles +# +# ... +# +# src_install() { +# ... +# dotmpfiles "${FILESDIR}"/file1.conf "${FILESDIR}"/file2.conf +# newtmpfiles "${FILESDIR}"/file3.conf-${PV} file3.conf +# ... +# } +# +# pkg_postinst() { +# ... +# tmpfiles_process file1.conf file2.conf file3.conf +# ... +# } +# +# @CODE + +if [[ -z ${TMPFILES_ECLASS} ]]; then +TMPFILES_ECLASS=1 + +case "${EAPI}" in +5|6) ;; +*) die "API is undefined for EAPI ${EAPI}" ;; +esac + +RDEPEND="virtual/tmpfiles" + +# @FUNCTION: dotmpfiles +# @USAGE: dotmpfiles <tmpfiles.d_file> ... +# @DESCRIPTION: +# Install one or more tmpfiles.d files into /usr/lib/tmpfiles.d. +dotmpfiles() { + debug-print-function "${FUNCNAME}" "$@" + + local f + for f; do + if [[ ${f} != *.conf ]]; then + die "tmpfiles.d files must end with .conf" + fi + done + + ( + insinto /usr/lib/tmpfiles.d + doins "$@" + ) +} + +# @FUNCTION: newtmpfiles +# @USAGE: newtmpfiles <old-name> <new-name>.conf +# @DESCRIPTION: +# Install a tmpfiles.d file in /usr/lib/tmpfiles.d under a new name. +newtmpfiles() { + debug-print-function "${FUNCNAME}" "$@" + + if [[ $2 != *.conf ]]; then + die "tmpfiles.d files must end with .conf" + fi + + ( + insinto /usr/lib/tmpfiles.d + newins "$@" + ) +} + +# @FUNCTION: tmpfiles_process +# @USAGE: tmpfiles_process <filename> <filename> ... +# @DESCRIPTION: +# Call a tmpfiles.d implementation to create new volatile and temporary +# files and directories. +tmpfiles_process() { + debug-print-function "${FUNCNAME}" "$@" + + [[ ${EBUILD_PHASE} == postinst ]] || die "${FUNCNAME}: Only valid in pkg_postinst" + [[ ${#} -gt 0 ]] || die "${FUNCNAME}: Must specify at least one filename" + + # Only process tmpfiles for the currently running system + if [[ ${ROOT} != / ]]; then + ewarn "Warning: tmpfiles.d not processed on ROOT != /. If you do not use" + ewarn "a service manager supporting tmpfiles.d, you need to run" + ewarn "the following command after booting (or chroot-ing with all" + ewarn "appropriate filesystems mounted) into the ROOT:" + ewarn + ewarn " tmpfiles --create" + ewarn + ewarn "Failure to do so may result in missing runtime directories" + ewarn "and failures to run programs or start services." + return + fi + + if type systemd-tmpfiles &> /dev/null; then + systemd-tmpfiles --create "$@" + elif type tmpfiles &> /dev/null; then + tmpfiles --create "$@" + fi + if [[ $? -ne 0 ]]; then + ewarn "The tmpfiles processor exited with a non-zero exit code" + fi +} + +fi diff -uNr a/eclass/toolchain-autoconf.eclass b/eclass/toolchain-autoconf.eclass --- a/eclass/toolchain-autoconf.eclass false +++ b/eclass/toolchain-autoconf.eclass 0b886e728ff0a72d15133899caf7d86959ea2a186ccb71633c6fd1520b0657b00c85348ffc41bf8dd54dd0adf916671b6505c2c04461bda7fd9ddb31cd061e0b @@ -0,0 +1,78 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: toolchain-autoconf.eclass +# @MAINTAINER: +# <base-system@gentoo.org> +# @BLURB: Common code for sys-devel/autoconf ebuilds +# @DESCRIPTION: +# This eclass contains the common phase functions migrated from +# sys-devel/autoconf eblits. + +case ${EAPI:-0} in + [0-5]) + die "${ECLASS} is banned in EAPI ${EAPI:-0}" + ;; + 6) + ;; + *) + die "Unknown EAPI ${EAPI:-0}" + ;; +esac + +if [[ -z ${_TOOLCHAIN_AUTOCONF_ECLASS} ]]; then + +EXPORT_FUNCTIONS src_prepare src_configure src_install + +toolchain-autoconf_src_prepare() { + find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + || die + default +} + +toolchain-autoconf_src_configure() { + # Disable Emacs in the build system since it is in a separate package. + export EMACS=no + econf --program-suffix="-${PV}" || die + # econf updates config.{sub,guess} which forces the manpages + # to be regenerated which we dont want to do #146621 + touch man/*.1 +} + +# slot the info pages. do this w/out munging the source so we don't have +# to depend on texinfo to regen things. #464146 (among others) +slot_info_pages() { + [[ ${SLOT} == "0" ]] && return + + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir || die + + # Rewrite all the references to other pages. + # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. + # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. + local p pages=( *.info ) args=() + for p in "${pages[@]/%.info}" ; do + args+=( + -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" + -e "s:(${p}):(${p}-${SLOT}):g" + ) + done + sed -i "${args[@]}" * || die + + # Rewrite all the file references, and rename them in the process. + local f d + for f in * ; do + d=${f/.info/-${SLOT}.info} + mv "${f}" "${d}" || die + sed -i -e "s:${f}:${d}:g" * || die + done + + popd >/dev/null || die +} + +toolchain-autoconf_src_install() { + default + slot_info_pages +} + +_TOOLCHAIN_AUTOCONF_ECLASS=1 +fi diff -uNr a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass --- a/eclass/toolchain-binutils.eclass false +++ b/eclass/toolchain-binutils.eclass c053b1cc6a75ba1c0332356caee51016c7c6bc02d2f2b93722a94271dc7007afd2750acba0257b8d9fb46cecd24ac7540092622d615c3722ca90a8ae68b4a83a @@ -0,0 +1,515 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# Maintainer: Toolchain Ninjas <toolchain@gentoo.org> +# +# We install binutils into CTARGET-VERSION specific directories. This lets +# us easily merge multiple versions for multiple targets (if we wish) and +# then switch the versions on the fly (with `binutils-config`). +# +# binutils-9999 -> live git +# binutils-9999_preYYMMDD -> nightly snapshot date YYMMDD +# binutils-# -> normal release + +if [[ -n ${BINUTILS_TYPE} ]] ; then + BTYPE=${BINUTILS_TYPE} +else + case ${PV} in + 9999) BTYPE="git";; + 9999_pre*) BTYPE="snap";; + *.*.90) BTYPE="snap";; + *.*.*.*.*) BTYPE="hjlu";; + *) BTYPE="rel";; + esac +fi + +case ${BTYPE} in +git) + BVER="git" + EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git" + inherit git-2 + ;; +snap) + BVER=${PV/9999_pre} + ;; +*) + BVER=${BINUTILS_VER:-${PV}} + ;; +esac + +inherit eutils libtool flag-o-matic gnuconfig multilib versionator unpacker +case ${EAPI:-0} in +0|1) + EXPORT_FUNCTIONS src_unpack src_compile src_test src_install pkg_postinst pkg_postrm ;; +2|3|4|5) + EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm ;; +*) die "unsupported EAPI ${EAPI}" ;; +esac + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="https://sourceware.org/binutils/" + +case ${BTYPE} in + git) SRC_URI="" ;; + snap) + SRC_URI="ftp://gcc.gnu.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2 + ftp://sourceware.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2" ;; + hjlu) + SRC_URI="mirror://kernel/linux/devel/binutils/binutils-${BVER}.tar." + version_is_at_least 2.21.51.0.5 && SRC_URI+="xz" || SRC_URI+="bz2" ;; + rel) SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.bz2" ;; +esac +add_src_uri() { + [[ -z $2 ]] && return + local a=$1 + if version_is_at_least 2.22.52.0.2 ; then + a+=".xz" + else + a+=".bz2" + fi + set -- mirror://gentoo https://dev.gentoo.org/~vapier/dist https://dev.gentoo.org/~tamiko/distfiles https://dev.gentoo.org/~dilfridge/distfiles + SRC_URI="${SRC_URI} ${@/%//${a}}" +} +PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}} +add_src_uri binutils-${PATCH_BINUTILS_VER}-patches-${PATCHVER}.tar ${PATCHVER} +add_src_uri binutils-${PATCH_BINUTILS_VER}-uclibc-patches-${UCLIBC_PATCHVER}.tar ${UCLIBC_PATCHVER} +add_src_uri elf2flt-${ELF2FLT_VER}.tar ${ELF2FLT_VER} + +if version_is_at_least 2.18 ; then + LICENSE="|| ( GPL-3 LGPL-3 )" +else + LICENSE="|| ( GPL-2 LGPL-2 )" +fi +IUSE="cxx multitarget nls static-libs test vanilla" +if version_is_at_least 2.19 && ! version_is_at_least 2.26 ; then + IUSE+=" zlib" +fi +SLOT="${BVER}" + +RDEPEND=">=sys-devel/binutils-config-3" +if in_iuse zlib ; then + RDEPEND+=" zlib? ( sys-libs/zlib )" +elif version_is_at_least 2.26 ; then + RDEPEND+=" sys-libs/zlib" +fi +DEPEND="${RDEPEND} + test? ( dev-util/dejagnu ) + nls? ( sys-devel/gettext ) + sys-devel/flex + virtual/yacc" +if is_cross ; then + # The build assumes the host has libiberty and such when cross-compiling + # its build tools. We should probably make binutils itself build a local + # copy to use, but until then, be lazy. + DEPEND+=" >=sys-libs/binutils-libs-${PV}" +fi + +S=${WORKDIR}/binutils +case ${BVER} in +git) ;; +*) S=${S}-${BVER} ;; +esac + +LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER} +INCPATH=${LIBPATH}/include +DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER} +MY_BUILDDIR=${WORKDIR}/build +if is_cross ; then + BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER} +else + BINPATH=/usr/${CTARGET}/binutils-bin/${BVER} +fi + +tc-binutils_unpack() { + case ${BTYPE} in + git) git-2_src_unpack ;; + *) unpacker ${A} ;; + esac + mkdir -p "${MY_BUILDDIR}" + [[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip +} + +# In case the ebuild wants to add a few of their own. +PATCHES=() + +tc-binutils_apply_patches() { + cd "${S}" + + if ! use vanilla ; then + if [[ -n ${PATCHVER} ]] ; then + EPATCH_SOURCE=${WORKDIR}/patch + if [[ ${CTARGET} == mips* ]] ; then + # remove gnu-hash for mips (bug #233233) + EPATCH_EXCLUDE+=" 77_all_generate-gnu-hash.patch" + fi + [[ -n $(ls "${EPATCH_SOURCE}"/*.bz2 2>/dev/null) ]] \ + && EPATCH_SUFFIX="patch.bz2" \ + || EPATCH_SUFFIX="patch" + epatch + fi + if [[ -n ${UCLIBC_PATCHVER} ]] ; then + EPATCH_SOURCE=${WORKDIR}/uclibc-patches + [[ -n $(ls "${EPATCH_SOURCE}"/*.bz2 2>/dev/null) ]] \ + && EPATCH_SUFFIX="patch.bz2" \ + || EPATCH_SUFFIX="patch" + EPATCH_MULTI_MSG="Applying uClibc fixes ..." \ + epatch + elif [[ ${CTARGET} == *-uclibc* ]] ; then + # starting with binutils-2.17.50.0.17, we no longer need + # uClibc patchsets :D + if grep -qs 'linux-gnu' "${S}"/ltconfig ; then + die "sorry, but this binutils doesn't yet support uClibc :(" + fi + fi + [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}" + + # Make sure our explicit libdir paths don't get clobbered. #562460 + sed -i \ + -e 's:@bfdlibdir@:@libdir@:g' \ + -e 's:@bfdincludedir@:@includedir@:g' \ + {bfd,opcodes}/Makefile.in || die + + epatch_user + fi + + # fix locale issues if possible #122216 + if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then + einfo "Fixing misc issues in configure files" + for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do + ebegin " Updating ${f/${S}\/}" + patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \ + || eerror "Please file a bug about this" + eend $? + done + fi + # fix conflicts with newer glibc #272594 + if [[ -e libiberty/testsuite/test-demangle.c ]] ; then + sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c + fi + + # Fix po Makefile generators + sed -i \ + -e '/^datadir = /s:$(prefix)/@DATADIRNAME@:@datadir@:' \ + -e '/^gnulocaledir = /s:$(prefix)/share:$(datadir):' \ + */po/Make-in || die "sed po's failed" + + # Run misc portage update scripts + gnuconfig_update + elibtoolize --portage --no-uclibc +} + +toolchain-binutils_src_unpack() { + tc-binutils_unpack + case ${EAPI:-0} in + 0|1) toolchain-binutils_src_prepare ;; + esac +} + +toolchain-binutils_src_prepare() { + tc-binutils_apply_patches +} + +_eprefix_init() { + has "${EAPI:-0}" 0 1 2 && ED=${D} EPREFIX= EROOT=${ROOT} +} + +# Intended for ebuilds to override to set their own versioning information. +toolchain-binutils_bugurl() { + printf "https://bugs.gentoo.org/" +} +toolchain-binutils_pkgversion() { + printf "Gentoo ${BVER}" + [[ -n ${PATCHVER} ]] && printf " p${PATCHVER}" +} + +toolchain-binutils_src_configure() { + _eprefix_init + + # make sure we filter $LINGUAS so that only ones that + # actually work make it through #42033 + strip-linguas -u */po + + # keep things sane + strip-flags + + local x + echo + for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do + einfo "$(printf '%10s' ${x}:) ${!x}" + done + echo + + cd "${MY_BUILDDIR}" + local myconf=() + + # enable gold if available (installed as ld.gold) + if use cxx ; then + if grep -q 'enable-gold=default' "${S}"/configure ; then + myconf+=( --enable-gold ) + # old ways - remove when 2.21 is stable + elif grep -q 'enable-gold=both/ld' "${S}"/configure ; then + myconf+=( --enable-gold=both/ld ) + elif grep -q 'enable-gold=both/bfd' "${S}"/configure ; then + myconf+=( --enable-gold=both/bfd ) + fi + if grep -q -e '--enable-plugins' "${S}"/ld/configure ; then + myconf+=( --enable-plugins ) + fi + fi + + use nls \ + && myconf+=( --without-included-gettext ) \ + || myconf+=( --disable-nls ) + + if in_iuse zlib ; then + # older versions did not have an explicit configure flag + export ac_cv_search_zlibVersion=$(usex zlib -lz no) + myconf+=( $(use_with zlib) ) + elif version_is_at_least 2.26 ; then + myconf+=( --with-system-zlib ) + fi + + # For bi-arch systems, enable a 64bit bfd. This matches + # the bi-arch logic in toolchain.eclass. #446946 + # We used to do it for everyone, but it's slow on 32bit arches. #438522 + case $(tc-arch) in + ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;; + esac + + use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) + [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) + is_cross && myconf+=( + --with-sysroot="${EPREFIX}"/usr/${CTARGET} + --enable-poison-system-directories + ) + + # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+ + # on everyone in alpha (for now), we'll just enable it when possible + has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt ) + has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt ) + + myconf+=( + --prefix="${EPREFIX}"/usr + --host=${CHOST} + --target=${CTARGET} + --datadir="${EPREFIX}"${DATAPATH} + --infodir="${EPREFIX}"${DATAPATH}/info + --mandir="${EPREFIX}"${DATAPATH}/man + --bindir="${EPREFIX}"${BINPATH} + --libdir="${EPREFIX}"${LIBPATH} + --libexecdir="${EPREFIX}"${LIBPATH} + --includedir="${EPREFIX}"${INCPATH} + --enable-obsolete + --enable-shared + --enable-threads + # Newer versions (>=2.27) offer a configure flag now. + --enable-relro + # Newer versions (>=2.24) make this an explicit option. #497268 + --enable-install-libiberty + --disable-werror + --with-bugurl="$(toolchain-binutils_bugurl)" + --with-pkgversion="$(toolchain-binutils_pkgversion)" + $(use_enable static-libs static) + ${EXTRA_ECONF} + # Disable modules that are in a combined binutils/gdb tree. #490566 + --disable-{gdb,libdecnumber,readline,sim} + # Strip out broken static link flags. + # https://gcc.gnu.org/PR56750 + --without-stage1-ldflags + ) + echo ./configure "${myconf[@]}" + "${S}"/configure "${myconf[@]}" || die + + # Prevent makeinfo from running in releases. It may not always be + # installed, and older binutils may fail with newer texinfo. + # Besides, we never patch the doc files anyways, so regenerating + # in the first place is useless. #193364 + # For older versions, it means we don't get any info pages at all. + # Oh well, tough luck. #294617 + if [[ -e ${S}/gas/doc/as.info ]] || ! version_is_at_least 2.24 ; then + sed -i \ + -e '/^MAKEINFO/s:=.*:= true:' \ + Makefile || die + fi +} + +toolchain-binutils_src_compile() { + _eprefix_init + case ${EAPI:-0} in + 0|1) toolchain-binutils_src_configure ;; + esac + + cd "${MY_BUILDDIR}" + emake all || die "emake failed" + + # only build info pages if we user wants them, and if + # we have makeinfo (may not exist when we bootstrap) + if type -p makeinfo > /dev/null ; then + emake info || die "make info failed" + fi + # we nuke the manpages when we're left with junk + # (like when we bootstrap, no perl -> no manpages) + find . -name '*.1' -a -size 0 -delete + + # elf2flt only works on some arches / targets + if [[ -n ${ELF2FLT_VER} ]] && [[ ${CTARGET} == *linux* || ${CTARGET} == *-elf* ]] ; then + cd "${WORKDIR}"/elf2flt-${ELF2FLT_VER} + + local x supported_arches=$(sed -n '/defined(TARGET_/{s:^.*TARGET_::;s:)::;p}' elf2flt.c | sort -u) + for x in ${supported_arches} UNSUPPORTED ; do + [[ ${CTARGET} == ${x}* ]] && break + done + + if [[ ${x} != "UNSUPPORTED" ]] ; then + append-flags -I"${S}"/include + myconf+=( + --with-bfd-include-dir=${MY_BUILDDIR}/bfd + --with-libbfd=${MY_BUILDDIR}/bfd/libbfd.a + --with-libiberty=${MY_BUILDDIR}/libiberty/libiberty.a + --with-binutils-ldscript-dir="${EPREFIX}"${LIBPATH}/ldscripts + ) + echo ./configure "${myconf[@]}" + ./configure "${myconf[@]}" || die + emake || die "make elf2flt failed" + fi + fi +} + +toolchain-binutils_src_test() { + cd "${MY_BUILDDIR}" + emake -k check || die "check failed :(" +} + +toolchain-binutils_src_install() { + _eprefix_init + local x d + + cd "${MY_BUILDDIR}" + emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install || die + rm -rf "${ED}"/${LIBPATH}/bin + use static-libs || find "${ED}" -name '*.la' -delete + + # Newer versions of binutils get fancy with ${LIBPATH} #171905 + cd "${ED}"/${LIBPATH} + for d in ../* ; do + [[ ${d} == ../${BVER} ]] && continue + mv ${d}/* . || die + rmdir ${d} || die + done + + # Now we collect everything intp the proper SLOT-ed dirs + # When something is built to cross-compile, it installs into + # /usr/$CHOST/ by default ... we have to 'fix' that :) + if is_cross ; then + cd "${ED}"/${BINPATH} + for x in * ; do + mv ${x} ${x/${CTARGET}-} + done + + if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then + mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH} + mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/ + rm -r "${ED}"/usr/${CHOST}/{include,lib} + fi + fi + insinto ${INCPATH} + local libiberty_headers=( + # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir. + demangle.h + dyn-string.h + fibheap.h + hashtab.h + libiberty.h + objalloc.h + splay-tree.h + ) + doins "${libiberty_headers[@]/#/${S}/include/}" || die + if [[ -d ${ED}/${LIBPATH}/lib ]] ; then + mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ + rm -r "${ED}"/${LIBPATH}/lib + fi + + # Insert elf2flt where appropriate + if [[ -x ${WORKDIR}/elf2flt-${ELF2FLT_VER}/elf2flt ]] ; then + cd "${WORKDIR}"/elf2flt-${ELF2FLT_VER} + insinto ${LIBPATH}/ldscripts + doins elf2flt.ld || die "doins elf2flt.ld failed" + exeinto ${BINPATH} + doexe elf2flt flthdr || die "doexe elf2flt flthdr failed" + mv "${ED}"/${BINPATH}/{ld,ld.real} || die + newexe ld-elf2flt ld || die "doexe ld-elf2flt failed" + newdoc README README.elf2flt + fi + + # Generate an env.d entry for this binutils + insinto /etc/env.d/binutils + cat <<-EOF > "${T}"/env.d + TARGET="${CTARGET}" + VER="${BVER}" + LIBPATH="${EPREFIX}${LIBPATH}" + EOF + newins "${T}"/env.d ${CTARGET}-${BVER} + + # Handle documentation + if ! is_cross ; then + cd "${S}" + dodoc README + docinto bfd + dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO + docinto binutils + dodoc binutils/ChangeLog binutils/NEWS binutils/README + docinto gas + dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* + docinto gprof + dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl + docinto ld + dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO + docinto libiberty + dodoc libiberty/ChangeLog* libiberty/README + docinto opcodes + dodoc opcodes/ChangeLog* + fi + # Remove shared info pages + rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} + # Trim all empty dirs + find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null +} + +toolchain-binutils_pkg_postinst() { + _eprefix_init + # Make sure this ${CTARGET} has a binutils version selected + [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 + binutils-config ${CTARGET}-${BVER} +} + +toolchain-binutils_pkg_postrm() { + _eprefix_init + local current_profile=$(binutils-config -c ${CTARGET}) + + # If no other versions exist, then uninstall for this + # target ... otherwise, switch to the newest version + # Note: only do this if this version is unmerged. We + # rerun binutils-config if this is a remerge, as + # we want the mtimes on the symlinks updated (if + # it is the same as the current selected profile) + if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then + local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') + choice=${choice//$'\n'/ } + choice=${choice/* } + if [[ -z ${choice} ]] ; then + binutils-config -u ${CTARGET} + else + binutils-config ${choice} + fi + elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then + binutils-config ${CTARGET}-${BVER} + fi +} diff -uNr a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass --- a/eclass/toolchain-funcs.eclass false +++ b/eclass/toolchain-funcs.eclass 07103723c9b40892b5d18e0470e8bfb50f4e3d55b7f53a0816f1ef4e46f604fbf983abf89dbfed2ef5537e7b18fa1541e48631be1bec9f52654b1aaf8f383374 @@ -0,0 +1,1030 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: toolchain-funcs.eclass +# @MAINTAINER: +# Toolchain Ninjas <toolchain@gentoo.org> +# @BLURB: functions to query common info about the toolchain +# @DESCRIPTION: +# The toolchain-funcs aims to provide a complete suite of functions +# for gleaning useful information about the toolchain and to simplify +# ugly things like cross-compiling and multilib. All of this is done +# in such a way that you can rely on the function always returning +# something sane. + +if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then +_TOOLCHAIN_FUNCS_ECLASS=1 + +inherit multilib + +# tc-getPROG <VAR [search vars]> <default> [tuple] +_tc-getPROG() { + local tuple=$1 + local v var vars=$2 + local prog=( $3 ) + + var=${vars%% *} + for v in ${vars} ; do + if [[ -n ${!v} ]] ; then + export ${var}="${!v}" + echo "${!v}" + return 0 + fi + done + + local search= + [[ -n $4 ]] && search=$(type -p $4-${prog[0]}) + [[ -z ${search} && -n ${!tuple} ]] && search=$(type -p ${!tuple}-${prog[0]}) + [[ -n ${search} ]] && prog[0]=${search##*/} + + export ${var}="${prog[*]}" + echo "${!var}" +} +tc-getBUILD_PROG() { + local vars="BUILD_$1 $1_FOR_BUILD HOST$1" + # respect host vars if not cross-compiling + # https://bugs.gentoo.org/630282 + tc-is-cross-compiler || vars+=" $1" + _tc-getPROG CBUILD "${vars}" "${@:2}" +} +tc-getPROG() { _tc-getPROG CHOST "$@"; } + +# @FUNCTION: tc-getAR +# @USAGE: [toolchain prefix] +# @RETURN: name of the archiver +tc-getAR() { tc-getPROG AR ar "$@"; } +# @FUNCTION: tc-getAS +# @USAGE: [toolchain prefix] +# @RETURN: name of the assembler +tc-getAS() { tc-getPROG AS as "$@"; } +# @FUNCTION: tc-getCC +# @USAGE: [toolchain prefix] +# @RETURN: name of the C compiler +tc-getCC() { tc-getPROG CC gcc "$@"; } +# @FUNCTION: tc-getCPP +# @USAGE: [toolchain prefix] +# @RETURN: name of the C preprocessor +tc-getCPP() { tc-getPROG CPP "${CC:-gcc} -E" "$@"; } +# @FUNCTION: tc-getCXX +# @USAGE: [toolchain prefix] +# @RETURN: name of the C++ compiler +tc-getCXX() { tc-getPROG CXX g++ "$@"; } +# @FUNCTION: tc-getLD +# @USAGE: [toolchain prefix] +# @RETURN: name of the linker +tc-getLD() { tc-getPROG LD ld "$@"; } +# @FUNCTION: tc-getSTRIP +# @USAGE: [toolchain prefix] +# @RETURN: name of the strip program +tc-getSTRIP() { tc-getPROG STRIP strip "$@"; } +# @FUNCTION: tc-getNM +# @USAGE: [toolchain prefix] +# @RETURN: name of the symbol/object thingy +tc-getNM() { tc-getPROG NM nm "$@"; } +# @FUNCTION: tc-getRANLIB +# @USAGE: [toolchain prefix] +# @RETURN: name of the archiver indexer +tc-getRANLIB() { tc-getPROG RANLIB ranlib "$@"; } +# @FUNCTION: tc-getOBJCOPY +# @USAGE: [toolchain prefix] +# @RETURN: name of the object copier +tc-getOBJCOPY() { tc-getPROG OBJCOPY objcopy "$@"; } +# @FUNCTION: tc-getOBJDUMP +# @USAGE: [toolchain prefix] +# @RETURN: name of the object dumper +tc-getOBJDUMP() { tc-getPROG OBJDUMP objdump "$@"; } +# @FUNCTION: tc-getF77 +# @USAGE: [toolchain prefix] +# @RETURN: name of the Fortran 77 compiler +tc-getF77() { tc-getPROG F77 gfortran "$@"; } +# @FUNCTION: tc-getFC +# @USAGE: [toolchain prefix] +# @RETURN: name of the Fortran 90 compiler +tc-getFC() { tc-getPROG FC gfortran "$@"; } +# @FUNCTION: tc-getGCJ +# @USAGE: [toolchain prefix] +# @RETURN: name of the java compiler +tc-getGCJ() { tc-getPROG GCJ gcj "$@"; } +# @FUNCTION: tc-getGO +# @USAGE: [toolchain prefix] +# @RETURN: name of the Go compiler +tc-getGO() { tc-getPROG GO gccgo "$@"; } +# @FUNCTION: tc-getPKG_CONFIG +# @USAGE: [toolchain prefix] +# @RETURN: name of the pkg-config tool +tc-getPKG_CONFIG() { tc-getPROG PKG_CONFIG pkg-config "$@"; } +# @FUNCTION: tc-getRC +# @USAGE: [toolchain prefix] +# @RETURN: name of the Windows resource compiler +tc-getRC() { tc-getPROG RC windres "$@"; } +# @FUNCTION: tc-getDLLWRAP +# @USAGE: [toolchain prefix] +# @RETURN: name of the Windows dllwrap utility +tc-getDLLWRAP() { tc-getPROG DLLWRAP dllwrap "$@"; } + +# @FUNCTION: tc-getBUILD_AR +# @USAGE: [toolchain prefix] +# @RETURN: name of the archiver for building binaries to run on the build machine +tc-getBUILD_AR() { tc-getBUILD_PROG AR ar "$@"; } +# @FUNCTION: tc-getBUILD_AS +# @USAGE: [toolchain prefix] +# @RETURN: name of the assembler for building binaries to run on the build machine +tc-getBUILD_AS() { tc-getBUILD_PROG AS as "$@"; } +# @FUNCTION: tc-getBUILD_CC +# @USAGE: [toolchain prefix] +# @RETURN: name of the C compiler for building binaries to run on the build machine +tc-getBUILD_CC() { tc-getBUILD_PROG CC gcc "$@"; } +# @FUNCTION: tc-getBUILD_CPP +# @USAGE: [toolchain prefix] +# @RETURN: name of the C preprocessor for building binaries to run on the build machine +tc-getBUILD_CPP() { tc-getBUILD_PROG CPP "$(tc-getBUILD_CC) -E" "$@"; } +# @FUNCTION: tc-getBUILD_CXX +# @USAGE: [toolchain prefix] +# @RETURN: name of the C++ compiler for building binaries to run on the build machine +tc-getBUILD_CXX() { tc-getBUILD_PROG CXX g++ "$@"; } +# @FUNCTION: tc-getBUILD_LD +# @USAGE: [toolchain prefix] +# @RETURN: name of the linker for building binaries to run on the build machine +tc-getBUILD_LD() { tc-getBUILD_PROG LD ld "$@"; } +# @FUNCTION: tc-getBUILD_STRIP +# @USAGE: [toolchain prefix] +# @RETURN: name of the strip program for building binaries to run on the build machine +tc-getBUILD_STRIP() { tc-getBUILD_PROG STRIP strip "$@"; } +# @FUNCTION: tc-getBUILD_NM +# @USAGE: [toolchain prefix] +# @RETURN: name of the symbol/object thingy for building binaries to run on the build machine +tc-getBUILD_NM() { tc-getBUILD_PROG NM nm "$@"; } +# @FUNCTION: tc-getBUILD_RANLIB +# @USAGE: [toolchain prefix] +# @RETURN: name of the archiver indexer for building binaries to run on the build machine +tc-getBUILD_RANLIB() { tc-getBUILD_PROG RANLIB ranlib "$@"; } +# @FUNCTION: tc-getBUILD_OBJCOPY +# @USAGE: [toolchain prefix] +# @RETURN: name of the object copier for building binaries to run on the build machine +tc-getBUILD_OBJCOPY() { tc-getBUILD_PROG OBJCOPY objcopy "$@"; } +# @FUNCTION: tc-getBUILD_PKG_CONFIG +# @USAGE: [toolchain prefix] +# @RETURN: name of the pkg-config tool for building binaries to run on the build machine +tc-getBUILD_PKG_CONFIG() { tc-getBUILD_PROG PKG_CONFIG pkg-config "$@"; } + +# @FUNCTION: tc-export +# @USAGE: <list of toolchain variables> +# @DESCRIPTION: +# Quick way to export a bunch of compiler vars at once. +tc-export() { + local var + for var in "$@" ; do + [[ $(type -t "tc-get${var}") != "function" ]] && die "tc-export: invalid export variable '${var}'" + "tc-get${var}" > /dev/null + done +} + +# @FUNCTION: tc-is-cross-compiler +# @RETURN: Shell true if we are using a cross-compiler, shell false otherwise +tc-is-cross-compiler() { + [[ ${CBUILD:-${CHOST}} != ${CHOST} ]] +} + +# @FUNCTION: tc-is-softfloat +# @DESCRIPTION: +# See if this toolchain is a softfloat based one. +# @CODE +# The possible return values: +# - only: the target is always softfloat (never had fpu) +# - yes: the target should support softfloat +# - softfp: (arm specific) the target should use hardfloat insns, but softfloat calling convention +# - no: the target doesn't support softfloat +# @CODE +# This allows us to react differently where packages accept +# softfloat flags in the case where support is optional, but +# rejects softfloat flags where the target always lacks an fpu. +tc-is-softfloat() { + local CTARGET=${CTARGET:-${CHOST}} + case ${CTARGET} in + bfin*|h8300*) + echo "only" ;; + *) + if [[ ${CTARGET//_/-} == *-softfloat-* ]] ; then + echo "yes" + elif [[ ${CTARGET//_/-} == *-softfp-* ]] ; then + echo "softfp" + else + echo "no" + fi + ;; + esac +} + +# @FUNCTION: tc-is-static-only +# @DESCRIPTION: +# Return shell true if the target does not support shared libs, shell false +# otherwise. +tc-is-static-only() { + local host=${CTARGET:-${CHOST}} + + # *MiNT doesn't have shared libraries, only platform so far + [[ ${host} == *-mint* ]] +} + +# @FUNCTION: tc-stack-grows-down +# @DESCRIPTION: +# Return shell true if the stack grows down. This is the default behavior +# for the vast majority of systems out there and usually projects shouldn't +# care about such internal details. +tc-stack-grows-down() { + # List the few that grow up. + case ${ARCH} in + hppa|metag) return 1 ;; + esac + + # Assume all others grow down. + return 0 +} + +# @FUNCTION: tc-export_build_env +# @USAGE: [compiler variables] +# @DESCRIPTION: +# Export common build related compiler settings. +tc-export_build_env() { + tc-export "$@" + if tc-is-cross-compiler; then + # Some build envs will initialize vars like: + # : ${BUILD_LDFLAGS:-${LDFLAGS}} + # So make sure all variables are non-empty. #526734 + : ${BUILD_CFLAGS:=-O1 -pipe} + : ${BUILD_CXXFLAGS:=-O1 -pipe} + : ${BUILD_CPPFLAGS:= } + : ${BUILD_LDFLAGS:= } + else + # https://bugs.gentoo.org/654424 + : ${BUILD_CFLAGS:=${CFLAGS}} + : ${BUILD_CXXFLAGS:=${CXXFLAGS}} + : ${BUILD_CPPFLAGS:=${CPPFLAGS}} + : ${BUILD_LDFLAGS:=${LDFLAGS}} + fi + export BUILD_{C,CXX,CPP,LD}FLAGS + + # Some packages use XXX_FOR_BUILD. + local v + for v in BUILD_{C,CXX,CPP,LD}FLAGS ; do + export ${v#BUILD_}_FOR_BUILD="${!v}" + done +} + +# @FUNCTION: tc-env_build +# @USAGE: <command> [command args] +# @INTERNAL +# @DESCRIPTION: +# Setup the compile environment to the build tools and then execute the +# specified command. We use tc-getBUILD_XX here so that we work with +# all of the semi-[non-]standard env vars like $BUILD_CC which often +# the target build system does not check. +tc-env_build() { + tc-export_build_env + CFLAGS=${BUILD_CFLAGS} \ + CXXFLAGS=${BUILD_CXXFLAGS} \ + CPPFLAGS=${BUILD_CPPFLAGS} \ + LDFLAGS=${BUILD_LDFLAGS} \ + AR=$(tc-getBUILD_AR) \ + AS=$(tc-getBUILD_AS) \ + CC=$(tc-getBUILD_CC) \ + CPP=$(tc-getBUILD_CPP) \ + CXX=$(tc-getBUILD_CXX) \ + LD=$(tc-getBUILD_LD) \ + NM=$(tc-getBUILD_NM) \ + PKG_CONFIG=$(tc-getBUILD_PKG_CONFIG) \ + RANLIB=$(tc-getBUILD_RANLIB) \ + "$@" +} + +# @FUNCTION: econf_build +# @USAGE: [econf flags] +# @DESCRIPTION: +# Sometimes we need to locally build up some tools to run on CBUILD because +# the package has helper utils which are compiled+executed when compiling. +# This won't work when cross-compiling as the CHOST is set to a target which +# we cannot natively execute. +# +# For example, the python package will build up a local python binary using +# a portable build system (configure+make), but then use that binary to run +# local python scripts to build up other components of the overall python. +# We cannot rely on the python binary in $PATH as that often times will be +# a different version, or not even installed in the first place. Instead, +# we compile the code in a different directory to run on CBUILD, and then +# use that binary when compiling the main package to run on CHOST. +# +# For example, with newer EAPIs, you'd do something like: +# @CODE +# src_configure() { +# ECONF_SOURCE=${S} +# if tc-is-cross-compiler ; then +# mkdir "${WORKDIR}"/${CBUILD} +# pushd "${WORKDIR}"/${CBUILD} >/dev/null +# econf_build --disable-some-unused-stuff +# popd >/dev/null +# fi +# ... normal build paths ... +# } +# src_compile() { +# if tc-is-cross-compiler ; then +# pushd "${WORKDIR}"/${CBUILD} >/dev/null +# emake one-or-two-build-tools +# ln/mv build-tools to normal build paths in ${S}/ +# popd >/dev/null +# fi +# ... normal build paths ... +# } +# @CODE +econf_build() { + local CBUILD=${CBUILD:-${CHOST}} + tc-env_build econf --build=${CBUILD} --host=${CBUILD} "$@" +} + +# @FUNCTION: tc-ld-is-gold +# @USAGE: [toolchain prefix] +# @DESCRIPTION: +# Return true if the current linker is set to gold. +tc-ld-is-gold() { + local out + + # First check the linker directly. + out=$($(tc-getLD "$@") --version 2>&1) + if [[ ${out} == *"GNU gold"* ]] ; then + return 0 + fi + + # Then see if they're selecting gold via compiler flags. + # Note: We're assuming they're using LDFLAGS to hold the + # options and not CFLAGS/CXXFLAGS. + local base="${T}/test-tc-gold" + cat <<-EOF > "${base}.c" + int main() { return 0; } + EOF + out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1) + rm -f "${base}"* + if [[ ${out} == *"GNU gold"* ]] ; then + return 0 + fi + + # No gold here! + return 1 +} + +# @FUNCTION: tc-ld-disable-gold +# @USAGE: [toolchain prefix] +# @DESCRIPTION: +# If the gold linker is currently selected, configure the compilation +# settings so that we use the older bfd linker instead. +tc-ld-disable-gold() { + if ! tc-ld-is-gold "$@" ; then + # They aren't using gold, so nothing to do! + return + fi + + ewarn "Forcing usage of the BFD linker instead of GOLD" + + # Set up LD to point directly to bfd if it's available. + # We need to extract the first word in case there are flags appended + # to its value (like multilib). #545218 + local ld=$(tc-getLD "$@") + local bfd_ld="${ld%% *}.bfd" + local path_ld=$(which "${bfd_ld}" 2>/dev/null) + [[ -e ${path_ld} ]] && export LD=${bfd_ld} + + # Set up LDFLAGS to select gold based on the gcc / clang version. + local fallback="true" + if tc-is-gcc; then + local major=$(gcc-major-version "$@") + local minor=$(gcc-minor-version "$@") + if [[ ${major} -gt 4 ]] || [[ ${major} -eq 4 && ${minor} -ge 8 ]]; then + # gcc-4.8+ supports -fuse-ld directly. + export LDFLAGS="${LDFLAGS} -fuse-ld=bfd" + fallback="false" + fi + elif tc-is-clang; then + local major=$(clang-major-version "$@") + local minor=$(clang-minor-version "$@") + if [[ ${major} -gt 3 ]] || [[ ${major} -eq 3 && ${minor} -ge 5 ]]; then + # clang-3.5+ supports -fuse-ld directly. + export LDFLAGS="${LDFLAGS} -fuse-ld=bfd" + fallback="false" + fi + fi + if [[ ${fallback} == "true" ]] ; then + # <=gcc-4.7 and <=clang-3.4 require some coercion. + # Only works if bfd exists. + if [[ -e ${path_ld} ]] ; then + local d="${T}/bfd-linker" + mkdir -p "${d}" + ln -sf "${path_ld}" "${d}"/ld + export LDFLAGS="${LDFLAGS} -B${d}" + else + die "unable to locate a BFD linker to bypass gold" + fi + fi +} + +# @FUNCTION: tc-has-openmp +# @USAGE: [toolchain prefix] +# @DESCRIPTION: +# See if the toolchain supports OpenMP. +tc-has-openmp() { + local base="${T}/test-tc-openmp" + cat <<-EOF > "${base}.c" + #include <omp.h> + int main() { + int nthreads, tid, ret = 0; + #pragma omp parallel private(nthreads, tid) + { + tid = omp_get_thread_num(); + nthreads = omp_get_num_threads(); ret += tid + nthreads; + } + return ret; + } + EOF + $(tc-getCC "$@") -fopenmp "${base}.c" -o "${base}" >&/dev/null + local ret=$? + rm -f "${base}"* + return ${ret} +} + +# @FUNCTION: tc-check-openmp +# @DESCRIPTION: +# Test for OpenMP support with the current compiler and error out with +# a clear error message, telling the user how to rectify the missing +# OpenMP support that has been requested by the ebuild. Using this function +# to test for OpenMP support should be preferred over tc-has-openmp and +# printing a custom message, as it presents a uniform interface to the user. +tc-check-openmp() { + if ! tc-has-openmp; then + eerror "Your current compiler does not support OpenMP!" + + if tc-is-gcc; then + eerror "Enable OpenMP support by building sys-devel/gcc with USE=\"openmp\"." + elif tc-is-clang; then + eerror "OpenMP support in sys-devel/clang is provided by sys-libs/libomp." + fi + + die "Active compiler does not have required support for OpenMP" + fi +} + +# @FUNCTION: tc-has-tls +# @USAGE: [-s|-c|-l] [toolchain prefix] +# @DESCRIPTION: +# See if the toolchain supports thread local storage (TLS). Use -s to test the +# compiler, -c to also test the assembler, and -l to also test the C library +# (the default). +tc-has-tls() { + local base="${T}/test-tc-tls" + cat <<-EOF > "${base}.c" + int foo(int *i) { + static __thread int j = 0; + return *i ? j : *i; + } + EOF + local flags + case $1 in + -s) flags="-S";; + -c) flags="-c";; + -l) ;; + -*) die "Usage: tc-has-tls [-c|-l] [toolchain prefix]";; + esac + : ${flags:=-fPIC -shared -Wl,-z,defs} + [[ $1 == -* ]] && shift + $(tc-getCC "$@") ${flags} "${base}.c" -o "${base}" >&/dev/null + local ret=$? + rm -f "${base}"* + return ${ret} +} + + +# Parse information from CBUILD/CHOST/CTARGET rather than +# use external variables from the profile. +tc-ninja_magic_to_arch() { +ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } + + local type=$1 + local host=$2 + [[ -z ${host} ]] && host=${CTARGET:-${CHOST}} + + case ${host} in + aarch64*) echo arm64;; + alpha*) echo alpha;; + arm*) echo arm;; + avr*) ninj avr32 avr;; + bfin*) ninj blackfin bfin;; + c6x*) echo c6x;; + cris*) echo cris;; + frv*) echo frv;; + hexagon*) echo hexagon;; + hppa*) ninj parisc hppa;; + i?86*) + # Starting with linux-2.6.24, the 'x86_64' and 'i386' + # trees have been unified into 'x86'. + # FreeBSD still uses i386 + if [[ ${type} == "kern" && ${host} == *freebsd* ]] ; then + echo i386 + else + echo x86 + fi + ;; + ia64*) echo ia64;; + m68*) echo m68k;; + metag*) echo metag;; + microblaze*) echo microblaze;; + mips*) echo mips;; + nios2*) echo nios2;; + nios*) echo nios;; + or1k|or32*) echo openrisc;; + powerpc*) + # Starting with linux-2.6.15, the 'ppc' and 'ppc64' trees + # have been unified into simply 'powerpc', but until 2.6.16, + # ppc32 is still using ARCH="ppc" as default + if [[ ${type} == "kern" ]] ; then + echo powerpc + elif [[ ${host} == powerpc64* ]] ; then + echo ppc64 + else + echo ppc + fi + ;; + riscv*) echo riscv;; + s390*) echo s390;; + score*) echo score;; + sh64*) ninj sh64 sh;; + sh*) echo sh;; + sparc64*) ninj sparc64 sparc;; + sparc*) [[ ${PROFILE_ARCH} == "sparc64" ]] \ + && ninj sparc64 sparc \ + || echo sparc + ;; + tile*) echo tile;; + vax*) echo vax;; + x86_64*freebsd*) echo amd64;; + x86_64*) + # Starting with linux-2.6.24, the 'x86_64' and 'i386' + # trees have been unified into 'x86'. + if [[ ${type} == "kern" ]] ; then + echo x86 + else + echo amd64 + fi + ;; + xtensa*) echo xtensa;; + + # since our usage of tc-arch is largely concerned with + # normalizing inputs for testing ${CTARGET}, let's filter + # other cross targets (mingw and such) into the unknown. + *) echo unknown;; + esac +} +# @FUNCTION: tc-arch-kernel +# @USAGE: [toolchain prefix] +# @RETURN: name of the kernel arch according to the compiler target +tc-arch-kernel() { + tc-ninja_magic_to_arch kern "$@" +} +# @FUNCTION: tc-arch +# @USAGE: [toolchain prefix] +# @RETURN: name of the portage arch according to the compiler target +tc-arch() { + tc-ninja_magic_to_arch portage "$@" +} + +tc-endian() { + local host=$1 + [[ -z ${host} ]] && host=${CTARGET:-${CHOST}} + host=${host%%-*} + + case ${host} in + aarch64*be) echo big;; + aarch64) echo little;; + alpha*) echo little;; + arm*b*) echo big;; + arm*) echo little;; + cris*) echo little;; + hppa*) echo big;; + i?86*) echo little;; + ia64*) echo little;; + m68*) echo big;; + mips*l*) echo little;; + mips*) echo big;; + powerpc*le) echo little;; + powerpc*) echo big;; + s390*) echo big;; + sh*b*) echo big;; + sh*) echo little;; + sparc*) echo big;; + x86_64*) echo little;; + *) echo wtf;; + esac +} + +# @FUNCTION: tc-get-compiler-type +# @RETURN: keyword identifying the compiler: gcc, clang, pathcc, unknown +tc-get-compiler-type() { + local code=' +#if defined(__PATHSCALE__) + HAVE_PATHCC +#elif defined(__clang__) + HAVE_CLANG +#elif defined(__GNUC__) + HAVE_GCC +#endif +' + local res=$($(tc-getCPP "$@") -E -P - <<<"${code}") + + case ${res} in + *HAVE_PATHCC*) echo pathcc;; + *HAVE_CLANG*) echo clang;; + *HAVE_GCC*) echo gcc;; + *) echo unknown;; + esac +} + +# @FUNCTION: tc-is-gcc +# @RETURN: Shell true if the current compiler is GCC, false otherwise. +tc-is-gcc() { + [[ $(tc-get-compiler-type) == gcc ]] +} + +# @FUNCTION: tc-is-clang +# @RETURN: Shell true if the current compiler is clang, false otherwise. +tc-is-clang() { + [[ $(tc-get-compiler-type) == clang ]] +} + +# Internal func. The first argument is the version info to expand. +# Query the preprocessor to improve compatibility across different +# compilers rather than maintaining a --version flag matrix. #335943 +_gcc_fullversion() { + local ver="$1"; shift + set -- $($(tc-getCPP "$@") -E -P - <<<"__GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__") + eval echo "$ver" +} + +# @FUNCTION: gcc-fullversion +# @RETURN: compiler version (major.minor.micro: [3.4.6]) +gcc-fullversion() { + _gcc_fullversion '$1.$2.$3' "$@" +} +# @FUNCTION: gcc-version +# @RETURN: compiler version (major.minor: [3.4].6) +gcc-version() { + _gcc_fullversion '$1.$2' "$@" +} +# @FUNCTION: gcc-major-version +# @RETURN: major compiler version (major: [3].4.6) +gcc-major-version() { + _gcc_fullversion '$1' "$@" +} +# @FUNCTION: gcc-minor-version +# @RETURN: minor compiler version (minor: 3.[4].6) +gcc-minor-version() { + _gcc_fullversion '$2' "$@" +} +# @FUNCTION: gcc-micro-version +# @RETURN: micro compiler version (micro: 3.4.[6]) +gcc-micro-version() { + _gcc_fullversion '$3' "$@" +} + +# Internal func. Based on _gcc_fullversion() above. +_clang_fullversion() { + local ver="$1"; shift + set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__") + eval echo "$ver" +} + +# @FUNCTION: clang-fullversion +# @RETURN: compiler version (major.minor.micro: [3.4.6]) +clang-fullversion() { + _clang_fullversion '$1.$2.$3' "$@" +} +# @FUNCTION: clang-version +# @RETURN: compiler version (major.minor: [3.4].6) +clang-version() { + _clang_fullversion '$1.$2' "$@" +} +# @FUNCTION: clang-major-version +# @RETURN: major compiler version (major: [3].4.6) +clang-major-version() { + _clang_fullversion '$1' "$@" +} +# @FUNCTION: clang-minor-version +# @RETURN: minor compiler version (minor: 3.[4].6) +clang-minor-version() { + _clang_fullversion '$2' "$@" +} +# @FUNCTION: clang-micro-version +# @RETURN: micro compiler version (micro: 3.4.[6]) +clang-micro-version() { + _clang_fullversion '$3' "$@" +} + +# Returns the installation directory - internal toolchain +# function for use by _gcc-specs-exists (for flag-o-matic). +_gcc-install-dir() { + echo "$(LC_ALL=C $(tc-getCC) -print-search-dirs 2> /dev/null |\ + awk '$1=="install:" {print $2}')" +} +# Returns true if the indicated specs file exists - internal toolchain +# function for use by flag-o-matic. +_gcc-specs-exists() { + [[ -f $(_gcc-install-dir)/$1 ]] +} + +# Returns requested gcc specs directive unprocessed - for used by +# gcc-specs-directive() +# Note; later specs normally overwrite earlier ones; however if a later +# spec starts with '+' then it appends. +# gcc -dumpspecs is parsed first, followed by files listed by "gcc -v" +# as "Reading <file>", in order. Strictly speaking, if there's a +# $(gcc_install_dir)/specs, the built-in specs aren't read, however by +# the same token anything from 'gcc -dumpspecs' is overridden by +# the contents of $(gcc_install_dir)/specs so the result is the +# same either way. +_gcc-specs-directive_raw() { + local cc=$(tc-getCC) + local specfiles=$(LC_ALL=C ${cc} -v 2>&1 | awk '$1=="Reading" {print $NF}') + ${cc} -dumpspecs 2> /dev/null | cat - ${specfiles} | awk -v directive=$1 \ +'BEGIN { pspec=""; spec=""; outside=1 } +$1=="*"directive":" { pspec=spec; spec=""; outside=0; next } + outside || NF==0 || ( substr($1,1,1)=="*" && substr($1,length($1),1)==":" ) { outside=1; next } + spec=="" && substr($0,1,1)=="+" { spec=pspec " " substr($0,2); next } + { spec=spec $0 } +END { print spec }' + return 0 +} + +# Return the requested gcc specs directive, with all included +# specs expanded. +# Note, it does not check for inclusion loops, which cause it +# to never finish - but such loops are invalid for gcc and we're +# assuming gcc is operational. +gcc-specs-directive() { + local directive subdname subdirective + directive="$(_gcc-specs-directive_raw $1)" + while [[ ${directive} == *%$*$* ]]; do + subdname=${directive/*%$} + subdname=${subdname/$*} + subdirective="$(_gcc-specs-directive_raw ${subdname})" + directive="${directive//\%(${subdname})/${subdirective}}" + done + echo "${directive}" + return 0 +} + +# Returns true if gcc sets relro +gcc-specs-relro() { + local directive + directive=$(gcc-specs-directive link_command) + [[ "${directive/\{!norelro:}" != "${directive}" ]] +} +# Returns true if gcc sets now +gcc-specs-now() { + local directive + directive=$(gcc-specs-directive link_command) + [[ "${directive/\{!nonow:}" != "${directive}" ]] +} +# Returns true if gcc builds PIEs +gcc-specs-pie() { + local directive + directive=$(gcc-specs-directive cc1) + [[ "${directive/\{!nopie:}" != "${directive}" ]] +} +# Returns true if gcc builds with the stack protector +gcc-specs-ssp() { + local directive + directive=$(gcc-specs-directive cc1) + [[ "${directive/\{!fno-stack-protector:}" != "${directive}" ]] +} +# Returns true if gcc upgrades fstack-protector to fstack-protector-all +gcc-specs-ssp-to-all() { + local directive + directive=$(gcc-specs-directive cc1) + [[ "${directive/\{!fno-stack-protector-all:}" != "${directive}" ]] +} +# Returns true if gcc builds with fno-strict-overflow +gcc-specs-nostrict() { + local directive + directive=$(gcc-specs-directive cc1) + [[ "${directive/\{!fstrict-overflow:}" != "${directive}" ]] +} +# Returns true if gcc builds with fstack-check +gcc-specs-stack-check() { + local directive + directive=$(gcc-specs-directive cc1) + [[ "${directive/\{!fno-stack-check:}" != "${directive}" ]] +} + + +# @FUNCTION: tc-enables-pie +# @RETURN: Truth if the current compiler generates position-independent code (PIC) which can be linked into executables +# @DESCRIPTION: +# Return truth if the current compiler generates position-independent code (PIC) +# which can be linked into executables. +tc-enables-pie() { + local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null | grep '^true$' + #if defined(__PIE__) + true + #endif + EOF + )" + [[ ${ret} == true ]] +} + +# @FUNCTION: tc-enables-ssp +# @RETURN: Truth if the current compiler enables stack smashing protection (SSP) on at least minimal level +# @DESCRIPTION: +# Return truth if the current compiler enables stack smashing protection (SSP) +# on level corresponding to any of the following options: +# -fstack-protector +# -fstack-protector-strong +# -fstack-protector-all +tc-enables-ssp() { + local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null | grep '^true$' + #if defined(__SSP__) || defined(__SSP_STRONG__) || defined(__SSP_ALL__) + true + #endif + EOF + )" + [[ ${ret} == true ]] +} + +# @FUNCTION: tc-enables-ssp-strong +# @RETURN: Truth if the current compiler enables stack smashing protection (SSP) on at least middle level +# @DESCRIPTION: +# Return truth if the current compiler enables stack smashing protection (SSP) +# on level corresponding to any of the following options: +# -fstack-protector-strong +# -fstack-protector-all +tc-enables-ssp-strong() { + local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null | grep '^true$' + #if defined(__SSP_STRONG__) || defined(__SSP_ALL__) + true + #endif + EOF + )" + [[ ${ret} == true ]] +} + +# @FUNCTION: tc-enables-ssp-all +# @RETURN: Truth if the current compiler enables stack smashing protection (SSP) on maximal level +# @DESCRIPTION: +# Return truth if the current compiler enables stack smashing protection (SSP) +# on level corresponding to any of the following options: +# -fstack-protector-all +tc-enables-ssp-all() { + local ret="$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P - <<-EOF 2> /dev/null | grep '^true$' + #if defined(__SSP_ALL__) + true + #endif + EOF + )" + [[ ${ret} == true ]] +} + + +# @FUNCTION: gen_usr_ldscript +# @USAGE: [-a] <list of libs to create linker scripts for> +# @DESCRIPTION: +# This function generate linker scripts in /usr/lib for dynamic +# libs in /lib. This is to fix linking problems when you have +# the .so in /lib, and the .a in /usr/lib. What happens is that +# in some cases when linking dynamic, the .a in /usr/lib is used +# instead of the .so in /lib due to gcc/libtool tweaking ld's +# library search path. This causes many builds to fail. +# See bug #4411 for more info. +# +# Note that you should in general use the unversioned name of +# the library (libfoo.so), as ldconfig should usually update it +# correctly to point to the latest version of the library present. +gen_usr_ldscript() { + local lib libdir=$(get_libdir) output_format="" auto=false suffix=$(get_libname) + [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/ + + tc-is-static-only && return + + # We only care about stuffing / for the native ABI. #479448 + if [[ $(type -t multilib_is_native_abi) == "function" ]] ; then + multilib_is_native_abi || return 0 + fi + + # Eventually we'd like to get rid of this func completely #417451 + case ${CTARGET:-${CHOST}} in + *-darwin*) ;; + *-android*) return 0 ;; + *linux*|*-freebsd*|*-openbsd*|*-netbsd*) + use prefix && return 0 ;; + *) return 0 ;; + esac + + # Just make sure it exists + dodir /usr/${libdir} + + if [[ $1 == "-a" ]] ; then + auto=true + shift + dodir /${libdir} + fi + + # OUTPUT_FORMAT gives hints to the linker as to what binary format + # is referenced ... makes multilib saner + local flags=( ${CFLAGS} ${LDFLAGS} -Wl,--verbose ) + if $(tc-getLD) --version | grep -q 'GNU gold' ; then + # If they're using gold, manually invoke the old bfd. #487696 + local d="${T}/bfd-linker" + mkdir -p "${d}" + ln -sf $(which ${CHOST}-ld.bfd) "${d}"/ld + flags+=( -B"${d}" ) + fi + output_format=$($(tc-getCC) "${flags[@]}" 2>&1 | sed -n 's/^OUTPUT_FORMAT("$[^"]*$",.*/\1/p') + [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" + + for lib in "$@" ; do + local tlib + if ${auto} ; then + lib="lib${lib}${suffix}" + else + # Ensure /lib/${lib} exists to avoid dangling scripts/symlinks. + # This especially is for AIX where $(get_libname) can return ".a", + # so /lib/${lib} might be moved to /usr/lib/${lib} (by accident). + [[ -r ${ED}/${libdir}/${lib} ]] || continue + #TODO: better die here? + fi + + case ${CTARGET:-${CHOST}} in + *-darwin*) + if ${auto} ; then + tlib=$(scanmacho -qF'%S#F' "${ED}"/usr/${libdir}/${lib}) + else + tlib=$(scanmacho -qF'%S#F' "${ED}"/${libdir}/${lib}) + fi + [[ -z ${tlib} ]] && die "unable to read install_name from ${lib}" + tlib=${tlib##*/} + + if ${auto} ; then + mv "${ED}"/usr/${libdir}/${lib%${suffix}}.*${suffix#.} "${ED}"/${libdir}/ || die + # some install_names are funky: they encode a version + if [[ ${tlib} != ${lib%${suffix}}.*${suffix#.} ]] ; then + mv "${ED}"/usr/${libdir}/${tlib%${suffix}}.*${suffix#.} "${ED}"/${libdir}/ || die + fi + rm -f "${ED}"/${libdir}/${lib} + fi + + # Mach-O files have an id, which is like a soname, it tells how + # another object linking against this lib should reference it. + # Since we moved the lib from usr/lib into lib this reference is + # wrong. Hence, we update it here. We don't configure with + # libdir=/lib because that messes up libtool files. + # Make sure we don't lose the specific version, so just modify the + # existing install_name + if [[ ! -w "${ED}/${libdir}/${tlib}" ]] ; then + chmod u+w "${ED}${libdir}/${tlib}" # needed to write to it + local nowrite=yes + fi + install_name_tool \ + -id "${EPREFIX}"/${libdir}/${tlib} \ + "${ED}"/${libdir}/${tlib} || die "install_name_tool failed" + [[ -n ${nowrite} ]] && chmod u-w "${ED}${libdir}/${tlib}" + # Now as we don't use GNU binutils and our linker doesn't + # understand linker scripts, just create a symlink. + pushd "${ED}/usr/${libdir}" > /dev/null + ln -snf "../../${libdir}/${tlib}" "${lib}" + popd > /dev/null + ;; + *) + if ${auto} ; then + tlib=$(scanelf -qF'%S#F' "${ED}"/usr/${libdir}/${lib}) + [[ -z ${tlib} ]] && die "unable to read SONAME from ${lib}" + mv "${ED}"/usr/${libdir}/${lib}* "${ED}"/${libdir}/ || die + # some SONAMEs are funky: they encode a version before the .so + if [[ ${tlib} != ${lib}* ]] ; then + mv "${ED}"/usr/${libdir}/${tlib}* "${ED}"/${libdir}/ || die + fi + rm -f "${ED}"/${libdir}/${lib} + else + tlib=${lib} + fi + cat > "${ED}/usr/${libdir}/${lib}" <<-END_LDSCRIPT + /* GNU ld script + Since Gentoo has critical dynamic libraries in /lib, and the static versions + in /usr/lib, we need to have a "fake" dynamic lib in /usr/lib, otherwise we + run into linking problems. This "fake" dynamic lib is a linker script that + redirects the linker to the real lib. And yes, this works in the cross- + compiling scenario as the sysroot-ed linker will prepend the real path. + + See bug https://bugs.gentoo.org/4411 for more info. + */ + ${output_format} + GROUP ( ${EPREFIX}/${libdir}/${tlib} ) + END_LDSCRIPT + ;; + esac + fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}" + done +} + +fi diff -uNr a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass --- a/eclass/toolchain-glibc.eclass false +++ b/eclass/toolchain-glibc.eclass 270dcc94920a0970815e44f83f04a48aa59f60a972d4c1383d67e77da873f4b01796a18bfb9c01d73161d5295479dec0b3a9674c625325b3043dfd1415ff89c2 @@ -0,0 +1,1471 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: toolchain-glibc.eclass +# @MAINTAINER: +# <toolchain@gentoo.org> +# @BLURB: Common code for sys-libs/glibc ebuilds +# @DESCRIPTION: +# This eclass contains the common phase functions migrated from +# sys-libs/glibc eblits. + +if [[ -z ${_TOOLCHAIN_GLIBC_ECLASS} ]]; then + +inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig \ + multilib systemd unpacker multiprocessing prefix + +case ${EAPI:-0} in + 0|1|2|3) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test \ + src_install pkg_preinst pkg_postinst;; + 2|3) EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure \ + src_compile src_test src_install pkg_preinst pkg_postinst;; + 4|5) EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare \ + src_configure src_compile src_test src_install \ + pkg_preinst pkg_postinst;; + 6) EXPORT_FUNCTIONS pkg_pretend;; + *) die "Unsupported EAPI=${EAPI}";; +esac + +# == common == + +alt_prefix() { + is_crosscompile && echo /usr/${CTARGET} +} + +if [[ ${EAPI:-0} == [012] ]] ; then + : ${ED:=${D}} + : ${EROOT:=${ROOT}} +fi +# This indirection is for binpkgs. #523332 +_nonfatal() { nonfatal "$@" ; } +if [[ ${EAPI:-0} == [0123] ]] ; then + nonfatal() { "$@" ; } + _nonfatal() { "$@" ; } +fi + +# We need to be able to set alternative headers for +# compiling for non-native platform +# Will also become useful for testing kernel-headers without screwing up +# the whole system. +# note: intentionally undocumented. +alt_headers() { + echo ${ALT_HEADERS:=$(alt_prefix)/usr/include} +} +alt_build_headers() { + if [[ -z ${ALT_BUILD_HEADERS} ]] ; then + ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)" + if tc-is-cross-compiler ; then + ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers) + if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then + local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h') + ALT_BUILD_HEADERS=${header_path%/linux/version.h} + fi + fi + fi + echo "${ALT_BUILD_HEADERS}" +} + +alt_libdir() { + echo $(alt_prefix)/$(get_libdir) +} +alt_usrlibdir() { + echo $(alt_prefix)/usr/$(get_libdir) +} + +builddir() { + echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1" +} + +setup_target_flags() { + # This largely mucks with compiler flags. None of which should matter + # when building up just the headers. + just_headers && return 0 + + case $(tc-arch) in + x86) + # -march needed for #185404 #199334 + # TODO: When creating the first glibc cross-compile, this test will + # always fail as it does a full link which in turn requires glibc. + # Probably also applies when changing multilib profile settings (e.g. + # enabling x86 when the profile was amd64-only previously). + # We could change main to _start and pass -nostdlib here so that we + # only test the gcc code compilation. Or we could do a compile and + # then look for the symbol via scanelf. + if ! glibc_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then + local t=${CTARGET_OPT:-${CTARGET}} + t=${t%%-*} + filter-flags '-march=*' + export CFLAGS="-march=${t} ${CFLAGS}" + einfo "Auto adding -march=${t} to CFLAGS #185404" + fi + ;; + amd64) + # -march needed for #185404 #199334 + # Note: This test only matters when the x86 ABI is enabled, so we could + # optimize a bit and elide it. + # TODO: See cross-compile issues listed above for x86. + if ! glibc_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then + local t=${CTARGET_OPT:-${CTARGET}} + t=${t%%-*} + # Normally the target is x86_64-xxx, so turn that into the -march that + # gcc actually accepts. #528708 + [[ ${t} == "x86_64" ]] && t="x86-64" + filter-flags '-march=*' + # ugly, ugly, ugly. ugly. + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + export CFLAGS_x86="${CFLAGS_x86} -march=${t}" + einfo "Auto adding -march=${t} to CFLAGS_x86 #185404" + fi + ;; + mips) + # The mips abi cannot support the GNU style hashes. #233233 + filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both + ;; + sparc) + # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. + filter-flags "-fcall-used-g7" + append-flags "-fcall-used-g6" + + # If the CHOST is the basic one (e.g. not sparcv9-xxx already), + # try to pick a better one so glibc can use cpu-specific .S files. + # We key off the CFLAGS to get a good value. Also need to handle + # version skew. + # We can't force users to set their CHOST to their exact machine + # as many of these are not recognized by config.sub/gcc and such :(. + # Note: If the mcpu values don't scale, we might try probing CPP defines. + # Note: Should we factor in -Wa,-AvXXX flags too ? Or -mvis/etc... ? + + local cpu + case ${CTARGET} in + sparc64-*) + case $(get-flag mcpu) in + niagara[234]) + if version_is_at_least 2.8 ; then + cpu="sparc64v2" + elif version_is_at_least 2.4 ; then + cpu="sparc64v" + elif version_is_at_least 2.2.3 ; then + cpu="sparc64b" + fi + ;; + niagara) + if version_is_at_least 2.4 ; then + cpu="sparc64v" + elif version_is_at_least 2.2.3 ; then + cpu="sparc64b" + fi + ;; + ultrasparc3) + cpu="sparc64b" + ;; + *) + # We need to force at least v9a because the base build doesn't + # work with just v9. + # https://sourceware.org/bugzilla/show_bug.cgi?id=19477 + [[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a" + ;; + esac + ;; + sparc-*) + case $(get-flag mcpu) in + niagara[234]) + if version_is_at_least 2.8 ; then + cpu="sparcv9v2" + elif version_is_at_least 2.4 ; then + cpu="sparcv9v" + elif version_is_at_least 2.2.3 ; then + cpu="sparcv9b" + else + cpu="sparcv9" + fi + ;; + niagara) + if version_is_at_least 2.4 ; then + cpu="sparcv9v" + elif version_is_at_least 2.2.3 ; then + cpu="sparcv9b" + else + cpu="sparcv9" + fi + ;; + ultrasparc3) + cpu="sparcv9b" + ;; + v9|ultrasparc) + cpu="sparcv9" + ;; + v8|supersparc|hypersparc|leon|leon3) + cpu="sparcv8" + ;; + esac + ;; + esac + [[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}" + ;; + esac +} + +setup_flags() { + # Make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi + + # Store our CFLAGS because it's changed depending on which CTARGET + # we are building when pulling glibc on a multilib profile + CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} + CFLAGS=${CFLAGS_BASE} + CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}} + CXXFLAGS=${CXXFLAGS_BASE} + ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} + ASFLAGS=${ASFLAGS_BASE} + + # Over-zealous CFLAGS can often cause problems. What may work for one + # person may not work for another. To avoid a large influx of bugs + # relating to failed builds, we strip most CFLAGS out to ensure as few + # problems as possible. + strip-flags + strip-unsupported-flags + filter-flags -m32 -m64 -mabi=* + filter-ldflags -Wl,-rpath=* + + # Bug 492892. + filter-flags -frecord-gcc-switches + + unset CBUILD_OPT CTARGET_OPT + if use multilib ; then + CTARGET_OPT=$(get_abi_CTARGET) + [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) + fi + + setup_target_flags + + if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then + CBUILD_OPT=${CTARGET_OPT} + fi + + # Lock glibc at -O2 -- linuxthreads needs it and we want to be + # conservative here. -fno-strict-aliasing is to work around #155906 + filter-flags -O? + append-flags -O2 -fno-strict-aliasing + + # Can't build glibc itself with fortify code. Newer versions add + # this flag for us, so no need to do it manually. + version_is_at_least 2.16 ${PV} || append-cppflags -U_FORTIFY_SOURCE + + # building glibc <2.25 with SSP is fraught with difficulty, especially + # due to __stack_chk_fail_local which would mean significant changes + # to the glibc build process. See bug #94325 #293721 + # Note we have to handle both user-given CFLAGS and gcc defaults via + # spec rules here. We can't simply add -fno-stack-protector as it gets + # added before user flags, and we can't just filter-flags because + # _filter_hardened doesn't support globs. + filter-flags -fstack-protector* + if ! version_is_at_least 2.25 ; then + tc-enables-ssp && append-flags $(test-flags -fno-stack-protector) + fi + + if [[ $(gcc-major-version) -lt 6 ]]; then + # Starting with gcc-6 (and fully upstreamed pie patches) we control + # default enabled/disabled pie via use flags. So nothing to do + # here. #618160 + + if use hardened && tc-enables-pie ; then + # Force PIC macro definition for all compilations since they're all + # either -fPIC or -fPIE with the default-PIE compiler. + append-cppflags -DPIC + else + # Don't build -fPIE without the default-PIE compiler and the + # hardened-pie patch + filter-flags -fPIE + fi + fi +} + +want_nptl() { + [[ -z ${LT_VER} ]] && return 0 + want_tls || return 1 + use nptl || return 1 + + # Older versions of glibc had incomplete arch support for nptl. + # But if you're building those now, you can handle USE=nptl yourself. + return 0 +} + +want_linuxthreads() { + [[ -z ${LT_VER} ]] && return 1 + use linuxthreads +} + +want_tls() { + # Archs that can use TLS (Thread Local Storage) + case $(tc-arch) in + x86) + # requires i486 or better #106556 + [[ ${CTARGET} == i[4567]86* ]] && return 0 + return 1 + ;; + esac + + return 0 +} + +want__thread() { + want_tls || return 1 + + # For some reason --with-tls --with__thread is causing segfaults on sparc32. + [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 + + [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} + + # only test gcc -- can't test linking yet + tc-has-tls -c ${CTARGET} + WANT__THREAD=$? + + return ${WANT__THREAD} +} + +use_multiarch() { + # Make sure binutils is new enough to support indirect functions #336792 + # This funky sed supports gold and bfd linkers. + local bver nver + bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}') + case $(tc-arch ${CTARGET}) in + amd64|x86) nver="2.20" ;; + arm) nver="2.22" ;; + hppa) nver="2.23" ;; + ppc|ppc64) nver="2.20" ;; + # ifunc was added in 2.23, but glibc also needs machinemode which is in 2.24. + s390) nver="2.24" ;; + sparc) nver="2.21" ;; + *) return 1 ;; + esac + version_is_at_least ${nver} ${bver} +} + +# Setup toolchain variables that had historically +# been defined in the profiles for these archs. +setup_env() { + # silly users + unset LD_RUN_PATH + unset LD_ASSUME_KERNEL + + if is_crosscompile || tc-is-cross-compiler ; then + multilib_env ${CTARGET_OPT:-${CTARGET}} + + if ! use multilib ; then + MULTILIB_ABIS=${DEFAULT_ABI} + else + MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} + fi + + # If the user has CFLAGS_<CTARGET> in their make.conf, use that, + # and fall back on CFLAGS. + local VAR=CFLAGS_${CTARGET//[-.]/_} + CFLAGS=${!VAR-${CFLAGS}} + einfo " $(printf '%15s' 'Manual CFLAGS:') ${CFLAGS}" + fi + + setup_flags + + export ABI=${ABI:-${DEFAULT_ABI:-default}} + + if use headers-only ; then + # Avoid mixing host's CC and target's CFLAGS_${ABI}: + # At this bootstrap stage we have only binutils for + # target but not compiler yet. + einfo "Skip CC ABI injection. We can't use (cross-)compiler yet." + return 0 + fi + + local VAR=CFLAGS_${ABI} + # We need to export CFLAGS with abi information in them because glibc's + # configure script checks CFLAGS for some targets (like mips). Keep + # around the original clean value to avoid appending multiple ABIs on + # top of each other. + : ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})} + export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}" + einfo " $(printf '%15s' 'Manual CC:') ${CC}" +} + +foreach_abi() { + setup_env + + local ret=0 + local abilist="" + if use multilib ; then + abilist=$(get_install_abis) + else + abilist=${DEFAULT_ABI} + fi + local -x ABI + for ABI in ${abilist:-default} ; do + setup_env + einfo "Running $1 for ABI ${ABI}" + $1 + : $(( ret |= $? )) + done + return ${ret} +} + +just_headers() { + is_crosscompile && use headers-only +} + +glibc_banner() { + local b="Gentoo ${PVR}" + [[ -n ${SNAP_VER} ]] && b+=" snapshot ${SNAP_VER}" + [[ -n ${BRANCH_UPDATE} ]] && b+=" branch ${BRANCH_UPDATE}" + [[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}" + echo "${b}" +} + +# == phases == + +glibc_compile_test() { + local ret save_cflags=${CFLAGS} + CFLAGS+=" $1" + shift + + pushd "${T}" >/dev/null + + rm -f glibc-test* + printf '%b' "$*" > glibc-test.c + + _nonfatal emake -s glibc-test + ret=$? + + popd >/dev/null + + CFLAGS=${save_cflags} + return ${ret} +} + +glibc_run_test() { + local ret + + if [[ ${EMERGE_FROM} == "binary" ]] ; then + # ignore build failures when installing a binary package #324685 + glibc_compile_test "" "$@" 2>/dev/null || return 0 + else + if ! glibc_compile_test "" "$@" ; then + ewarn "Simple build failed ... assuming this is desired #324685" + return 0 + fi + fi + + pushd "${T}" >/dev/null + + ./glibc-test + ret=$? + rm -f glibc-test* + + popd >/dev/null + + return ${ret} +} + +check_devpts() { + # Make sure devpts is mounted correctly for use w/out setuid pt_chown. + + # If merely building the binary package, then there's nothing to verify. + [[ ${MERGE_TYPE} == "buildonly" ]] && return + + # Only sanity check when installing the native glibc. + [[ ${ROOT} != "/" ]] && return + + # Older versions always installed setuid, so no need to check. + in_iuse suid || return + + # If they're opting in to the old suid code, then no need to check. + use suid && return + + if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then + eerror "In order to use glibc with USE=-suid, you must make sure that" + eerror "you have devpts mounted at /dev/pts with the gid=5 option." + eerror "Openrc should do this for you, so you should check /etc/fstab" + eerror "and make sure you do not have any invalid settings there." + # Do not die on older kernels as devpts did not export these settings #489520. + if version_is_at_least 2.6.25 $(uname -r) ; then + die "mount & fix your /dev/pts settings" + fi + fi +} + +toolchain-glibc_pkg_pretend() { + if [[ ${EAPI:-0} == 6 ]]; then + eerror "We're moving code back to the ebuilds to get away from the ancient EAPI cruft." + eerror "From EAPI=6 on you'll have to define the phases in the glibc ebuilds." + die "Silly overlay authors..." + fi + + # For older EAPIs, this is run in pkg_preinst. + if [[ ${EAPI:-0} != [0123] ]] ; then + check_devpts + fi + + # Prevent native builds from downgrading. + if [[ ${MERGE_TYPE} != "buildonly" ]] && \ + [[ ${ROOT} == "/" ]] && \ + [[ ${CBUILD} == ${CHOST} ]] && \ + [[ ${CHOST} == ${CTARGET} ]] ; then + # The high rev # is to allow people to downgrade between -r# versions. + # We want to block 2.20->2.19, but 2.20-r3->2.20-r2 should be fine. + # Hopefully we never actually use a r# this high. + if has_version ">${CATEGORY}/${P}-r10000" ; then + eerror "Sanity check to keep you from breaking your system:" + eerror " Downgrading glibc is not supported and a sure way to destruction" + die "aborting to save your system" + fi + + if ! glibc_run_test '#include <pwd.h>\nint main(){return getpwuid(0)==0;}\n' + then + eerror "Your patched vendor kernel is broken. You need to get an" + eerror "update from whoever is providing the kernel to you." + eerror "https://sourceware.org/bugzilla/show_bug.cgi?id=5227" + eerror "http://bugs.gentoo.org/262698" + die "keeping your system alive, say thank you" + fi + + if ! glibc_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' + then + eerror "Your old kernel is broken. You need to update it to" + eerror "a newer version as syscall(<bignum>) will break." + eerror "http://bugs.gentoo.org/279260" + die "keeping your system alive, say thank you" + fi + fi + + # users have had a chance to phase themselves, time to give em the boot + if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then + eerror "You still haven't deleted ${EROOT}/etc/locales.build." + eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher." + die "lazy upgrader detected" + fi + + if [[ ${CTARGET} == i386-* ]] ; then + eerror "i386 CHOSTs are no longer supported." + eerror "Chances are you don't actually want/need i386." + eerror "Please read http://www.gentoo.org/doc/en/change-chost.xml" + die "please fix your CHOST" + fi + + if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then + ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS." + ewarn "This will result in a 50% performance penalty when running with a 32bit" + ewarn "hypervisor, which is probably not what you want." + fi + + use hardened && ! tc-enables-pie && \ + ewarn "PIE hardening not applied, as your compiler doesn't default to PIE" + + # Make sure host system is up to date #394453 + if has_version '<sys-libs/glibc-2.13' && \ + [[ -n $(scanelf -qys__guard -F'#s%F' "${EROOT}"/lib*/l*-*.so) ]] + then + ebegin "Scanning system for __guard to see if you need to rebuild first ..." + local files=$( + scanelf -qys__guard -F'#s%F' \ + "${EROOT}"/*bin/ \ + "${EROOT}"/lib* \ + "${EROOT}"/usr/*bin/ \ + "${EROOT}"/usr/lib* | \ + egrep -v \ + -e "^${EROOT}/lib.*/(libc|ld)-2.*.so$" \ + -e "^${EROOT}/sbin/(ldconfig|sln)$" + ) + [[ -z ${files} ]] + if ! eend $? ; then + eerror "Your system still has old SSP __guard symbols. You need to" + eerror "rebuild all the packages that provide these files first:" + eerror "${files}" + die "old __guard detected" + fi + fi +} + +toolchain-glibc_pkg_setup() { + [[ ${EAPI:-0} == [0123] ]] && toolchain-glibc_pkg_pretend +} + +int_to_KV() { + local version=$1 major minor micro + major=$((version / 65536)) + minor=$(((version % 65536) / 256)) + micro=$((version % 256)) + echo ${major}.${minor}.${micro} +} + +eend_KV() { + [[ $(KV_to_int $1) -ge $(KV_to_int $2) ]] + eend $? +} + +get_kheader_version() { + printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \ + $(tc-getCPP ${CTARGET}) -I "$(alt_build_headers)" - | \ + tail -n 1 +} + +check_nptl_support() { + # don't care about the compiler here as we aren't using it + just_headers && return + + local run_kv build_kv want_kv + run_kv=$(int_to_KV $(get_KV)) + build_kv=$(int_to_KV $(get_kheader_version)) + want_kv=${NPTL_KERN_VER} + + ebegin "Checking gcc for __thread support" + if ! eend $(want__thread ; echo $?) ; then + echo + eerror "Could not find a gcc that supports the __thread directive!" + eerror "Please update your binutils/gcc and try again." + die "No __thread support in gcc!" + fi + + if ! is_crosscompile && ! tc-is-cross-compiler ; then + # Building fails on an non-supporting kernel + ebegin "Checking kernel version (${run_kv} >= ${want_kv})" + if ! eend_KV ${run_kv} ${want_kv} ; then + echo + eerror "You need a kernel of at least ${want_kv} for NPTL support!" + die "Kernel version too low!" + fi + fi + + ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})" + if ! eend_KV ${build_kv} ${want_kv} ; then + echo + eerror "You need linux-headers of at least ${want_kv} for NPTL support!" + die "linux-headers version too low!" + fi +} + +unpack_pkg() { + local a=${PN} + [[ -n ${SNAP_VER} ]] && a="${a}-${RELEASE_VER}" + [[ -n $1 ]] && a="${a}-$1" + if [[ -n ${SNAP_VER} ]] ; then + a="${a}-${SNAP_VER}" + else + if [[ -n $2 ]] ; then + a="${a}-$2" + else + a="${a}-${RELEASE_VER}" + fi + fi + if has ${a}.tar.xz ${A} ; then + unpacker ${a}.tar.xz + else + unpack ${a}.tar.bz2 + fi + [[ -n $1 ]] && { mv ${a} $1 || die ; } +} + +toolchain-glibc_do_src_unpack() { + # Check NPTL support _before_ we unpack things to save some time + want_nptl && check_nptl_support + + if [[ -n ${EGIT_REPO_URIS} ]] ; then + local i d + for ((i=0; i<${#EGIT_REPO_URIS[@]}; ++i)) ; do + EGIT_REPO_URI=${EGIT_REPO_URIS[$i]} + EGIT_SOURCEDIR=${EGIT_SOURCEDIRS[$i]} + git-2_src_unpack + done + else + unpack_pkg + fi + + cd "${S}" + touch locale/C-translit.h #185476 #218003 + [[ -n ${LT_VER} ]] && unpack_pkg linuxthreads ${LT_VER} + [[ -n ${PORTS_VER} ]] && unpack_pkg ports ${PORTS_VER} + [[ -n ${LIBIDN_VER} ]] && unpack_pkg libidn + + if [[ -n ${PATCH_VER} ]] ; then + cd "${WORKDIR}" + unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2 + # pull out all the addons + local d + for d in extra/*/configure ; do + d=${d%/configure} + [[ -d ${S}/${d} ]] && die "${d} already exists in \${S}" + mv "${d}" "${S}" || die "moving ${d} failed" + done + fi +} + +toolchain-glibc_src_unpack() { + setup_env + + toolchain-glibc_do_src_unpack + [[ ${EAPI:-0} == [01] ]] && cd "${S}" && toolchain-glibc_src_prepare +} + +toolchain-glibc_src_prepare() { + # XXX: We should do the branchupdate, before extracting the manpages and + # infopages else it does not help much (mtimes change if there is a change + # to them with branchupdate) + if [[ -n ${BRANCH_UPDATE} ]] ; then + epatch "${DISTDIR}"/glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 + + # Snapshot date patch + einfo "Patching version to display snapshot date ..." + sed -i -e "s:$#define RELEASE$.*:\1 \"${BRANCH_UPDATE}\":" version.h + fi + + # tag, glibc is it + if ! version_is_at_least 2.17 ; then + [[ -e csu/Banner ]] && die "need new banner location" + glibc_banner > csu/Banner + fi + if [[ -n ${PATCH_VER} ]] && ! use vanilla ; then + EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER} ..." \ + EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ + EPATCH_SUFFIX="patch" \ + ARCH=$(tc-arch) \ + epatch "${WORKDIR}"/patches + fi + + if just_headers ; then + if [[ -e ports/sysdeps/mips/preconfigure ]] ; then + # mips peeps like to screw with us. if building headers, + # we don't have a real compiler, so we can't let them + # insert -mabi on us. + sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die + find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} + + fi + fi + + epatch_user + + gnuconfig_update + + # Glibc is stupid sometimes, and doesn't realize that with a + # static C-Only gcc, -lgcc_eh doesn't exist. + # https://sourceware.org/ml/libc-alpha/2003-09/msg00100.html + # https://sourceware.org/ml/libc-alpha/2005-02/msg00042.html + # But! Finally fixed in recent versions: + # https://sourceware.org/ml/libc-alpha/2012-05/msg01865.html + if ! version_is_at_least 2.16 ; then + echo 'int main(){}' > "${T}"/gcc_eh_test.c + if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then + sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" + fi + fi + + cd "${WORKDIR}" + find . -type f '(' -size 0 -o -name "*.orig" ')' -delete + find . -name configure -exec touch {} + + + eprefixify extra/locale/locale-gen + + # Fix permissions on some of the scripts. + chmod u+x "${S}"/scripts/*.sh +} +dump_toolchain_settings() { + echo + + einfo "$*" + + local v + for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC LD {AS,C,CPP,CXX,LD}FLAGS ; do + einfo " $(printf '%15s' ${v}:) ${!v}" + done + + # The glibc configure script doesn't properly use LDFLAGS all the time. + export CC="$(tc-getCC ${CTARGET}) ${LDFLAGS}" + einfo " $(printf '%15s' 'Manual CC:') ${CC}" + echo +} + +glibc_do_configure() { + # Glibc does not work with gold (for various reasons) #269274. + tc-ld-disable-gold + + dump_toolchain_settings "Configuring glibc for $1" + + local myconf=() + + # set addons + pushd "${S}" > /dev/null + local addons=$(echo */configure | sed \ + -e 's:/configure::g' \ + -e 's:$linuxthreads\|nptl\|rtkaio\|glibc-compat$$ \|$$::g' \ + -e 's: \+$::' \ + -e 's! !,!g' \ + -e 's!^!,!' \ + -e '/^,\*$/d') + [[ -d ports ]] && addons+=",ports" + popd > /dev/null + + if has_version '<sys-libs/glibc-2.13' ; then + myconf+=( --enable-old-ssp-compat ) + fi + + if version_is_at_least 2.25 ; then + case ${CTARGET} in + mips*) + # dlopen() detects stack smash on mips n32 ABI. + # Cause is unknown: https://bugs.gentoo.org/640130 + myconf+=( --enable-stack-protector=no ) + ;; + powerpc-*) + # Currently gcc on powerpc32 generates invalid code for + # __builtin_return_address(0) calls. Normally programs + # don't do that but malloc hooks in glibc do: + # https://gcc.gnu.org/PR81996 + # https://bugs.gentoo.org/629054 + myconf+=( --enable-stack-protector=no ) + ;; + *) + myconf+=( --enable-stack-protector=all ) + ;; + esac + fi + + # Keep a whitelist of targets supporing IFUNC. glibc's ./configure + # is not robust enough to detect proper support: + # https://bugs.gentoo.org/641216 + # https://sourceware.org/PR22634#c0 + case $(tc-arch ${CTARGET}) in + # Keep whitelist of targets where autodetection mostly works. + amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;; + # Blacklist everywhere else + *) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;; + esac + + if version_is_at_least 2.25 ; then + myconf+=( --enable-stackguard-randomization ) + else + myconf+=( $(use_enable hardened stackguard-randomization) ) + fi + + [[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp ) + + if [[ $1 == "linuxthreads" ]] ; then + if want_tls ; then + myconf+=( --with-tls ) + + if ! want__thread || use glibc-compat20 || [[ ${LT_KER_VER} == 2.[02].* ]] ; then + myconf+=( --without-__thread ) + else + myconf+=( --with-__thread ) + fi + else + myconf+=( --without-tls --without-__thread ) + fi + + myconf+=( --disable-sanity-checks ) + addons="linuxthreads${addons}" + myconf+=( --enable-kernel=${LT_KER_VER} ) + elif [[ $1 == "nptl" ]] ; then + # Newer versions require nptl, so there is no addon for it. + version_is_at_least 2.20 || addons="nptl${addons}" + myconf+=( --enable-kernel=${NPTL_KERN_VER} ) + else + die "invalid pthread option" + fi + myconf+=( --enable-add-ons="${addons#,}" ) + + # Since SELinux support is only required for nscd, only enable it if: + # 1. USE selinux + # 2. only for the primary ABI on multilib systems + # 3. Not a crosscompile + if ! is_crosscompile && use selinux ; then + if use multilib ; then + if is_final_abi ; then + myconf+=( --with-selinux ) + else + myconf+=( --without-selinux ) + fi + else + myconf+=( --with-selinux ) + fi + else + myconf+=( --without-selinux ) + fi + + # Force a few tests where we always know the answer but + # configure is incapable of finding it. + if is_crosscompile ; then + export \ + libc_cv_c_cleanup=yes \ + libc_cv_forced_unwind=yes + fi + + myconf+=( + --without-cvs + --disable-werror + --enable-bind-now + --build=${CBUILD_OPT:-${CBUILD}} + --host=${CTARGET_OPT:-${CTARGET}} + $(use_enable profile) + $(use_with gd) + --with-headers=$(alt_build_headers) + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --libdir='$(prefix)'/$(get_libdir) + --mandir='$(prefix)'/share/man + --infodir='$(prefix)'/share/info + --libexecdir='$(libdir)'/misc/glibc + --with-bugurl=http://bugs.gentoo.org/ + --with-pkgversion="$(glibc_banner)" + $(use_multiarch || echo --disable-multi-arch) + $(in_iuse rpc && use_enable rpc obsolete-rpc || echo --enable-obsolete-rpc) + $(in_iuse systemtap && use_enable systemtap) + $(in_iuse nscd && use_enable nscd) + ${EXTRA_ECONF} + ) + + # We rely on sys-libs/timezone-data for timezone tools normally. + if version_is_at_least 2.23 ; then + myconf+=( $(use_enable vanilla timezone-tools) ) + fi + + # These libs don't have configure flags. + ac_cv_lib_audit_audit_log_user_avc_message=$(in_iuse audit && usex audit || echo no) + ac_cv_lib_cap_cap_init=$(in_iuse caps && usex caps || echo no) + + # There is no configure option for this and we need to export it + # since the glibc build will re-run configure on itself + export libc_cv_rootsbindir="${EPREFIX}/sbin" + export libc_cv_slibdir="${EPREFIX}/$(get_libdir)" + + # We take care of patching our binutils to use both hash styles, + # and many people like to force gnu hash style only, so disable + # this overriding check. #347761 + export libc_cv_hashstyle=no + + # Overtime, generating info pages can be painful. So disable this for + # versions older than the latest stable to avoid the issue (this ver + # should be updated from time to time). #464394 #465816 + if ! version_is_at_least 2.17 ; then + export ac_cv_prog_MAKEINFO=: + fi + + local builddir=$(builddir "$1") + mkdir -p "${builddir}" + cd "${builddir}" + set -- "${S}"/configure "${myconf[@]}" + echo "$@" + "$@" || die "failed to configure glibc" + + # ia64 static cross-compilers are a pita in so much that they + # can't produce static ELFs (as the libgcc.a is broken). so + # disable building of the programs for those targets if it + # doesn't work. + # XXX: We could turn this into a compiler test, but ia64 is + # the only one that matters, so this should be fine for now. + if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then + sed -i '1i+link-static = touch $@' config.make + fi + + # If we're trying to migrate between ABI sets, we need + # to lie and use a local copy of gcc. Like if the system + # is built with MULTILIB_ABIS="amd64 x86" but we want to + # add x32 to it, gcc/glibc don't yet support x32. + if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then + echo 'main(){}' > "${T}"/test.c + if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then + sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die + mkdir -p sunrpc + cp $(which rpcgen) sunrpc/cross-rpcgen || die + touch -t 202001010101 sunrpc/cross-rpcgen || die + fi + fi +} + +toolchain-glibc_headers_configure() { + export ABI=default + + local builddir=$(builddir "headers") + mkdir -p "${builddir}" + cd "${builddir}" + + # if we don't have a compiler yet, we can't really test it now ... + # hopefully they don't affect header generation, so let's hope for + # the best here ... + local v vars=( + ac_cv_header_cpuid_h=yes + libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes + libc_cv_asm_cfi_directives=yes + libc_cv_broken_visibility_attribute=no + libc_cv_c_cleanup=yes + libc_cv_forced_unwind=yes + libc_cv_gcc___thread=yes + libc_cv_mlong_double_128=yes + libc_cv_mlong_double_128ibm=yes + libc_cv_ppc_machine=yes + libc_cv_ppc_rel16=yes + libc_cv_predef_fortify_source=no + libc_cv_visibility_attribute=yes + libc_cv_z_combreloc=yes + libc_cv_z_execstack=yes + libc_cv_z_initfirst=yes + libc_cv_z_nodelete=yes + libc_cv_z_nodlopen=yes + libc_cv_z_relro=yes + libc_mips_abi=${ABI} + libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard) + # These libs don't have configure flags. + ac_cv_lib_audit_audit_log_user_avc_message=no + ac_cv_lib_cap_cap_init=no + ) + if ! version_is_at_least 2.25 ; then + vars+=( + libc_cv_predef_stack_protector=no + ) + fi + einfo "Forcing cached settings:" + for v in "${vars[@]}" ; do + einfo " ${v}" + export ${v} + done + + # Blow away some random CC settings that screw things up. #550192 + if [[ -d ${S}/sysdeps/mips ]]; then + pushd "${S}"/sysdeps/mips >/dev/null + sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die + sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die + if version_is_at_least 2.21 ; then + # Force the mips ABI to the default. This is OK because the set of + # installed headers in this phase is the same between the 3 ABIs. + # If this ever changes, this hack will break, but that's unlikely + # as glibc discourages that behavior. + # https://crbug.com/647033 + sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die + fi + popd >/dev/null + fi + + local myconf=() + myconf+=( + --disable-sanity-checks + --enable-hacker-mode + --without-cvs + --disable-werror + --enable-bind-now + --build=${CBUILD_OPT:-${CBUILD}} + --host=${CTARGET_OPT:-${CTARGET}} + --with-headers=$(alt_build_headers) + --prefix="${EPREFIX}/usr" + ${EXTRA_ECONF} + ) + + local addons + [[ -d ${S}/ports ]] && addons+=",ports" + # Newer versions require nptl, so there is no addon for it. + version_is_at_least 2.20 || addons+=",nptl" + myconf+=( --enable-add-ons="${addons#,}" ) + + # Nothing is compiled here which would affect the headers for the target. + # So forcing CC/CFLAGS is sane. + set -- "${S}"/configure "${myconf[@]}" + echo "$@" + CC="$(tc-getBUILD_CC)" \ + CFLAGS="-O1 -pipe" \ + CPPFLAGS="-U_FORTIFY_SOURCE" \ + LDFLAGS="" \ + "$@" || die "failed to configure glibc" +} + +toolchain-glibc_do_src_configure() { + if just_headers ; then + toolchain-glibc_headers_configure + else + want_linuxthreads && glibc_do_configure linuxthreads + want_nptl && glibc_do_configure nptl + fi +} + +toolchain-glibc_src_configure() { + foreach_abi toolchain-glibc_do_src_configure +} + +toolchain-glibc_do_src_compile() { + local t + for t in linuxthreads nptl ; do + if want_${t} ; then + [[ ${EAPI:-0} == [01] ]] && glibc_do_configure ${t} + emake -C "$(builddir ${t})" || die "make ${t} for ${ABI} failed" + fi + done +} + +toolchain-glibc_src_compile() { + if just_headers ; then + [[ ${EAPI:-0} == [01] ]] && toolchain-glibc_headers_configure + return + fi + + foreach_abi toolchain-glibc_do_src_compile +} + +glibc_src_test() { + cd "$(builddir $1)" + nonfatal emake -j1 check && return 0 + einfo "make check failed - re-running with --keep-going to get the rest of the results" + nonfatal emake -j1 -k check + ewarn "make check failed for ${ABI}-${CTARGET}-$1" + return 1 +} + +toolchain-glibc_do_src_test() { + local ret=0 t + for t in linuxthreads nptl ; do + if want_${t} ; then + glibc_src_test ${t} + : $(( ret |= $? )) + fi + done + return ${ret} +} + +toolchain-glibc_src_test() { + # Give tests more time to complete. + export TIMEOUTFACTOR=5 + + foreach_abi toolchain-glibc_do_src_test || die "tests failed" +} + +toolchain-glibc_do_src_install() { + local builddir=$(builddir $(want_linuxthreads && echo linuxthreads || echo nptl)) + cd "${builddir}" + + emake install_root="${D}$(alt_prefix)" install || die + + if want_linuxthreads && want_nptl ; then + einfo "Installing NPTL to $(alt_libdir)/tls/..." + cd "$(builddir nptl)" + dodir $(alt_libdir)/tls $(alt_usrlibdir)/nptl + + local l src_lib + for l in libc libm librt libpthread libthread_db ; do + # take care of shared lib first ... + l=${l}.so + if [[ -e ${l} ]] ; then + src_lib=${l} + else + src_lib=$(eval echo */${l}) + fi + cp -a ${src_lib} "${ED}"$(alt_libdir)/tls/${l} || die "copying nptl ${l}" + fperms a+rx $(alt_libdir)/tls/${l} + dosym ${l} $(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib}) + + # then grab the linker script or the symlink ... + if [[ -L ${ED}$(alt_usrlibdir)/${l} ]] ; then + dosym $(alt_libdir)/tls/${l} $(alt_usrlibdir)/nptl/${l} + else + sed \ + -e "s:/${l}:/tls/${l}:g" \ + -e "s:/${l/%.so/_nonshared.a}:/nptl/${l/%.so/_nonshared.a}:g" \ + "${ED}"$(alt_usrlibdir)/${l} > "${ED}"$(alt_usrlibdir)/nptl/${l} + fi + + # then grab the static lib ... + src_lib=${src_lib/%.so/.a} + [[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a} + cp -a ${src_lib} "${ED}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}" + src_lib=${src_lib/%.a/_nonshared.a} + if [[ -e ${src_lib} ]] ; then + cp -a ${src_lib} "${ED}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}" + fi + done + + # use the nptl linker instead of the linuxthreads one as the linuxthreads + # one may lack TLS support and that can be really bad for business + cp -a elf/ld.so "${ED}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp" + fi + + # Normally real_pv is ${PV}. Live ebuilds are exception, there we need + # to infer upstream version: + # '#define VERSION "2.26.90"' -> '2.26.90' + local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h) + # Newer versions get fancy with libm linkage to include vectorized support. + # While we don't really need a ldscript here, portage QA checks get upset. + if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then + dosym ../../$(get_libdir)/libm-${upstream_pv}.so $(alt_usrlibdir)/libm-${upstream_pv}.so + fi + + # We'll take care of the cache ourselves + rm -f "${ED}"/etc/ld.so.cache + + # Everything past this point just needs to be done once ... + is_final_abi || return 0 + + # Make sure the non-native interp can be found on multilib systems even + # if the main library set isn't installed into the right place. Maybe + # we should query the active gcc for info instead of hardcoding it ? + local i ldso_abi ldso_name + local ldso_abi_list=( + # x86 + amd64 /lib64/ld-linux-x86-64.so.2 + x32 /libx32/ld-linux-x32.so.2 + x86 /lib/ld-linux.so.2 + # mips + o32 /lib/ld.so.1 + n32 /lib32/ld.so.1 + n64 /lib64/ld.so.1 + # powerpc + ppc /lib/ld.so.1 + ppc64 /lib64/ld64.so.1 + # s390 + s390 /lib/ld.so.1 + s390x /lib/ld64.so.1 + # sparc + sparc32 /lib/ld-linux.so.2 + sparc64 /lib64/ld-linux.so.2 + ) + case $(tc-endian) in + little) + ldso_abi_list+=( + # arm + arm64 /lib/ld-linux-aarch64.so.1 + ) + ;; + big) + ldso_abi_list+=( + # arm + arm64 /lib/ld-linux-aarch64_be.so.1 + ) + ;; + esac + if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib + fi + for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do + ldso_abi=${ldso_abi_list[i]} + has ${ldso_abi} $(get_install_abis) || continue + + ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}" + if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then + dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name} + fi + done + + # With devpts under Linux mounted properly, we do not need the pt_chown + # binary to be setuid. This is because the default owners/perms will be + # exactly what we want. + if in_iuse suid && ! use suid ; then + find "${ED}" -name pt_chown -exec chmod -s {} + + fi + + ################################################################# + # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # + # Make sure we install some symlink hacks so that when we build + # a 2nd stage cross-compiler, gcc finds the target system + # headers correctly. See gcc/doc/gccinstall.info + if is_crosscompile ; then + # We need to make sure that /lib and /usr/lib always exists. + # gcc likes to use relative paths to get to its multilibs like + # /usr/lib/../lib64/. So while we don't install any files into + # /usr/lib/, we do need it to exist. + cd "${ED}"$(alt_libdir)/.. + [[ -e lib ]] || mkdir lib + cd "${ED}"$(alt_usrlibdir)/.. + [[ -e lib ]] || mkdir lib + + dosym usr/include $(alt_prefix)/sys-include + return 0 + fi + + # Files for Debian-style locale updating + dodir /usr/share/i18n + sed \ + -e "/^#/d" \ + -e "/SUPPORTED-LOCALES=/d" \ + -e "s: \\\\::g" -e "s:/: :g" \ + "${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \ + || die "generating /usr/share/i18n/SUPPORTED failed" + cd "${WORKDIR}"/extra/locale + dosbin locale-gen || die + doman *.[0-8] + insinto /etc + doins locale.gen || die + + # Make sure all the ABI's can find the locales and so we only + # have to generate one set + local a + keepdir /usr/$(get_libdir)/locale + for a in $(get_install_abis) ; do + if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then + dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale + fi + done + + cd "${S}" + + # Install misc network config files + insinto /etc + doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf || die + doins "${WORKDIR}"/extra/etc/*.conf || die + + if ! in_iuse nscd || use nscd ; then + doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)" || die + + local nscd_args=( + -e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):" + ) + version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' ) + sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd + + # Newer versions of glibc include the nscd.service themselves. + # TODO: Drop the $FILESDIR copy once 2.19 goes stable. + if version_is_at_least 2.19 ; then + systemd_dounit nscd/nscd.service || die + systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf || die + else + systemd_dounit "${FILESDIR}"/nscd.service || die + systemd_newtmpfilesd "${FILESDIR}"/nscd.tmpfilesd nscd.conf || die + fi + else + # Do this since extra/etc/*.conf above might have nscd.conf. + rm -f "${ED}"/etc/nscd.conf + fi + + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc + doenvd "${T}"/00glibc || die + + for d in BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do + [[ -s ${d} ]] && dodoc ${d} + done + + # Prevent overwriting of the /etc/localtime symlink. We'll handle the + # creation of the "factory" symlink in pkg_postinst(). + rm -f "${ED}"/etc/localtime +} + +toolchain-glibc_headers_install() { + local builddir=$(builddir "headers") + cd "${builddir}" + emake install_root="${D}$(alt_prefix)" install-headers || die + if ! version_is_at_least 2.16 ; then + insinto $(alt_headers)/bits + doins bits/stdio_lim.h || die + fi + insinto $(alt_headers)/gnu + doins "${S}"/include/gnu/stubs.h || die "doins include gnu" + # Make sure we install the sys-include symlink so that when + # we build a 2nd stage cross-compiler, gcc finds the target + # system headers correctly. See gcc/doc/gccinstall.info + 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 + toolchain-glibc_headers_install + return + fi + + foreach_abi toolchain-glibc_do_src_install + src_strip +} + +# Simple test to make sure our new glibc isn't completely broken. +# Make sure we don't test with statically built binaries since +# they will fail. Also, skip if this glibc is a cross compiler. +# +# If coreutils is built with USE=multicall, some of these files +# will just be wrapper scripts, not actual ELFs we can test. +glibc_sanity_check() { + cd / #228809 + + # We enter ${ED} so to avoid trouble if the path contains + # special characters; for instance if the path contains the + # colon character (:), then the linker will try to split it + # and look for the libraries in an unexpected place. This can + # lead to unsafe code execution if the generated prefix is + # within a world-writable directory. + # (e.g. /var/tmp/portage:${HOSTNAME}) + pushd "${ED}"/$(get_libdir) >/dev/null + + local x striptest + for x in cal date env free ls true uname uptime ; do + x=$(type -p ${x}) + [[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue + striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue + case ${striptest} in + *"statically linked"*) continue;; + *"ASCII text"*) continue;; + esac + # We need to clear the locale settings as the upgrade might want + # incompatible locale data. This test is not for verifying that. + LC_ALL=C \ + ./ld-*.so --library-path . ${x} > /dev/null \ + || die "simple run test (${x}) failed" + done + + popd >/dev/null +} + +toolchain-glibc_pkg_preinst() { + # nothing to do if just installing headers + just_headers && return + + # prepare /etc/ld.so.conf.d/ for files + mkdir -p "${EROOT}"/etc/ld.so.conf.d + + # Default /etc/hosts.conf:multi to on for systems with small dbs. + if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then + sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf + elog "Defaulting /etc/host.conf:multi to on" + fi + + [[ ${ROOT} != "/" ]] && return 0 + [[ -d ${ED}/$(get_libdir) ]] || return 0 + [[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check + + # For newer EAPIs, this was run in pkg_pretend. + if [[ ${EAPI:-0} == [0123] ]] ; then + check_devpts + fi +} + +toolchain-glibc_pkg_postinst() { + # nothing to do if just installing headers + just_headers && return + + if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then + # Generate fastloading iconv module configuration file. + "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}" + fi + + if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then + # Reload init ... if in a chroot or a diff init package, ignore + # errors from this step #253697 + /sbin/telinit U 2>/dev/null + + # if the host locales.gen contains no entries, we'll install everything + local locale_list="${EROOT}etc/locale.gen" + if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then + ewarn "Generating all locales; edit /etc/locale.gen to save time/space" + locale_list="${EROOT}usr/share/i18n/SUPPORTED" + fi + locale-gen -j $(makeopts_jobs) --config "${locale_list}" + fi +} + +_TOOLCHAIN_GLIBC_ECLASS=1 +fi diff -uNr a/eclass/toolchain.eclass b/eclass/toolchain.eclass --- a/eclass/toolchain.eclass false +++ b/eclass/toolchain.eclass cee975dc0a6496c6865ad866217ab7ae632c3f14f55af182fa5a12ff6379ee584e5070d02c6a1bed442cdff3db8764023988bb82c3160a87791e15ec981d3bf0 @@ -0,0 +1,2450 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Maintainer: Toolchain Ninjas <toolchain@gentoo.org> + +DESCRIPTION="The GNU Compiler Collection" +HOMEPAGE="https://gcc.gnu.org/" +RESTRICT="strip" # cross-compilers need controlled stripping + +inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator prefix + +if [[ ${PV} == *_pre9999* ]] ; then + EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git" + # naming style: + # gcc-4.7.1_pre9999 -> gcc-4_7-branch + # Note that the micro version is required or lots of stuff will break. + # To checkout master set gcc_LIVE_BRANCH="master" in the ebuild before + # inheriting this eclass. + EGIT_BRANCH="${PN}-${PV%.?_pre9999}-branch" + EGIT_BRANCH=${EGIT_BRANCH//./_} + inherit git-2 +fi + +FEATURES=${FEATURES/multilib-strict/} + +case ${EAPI:-0} in + 0|1|2|3|4*) die "Need to upgrade to at least EAPI=5" ;; + 5*) ;; + *) die "I don't speak EAPI ${EAPI}." ;; +esac +EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \ + src_compile src_test src_install pkg_postinst pkg_postrm + +#---->> globals <<---- + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} = ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi +: ${TARGET_ABI:=${ABI}} +: ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}} +: ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}} + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +# General purpose version check. Without a second arg matches up to minor version (x.x.x) +tc_version_is_at_least() { + version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}" +} + +# General purpose version range check +# Note that it matches up to but NOT including the second version +tc_version_is_between() { + tc_version_is_at_least "${1}" && ! tc_version_is_at_least "${2}" +} + +GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}} +GCC_PVR=${GCC_PV} +[[ ${PR} != "r0" ]] && GCC_PVR=${GCC_PVR}-${PR} +GCC_RELEASE_VER=$(get_version_component_range 1-3 ${GCC_PV}) +GCC_BRANCH_VER=$(get_version_component_range 1-2 ${GCC_PV}) +GCCMAJOR=$(get_version_component_range 1 ${GCC_PV}) +GCCMINOR=$(get_version_component_range 2 ${GCC_PV}) +GCCMICRO=$(get_version_component_range 3 ${GCC_PV}) +[[ ${BRANCH_UPDATE-notset} == "notset" ]] && \ + BRANCH_UPDATE=$(get_version_component_range 4 ${GCC_PV}) + +# According to gcc/c-cppbuiltin.c, GCC_CONFIG_VER MUST match this regex. +# ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)? +GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(replace_version_separator 3 '-' ${GCC_PV})} + +# Pre-release support +if [[ ${GCC_PV} == *_pre* ]] ; then + PRERELEASE=${GCC_PV/_pre/-} +elif [[ ${GCC_PV} == *_alpha* ]] ; then + SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_alpha} +elif [[ ${GCC_PV} == *_beta* ]] ; then + SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_beta} +elif [[ ${GCC_PV} == *_rc* ]] ; then + SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc} +fi + +if [[ ${SNAPSHOT} == [56789].0-* ]] ; then + # The gcc-5+ releases have dropped the .0 for some reason. + SNAPSHOT=${SNAPSHOT/.0} +fi + +PREFIX=${TOOLCHAIN_PREFIX:-${EPREFIX}/usr} + +if tc_version_is_at_least 3.4.0 ; then + LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}} +else + LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}} +fi +INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include} + +if is_crosscompile ; then + BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CHOST}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}} + HOSTLIBPATH=${PREFIX}/${CHOST}/${CTARGET}/lib/${GCC_CONFIG_VER} +else + BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}} +fi + +DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}} + +# Dont install in /usr/include/g++-v3/, but in gcc internal directory. +# We will handle /usr/include/g++-v3/ with gcc-config ... +STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}} + +#---->> LICENSE+SLOT+IUSE logic <<---- + +if tc_version_is_at_least 4.6 ; then + LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+" +elif tc_version_is_at_least 4.4 ; then + LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+" +elif tc_version_is_at_least 4.3 ; then + LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+" +elif tc_version_is_at_least 4.2 ; then + LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+" +elif tc_version_is_at_least 3.3 ; then + LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+" +else + LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" +fi + +IUSE="regression-test vanilla" +IUSE_DEF=( nls nptl ) + +if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then + IUSE+=" altivec debug" + IUSE_DEF+=( cxx fortran ) + [[ -n ${PIE_VER} ]] && IUSE+=" nopie" + [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking" + [[ -n ${D_VER} ]] && IUSE+=" d" + [[ -n ${SPECS_VER} ]] && IUSE+=" nossp" + tc_version_is_at_least 3 && IUSE+=" doc hardened multilib objc" + tc_version_is_between 3 7 && IUSE+=" awt gcj" + tc_version_is_at_least 3.3 && IUSE+=" pgo" + tc_version_is_at_least 4.0 && IUSE+=" objc-gc" + tc_version_is_between 4.0 4.9 && IUSE+=" mudflap" + tc_version_is_at_least 4.1 && IUSE+=" libssp objc++" + tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp ) + tc_version_is_at_least 4.3 && IUSE+=" fixed-point" + tc_version_is_at_least 4.7 && IUSE+=" go" + # Note: while <=gcc-4.7 also supported graphite, it required forked ppl + # versions which we dropped. Since graphite was also experimental in + # the older versions, we don't want to bother supporting it. #448024 + tc_version_is_at_least 4.8 && IUSE+=" graphite" IUSE_DEF+=( sanitize ) + tc_version_is_between 4.9 8 && IUSE+=" cilk" + tc_version_is_at_least 4.9 && IUSE+=" +vtv" + tc_version_is_at_least 5.0 && IUSE+=" jit mpx" + tc_version_is_at_least 6.0 && IUSE+=" +pie +ssp +pch" + # systemtap is a gentoo-specific switch: bug #654748 + tc_version_is_at_least 8.0 && IUSE+=" systemtap" +fi + +IUSE+=" ${IUSE_DEF[*]/#/+}" + +SLOT="${GCC_CONFIG_VER}" + +#---->> DEPEND <<---- + +RDEPEND="sys-libs/zlib + nls? ( virtual/libintl )" + +tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv" + +if tc_version_is_at_least 4 ; then + GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0=" + if tc_version_is_at_least 4.3 ; then + RDEPEND+=" ${GMP_MPFR_DEPS}" + elif in_iuse fortran ; then + RDEPEND+=" fortran? ( ${GMP_MPFR_DEPS} )" + fi +fi + +tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1:0=" + +if in_iuse objc-gc ; then + if tc_version_is_at_least 7 ; then + RDEPEND+=" objc-gc? ( >=dev-libs/boehm-gc-7.4.2 )" + fi +fi + +if in_iuse graphite ; then + if tc_version_is_at_least 5.0 ; then + RDEPEND+=" graphite? ( >=dev-libs/isl-0.14:0= )" + elif tc_version_is_at_least 4.8 ; then + RDEPEND+=" + graphite? ( + >=dev-libs/cloog-0.18.0:0= + >=dev-libs/isl-0.11.1:0= + )" + fi +fi + +DEPEND="${RDEPEND} + >=sys-devel/bison-1.875 + >=sys-devel/flex-2.5.4 + nls? ( sys-devel/gettext ) + regression-test? ( + >=dev-util/dejagnu-1.4.4 + >=sys-devel/autogen-5.5.4 + )" + +if in_iuse gcj ; then + GCJ_DEPS=">=media-libs/libart_lgpl-2.1" + GCJ_GTK_DEPS=" + x11-base/xorg-proto + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXtst + =x11-libs/gtk+-2* + virtual/pkgconfig + " + tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango" + tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip" + DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )" +fi + +if in_iuse systemtap ; then + # gcc needs sys/sdt.h headers on target + DEPEND+=" systemtap? ( dev-util/systemtap )" +fi + +PDEPEND=">=sys-devel/gcc-config-1.7" + +#---->> S + SRC_URI essentials <<---- + +# Set the source directory depending on whether we're using +# a prerelease, snapshot, or release tarball. +S=$( + if [[ -n ${PRERELEASE} ]] ; then + echo ${WORKDIR}/gcc-${PRERELEASE} + elif [[ -n ${SNAPSHOT} ]] ; then + echo ${WORKDIR}/gcc-${SNAPSHOT} + else + echo ${WORKDIR}/gcc-${GCC_RELEASE_VER} + fi +) + +gentoo_urls() { + local devspace="HTTP~vapier/dist/URI HTTP~rhill/dist/URI + HTTP~zorry/patches/gcc/URI HTTP~blueness/dist/URI + HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI" + devspace=${devspace//HTTP/https:\/\/dev.gentoo.org\/} + echo mirror://gentoo/$1 ${devspace//URI/$1} +} + +# This function handles the basics of setting the SRC_URI for a gcc ebuild. +# To use, set SRC_URI with: +# +# SRC_URI="$(get_gcc_src_uri)" +# +# Other than the variables normally set by portage, this function's behavior +# can be altered by setting the following: +# +# SNAPSHOT +# If set, this variable signals that we should be using a snapshot of +# gcc. It is expected to be in the format "YYYY-MM-DD". Note that if +# the ebuild has a _pre suffix, this variable is ignored and the +# prerelease tarball is used instead. +# +# BRANCH_UPDATE +# If set, this variable signals that we should be using the main +# release tarball (determined by ebuild version) and applying a +# CVS branch update patch against it. The location of this branch +# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}. +# Just like with SNAPSHOT, this variable is ignored if the ebuild +# has a _pre suffix. +# +# PATCH_VER +# PATCH_GCC_VER +# This should be set to the version of the gentoo patch tarball. +# The resulting filename of this tarball will be: +# gcc-${PATCH_GCC_VER:-${GCC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 +# +# PIE_VER +# PIE_GCC_VER +# These variables control patching in various updates for the logic +# controlling Position Independant Executables. PIE_VER is expected +# to be the version of this patch, and PIE_GCC_VER the gcc version of +# the patch: +# An example: +# PIE_VER="8.7.6.5" +# PIE_GCC_VER="3.4.0" +# The resulting filename of this tarball will be: +# gcc-${PIE_GCC_VER:-${GCC_RELEASE_VER}}-piepatches-v${PIE_VER}.tar.bz2 +# +# SPECS_VER +# SPECS_GCC_VER +# This is for the minispecs files included in the hardened gcc-4.x +# The specs files for hardenedno*, vanilla and for building the "specs" file. +# SPECS_VER is expected to be the version of this patch, SPECS_GCC_VER +# the gcc version of the patch. +# An example: +# SPECS_VER="8.7.6.5" +# SPECS_GCC_VER="3.4.0" +# The resulting filename of this tarball will be: +# gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.bz2 +# +# HTB_VER +# HTB_GCC_VER +# These variables control whether or not an ebuild supports Herman +# ten Brugge's bounds-checking patches. If you want to use a patch +# for an older gcc version with a new gcc, make sure you set +# HTB_GCC_VER to that version of gcc. +get_gcc_src_uri() { + export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}} + export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}} + export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}} + export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}} + export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}} + + # Set where to download gcc itself depending on whether we're using a + # prerelease, snapshot, or release tarball. + if [[ ${PV} == *9999* ]] ; then + # Nothing to do w/git snapshots. + : + elif [[ -n ${PRERELEASE} ]] ; then + GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2" + elif [[ -n ${SNAPSHOT} ]] ; then + if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then + GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.xz" + else + GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2" + fi + else + if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then + GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.xz" + else + GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2" + fi + # we want all branch updates to be against the main release + [[ -n ${BRANCH_UPDATE} ]] && \ + GCC_SRC_URI+=" $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)" + fi + + [[ -n ${UCLIBC_VER} ]] && \ + GCC_SRC_URI+=" $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)" + [[ -n ${PATCH_VER} ]] && \ + GCC_SRC_URI+=" $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)" + + # strawberry pie, Cappuccino and a Gauloises (it's a good thing) + [[ -n ${PIE_VER} ]] && \ + PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2} && \ + GCC_SRC_URI+=" $(gentoo_urls ${PIE_CORE})" + + # gcc minispec for the hardened gcc 4 compiler + [[ -n ${SPECS_VER} ]] && \ + GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)" + + # gcc bounds checking patch + if [[ -n ${HTB_VER} ]] ; then + local HTBFILE="bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2" + GCC_SRC_URI+=" + boundschecking? ( + mirror://sourceforge/boundschecking/${HTBFILE} + $(gentoo_urls ${HTBFILE}) + )" + fi + + [[ -n ${D_VER} ]] && \ + GCC_SRC_URI+=" d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )" + + if in_iuse gcj ; then + if tc_version_is_at_least 4.5 ; then + GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )" + elif tc_version_is_at_least 4.3 ; then + GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )" + fi + fi + + echo "${GCC_SRC_URI}" +} + +SRC_URI=$(get_gcc_src_uri) + +#---->> pkg_pretend <<---- + +toolchain_pkg_pretend() { + if [[ -n ${PRERELEASE}${SNAPSHOT} || ${PV} == *9999* ]] && + [[ -z ${I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS} ]] ; then + die "Please \`export I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS=1\` or define it" \ + "in your make.conf if you want to use this version." + fi + + if ! use_if_iuse cxx ; then + use_if_iuse go && ewarn 'Go requires a C++ compiler, disabled due to USE="-cxx"' + use_if_iuse objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="-cxx"' + use_if_iuse gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="-cxx"' + fi + + want_minispecs +} + +#---->> pkg_setup <<---- + +toolchain_pkg_setup() { + # we dont want to use the installed compiler's specs to build gcc + unset GCC_SPECS + unset LANGUAGES #265283 +} + +#---->> src_unpack <<---- + +toolchain_src_unpack() { + if [[ ${PV} == *9999* ]]; then + git-2_src_unpack + else + gcc_quick_unpack + fi +} + +gcc_quick_unpack() { + pushd "${WORKDIR}" > /dev/null + export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}} + export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}} + export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}} + export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}} + export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}} + + if [[ -n ${GCC_A_FAKEIT} ]] ; then + unpack ${GCC_A_FAKEIT} + elif [[ -n ${PRERELEASE} ]] ; then + unpack gcc-${PRERELEASE}.tar.bz2 + elif [[ -n ${SNAPSHOT} ]] ; then + if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then + unpack gcc-${SNAPSHOT}.tar.xz + else + unpack gcc-${SNAPSHOT}.tar.bz2 + fi + elif [[ ${PV} != *9999* ]] ; then + if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then + unpack gcc-${GCC_RELEASE_VER}.tar.xz + else + unpack gcc-${GCC_RELEASE_VER}.tar.bz2 + fi + # We want branch updates to be against a release tarball + if [[ -n ${BRANCH_UPDATE} ]] ; then + pushd "${S}" > /dev/null + epatch "${DISTDIR}"/gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 + popd > /dev/null + fi + fi + + if [[ -n ${D_VER} ]] && use d ; then + pushd "${S}"/gcc > /dev/null + unpack gdc-${D_VER}-src.tar.bz2 + cd .. + ebegin "Adding support for the D language" + ./gcc/d/setup-gcc.sh >& "${T}"/dgcc.log + if ! eend $? ; then + eerror "The D GCC package failed to apply" + eerror "Please include this log file when posting a bug report:" + eerror " ${T}/dgcc.log" + die "failed to include the D language" + fi + popd > /dev/null + fi + + [[ -n ${PATCH_VER} ]] && \ + unpack gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2 + + [[ -n ${UCLIBC_VER} ]] && \ + unpack gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2 + + if want_pie ; then + if [[ -n ${PIE_CORE} ]] ; then + unpack ${PIE_CORE} + else + unpack gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2 + fi + [[ -n ${SPECS_VER} ]] && \ + unpack gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2 + fi + + use_if_iuse boundschecking && unpack "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2" + + popd > /dev/null +} + +#---->> src_prepare <<---- + +toolchain_src_prepare() { + export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}" + cd "${S}" + + if ! use vanilla ; then + if [[ -n ${PATCH_VER} ]] ; then + guess_patch_type_in_dir "${WORKDIR}"/patch + EPATCH_MULTI_MSG="Applying Gentoo patches ..." \ + epatch "${WORKDIR}"/patch + BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION} p${PATCH_VER}" + fi + if [[ -n ${UCLIBC_VER} ]] ; then + guess_patch_type_in_dir "${WORKDIR}"/uclibc + EPATCH_MULTI_MSG="Applying uClibc patches ..." \ + epatch "${WORKDIR}"/uclibc + fi + fi + do_gcc_HTB_patches + do_gcc_PIE_patches + epatch_user + + if ( tc_version_is_at_least 4.8.2 || use_if_iuse hardened ) && ! use vanilla ; then + make_gcc_hard + fi + + # install the libstdc++ python into the right location + # http://gcc.gnu.org/PR51368 + if tc_version_is_between 4.5 4.7 ; then + sed -i \ + '/^pythondir =/s:=.*:= $(datadir)/python:' \ + "${S}"/libstdc++-v3/python/Makefile.in || die + fi + + # make sure the pkg config files install into multilib dirs. + # since we configure with just one --libdir, we can't use that + # (as gcc itself takes care of building multilibs). #435728 + find "${S}" -name Makefile.in \ + -exec sed -i '/^pkgconfigdir/s:=.*:=$(toolexeclibdir)/pkgconfig:' {} + + + # No idea when this first started being fixed, but let's go with 4.3.x for now + if ! tc_version_is_at_least 4.3 ; then + fix_files="" + for x in contrib/test_summary libstdc++-v3/scripts/check_survey.in ; do + [[ -e ${x} ]] && fix_files="${fix_files} ${x}" + done + ht_fix_file ${fix_files} */configure *.sh */Makefile.in + fi + + setup_multilib_osdirnames + gcc_version_patch + + if tc_version_is_at_least 4.1 ; then + if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} ]] ; then + # BASE-VER must be a three-digit version number + # followed by an optional -pre string + # eg. 4.5.1, 4.6.2-pre20120213, 4.7.0-pre9999 + # If BASE-VER differs from ${PV/_/-} then libraries get installed in + # the wrong directory. + echo ${PV/_/-} > "${S}"/gcc/BASE-VER + fi + fi + + # >= gcc-4.3 doesn't bundle ecj.jar, so copy it + if tc_version_is_at_least 4.3 && use_if_iuse gcj ; then + if tc_version_is_at_least 4.5 ; then + einfo "Copying ecj-4.5.jar" + cp -pPR "${DISTDIR}/ecj-4.5.jar" "${S}/ecj.jar" || die + else + einfo "Copying ecj-4.3.jar" + cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die + fi + fi + + # disable --as-needed from being compiled into gcc specs + # natively when using a gcc version < 3.4.4 + # http://gcc.gnu.org/PR14992 + if ! tc_version_is_at_least 3.4.4 ; then + sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g "${S}"/gcc/config.in + fi + + # In gcc 3.3.x and 3.4.x, rename the java bins to gcc-specific names + # in line with gcc-4. + if tc_version_is_between 3.3 4.0 ; then + do_gcc_rename_java_bins + fi + + # Prevent libffi from being installed + if tc_version_is_between 3.0 4.8 ; then + sed -i -e 's/$install.*:$ install-.*recursive/\1/' "${S}"/libffi/Makefile.in || die + sed -i -e 's/$install-data-am:$.*/\1/' "${S}"/libffi/include/Makefile.in || die + fi + + # Fixup libtool to correctly generate .la files with portage + elibtoolize --portage --shallow --no-uclibc + + gnuconfig_update + + # update configure files + local f + einfo "Fixing misc issues in configure files" + for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do + ebegin " Updating ${f/${S}\/} [LANG]" + patch "${f}" "${FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \ + || eerror "Please file a bug about this" + eend $? + done + sed -i 's|A-Za-z0-9|[:alnum:]|g' "${S}"/gcc/*.awk #215828 + + # Prevent new texinfo from breaking old versions (see #198182, #464008) + tc_version_is_at_least 4.1 && epatch "${FILESDIR}"/gcc-configure-texinfo.patch + + if [[ -x contrib/gcc_update ]] ; then + einfo "Touching generated files" + ./contrib/gcc_update --touch | \ + while read f ; do + einfo " ${f%%...}" + done + fi +} + +guess_patch_type_in_dir() { + [[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \ + && EPATCH_SUFFIX="patch.bz2" \ + || EPATCH_SUFFIX="patch" +} + +do_gcc_HTB_patches() { + use_if_iuse boundschecking || return 0 + + # modify the bounds checking patch with a regression patch + epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch" + BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, HTB-${HTB_GCC_VER}-${HTB_VER}" +} + +do_gcc_PIE_patches() { + want_pie || return 0 + use vanilla && return 0 + + if tc_version_is_at_least 4.3.2 ; then + guess_patch_type_in_dir "${WORKDIR}"/piepatch/ + EPATCH_MULTI_MSG="Applying pie patches ..." \ + epatch "${WORKDIR}"/piepatch/ + else + guess_patch_type_in_dir "${WORKDIR}"/piepatch/upstream + + # corrects startfile/endfile selection and shared/static/pie flag usage + EPATCH_MULTI_MSG="Applying upstream pie patches ..." \ + epatch "${WORKDIR}"/piepatch/upstream + # adds non-default pie support (rs6000) + EPATCH_MULTI_MSG="Applying non-default pie patches ..." \ + epatch "${WORKDIR}"/piepatch/nondef + # adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined + EPATCH_MULTI_MSG="Applying default pie patches ..." \ + epatch "${WORKDIR}"/piepatch/def + fi + + BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}" +} + +# configure to build with the hardened GCC specs as the default +make_gcc_hard() { + + local gcc_hard_flags="" + + # If we use gcc-6 or newer with pie enable to compile older gcc we need to pass -no-pie + # to stage1; bug 618908 + if ! tc_version_is_at_least 6.0 && [[ $(gcc-major-version) -ge 6 ]] ; then + einfo "Disabling PIE in stage1 (only) ..." + sed -i -e "/^STAGE1_LDFLAGS/ s/$/ -no-pie/" "${S}"/Makefile.in || die + fi + + # Gcc >= 6.X we can use configurations options to turn pie/ssp on as default + if tc_version_is_at_least 6.0 ; then + if use_if_iuse pie ; then + einfo "Updating gcc to use automatic PIE building ..." + fi + if use_if_iuse ssp ; then + einfo "Updating gcc to use automatic SSP building ..." + fi + if use_if_iuse hardened ; then + # Will add some optimatizion as default. + gcc_hard_flags+=" -DEXTRA_OPTIONS" + # rebrand to make bug reports easier + BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened} + fi + else + if use_if_iuse hardened ; then + # rebrand to make bug reports easier + BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened} + if hardened_gcc_works ; then + einfo "Updating gcc to use automatic PIE + SSP building ..." + gcc_hard_flags+=" -DEFAULT_PIE_SSP" + elif hardened_gcc_works pie ; then + einfo "Updating gcc to use automatic PIE building ..." + ewarn "SSP has not been enabled by default" + gcc_hard_flags+=" -DEFAULT_PIE" + elif hardened_gcc_works ssp ; then + einfo "Updating gcc to use automatic SSP building ..." + ewarn "PIE has not been enabled by default" + gcc_hard_flags+=" -DEFAULT_SSP" + else + # do nothing if hardened isn't supported, but don't die either + ewarn "hardened is not supported for this arch in this gcc version" + return 0 + fi + else + if hardened_gcc_works ssp ; then + einfo "Updating gcc to use automatic SSP building ..." + gcc_hard_flags+=" -DEFAULT_SSP" + fi + fi + fi + + # we want to be able to control the pie patch logic via something other + # than ALL_CFLAGS... + sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \ + -e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \ + -i "${S}"/gcc/Makefile.in + # Need to add HARD_CFLAGS to ALL_CXXFLAGS on >= 4.7 + if tc_version_is_at_least 4.7 ; then + sed -e '/^ALL_CXXFLAGS/iHARD_CFLAGS = ' \ + -e 's|^ALL_CXXFLAGS = |ALL_CXXFLAGS = $(HARD_CFLAGS) |' \ + -i "${S}"/gcc/Makefile.in + fi + + sed -i \ + -e "/^HARD_CFLAGS = /s|=|= ${gcc_hard_flags} |" \ + "${S}"/gcc/Makefile.in || die + +} + +# This is a historical wart. The original Gentoo/amd64 port used: +# lib32 - 32bit binaries (x86) +# lib64 - 64bit binaries (x86_64) +# lib - "native" binaries (a symlink to lib64) +# Most other distros use the logic (including mainline gcc): +# lib - 32bit binaries (x86) +# lib64 - 64bit binaries (x86_64) +# Over time, Gentoo is migrating to the latter form. +# +# Unfortunately, due to distros picking the lib32 behavior, newer gcc +# versions will dynamically detect whether to use lib or lib32 for its +# 32bit multilib. So, to keep the automagic from getting things wrong +# while people are transitioning from the old style to the new style, +# we always set the MULTILIB_OSDIRNAMES var for relevant targets. +setup_multilib_osdirnames() { + is_multilib || return 0 + + local config + local libdirs="../lib64 ../lib32" + + # this only makes sense for some Linux targets + case ${CTARGET} in + x86_64*-linux*) config="i386" ;; + powerpc64*-linux*) config="rs6000" ;; + sparc64*-linux*) config="sparc" ;; + s390x*-linux*) config="s390" ;; + *) return 0 ;; + esac + config+="/t-linux64" + + local sed_args=() + if tc_version_is_at_least 4.6 ; then + sed_args+=( -e 's:$[(]call if_multiarch[^)]*[)]::g' ) + fi + if [[ ${SYMLINK_LIB} == "yes" ]] ; then + einfo "updating multilib directories to be: ${libdirs}" + if tc_version_is_at_least 4.6.4 || tc_version_is_at_least 4.7 ; then + sed_args+=( -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:' ) + else + sed_args+=( -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" ) + fi + else + einfo "using upstream multilib; disabling lib32 autodetection" + sed_args+=( -r -e 's:[$][(]if.*,(.*)[)]:\1:' ) + fi + sed -i "${sed_args[@]}" "${S}"/gcc/config/${config} || die +} + +gcc_version_patch() { + # gcc-4.3+ has configure flags (whoo!) + tc_version_is_at_least 4.3 && return 0 + + local version_string=${GCC_CONFIG_VER} + [[ -n ${BRANCH_UPDATE} ]] && version_string+=" ${BRANCH_UPDATE}" + + einfo "patching gcc version: ${version_string} (${BRANDING_GCC_PKGVERSION})" + + local gcc_sed=( -e 's:gcc\.gnu\.org/bugs\.html:bugs\.gentoo\.org/:' ) + if grep -qs VERSUFFIX "${S}"/gcc/version.c ; then + gcc_sed+=( -e "/VERSUFFIX \"\"/s:\"\":\" (${BRANDING_GCC_PKGVERSION})\":" ) + else + version_string="${version_string} (${BRANDING_GCC_PKGVERSION})" + gcc_sed+=( -e "/const char version_string\[\] = /s:= \".*\":= \"${version_string}\":" ) + fi + sed -i "${gcc_sed[@]}" "${S}"/gcc/version.c || die +} + +do_gcc_rename_java_bins() { + # bug #139918 - conflict between gcc and java-config-2 for ownership of + # /usr/bin/rmi{c,registry}. Done with mv & sed rather than a patch + # because patches would be large (thanks to the rename of man files), + # and it's clear from the sed invocations that all that changes is the + # rmi{c,registry} names to grmi{c,registry} names. + # Kevin F. Quinn 2006-07-12 + einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry." + # 1) Move the man files if present (missing prior to gcc-3.4) + for manfile in rmic rmiregistry ; do + [[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue + mv "${S}"/gcc/doc/${manfile}.1 "${S}"/gcc/doc/g${manfile}.1 + done + # 2) Fixup references in the docs if present (mission prior to gcc-3.4) + for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi ; do + [[ -f ${S}/${jfile} ]] || continue + sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} || + die "Failed to fixup file ${jfile} for rename to grmiregistry" + sed -i -e 's:rmic:grmic:g' "${S}"/${jfile} || + die "Failed to fixup file ${jfile} for rename to grmic" + done + # 3) Fixup Makefiles to build the changed executable names + # These are present in all 3.x versions, and are the important bit + # to get gcc to build with the new names. + for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in ; do + sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} || + die "Failed to fixup file ${jfile} for rename to grmiregistry" + # Careful with rmic on these files; it's also the name of a directory + # which should be left unchanged. Replace occurrences of 'rmic$', + # 'rmic_' and 'rmic '. + sed -i -e 's:rmic$[$_ ]$:grmic\1:g' "${S}"/${jfile} || + die "Failed to fixup file ${jfile} for rename to grmic" + done +} + +#---->> src_configure <<---- + +toolchain_src_configure() { + downgrade_arch_flags + gcc_do_filter_flags + + einfo "CFLAGS=\"${CFLAGS}\"" + einfo "CXXFLAGS=\"${CXXFLAGS}\"" + einfo "LDFLAGS=\"${LDFLAGS}\"" + + # Force internal zip based jar script to avoid random + # issues with 3rd party jar implementations. #384291 + export JAR=no + + # For hardened gcc 4.3 piepatchset to build the hardened specs + # file (build.specs) to use when building gcc. + if ! tc_version_is_at_least 4.4 && want_minispecs ; then + setup_minispecs_gcc_build_specs + fi + + local confgcc=( --host=${CHOST} ) + + if is_crosscompile || tc-is-cross-compiler ; then + # Straight from the GCC install doc: + # "GCC has code to correctly determine the correct value for target + # for nearly all native systems. Therefore, we highly recommend you + # not provide a configure target when configuring a native compiler." + confgcc+=( --target=${CTARGET} ) + fi + [[ -n ${CBUILD} ]] && confgcc+=( --build=${CBUILD} ) + + confgcc+=( + --prefix="${PREFIX}" + --bindir="${BINPATH}" + --includedir="${INCLUDEPATH}" + --datadir="${DATAPATH}" + --mandir="${DATAPATH}/man" + --infodir="${DATAPATH}/info" + --with-gxx-include-dir="${STDCXX_INCDIR}" + ) + + # Stick the python scripts in their own slotted directory (bug #279252) + # + # --with-python-dir=DIR + # Specifies where to install the Python modules used for aot-compile. DIR + # should not include the prefix used in installation. For example, if the + # Python modules are to be installed in /usr/lib/python2.5/site-packages, + # then --with-python-dir=/lib/python2.5/site-packages should be passed. + # + # This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python" + if tc_version_is_at_least 4.4 ; then + confgcc+=( --with-python-dir=${DATAPATH/$PREFIX/}/python ) + fi + + ### language options + + local GCC_LANG="c" + is_cxx && GCC_LANG+=",c++" + is_d && GCC_LANG+=",d" + is_gcj && GCC_LANG+=",java" + is_go && GCC_LANG+=",go" + is_jit && GCC_LANG+=",jit" + if is_objc || is_objcxx ; then + GCC_LANG+=",objc" + if tc_version_is_at_least 4 ; then + use objc-gc && confgcc+=( --enable-objc-gc ) + fi + is_objcxx && GCC_LANG+=",obj-c++" + fi + + # fortran support just got sillier! the lang value can be f77 for + # fortran77, f95 for fortran95, or just plain old fortran for the + # currently supported standard depending on gcc version. + is_fortran && GCC_LANG+=",fortran" + is_f77 && GCC_LANG+=",f77" + is_f95 && GCC_LANG+=",f95" + + # We do NOT want 'ADA support' in here! + # is_ada && GCC_LANG+=",ada" + + confgcc+=( --enable-languages=${GCC_LANG} ) + + ### general options + + confgcc+=( + --enable-obsolete + --enable-secureplt + --disable-werror + --with-system-zlib + ) + + if use nls ; then + confgcc+=( --enable-nls --without-included-gettext ) + else + confgcc+=( --disable-nls ) + fi + + tc_version_is_at_least 3.4 || confgcc+=( --disable-libunwind-exceptions ) + + # Use the default ("release") checking because upstream usually neglects + # to test "disabled" so it has a history of breaking. #317217 + if tc_version_is_at_least 3.4 && in_iuse debug ; then + # The "release" keyword is new to 4.0. #551636 + local off=$(tc_version_is_at_least 4.0 && echo release || echo no) + confgcc+=( --enable-checking="${GCC_CHECKS_LIST:-$(usex debug yes ${off})}" ) + fi + + # Branding + tc_version_is_at_least 4.3 && confgcc+=( + --with-bugurl=https://bugs.gentoo.org/ + --with-pkgversion="${BRANDING_GCC_PKGVERSION}" + ) + + # If we want hardened support with the newer piepatchset for >=gcc 4.4 + if tc_version_is_at_least 4.4 && want_minispecs && in_iuse hardened ; then + confgcc+=( $(use_enable hardened esp) ) + fi + + # allow gcc to search for clock funcs in the main C lib. + # if it can't find them, then tough cookies -- we aren't + # going to link in -lrt to all C++ apps. #411681 + if tc_version_is_at_least 4.4 && is_cxx ; then + confgcc+=( --enable-libstdcxx-time ) + fi + + # Support to disable pch when building libstdcxx + if tc_version_is_at_least 6.0 && ! use_if_iuse pch ; then + confgcc+=( --disable-libstdcxx-pch ) + fi + + # The jit language requires this. + is_jit && confgcc+=( --enable-host-shared ) + + # # Turn on the -Wl,--build-id flag by default for ELF targets. #525942 + # # This helps with locating debug files. + # case ${CTARGET} in + # *-linux-*|*-elf|*-eabi) + # tc_version_is_at_least 4.5 && confgcc+=( + # --enable-linker-build-id + # ) + # ;; + # esac + + # newer gcc versions like to bootstrap themselves with C++, + # so we need to manually disable it ourselves + if tc_version_is_between 4.7 4.8 && ! is_cxx ; then + confgcc+=( --disable-build-with-cxx --disable-build-poststage1-with-cxx ) + fi + + ### Cross-compiler options + if is_crosscompile ; then + # Enable build warnings by default with cross-compilers when system + # paths are included (e.g. via -I flags). + confgcc+=( --enable-poison-system-directories ) + + # When building a stage1 cross-compiler (just C compiler), we have to + # disable a bunch of features or gcc goes boom + local needed_libc="" + case ${CTARGET} in + *-linux) needed_libc=no-fucking-clue;; + *-dietlibc) needed_libc=dietlibc;; + *-elf|*-eabi) + needed_libc=newlib + # Bare-metal targets don't have access to clock_gettime() + # arm-none-eabi example: bug #589672 + # But we explicitly do --enable-libstdcxx-time above. + # Undoing it here. + confgcc+=( --disable-libstdcxx-time ) + ;; + *-freebsd*) needed_libc=freebsd-lib;; + *-gnu*) needed_libc=glibc;; + *-klibc) needed_libc=klibc;; + *-musl*) needed_libc=musl;; + *-uclibc*) + if ! echo '#include <features.h>' | \ + $(tc-getCPP ${CTARGET}) -E -dD - 2>/dev/null | \ + grep -q __HAVE_SHARED__ + then #291870 + confgcc+=( --disable-shared ) + fi + needed_libc=uclibc + ;; + *-cygwin) needed_libc=cygwin;; + x86_64-*-mingw*|\ + *-w64-mingw*) needed_libc=mingw64-runtime;; + mingw*|*-mingw*) needed_libc=mingw-runtime;; + avr) confgcc+=( --enable-shared --disable-threads );; + esac + if [[ -n ${needed_libc} ]] ; then + local confgcc_no_libc=( --disable-shared ) + tc_version_is_at_least 4.8 && confgcc_no_libc+=( --disable-libatomic ) + if ! has_version ${CATEGORY}/${needed_libc} ; then + confgcc+=( + "${confgcc_no_libc[@]}" + --disable-threads + --without-headers + ) + elif has_version "${CATEGORY}/${needed_libc}[headers-only(-)]" ; then + confgcc+=( + "${confgcc_no_libc[@]}" + --with-sysroot="${PREFIX}"/${CTARGET} + ) + else + confgcc+=( --with-sysroot="${PREFIX}"/${CTARGET} ) + fi + fi + + tc_version_is_at_least 4.2 && confgcc+=( --disable-bootstrap ) + else + if tc-is-static-only ; then + confgcc+=( --disable-shared ) + else + confgcc+=( --enable-shared ) + fi + case ${CHOST} in + mingw*|*-mingw*|*-cygwin) + confgcc+=( --enable-threads=win32 ) ;; + *) + confgcc+=( --enable-threads=posix ) ;; + esac + fi + + # __cxa_atexit is "essential for fully standards-compliant handling of + # destructors", but apparently requires glibc. + case ${CTARGET} in + *-uclibc*) + confgcc+=( + --disable-__cxa_atexit + $(use_enable nptl tls) + ) + tc_version_is_between 3.3 3.4 && confgcc+=( --enable-sjlj-exceptions ) + if tc_version_is_between 3.4 4.3 ; then + confgcc+=( --enable-clocale=uclibc ) + fi + ;; + *-elf|*-eabi) + confgcc+=( --with-newlib ) + ;; + *-gnu*) + confgcc+=( + --enable-__cxa_atexit + --enable-clocale=gnu + ) + ;; + *-freebsd*) + confgcc+=( --enable-__cxa_atexit ) + ;; + *-solaris*) + confgcc+=( --enable-__cxa_atexit ) + ;; + esac + + ### arch options + + gcc-multilib-configure + + # ppc altivec support + in_iuse altivec && confgcc+=( $(use_enable altivec) ) + + # gcc has fixed-point arithmetic support in 4.3 for mips targets that can + # significantly increase compile time by several hours. This will allow + # users to control this feature in the event they need the support. + tc_version_is_at_least 4.3 && in_iuse fixed-point && confgcc+=( $(use_enable fixed-point) ) + + case $(tc-is-softfloat) in + yes) confgcc+=( --with-float=soft ) ;; + softfp) confgcc+=( --with-float=softfp ) ;; + *) + # If they've explicitly opt-ed in, do hardfloat, + # otherwise let the gcc default kick in. + case ${CTARGET//_/-} in + *-hardfloat-*|*eabihf) confgcc+=( --with-float=hard ) ;; + esac + esac + + local with_abi_map=() + case $(tc-arch) in + arm) #264534 #414395 + local a arm_arch=${CTARGET%%-*} + # Remove trailing endian variations first: eb el be bl b l + for a in e{b,l} {b,l}e b l ; do + if [[ ${arm_arch} == *${a} ]] ; then + arm_arch=${arm_arch%${a}} + break + fi + done + # Convert armv7{a,r,m} to armv7-{a,r,m} + [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-} + # See if this is a valid --with-arch flag + if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch}; + . "${srcdir}"/config.gcc) &>/dev/null + then + confgcc+=( --with-arch=${arm_arch} ) + fi + + # Make default mode thumb for microcontroller classes #418209 + [[ ${arm_arch} == *-m ]] && confgcc+=( --with-mode=thumb ) + + # Enable hardvfp + if [[ $(tc-is-softfloat) == "no" ]] && \ + [[ ${CTARGET} == armv[67]* ]] && \ + tc_version_is_at_least 4.5 + then + # Follow the new arm hardfp distro standard by default + confgcc+=( --with-float=hard ) + case ${CTARGET} in + armv6*) confgcc+=( --with-fpu=vfp ) ;; + armv7*) confgcc+=( --with-fpu=vfpv3-d16 ) ;; + esac + fi + ;; + mips) + # Add --with-abi flags to set default ABI + confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) ) + ;; + amd64) + # drop the older/ABI checks once this get's merged into some + # version of gcc upstream + if tc_version_is_at_least 4.8 && has x32 $(get_all_abis TARGET) ; then + confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) ) + fi + ;; + x86) + # Default arch for x86 is normally i386, lets give it a bump + # since glibc will do so based on CTARGET anyways + confgcc+=( --with-arch=${CTARGET%%-*} ) + ;; + hppa) + # Enable sjlj exceptions for backward compatibility on hppa + [[ ${GCCMAJOR} == "3" ]] && confgcc+=( --enable-sjlj-exceptions ) + ;; + ppc) + # Set up defaults based on current CFLAGS + is-flagq -mfloat-gprs=double && confgcc+=( --enable-e500-double ) + [[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc+=( --enable-e500-double ) + ;; + esac + + # if the target can do biarch (-m32/-m64), enable it. overhead should + # be small, and should simplify building of 64bit kernels in a 32bit + # userland by not needing sys-devel/kgcc64. #349405 + case $(tc-arch) in + ppc|ppc64) tc_version_is_at_least 3.4 && confgcc+=( --enable-targets=all ) ;; + sparc) tc_version_is_at_least 4.4 && confgcc+=( --enable-targets=all ) ;; + amd64|x86) tc_version_is_at_least 4.3 && confgcc+=( --enable-targets=all ) ;; + esac + + # On Darwin we need libdir to be set in order to get correct install names + # for things like libobjc-gnu, libgcj and libfortran. If we enable it on + # non-Darwin we screw up the behaviour this eclass relies on. We in + # particular need this over --libdir for bug #255315. + [[ ${CTARGET} == *-darwin* ]] && \ + confgcc+=( --enable-version-specific-runtime-libs ) + + ### library options + + if ! is_gcj ; then + confgcc+=( --disable-libgcj ) + elif use awt ; then + confgcc+=( --enable-java-awt=gtk ) + fi + + if tc_version_is_at_least 4.2 ; then + if in_iuse openmp ; then + # Make sure target has pthreads support. #326757 #335883 + # There shouldn't be a chicken & egg problem here as openmp won't + # build without a C library, and you can't build that w/out + # already having a compiler ... + if ! is_crosscompile || \ + $(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null + then + confgcc+=( $(use_enable openmp libgomp) ) + else + # Force disable as the configure script can be dumb #359855 + confgcc+=( --disable-libgomp ) + fi + else + # For gcc variants where we don't want openmp (e.g. kgcc) + confgcc+=( --disable-libgomp ) + fi + fi + + if tc_version_is_at_least 4.0 ; then + if in_iuse mudflap ; then + confgcc+=( $(use_enable mudflap libmudflap) ) + else + confgcc+=( --disable-libmudflap ) + fi + + if use_if_iuse libssp ; then + confgcc+=( --enable-libssp ) + else + if hardened_gcc_is_stable ssp; then + export gcc_cv_libc_provides_ssp=yes + fi + if use_if_iuse ssp; then + # On some targets USE="ssp -libssp" is an invalid + # configuration as target libc does not provide + # stack_chk_* functions. Do not disable libssp there. + case ${CTARGET} in + mingw*|*-mingw*) ewarn "Not disabling libssp" ;; + *) confgcc+=( --disable-libssp ) ;; + esac + else + confgcc+=( --disable-libssp ) + fi + fi + fi + + if in_iuse cilk ; then + confgcc+=( $(use_enable cilk libcilkrts) ) + fi + + if in_iuse mpx ; then + confgcc+=( $(use_enable mpx libmpx) ) + fi + + if in_iuse systemtap ; then + confgcc+=( $(use_enable systemtap) ) + fi + + if in_iuse vtv ; then + confgcc+=( + $(use_enable vtv vtable-verify) + $(use_enable vtv libvtv) + ) + fi + + # newer gcc's come with libquadmath, but only fortran uses + # it, so auto punt it when we don't care + if tc_version_is_at_least 4.6 && ! is_fortran ; then + confgcc+=( --disable-libquadmath ) + fi + + if tc_version_is_at_least 4.6 ; then + confgcc+=( --enable-lto ) + elif tc_version_is_at_least 4.5 ; then + confgcc+=( --disable-lto ) + fi + + # graphite was added in 4.4 but we only support it in 4.8+ due to external + # library issues. #448024 + if tc_version_is_at_least 5.0 && in_iuse graphite ; then + confgcc+=( $(use_with graphite isl) ) + use graphite && confgcc+=( --disable-isl-version-check ) + elif tc_version_is_at_least 4.8 && in_iuse graphite ; then + confgcc+=( $(use_with graphite cloog) ) + use graphite && confgcc+=( --disable-isl-version-check ) + elif tc_version_is_at_least 4.4 ; then + confgcc+=( --without-{cloog,ppl} ) + fi + + if tc_version_is_at_least 4.8 && in_iuse sanitize ; then + confgcc+=( $(use_enable sanitize libsanitizer) ) + fi + + if tc_version_is_at_least 6.0 && in_iuse pie ; then + confgcc+=( $(use_enable pie default-pie) ) + fi + + if tc_version_is_at_least 6.0 && in_iuse ssp ; then + confgcc+=( + # This defaults to -fstack-protector-strong. + $(use_enable ssp default-ssp) + ) + fi + + # Disable gcc info regeneration -- it ships with generated info pages + # already. Our custom version/urls/etc... trigger it. #464008 + export gcc_cv_prog_makeinfo_modern=no + + # Do not let the X detection get in our way. We know things can be found + # via system paths, so no need to hardcode things that'll break multilib. + # Older gcc versions will detect ac_x_libraries=/usr/lib64 which ends up + # killing the 32bit builds which want /usr/lib. + export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries=' + + confgcc+=( "$@" ${EXTRA_ECONF} ) + + # Nothing wrong with a good dose of verbosity + echo + einfo "PREFIX: ${PREFIX}" + einfo "BINPATH: ${BINPATH}" + einfo "LIBPATH: ${LIBPATH}" + einfo "DATAPATH: ${DATAPATH}" + einfo "STDCXX_INCDIR: ${STDCXX_INCDIR}" + echo + einfo "Languages: ${GCC_LANG}" + echo + einfo "Configuring GCC with: ${confgcc[@]//--/\n\t--}" + echo + + # Build in a separate build tree + mkdir -p "${WORKDIR}"/build + pushd "${WORKDIR}"/build > /dev/null + + # and now to do the actual configuration + addwrite /dev/zero + echo "${S}"/configure "${confgcc[@]}" + # Older gcc versions did not detect bash and re-exec itself, so force the + # use of bash. Newer ones will auto-detect, but this is not harmeful. + CONFIG_SHELL="${EPREFIX}/bin/bash" \ + bash "${S}"/configure "${confgcc[@]}" || die "failed to run configure" + + # return to whatever directory we were in before + popd > /dev/null +} + +# Replace -m flags unsupported by the version being built with the best +# available equivalent +downgrade_arch_flags() { + local arch bver i isa myarch mytune rep ver + + bver=${1:-${GCC_BRANCH_VER}} + [[ $(gcc-version) < ${bver} ]] && return 0 + [[ $(tc-arch) != amd64 && $(tc-arch) != x86 ]] && return 0 + + myarch=$(get-flag march) + mytune=$(get-flag mtune) + + # If -march=native isn't supported we have to tease out the actual arch + if [[ ${myarch} == native || ${mytune} == native ]] ; then + if [[ ${bver} < 4.2 ]] ; then + arch=$($(tc-getCC) -march=native -v -E -P - </dev/null 2>&1 \ + | sed -rn "/cc1.*-march/s:.*-march=([^ ']*).*:\1:p") + replace-cpu-flags native ${arch} + fi + fi + + # Handle special -mtune flags + [[ ${mytune} == intel && ${bver} < 4.9 ]] && replace-cpu-flags intel generic + [[ ${mytune} == generic && ${bver} < 4.2 ]] && filter-flags '-mtune=*' + [[ ${mytune} == x86-64 ]] && filter-flags '-mtune=*' + [[ ${bver} < 3.4 ]] && filter-flags '-mtune=*' + + # "added" "arch" "replacement" + local archlist=( + 4.9 bdver4 bdver3 + 4.9 bonnell atom + 4.9 broadwell core-avx2 + 4.9 haswell core-avx2 + 4.9 ivybridge core-avx-i + 4.9 nehalem corei7 + 4.9 sandybridge corei7-avx + 4.9 silvermont corei7 + 4.9 westmere corei7 + 4.8 bdver3 bdver2 + 4.8 btver2 btver1 + 4.7 bdver2 bdver1 + 4.7 core-avx2 core-avx-i + 4.6 bdver1 amdfam10 + 4.6 btver1 amdfam10 + 4.6 core-avx-i core2 + 4.6 corei7 core2 + 4.6 corei7-avx core2 + 4.5 atom core2 + 4.3 amdfam10 k8 + 4.3 athlon64-sse3 k8 + 4.3 barcelona k8 + 4.3 core2 nocona + 4.3 geode k6-2 # gcc.gnu.org/PR41989#c22 + 4.3 k8-sse3 k8 + 4.3 opteron-sse3 k8 + 3.4 athlon-fx x86-64 + 3.4 athlon64 x86-64 + 3.4 c3-2 c3 + 3.4 k8 x86-64 + 3.4 opteron x86-64 + 3.4 pentium-m pentium3 + 3.4 pentium3m pentium3 + 3.4 pentium4m pentium4 + ) + + for ((i = 0; i < ${#archlist[@]}; i += 3)) ; do + myarch=$(get-flag march) + mytune=$(get-flag mtune) + + ver=${archlist[i]} + arch=${archlist[i + 1]} + rep=${archlist[i + 2]} + + [[ ${myarch} != ${arch} && ${mytune} != ${arch} ]] && continue + + if [[ ${ver} > ${bver} ]] ; then + einfo "Replacing ${myarch} (added in gcc ${ver}) with ${rep}..." + [[ ${myarch} == ${arch} ]] && replace-cpu-flags ${myarch} ${rep} + [[ ${mytune} == ${arch} ]] && replace-cpu-flags ${mytune} ${rep} + continue + else + break + fi + done + + # we only check -mno* here since -m* get removed by strip-flags later on + local isalist=( + 4.9 -mno-sha + 4.9 -mno-avx512pf + 4.9 -mno-avx512f + 4.9 -mno-avx512er + 4.9 -mno-avx512cd + 4.8 -mno-xsaveopt + 4.8 -mno-xsave + 4.8 -mno-rtm + 4.8 -mno-fxsr + 4.7 -mno-lzcnt + 4.7 -mno-bmi2 + 4.7 -mno-avx2 + 4.6 -mno-tbm + 4.6 -mno-rdrnd + 4.6 -mno-fsgsbase + 4.6 -mno-f16c + 4.6 -mno-bmi + 4.5 -mno-xop + 4.5 -mno-movbe + 4.5 -mno-lwp + 4.5 -mno-fma4 + 4.4 -mno-pclmul + 4.4 -mno-fma + 4.4 -mno-avx + 4.4 -mno-aes + 4.3 -mno-ssse3 + 4.3 -mno-sse4a + 4.3 -mno-sse4 + 4.3 -mno-sse4.2 + 4.3 -mno-sse4.1 + 4.3 -mno-popcnt + 4.3 -mno-abm + ) + + for ((i = 0; i < ${#isalist[@]}; i += 2)) ; do + ver=${isalist[i]} + isa=${isalist[i + 1]} + [[ ${ver} > ${bver} ]] && filter-flags ${isa} ${isa/-m/-mno-} + done +} + +gcc_do_filter_flags() { + strip-flags + replace-flags -O? -O2 + + # dont want to funk ourselves + filter-flags '-mabi*' -m31 -m32 -m64 + + filter-flags -frecord-gcc-switches # 490738 + filter-flags -mno-rtm -mno-htm # 506202 + + if tc_version_is_between 3.2 3.4 ; then + # XXX: this is so outdated it's barely useful, but it don't hurt... + replace-cpu-flags G3 750 + replace-cpu-flags G4 7400 + replace-cpu-flags G5 7400 + + # XXX: should add a sed or something to query all supported flags + # from the gcc source and trim everything else ... + filter-flags -f{no-,}unit-at-a-time -f{no-,}web -mno-tls-direct-seg-refs + filter-flags -f{no-,}stack-protector{,-all} + filter-flags -fvisibility-inlines-hidden -fvisibility=hidden + fi + + if tc_version_is_at_least 3.4 ; then + case $(tc-arch) in + amd64|x86) + filter-flags '-mcpu=*' + + tc_version_is_between 4.4 4.5 && append-flags -mno-avx # 357287 + + if tc_version_is_between 4.6 4.7 ; then + # https://bugs.gentoo.org/411333 + # https://bugs.gentoo.org/466454 + replace-cpu-flags c3-2 pentium2 pentium3 pentium3m pentium-m i686 + fi + ;; + alpha) + # https://bugs.gentoo.org/454426 + append-ldflags -Wl,--no-relax + ;; + sparc) + # temporary workaround for random ICEs reproduced by multiple users + # https://bugs.gentoo.org/457062 + tc_version_is_between 4.6 4.8 && MAKEOPTS+=" -j1" + ;; + *-macos) + # http://gcc.gnu.org/PR25127 + tc_version_is_between 4.0 4.2 && \ + filter-flags '-mcpu=*' '-march=*' '-mtune=*' + ;; + esac + fi + + strip-unsupported-flags + + # these are set here so we have something sane at configure time + if is_crosscompile ; then + # Set this to something sane for both native and target + CFLAGS="-O2 -pipe" + FFLAGS=${CFLAGS} + FCFLAGS=${CFLAGS} + + # "hppa2.0-unknown-linux-gnu" -> hppa2_0_unknown_linux_gnu + local VAR="CFLAGS_"${CTARGET//[-.]/_} + CXXFLAGS=${!VAR-${CFLAGS}} + fi + + export GCJFLAGS=${GCJFLAGS:-${CFLAGS}} +} + +setup_minispecs_gcc_build_specs() { + # Setup the "build.specs" file for gcc 4.3 to use when building. + if hardened_gcc_works pie ; then + cat "${WORKDIR}"/specs/pie.specs >> "${WORKDIR}"/build.specs + fi + if hardened_gcc_works ssp ; then + for s in ssp sspall ; do + cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs + done + fi + for s in nostrict znow ; do + cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs + done + export GCC_SPECS="${WORKDIR}"/build.specs +} + +gcc-multilib-configure() { + if ! is_multilib ; then + confgcc+=( --disable-multilib ) + # Fun times: if we are building for a target that has multiple + # possible ABI formats, and the user has told us to pick one + # that isn't the default, then not specifying it via the list + # below will break that on us. + else + confgcc+=( --enable-multilib ) + fi + + # translate our notion of multilibs into gcc's + local abi list + for abi in $(get_all_abis TARGET) ; do + local l=$(gcc-abi-map ${abi}) + [[ -n ${l} ]] && list+=",${l}" + done + if [[ -n ${list} ]] ; then + case ${CTARGET} in + x86_64*) + tc_version_is_at_least 4.8 && confgcc+=( --with-multilib-list=${list:1} ) + ;; + esac + fi +} + +gcc-abi-map() { + # Convert the ABI name we use in Gentoo to what gcc uses + local map=() + case ${CTARGET} in + mips*) map=("o32 32" "n32 n32" "n64 64") ;; + x86_64*) map=("amd64 m64" "x86 m32" "x32 mx32") ;; + esac + + local m + for m in "${map[@]}" ; do + l=( ${m} ) + [[ $1 == ${l[0]} ]] && echo ${l[1]} && break + done +} + +#----> src_compile <---- + +toolchain_src_compile() { + touch "${S}"/gcc/c-gperf.h + + # Do not make manpages if we do not have perl ... + [[ ! -x /usr/bin/perl ]] \ + && find "${WORKDIR}"/build -name '*.[17]' -exec touch {} + + + gcc_do_make ${GCC_MAKE_TARGET} +} + +gcc_do_make() { + # This function accepts one optional argument, the make target to be used. + # If omitted, gcc_do_make will try to guess whether it should use all, + # or bootstrap-lean depending on CTARGET and arch. + # An example of how to use this function: + # + # gcc_do_make all-target-libstdc++-v3 + + [[ -n ${1} ]] && GCC_MAKE_TARGET=${1} + + # default target + if is_crosscompile || tc-is-cross-compiler ; then + # 3 stage bootstrapping doesnt quite work when you cant run the + # resulting binaries natively ^^; + GCC_MAKE_TARGET=${GCC_MAKE_TARGET-all} + else + if tc_version_is_at_least 3.3 && use_if_iuse pgo; then + GCC_MAKE_TARGET=${GCC_MAKE_TARGET-profiledbootstrap} + else + GCC_MAKE_TARGET=${GCC_MAKE_TARGET-bootstrap-lean} + fi + fi + + # Older versions of GCC could not do profiledbootstrap in parallel due to + # collisions with profiling info. + # boundschecking also seems to introduce parallel build issues. + if [[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]] || use_if_iuse boundschecking ; then + ! tc_version_is_at_least 4.6 && export MAKEOPTS="${MAKEOPTS} -j1" + fi + + if [[ ${GCC_MAKE_TARGET} == "all" ]] ; then + STAGE1_CFLAGS=${STAGE1_CFLAGS-"${CFLAGS}"} + elif [[ $(gcc-version) == "3.4" && ${GCC_BRANCH_VER} == "3.4" ]] && gcc-specs-ssp ; then + # See bug #79852 + STAGE1_CFLAGS=${STAGE1_CFLAGS-"-O2"} + fi + + if is_crosscompile; then + # In 3.4, BOOT_CFLAGS is never used on a crosscompile... + # but I'll leave this in anyways as someone might have had + # some reason for putting it in here... --eradicator + BOOT_CFLAGS=${BOOT_CFLAGS-"-O2"} + else + # we only want to use the system's CFLAGS if not building a + # cross-compiler. + BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"} + fi + + einfo "Compiling ${PN} (${GCC_MAKE_TARGET})..." + + pushd "${WORKDIR}"/build >/dev/null + + emake \ + LDFLAGS="${LDFLAGS}" \ + STAGE1_CFLAGS="${STAGE1_CFLAGS}" \ + LIBPATH="${LIBPATH}" \ + BOOT_CFLAGS="${BOOT_CFLAGS}" \ + ${GCC_MAKE_TARGET} \ + || die "emake failed with ${GCC_MAKE_TARGET}" + + if ! is_crosscompile && use_if_iuse cxx && use_if_iuse doc ; then + if type -p doxygen > /dev/null ; then + if tc_version_is_at_least 4.3 ; then + cd "${CTARGET}"/libstdc++-v3/doc + emake doc-man-doxygen || ewarn "failed to make docs" + elif tc_version_is_at_least 3.0 ; then + cd "${CTARGET}"/libstdc++-v3 + emake doxygen-man || ewarn "failed to make docs" + fi + # Clean bogus manpages. #113902 + find -name '*_build_*' -delete + # Blow away generated directory references. Newer versions of gcc + # have gotten better at this, but not perfect. This is easier than + # backporting all of the various doxygen patches. #486754 + find -name '*_.3' -exec grep -l ' Directory Reference ' {} + | \ + xargs rm -f + else + ewarn "Skipping libstdc++ manpage generation since you don't have doxygen installed" + fi + fi + + popd >/dev/null +} + +#---->> src_test <<---- + +toolchain_src_test() { + if use regression-test ; then + cd "${WORKDIR}"/build + emake -k check + fi +} + +#---->> src_install <<---- + +toolchain_src_install() { + cd "${WORKDIR}"/build + + # Do allow symlinks in private gcc include dir as this can break the build + find gcc/include*/ -type l -delete + + # Copy over the info pages. We disabled their generation earlier, but the + # build system only expects to install out of the build dir, not the source. #464008 + mkdir -p gcc/doc + local x= + for x in "${S}"/gcc/doc/*.info* ; do + if [[ -f ${x} ]] ; then + cp "${x}" gcc/doc/ || die + fi + done + + # We remove the generated fixincludes, as they can cause things to break + # (ncurses, openssl, etc). We do not prevent them from being built, as + # in the following commit which we revert: + # https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.647&r2=1.648 + # This is because bsd userland needs fixedincludes to build gcc, while + # linux does not. Both can dispose of them afterwards. + while read x ; do + grep -q 'It has been auto-edited by fixincludes from' "${x}" \ + && rm -f "${x}" + done < <(find gcc/include*/ -name '*.h') + + # Do the 'make install' from the build directory + S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install || die + + # Punt some tools which are really only useful while building gcc + find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \; + # This one comes with binutils + find "${D}" -name libiberty.a -delete + + # Move the libraries to the proper location + gcc_movelibs + + # Basic sanity check + if ! is_crosscompile ; then + local EXEEXT + eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log) + [[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${D}" + fi + + dodir /etc/env.d/gcc + create_gcc_env_entry + + # Setup the gcc_env_entry for hardened gcc 4 with minispecs + want_minispecs && copy_minispecs_gcc_specs + + # Make sure we dont have stuff lying around that + # can nuke multiple versions of gcc + gcc_slot_java + + dodir /usr/bin + cd "${D}"${BINPATH} + # Ugh: we really need to auto-detect this list. + # It's constantly out of date. + for x in cpp gcc g++ c++ gcov g77 gcj gcjh gfortran gccgo ; do + # For some reason, g77 gets made instead of ${CTARGET}-g77... + # this should take care of that + if [[ -f ${x} ]] ; then + # In case they're hardlinks, clear out the target first + # otherwise the mv below will complain. + rm -f ${CTARGET}-${x} + mv ${x} ${CTARGET}-${x} + fi + + if [[ -f ${CTARGET}-${x} ]] ; then + if ! is_crosscompile ; then + ln -sf ${CTARGET}-${x} ${x} + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + /usr/bin/${x}-${GCC_CONFIG_VER} + fi + # Create versioned symlinks + dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} + fi + + if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then + rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER} + ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} + fi + done + # Rename the main go binaries as we don't want to clobber dev-lang/go + # when gcc-config runs. #567806 + if tc_version_is_at_least 5 && is_go ; then + for x in go gofmt; do + mv ${x} ${x}-${GCCMAJOR} || die + done + fi + + # Now do the fun stripping stuff + env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}" + is_crosscompile && \ + env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${HOSTLIBPATH}" + env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}" + # gcc used to install helper binaries in lib/ but then moved to libexec/ + [[ -d ${D}${PREFIX}/libexec/gcc ]] && \ + env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}" + + cd "${S}" + if is_crosscompile; then + rm -rf "${ED}"usr/share/{man,info} + rm -rf "${D}"${DATAPATH}/{man,info} + else + if tc_version_is_at_least 3.0 ; then + local cxx_mandir=$(find "${WORKDIR}/build/${CTARGET}/libstdc++-v3" -name man) + if [[ -d ${cxx_mandir} ]] ; then + cp -r "${cxx_mandir}"/man? "${D}/${DATAPATH}"/man/ + fi + fi + has noinfo ${FEATURES} \ + && rm -r "${D}${DATAPATH}"/info \ + || prepinfo "${DATAPATH#${EPREFIX}}" + has noman ${FEATURES} \ + && rm -r "${D}${DATAPATH}"/man \ + || prepman "${DATAPATH#${EPREFIX}}" + fi + # prune empty dirs left behind + find "${D}" -depth -type d -delete 2>/dev/null + + # install testsuite results + if use regression-test; then + docinto testsuite + find "${WORKDIR}"/build -type f -name "*.sum" -exec dodoc {} + + find "${WORKDIR}"/build -type f -path "*/testsuite/*.log" -exec dodoc {} + + fi + + # Rather install the script, else portage with changing $FILESDIR + # between binary and source package borks things .... + if ! is_crosscompile && [[ ${PN} != "kgcc64" ]] ; then + insinto "${DATAPATH#${EPREFIX}}" + newins "$(prefixify_ro "${FILESDIR}"/awk/fixlafiles.awk-no_gcc_la)" fixlafiles.awk || die + exeinto "${DATAPATH#${EPREFIX}}" + doexe "$(prefixify_ro "${FILESDIR}"/fix_libtool_files.sh)" || die + doexe "${FILESDIR}"/c{89,99} || die + fi + + # libstdc++.la: Delete as it doesn't add anything useful: g++ itself + # handles linkage correctly in the dynamic & static case. It also just + # causes us pain: any C++ progs/libs linking with libtool will gain a + # reference to the full libstdc++.la file which is gcc version specific. + # libstdc++fs.la: It doesn't link against anything useful. + # libsupc++.la: This has no dependencies. + # libcc1.la: There is no static library, only dynamic. + # libcc1plugin.la: Same as above, and it's loaded via dlopen. + # libcp1plugin.la: Same as above, and it's loaded via dlopen. + # libgomp.la: gcc itself handles linkage (libgomp.spec). + # libgomp-plugin-*.la: Same as above, and it's an internal plugin only + # loaded via dlopen. + # libgfortran.la: gfortran itself handles linkage correctly in the + # dynamic & static case (libgfortran.spec). #573302 + # libgfortranbegin.la: Same as above, and it's an internal lib. + # libmpx.la: gcc itself handles linkage correctly (libmpx.spec). + # libmpxwrappers.la: See above. + # libitm.la: gcc itself handles linkage correctly (libitm.spec). + # libvtv.la: gcc itself handles linkage correctly. + # lib*san.la: Sanitizer linkage is handled internally by gcc, and they + # do not support static linking. #487550 #546700 + find "${D}/${LIBPATH}" \ + '(' \ + -name libstdc++.la -o \ + -name libstdc++fs.la -o \ + -name libsupc++.la -o \ + -name libcc1.la -o \ + -name libcc1plugin.la -o \ + -name libcp1plugin.la -o \ + -name 'libgomp.la' -o \ + -name 'libgomp-plugin-*.la' -o \ + -name libgfortran.la -o \ + -name libgfortranbegin.la -o \ + -name libmpx.la -o \ + -name libmpxwrappers.la -o \ + -name libitm.la -o \ + -name libvtv.la -o \ + -name 'lib*san.la' \ + ')' -type f -delete + + # Use gid of 0 because some stupid ports don't have + # the group 'root' set to gid 0. Send to /dev/null + # for people who are testing as non-root. + chown -R root:0 "${D}${LIBPATH}" 2>/dev/null + + # Move pretty-printers to gdb datadir to shut ldconfig up + local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/} + pushd "${D}${LIBPATH}" >/dev/null + for py in $(find . -name '*-gdb.py') ; do + local multidir=${py%/*} + insinto "${gdbdir}/${multidir}" + sed -i "/^libdir =/s:=.*:= '${LIBPATH}/${multidir}':" "${py}" || die #348128 + doins "${py}" || die + rm "${py}" || die + done + popd >/dev/null + + # Don't scan .gox files for executable stacks - false positives + export QA_EXECSTACK="usr/lib*/go/*/*.gox" + export QA_WX_LOAD="usr/lib*/go/*/*.gox" + + # Disable RANDMMAP so PCH works. #301299 + if tc_version_is_at_least 4.3 ; then + pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1" + pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1plus" + fi + + # Disable MPROTECT so java works. #574808 + if is_gcj ; then + pax-mark -m "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/ecj1" + pax-mark -m "${D}${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}/gij" + fi +} + +# Move around the libs to the right location. For some reason, +# when installing gcc, it dumps internal libraries into /usr/lib +# instead of the private gcc lib path +gcc_movelibs() { + # older versions of gcc did not support --print-multi-os-directory + tc_version_is_at_least 3.2 || return 0 + + # For non-target libs which are for CHOST and not CTARGET, we want to + # move them to the compiler-specific CHOST internal dir. This is stuff + # that you want to link against when building tools rather than building + # code to run on the target. + if tc_version_is_at_least 5 && is_crosscompile ; then + dodir "${HOSTLIBPATH#${EPREFIX}}" + mv "${ED}"usr/$(get_libdir)/libcc1* "${D}${HOSTLIBPATH}" || die + fi + + # For all the libs that are built for CTARGET, move them into the + # compiler-specific CTARGET internal dir. + local x multiarg removedirs="" + for multiarg in $($(XGCC) -print-multi-lib) ; do + multiarg=${multiarg#*;} + multiarg=${multiarg//@/ -} + + local OS_MULTIDIR=$($(XGCC) ${multiarg} --print-multi-os-directory) + local MULTIDIR=$($(XGCC) ${multiarg} --print-multi-directory) + local TODIR="${D}${LIBPATH}"/${MULTIDIR} + local FROMDIR= + + [[ -d ${TODIR} ]] || mkdir -p ${TODIR} + + for FROMDIR in \ + "${LIBPATH}"/${OS_MULTIDIR} \ + "${LIBPATH}"/../${MULTIDIR} \ + "${PREFIX}"/lib/${OS_MULTIDIR} \ + "${PREFIX}"/${CTARGET}/lib/${OS_MULTIDIR} + do + removedirs="${removedirs} ${FROMDIR}" + FROMDIR=${D}${FROMDIR} + if [[ ${FROMDIR} != "${TODIR}" && -d ${FROMDIR} ]] ; then + local files=$(find "${FROMDIR}" -maxdepth 1 ! -type d 2>/dev/null) + if [[ -n ${files} ]] ; then + mv ${files} "${TODIR}" || die + fi + fi + done + fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}" + + # SLOT up libgcj.pc if it's available (and let gcc-config worry about links) + FROMDIR="${PREFIX}/lib/${OS_MULTIDIR}" + for x in "${D}${FROMDIR}"/pkgconfig/libgcj*.pc ; do + [[ -f ${x} ]] || continue + sed -i "/^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}:" "${x}" || die + mv "${x}" "${D}${FROMDIR}"/pkgconfig/libgcj-${GCC_PV}.pc || die + done + done + + # We remove directories separately to avoid this case: + # mv SRC/lib/../lib/*.o DEST + # rmdir SRC/lib/../lib/ + # mv SRC/lib/../lib32/*.o DEST # Bork + for FROMDIR in ${removedirs} ; do + rmdir "${D}"${FROMDIR} >& /dev/null + done + find -depth "${D}" -type d -exec rmdir {} + >& /dev/null +} + +# make sure the libtool archives have libdir set to where they actually +# -are-, and not where they -used- to be. also, any dependencies we have +# on our own .la files need to be updated. +fix_libtool_libdir_paths() { + local libpath="$1" + + pushd "${D}" >/dev/null + + pushd "./${libpath}" >/dev/null + local dir="${PWD#${D%/}}" + local allarchives=$(echo *.la) + allarchives="$${allarchives// /\\|}$" + popd >/dev/null + + # The libdir might not have any .la files. #548782 + find "./${dir}" -maxdepth 1 -name '*.la' \ + -exec sed -i -e "/^libdir=/s:=.*:='${dir}':" {} + || die + # Would be nice to combine these, but -maxdepth can not be specified + # on sub-expressions. + find "./${PREFIX}"/lib* -maxdepth 3 -name '*.la' \ + -exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${libpath}/\1:g" {} + || die + find "./${dir}/" -maxdepth 1 -name '*.la' \ + -exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${libpath}/\1:g" {} + || die + + popd >/dev/null +} + +create_gcc_env_entry() { + dodir /etc/env.d/gcc + local gcc_envd_base="/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}" + + local gcc_specs_file + local gcc_envd_file="${ED}${gcc_envd_base}" + if [[ -z $1 ]] ; then + # I'm leaving the following commented out to remind me that it + # was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset + # on chroot or in non-toolchain.eclass gcc ebuilds! + #gcc_specs_file="${LIBPATH}/specs" + gcc_specs_file="" + else + gcc_envd_file+="-$1" + gcc_specs_file="${LIBPATH}/$1.specs" + fi + + # We want to list the default ABI's LIBPATH first so libtool + # searches that directory first. This is a temporary + # workaround for libtool being stupid and using .la's from + # conflicting ABIs by using the first one in the search path + local ldpaths mosdirs + if tc_version_is_at_least 3.2 ; then + local mdir mosdir abi ldpath + for abi in $(get_all_abis TARGET) ; do + mdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory) + ldpath=${LIBPATH} + [[ ${mdir} != "." ]] && ldpath+="/${mdir}" + ldpaths="${ldpath}${ldpaths:+:${ldpaths}}" + + mosdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) -print-multi-os-directory) + mosdirs="${mosdir}${mosdirs:+:${mosdirs}}" + done + else + # Older gcc's didn't do multilib, so logic is simple. + ldpaths=${LIBPATH} + fi + + cat <<-EOF > ${gcc_envd_file} + PATH="${BINPATH}" + ROOTPATH="${BINPATH}" + GCC_PATH="${BINPATH}" + LDPATH="${ldpaths}" + MANPATH="${DATAPATH}/man" + INFOPATH="${DATAPATH}/info" + STDCXX_INCDIR="${STDCXX_INCDIR##*/}" + CTARGET="${CTARGET}" + GCC_SPECS="${gcc_specs_file}" + MULTIOSDIRS="${mosdirs}" + EOF +} + +copy_minispecs_gcc_specs() { + # on gcc 6 we don't need minispecs + if tc_version_is_at_least 6.0 ; then + return 0 + fi + + # setup the hardenedno* specs files and the vanilla specs file. + if hardened_gcc_works ; then + create_gcc_env_entry hardenednopiessp + fi + if hardened_gcc_works pie ; then + create_gcc_env_entry hardenednopie + fi + if hardened_gcc_works ssp ; then + create_gcc_env_entry hardenednossp + fi + create_gcc_env_entry vanilla + insinto ${LIBPATH#${EPREFIX}} + doins "${WORKDIR}"/specs/*.specs || die "failed to install specs" + # Build system specs file which, if it exists, must be a complete set of + # specs as it completely and unconditionally overrides the builtin specs. + if ! tc_version_is_at_least 4.4 ; then + $(XGCC) -dumpspecs > "${WORKDIR}"/specs/specs + cat "${WORKDIR}"/build.specs >> "${WORKDIR}"/specs/specs + doins "${WORKDIR}"/specs/specs || die "failed to install the specs file" + fi +} + +gcc_slot_java() { + local x + + # Move Java headers to compiler-specific dir + for x in "${D}${PREFIX}"/include/gc*.h "${D}${PREFIX}"/include/j*.h ; do + [[ -f ${x} ]] && mv -f "${x}" "${D}${LIBPATH}"/include/ + done + for x in gcj gnu java javax org ; do + if [[ -d ${D}${PREFIX}/include/${x} ]] ; then + dodir /${LIBPATH#${EPREFIX}}/include/${x} + mv -f "${D}${PREFIX}"/include/${x}/* "${D}${LIBPATH}"/include/${x}/ + rm -rf "${D}${PREFIX}"/include/${x} + fi + done + + if [[ -d ${D}${PREFIX}/lib/security ]] || [[ -d ${D}${PREFIX}/$(get_libdir)/security ]] ; then + dodir /${LIBPATH#${EPREFIX}}/security + mv -f "${D}${PREFIX}"/lib*/security/* "${D}${LIBPATH}"/security + rm -rf "${D}${PREFIX}"/lib*/security + fi + + # Move random gcj files to compiler-specific directories + for x in libgcj.spec logging.properties ; do + x="${D}${PREFIX}/lib/${x}" + [[ -f ${x} ]] && mv -f "${x}" "${D}${LIBPATH}"/ + done + + # Rename jar because it could clash with Kaffe's jar if this gcc is + # primary compiler (aka don't have the -<version> extension) + cd "${D}${BINPATH}" + [[ -f jar ]] && mv -f jar gcj-jar +} + +#---->> pkg_post* <<---- + +toolchain_pkg_postinst() { + do_gcc_config + if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow update all + fi + + if ! is_crosscompile && [[ ${PN} != "kgcc64" ]] ; then + echo + ewarn "If you have issues with packages unable to locate libstdc++.la," + ewarn "then try running 'fix_libtool_files.sh' on the old gcc versions." + echo + ewarn "You might want to review the GCC upgrade guide when moving between" + ewarn "major versions (like 4.2 to 4.3):" + ewarn "https://wiki.gentoo.org/wiki/Upgrading_GCC" + echo + + # Clean up old paths + rm -f "${EROOT}"*/rcscripts/awk/fixlafiles.awk "${EROOT}"sbin/fix_libtool_files.sh + rmdir "${EROOT}"*/rcscripts{/awk,} 2>/dev/null + + mkdir -p "${EROOT}"usr/{share/gcc-data,sbin,bin} + # DATAPATH has EPREFIX already, use ROOT with it + cp "${ROOT}${DATAPATH}"/fixlafiles.awk "${EROOT}"usr/share/gcc-data/ || die + cp "${ROOT}${DATAPATH}"/fix_libtool_files.sh "${EROOT}"usr/sbin/ || die + + # Since these aren't critical files and portage sucks with + # handling of binpkgs, don't require these to be found + cp "${ROOT}${DATAPATH}"/c{89,99} "${EROOT}"usr/bin/ 2>/dev/null + fi + + if use regression-test ; then + elog "Testsuite results have been installed into /usr/share/doc/${PF}/testsuite" + echo + fi + + if [[ -n ${PRERELEASE}${SNAPSHOT} ]] ; then + einfo "This GCC ebuild is provided for your convenience, and the use" + einfo "of this compiler is not supported by the Gentoo Developers." + einfo "Please report bugs to upstream at http://gcc.gnu.org/bugzilla/" + fi +} + +toolchain_pkg_postrm() { + if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow clean all + fi + + # to make our lives easier (and saner), we do the fix_libtool stuff here. + # rather than checking SLOT's and trying in upgrade paths, we just see if + # the common libstdc++.la exists in the ${LIBPATH} of the gcc that we are + # unmerging. if it does, that means this was a simple re-emerge. + + # clean up the cruft left behind by cross-compilers + if is_crosscompile ; then + if [[ -z $(ls "${EROOT}"etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then + rm -f "${EROOT}"etc/env.d/gcc/config-${CTARGET} + rm -f "${EROOT}"etc/env.d/??gcc-${CTARGET} + rm -f "${EROOT}"usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64} + fi + return 0 + fi + + # ROOT isnt handled by the script + [[ ${ROOT} != "/" ]] && return 0 + + if [[ ! -e ${LIBPATH}/libstdc++.so ]] ; then + # make sure the profile is sane during same-slot upgrade #289403 + do_gcc_config + + einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}'" + fix_libtool_files.sh ${GCC_RELEASE_VER} + if [[ -n ${BRANCH_UPDATE} ]] ; then + einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}'" + fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE} + fi + fi + + return 0 +} + +do_gcc_config() { + if ! should_we_gcc_config ; then + gcc-config --use-old --force + return 0 + fi + + local current_gcc_config target + + current_gcc_config=$(gcc-config -c ${CTARGET} 2>/dev/null) + if [[ -n ${current_gcc_config} ]] ; then + local current_specs use_specs + # figure out which specs-specific config is active + current_specs=$(gcc-config -S ${current_gcc_config} | awk '{print $3}') + [[ -n ${current_specs} ]] && use_specs=-${current_specs} + + if [[ -n ${use_specs} ]] && \ + [[ ! -e ${ROOT}/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}${use_specs} ]] + then + ewarn "The currently selected specs-specific gcc config," + ewarn "${current_specs}, doesn't exist anymore. This is usually" + ewarn "due to enabling/disabling hardened or switching to a version" + ewarn "of gcc that doesnt create multiple specs files. The default" + ewarn "config will be used, and the previous preference forgotten." + use_specs="" + fi + + target="${CTARGET}-${GCC_CONFIG_VER}${use_specs}" + else + # The curent target is invalid. Attempt to switch to a valid one. + # Blindly pick the latest version. #529608 + # TODO: Should update gcc-config to accept `-l ${CTARGET}` rather than + # doing a partial grep like this. + target=$(gcc-config -l 2>/dev/null | grep " ${CTARGET}-[0-9]" | tail -1 | awk '{print $2}') + fi + + gcc-config "${target}" +} + +should_we_gcc_config() { + # if the current config is invalid, we definitely want a new one + # Note: due to bash quirkiness, the following must not be 1 line + local curr_config + curr_config=$(gcc-config -c ${CTARGET} 2>&1) || return 0 + + # if the previously selected config has the same major.minor (branch) as + # the version we are installing, then it will probably be uninstalled + # for being in the same SLOT, make sure we run gcc-config. + local curr_config_ver=$(gcc-config -S ${curr_config} | awk '{print $2}') + + local curr_branch_ver=$(get_version_component_range 1-2 ${curr_config_ver}) + + if [[ ${curr_branch_ver} == ${GCC_BRANCH_VER} ]] ; then + return 0 + else + # if we're installing a genuinely different compiler version, + # we should probably tell the user -how- to switch to the new + # gcc version, since we're not going to do it for him/her. + # We don't want to switch from say gcc-3.3 to gcc-3.4 right in + # the middle of an emerge operation (like an 'emerge -e world' + # which could install multiple gcc versions). + # Only warn if we're installing a pkg as we might be called from + # the pkg_{pre,post}rm steps. #446830 + if [[ ${EBUILD_PHASE} == *"inst" ]] ; then + einfo "The current gcc config appears valid, so it will not be" + einfo "automatically switched for you. If you would like to" + einfo "switch to the newly installed gcc version, do the" + einfo "following:" + echo + einfo "gcc-config ${CTARGET}-${GCC_CONFIG_VER}" + einfo "source /etc/profile" + echo + fi + return 1 + fi +} + +#---->> support and misc functions <<---- + +# This is to make sure we don't accidentally try to enable support for a +# language that doesnt exist. GCC 3.4 supports f77, while 4.0 supports f95, etc. +# +# Also add a hook so special ebuilds (kgcc64) can control which languages +# exactly get enabled +gcc-lang-supported() { + grep ^language=\"${1}\" "${S}"/gcc/*/config-lang.in > /dev/null || return 1 + [[ -z ${TOOLCHAIN_ALLOWED_LANGS} ]] && return 0 + has $1 ${TOOLCHAIN_ALLOWED_LANGS} +} + +is_ada() { + gcc-lang-supported ada || return 1 + use_if_iuse ada +} + +is_cxx() { + gcc-lang-supported 'c++' || return 1 + ! is_crosscompile && tc_version_is_at_least 4.8 && return 0 + use_if_iuse cxx +} + +is_d() { + gcc-lang-supported d || return 1 + use_if_iuse d +} + +is_f77() { + gcc-lang-supported f77 || return 1 + use_if_iuse fortran +} + +is_f95() { + gcc-lang-supported f95 || return 1 + use_if_iuse fortran +} + +is_fortran() { + gcc-lang-supported fortran || return 1 + use_if_iuse fortran +} + +is_gcj() { + gcc-lang-supported java || return 1 + use_if_iuse cxx && use_if_iuse gcj +} + +is_go() { + gcc-lang-supported go || return 1 + use_if_iuse cxx && use_if_iuse go +} + +is_jit() { + gcc-lang-supported jit || return 1 + use_if_iuse jit +} + +is_multilib() { + tc_version_is_at_least 3 || return 1 + use_if_iuse multilib +} + +is_objc() { + gcc-lang-supported objc || return 1 + use_if_iuse objc +} + +is_objcxx() { + gcc-lang-supported 'obj-c++' || return 1 + use_if_iuse cxx && use_if_iuse objc++ +} + +# Grab a variable from the build system (taken from linux-info.eclass) +get_make_var() { + local var=$1 makefile=${2:-${WORKDIR}/build/Makefile} + echo -e "e:\\n\\t@echo \$(${var})\\ninclude ${makefile}" | \ + r=${makefile%/*} emake --no-print-directory -s -f - 2>/dev/null +} + +XGCC() { get_make_var GCC_FOR_TARGET ; } + +# The gentoo piessp patches allow for 3 configurations: +# 1) PIE+SSP by default +# 2) PIE by default +# 3) SSP by default +hardened_gcc_works() { + if [[ $1 == "pie" ]] ; then + # $gcc_cv_ld_pie is unreliable as it simply take the output of + # `ld --help | grep -- -pie`, that reports the option in all cases, also if + # the loader doesn't actually load the resulting executables. + # To avoid breakage, blacklist FreeBSD here at least + [[ ${CTARGET} == *-freebsd* ]] && return 1 + + want_pie || return 1 + use_if_iuse nopie && return 1 + hardened_gcc_is_stable pie + return $? + elif [[ $1 == "ssp" ]] ; then + [[ -n ${SPECS_VER} ]] || return 1 + use_if_iuse nossp && return 1 + hardened_gcc_is_stable ssp + return $? + else + # laziness ;) + hardened_gcc_works pie || return 1 + hardened_gcc_works ssp || return 1 + return 0 + fi +} + +hardened_gcc_is_stable() { + local tocheck + if [[ $1 == "pie" ]] ; then + if [[ ${CTARGET} == *-uclibc* ]] ; then + tocheck=${PIE_UCLIBC_STABLE} + else + tocheck=${PIE_GLIBC_STABLE} + fi + elif [[ $1 == "ssp" ]] ; then + if [[ ${CTARGET} == *-uclibc* ]] ; then + tocheck=${SSP_UCLIBC_STABLE} + elif [[ ${CTARGET} == *-gnu* ]] ; then + tocheck=${SSP_STABLE} + fi + else + die "hardened_gcc_stable needs to be called with pie or ssp" + fi + + has $(tc-arch) ${tocheck} && return 0 + return 1 +} + +want_minispecs() { + # on gcc 6 we don't need minispecs + if tc_version_is_at_least 6.0 ; then + return 0 + fi + if tc_version_is_at_least 4.3.2 && use_if_iuse hardened ; then + if ! want_pie ; then + ewarn "PIE_VER or SPECS_VER is not defined in the GCC ebuild." + elif use vanilla ; then + ewarn "You will not get hardened features if you have the vanilla USE-flag." + elif use_if_iuse nopie && use_if_iuse nossp ; then + ewarn "You will not get hardened features if you have the nopie and nossp USE-flag." + elif ! hardened_gcc_works ; then + ewarn "Your $(tc-arch) arch is not supported." + else + return 0 + fi + ewarn "Hope you know what you are doing. Hardened will not work." + return 0 + fi + return 1 +} + +want_pie() { + ! use_if_iuse hardened && [[ -n ${PIE_VER} ]] && use_if_iuse nopie && return 1 + [[ -n ${PIE_VER} ]] && [[ -n ${SPECS_VER} ]] && return 0 + tc_version_is_at_least 4.3.2 && return 1 + [[ -z ${PIE_VER} ]] && return 1 + use_if_iuse nopie || return 0 + return 1 +} + +has toolchain_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" toolchain_death_notice" +toolchain_death_notice() { + if [[ -e "${WORKDIR}"/build ]] ; then + pushd "${WORKDIR}"/build >/dev/null + (echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > gccinfo.log + [[ -e "${T}"/build.log ]] && cp "${T}"/build.log . + tar jcf "${WORKDIR}"/gcc-build-logs.tar.bz2 \ + gccinfo.log build.log $(find -name config.log) + rm gccinfo.log build.log + eerror + eerror "Please include ${WORKDIR}/gcc-build-logs.tar.bz2 in your bug report." + eerror + popd >/dev/null + fi +} diff -uNr a/eclass/twisted-r1.eclass b/eclass/twisted-r1.eclass --- a/eclass/twisted-r1.eclass false +++ b/eclass/twisted-r1.eclass aa64b7b0019b99b8df00d19dbe1cbc79df306a6b0336187ada0dfa69fb4c45a3e2f2366736df01b100e00296b37d353faf30fe0f7ebd99c4ed7e9c9b0c2dd2bc @@ -0,0 +1,236 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: twisted-r1.eclass +# @MAINTAINER: +# Gentoo Python Project <python@gentoo.org> +# @AUTHOR: +# Author: Michał Górny <mgorny@gentoo.org> +# Author: Jan Matejka <yac@gentoo.org> +# @BLURB: Eclass for Twisted packages +# @DESCRIPTION: +# The twisted eclass defines phase functions for Twisted packages. + +case "${EAPI:-0}" in + 0|1|2|3) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" + ;; + 4|5) + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; +esac + +if [[ ! ${_TWISTED_R1} ]]; then + +inherit distutils-r1 versionator + +fi # ! ${_TWISTED_R1} + +EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm + +if [[ ! ${_TWISTED_R1} ]]; then + +# @FUNCTION: _twisted-r1_camelcase +# @USAGE: <pn> +# @DESCRIPTION: +# Convert dash-separated <pn> to CamelCase name suitable for Twisted. +# In pure bash, therefore safe for global scope execution. +_twisted-r1_camelcase() { + local IFS=- + + # IFS=- splits words by -. + local words=( ${1} ) + + # we can't keep '-' as it collides with [a-z] check + # and '' is used by bash-4 words[*], so let's just set globally + IFS= + + if [[ ${BASH_VERSINFO[0]} -ge 4 ]]; then + echo "${words[*]^}" + return + fi + + local w LC_COLLATE=C uc='ABCDEFGHIJKLMNOPQRSTUVWXYZ' + + local out + for w in "${words[@]}"; do + local fl=${w:0:1} + + # Danger: magic starts here. Please close your eyes. + # In base 36, a..z represents digits 10..35. We substract 10 + # and get array subscripts for uc. + + [[ ${fl} == [a-z] ]] && fl=${uc:36#${fl} - 10:1} + + out+=${fl}${w:1} + done + + echo "${out}" +} + +# @ECLASS-VARIABLE: TWISTED_PN +# @DESCRIPTION: +# The real package name. Default to camel-case conversion of ${PN}. +# +# Example: TwistedCore +: ${TWISTED_PN:=$(_twisted-r1_camelcase ${PN})} + +# @ECLASS-VARIABLE: TWISTED_P +# @DESCRIPTION: +# The real package name with version appended. +# +# It is used to build the default SRC_URI and S values. +# +# Example: TwistedCore-1.2.3 +: ${TWISTED_P:=${TWISTED_PN}-${PV}} + +# @ECLASS-VARIABLE: TWISTED_RELEASE +# @DESCRIPTION: +# The 'release' of Twisted. Defaults to the major & minor version +# number from ${PV}. +# +# It is used to build the default SRC_URI. It may be also used +# in dependencies against other Twisted packages. +# +# Example: 1.2 +: ${TWISTED_RELEASE:=$(get_version_component_range 1-2 ${PV})} + +HOMEPAGE="https://www.twistedmatrix.com/trac/" +SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN#Twisted}" +SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +IUSE="" + +S=${WORKDIR}/${TWISTED_P} + +# @ECLASS-VARIABLE: TWISTED_PLUGINS +# @DESCRIPTION: +# An array of Twisted plugins, whose cache is regenerated +# in pkg_postinst() and pkg_postrm() phases. +# +# If no plugins are installed, set to empty array. +declare -p TWISTED_PLUGINS &>/dev/null || TWISTED_PLUGINS=( twisted.plugins ) + +# @FUNCTION: twisted-r1_python_test +# @DESCRIPTION: +# The common python_test() implementation that suffices for Twisted +# packages. +twisted-r1_python_test() { + local sitedir=$(python_get_sitedir) + + # Copy modules of other Twisted packages from site-packages + # directory to the temporary directory. + local libdir=${BUILD_DIR}/test/lib + mkdir -p "${libdir}" || die + cp -r "${ROOT}${sitedir}"/twisted "${libdir}" || die + # Drop the installed module in case previous version conflicts with + # the new one somehow. + rm -fr "${libdir}/${PN/-//}" || die + + distutils_install_for_testing || die + + if [[ ${TEST_DIR} != ${BUILD_DIR}/test ]]; then + eerror "twisted-r1 integrity check failed." + eerror "TEST_DIR: ${TEST_DIR}" + eerror "expected: ${BUILD_DIR}/test" + die "TEST_DIR integrity check failed" + fi + + cd "${TEST_DIR}"/lib || die + trial ${PN/-/.} || die "Tests fail with ${EPYTHON}" +} + +# @FUNCTION: python_test +# @DESCRIPTION: +# Default python_test() for Twisted packages. If you need to override +# it, you can access the original implementation +# via twisted-r1_python_test. +python_test() { + twisted-r1_python_test +} + +# @FUNCTION: twisted-r1_src_install +# @DESCRIPTION: +# Default src_install() for Twisted packages. Automatically handles HTML +# docs (unless HTML_DOCS is set explicitly) and manpages in Twisted +# packages. +twisted-r1_src_install() { + [[ -d doc ]] && local HTML_DOCS=( "${HTML_DOCS[@]:-doc/.}" ) + [[ -d doc/man ]] && doman doc/man/*.[[:digit:]] + + distutils-r1_src_install +} + +# @FUNCTION: _twisted-r1_create_caches +# @USAGE: <packages>... +# @DESCRIPTION: +# Create dropin.cache for plugins in specified packages. The packages +# are to be listed in standard dotted Python syntax. +_twisted-r1_create_caches() { + # http://twistedmatrix.com/documents/current/core/howto/plugin.html + "${PYTHON}" -c \ +"import sys +sys.path.insert(0, '${ROOT}$(python_get_sitedir)') + +fail = False + +try: + from twisted.plugin import getPlugins, IPlugin +except ImportError as e: + if '${EBUILD_PHASE}' == 'postinst': + raise +else: + for module in sys.argv[1:]: + try: + __import__(module, globals()) + except ImportError as e: + if '${EBUILD_PHASE}' == 'postinst': + raise + else: + list(getPlugins(IPlugin, sys.modules[module])) +" \ + "${@}" || die "twisted plugin cache update failed" +} + +# @FUNCTION: twisted-r1_update_plugin_cache +# @DESCRIPTION: +# Update and clean up plugin caches for packages listed +# in TWISTED_PLUGINS. +twisted-r1_update_plugin_cache() { + [[ ${TWISTED_PLUGINS[@]} ]] || return + + local subdirs=( "${TWISTED_PLUGINS[@]//.//}" ) + local paths=( "${subdirs[@]/#/${ROOT}$(python_get_sitedir)/}" ) + local caches=( "${paths[@]/%//dropin.cache}" ) + + # First, delete existing (possibly stray) caches. + rm -f "${caches[@]}" || die + + # Now, let's see which ones we can regenerate. + _twisted-r1_create_caches "${TWISTED_PLUGINS[@]}" + + # Finally, drop empty parent directories. + rmdir -p "${paths[@]}" 2>/dev/null +} + +# @FUNCTION: twisted-r1_pkg_postinst +# @DESCRIPTION: +# Post-installation hook for twisted-r1. Updates plugin caches. +twisted-r1_pkg_postinst() { + _distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache +} + +# @FUNCTION: twisted-r1_pkg_postrm +# @DESCRIPTION: +# Post-removal hook for twisted-r1. Updates plugin caches. +twisted-r1_pkg_postrm() { + _distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache +} + +_TWISTED_R1=1 + +fi # ! ${_TWISTED_R1} diff -uNr a/eclass/udev.eclass b/eclass/udev.eclass --- a/eclass/udev.eclass false +++ b/eclass/udev.eclass 76a997f4d207de1fe0c48cdafab6428b7a69d95d0d5cf5e8fe950ad9090d1f588c40e4fbdef99dabb03ad695708f454c30124d6753df41bd647a49c207b76f9e @@ -0,0 +1,119 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: udev.eclass +# @MAINTAINER: +# udev-bugs@gentoo.org +# @BLURB: Default eclass for determining udev directories. +# @DESCRIPTION: +# Default eclass for determining udev directories. +# @EXAMPLE: +# +# @CODE +# inherit udev +# +# # Example of the eclass usage: +# RDEPEND="virtual/udev" +# DEPEND="${RDEPEND}" +# +# src_configure() { +# econf --with-rulesdir="$(get_udevdir)"/rules.d +# } +# +# src_install() { +# default +# # udev_dorules contrib/99-foomatic +# # udev_newrules contrib/98-foomatic 99-foomatic +# } +# @CODE + +if [[ -z ${_UDEV_ECLASS} ]]; then +_UDEV_ECLASS=1 + +inherit toolchain-funcs + +case ${EAPI:-0} in + 0|1|2|3|4|5|6) ;; + *) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established." +esac + +RDEPEND="" +DEPEND="virtual/pkgconfig" + +# @FUNCTION: _udev_get_udevdir +# @INTERNAL +# @DESCRIPTION: +# Get unprefixed udevdir. +_udev_get_udevdir() { + if $($(tc-getPKG_CONFIG) --exists udev); then + echo "$($(tc-getPKG_CONFIG) --variable=udevdir udev)" + else + echo /lib/udev + fi +} + +# @FUNCTION: udev_get_udevdir +# @DESCRIPTION: +# Use the short version $(get_udevdir) instead! +udev_get_udevdir() { + debug-print-function ${FUNCNAME} "${@}" + + eerror "This ebuild should be using the get_udevdir() function instead of the deprecated udev_get_udevdir()" + die "Deprecated function call: udev_get_udevdir(), please report to (overlay) maintainers." +} + +# @FUNCTION: get_udevdir +# @DESCRIPTION: +# Output the path for the udev directory (not including ${D}). +# This function always succeeds, even if udev is not installed. +# The fallback value is set to /lib/udev +get_udevdir() { + debug-print-function ${FUNCNAME} "${@}" + + echo "$(_udev_get_udevdir)" +} + +# @FUNCTION: udev_dorules +# @USAGE: rules [...] +# @DESCRIPTION: +# Install udev rule(s). Uses doins, thus it is fatal in EAPI 4 +# and non-fatal in earlier EAPIs. +udev_dorules() { + debug-print-function ${FUNCNAME} "${@}" + + ( + insinto "$(_udev_get_udevdir)"/rules.d + doins "${@}" + ) +} + +# @FUNCTION: udev_newrules +# @USAGE: oldname newname +# @DESCRIPTION: +# Install udev rule with a new name. Uses newins, thus it is fatal +# in EAPI 4 and non-fatal in earlier EAPIs. +udev_newrules() { + debug-print-function ${FUNCNAME} "${@}" + + ( + insinto "$(_udev_get_udevdir)"/rules.d + newins "${@}" + ) +} + +# @FUNCTION: udev_reload +# @DESCRIPTION: +# Run udevadm control --reload to refresh rules and databases +udev_reload() { + if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then + return 0 + fi + + if [[ -d ${ROOT}/run/udev ]]; then + ebegin "Running udev control --reload for reloading rules and databases" + udevadm control --reload + eend $? + fi +} + +fi diff -uNr a/eclass/unpacker.eclass b/eclass/unpacker.eclass --- a/eclass/unpacker.eclass false +++ b/eclass/unpacker.eclass 8ff2f25577d1bd1e2fc8628f0ffc495a0c892df38f711c5c2c3dadf873e2ae17efa15686066e323a316843e619a5499d023be1d5d489dd9ff851cdcd0432bf87 @@ -0,0 +1,464 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: unpacker.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: helpers for extraneous file formats and consistent behavior across EAPIs +# @DESCRIPTION: +# Some extraneous file formats are not part of PMS, or are only in certain +# EAPIs. Rather than worrying about that, support the crazy cruft here +# and for all EAPI versions. + +# Possible todos: +# - merge rpm unpacking +# - support partial unpacks? + +if [[ -z ${_UNPACKER_ECLASS} ]]; then +_UNPACKER_ECLASS=1 + +# @ECLASS-VARIABLE: UNPACKER_BZ2 +# @DEFAULT_UNSET +# @DESCRIPTION: +# Utility to use to decompress bzip2 files. Will dynamically pick between +# `pbzip2` and `bzip2`. Make sure your choice accepts the "-dc" options. +# Note: this is meant for users to set, not ebuilds. + +# @ECLASS-VARIABLE: UNPACKER_LZIP +# @DEFAULT_UNSET +# @DESCRIPTION: +# Utility to use to decompress lzip files. Will dynamically pick between +# `plzip`, `pdlzip` and `lzip`. Make sure your choice accepts the "-dc" options. +# Note: this is meant for users to set, not ebuilds. + +# for internal use only (unpack_pdv and unpack_makeself) +find_unpackable_file() { + local src=$1 + if [[ -z ${src} ]] ; then + src=${DISTDIR}/${A} + else + if [[ ${src} == ./* ]] ; then + : # already what we want + elif [[ -e ${DISTDIR}/${src} ]] ; then + src=${DISTDIR}/${src} + elif [[ -e ${PWD}/${src} ]] ; then + src=${PWD}/${src} + elif [[ -e ${src} ]] ; then + src=${src} + fi + fi + [[ ! -e ${src} ]] && return 1 + echo "${src}" +} + +unpack_banner() { + echo ">>> Unpacking ${1##*/} to ${PWD}" +} + +# @FUNCTION: unpack_pdv +# @USAGE: <file to unpack> <size of off_t> +# @DESCRIPTION: +# Unpack those pesky pdv generated files ... +# They're self-unpacking programs with the binary package stuffed in +# the middle of the archive. Valve seems to use it a lot ... too bad +# it seems to like to segfault a lot :(. So lets take it apart ourselves. +# +# You have to specify the off_t size ... I have no idea how to extract that +# information out of the binary executable myself. Basically you pass in +# the size of the off_t type (in bytes) on the machine that built the pdv +# archive. +# +# One way to determine this is by running the following commands: +# +# @CODE +# strings <pdv archive> | grep lseek +# strace -elseek <pdv archive> +# @CODE +# +# Basically look for the first lseek command (we do the strings/grep because +# sometimes the function call is _llseek or something) and steal the 2nd +# parameter. Here is an example: +# +# @CODE +# $ strings hldsupdatetool.bin | grep lseek +# lseek +# $ strace -elseek ./hldsupdatetool.bin +# lseek(3, -4, SEEK_END) = 2981250 +# @CODE +# +# Thus we would pass in the value of '4' as the second parameter. +unpack_pdv() { + local src=$(find_unpackable_file "$1") + local sizeoff_t=$2 + + [[ -z ${src} ]] && die "Could not locate source for '$1'" + [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" + + unpack_banner "${src}" + + local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\") + local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\") + + # grab metadata for debug reasons + local metafile="${T}/${FUNCNAME}.meta" + tail -c +$((${metaskip}+1)) "${src}" > "${metafile}" + + # rip out the final file name from the metadata + local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1) + datafile=$(basename "${datafile}") + + # now lets uncompress/untar the file if need be + local tmpfile="${T}/${FUNCNAME}" + tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > "${tmpfile}" + + local iscompressed=$(file -b "${tmpfile}") + if [[ ${iscompressed:0:8} == "compress" ]] ; then + iscompressed=1 + mv "${tmpfile}"{,.Z} + gunzip "${tmpfile}" + else + iscompressed=0 + fi + local istar=$(file -b "${tmpfile}") + if [[ ${istar:0:9} == "POSIX tar" ]] ; then + istar=1 + else + istar=0 + fi + + #for some reason gzip dies with this ... dd cant provide buffer fast enough ? + #dd if=${src} ibs=${metaskip} count=1 \ + # | dd ibs=${tailskip} skip=1 \ + # | gzip -dc \ + # > ${datafile} + if [ ${iscompressed} -eq 1 ] ; then + if [ ${istar} -eq 1 ] ; then + tail -c +$((${tailskip}+1)) "${src}" 2>/dev/null \ + | head -c $((${metaskip}-${tailskip})) \ + | tar -xzf - + else + tail -c +$((${tailskip}+1)) "${src}" 2>/dev/null \ + | head -c $((${metaskip}-${tailskip})) \ + | gzip -dc \ + > ${datafile} + fi + else + if [ ${istar} -eq 1 ] ; then + tail -c +$((${tailskip}+1)) "${src}" 2>/dev/null \ + | head -c $((${metaskip}-${tailskip})) \ + | tar --no-same-owner -xf - + else + tail -c +$((${tailskip}+1)) "${src}" 2>/dev/null \ + | head -c $((${metaskip}-${tailskip})) \ + > ${datafile} + fi + fi + true + #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" + #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" +} + +# @FUNCTION: unpack_makeself +# @USAGE: [file to unpack] [offset] [tail|dd] +# @DESCRIPTION: +# Unpack those pesky makeself generated files ... +# They're shell scripts with the binary package tagged onto +# the end of the archive. Loki utilized the format as does +# many other game companies. +# +# If the file is not specified, then ${A} is used. If the +# offset is not specified then we will attempt to extract +# the proper offset from the script itself. +unpack_makeself() { + local src_input=${1:-${A}} + local src=$(find_unpackable_file "${src_input}") + local skip=$2 + local exe=$3 + + [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" + + unpack_banner "${src}" + + if [[ -z ${skip} ]] ; then + local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}') + local skip=0 + exe=tail + case ${ver} in + 1.5.*|1.6.0-nv*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same + skip=$(grep -a ^skip= "${src}" | cut -d= -f2) + ;; + 2.0|2.0.1) + skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) + ;; + 2.1.1) + skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) + (( skip++ )) + ;; + 2.1.2) + skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) + (( skip++ )) + ;; + 2.1.3) + skip=`grep -a ^offset= "${src}" | awk '{print $3}'` + (( skip++ )) + ;; + 2.1.4|2.1.5|2.1.6|2.2.0) + skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) + skip=$(head -n ${skip} "${src}" | wc -c) + exe="dd" + ;; + *) + eerror "I'm sorry, but I was unable to support the Makeself file." + eerror "The version I detected was '${ver}'." + eerror "Please file a bug about the file ${src##*/} at" + eerror "https://bugs.gentoo.org/ so that support can be added." + die "makeself version '${ver}' not supported" + ;; + esac + debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" + fi + case ${exe} in + tail) exe=( tail -n +${skip} "${src}" );; + dd) exe=( dd ibs=${skip} skip=1 if="${src}" );; + *) die "makeself cant handle exe '${exe}'" + esac + + # lets grab the first few bytes of the file to figure out what kind of archive it is + local filetype tmpfile="${T}/${FUNCNAME}" + "${exe[@]}" 2>/dev/null | head -c 512 > "${tmpfile}" + filetype=$(file -b "${tmpfile}") || die + case ${filetype} in + *tar\ archive*) + "${exe[@]}" | tar --no-same-owner -xf - + ;; + bzip2*) + "${exe[@]}" | bzip2 -dc | tar --no-same-owner -xf - + ;; + gzip*) + "${exe[@]}" | tar --no-same-owner -xzf - + ;; + compress*) + "${exe[@]}" | gunzip | tar --no-same-owner -xf - + ;; + XZ*) + "${exe[@]}" | unxz | tar --no-same-owner -xf - + ;; + *) + eerror "Unknown filetype \"${filetype}\" ?" + false + ;; + esac + assert "failure unpacking (${filetype}) makeself ${src##*/} ('${ver}' +${skip})" +} + +# @FUNCTION: unpack_deb +# @USAGE: <one deb to unpack> +# @DESCRIPTION: +# Unpack a Debian .deb archive in style. +unpack_deb() { + [[ $# -eq 1 ]] || die "Usage: ${FUNCNAME} <file>" + + local deb=$(find_unpackable_file "$1") + + unpack_banner "${deb}" + + # on AIX ar doesn't work out as their ar used a different format + # from what GNU ar (and thus what .deb files) produce + if [[ -n ${EPREFIX} ]] ; then + { + read # global header + [[ ${REPLY} = "!<arch>" ]] || die "${deb} does not seem to be a deb archive" + local f timestamp uid gid mode size magic + while read f timestamp uid gid mode size magic ; do + [[ -n ${f} && -n ${size} ]] || continue # ignore empty lines + if [[ ${f} = "data.tar"* ]] ; then + head -c "${size}" > "${f}" + else + head -c "${size}" > /dev/null # trash it + fi + done + } < "${deb}" + else + ar x "${deb}" + fi + + unpacker ./data.tar* + + # Clean things up #458658. No one seems to actually care about + # these, so wait until someone requests to do something else ... + rm -f debian-binary {control,data}.tar* +} + +# @FUNCTION: unpack_cpio +# @USAGE: <one cpio to unpack> +# @DESCRIPTION: +# Unpack a cpio archive, file "-" means stdin. +unpack_cpio() { + [[ $# -eq 1 ]] || die "Usage: ${FUNCNAME} <file>" + + # needed as cpio always reads from stdin + local cpio_cmd=( cpio --make-directories --extract --preserve-modification-time ) + if [[ $1 == "-" ]] ; then + unpack_banner "stdin" + "${cpio_cmd[@]}" + else + local cpio=$(find_unpackable_file "$1") + unpack_banner "${cpio}" + "${cpio_cmd[@]}" <"${cpio}" + fi +} + +# @FUNCTION: unpack_zip +# @USAGE: <zip file> +# @DESCRIPTION: +# Unpack zip archives. +# This function ignores all non-fatal errors (i.e. warnings). +# That is useful for zip archives with extra crap attached +# (e.g. self-extracting archives). +unpack_zip() { + [[ $# -eq 1 ]] || die "Usage: ${FUNCNAME} <file>" + + local zip=$(find_unpackable_file "$1") + unpack_banner "${zip}" + unzip -qo "${zip}" + + [[ $? -le 1 ]] || die "unpacking ${zip} failed (arch=unpack_zip)" +} + +# @FUNCTION: _unpacker +# @USAGE: <one archive to unpack> +# @INTERNAL +# @DESCRIPTION: +# Unpack the specified archive. We only operate on one archive here +# to keep down on the looping logic (that is handled by `unpacker`). +_unpacker() { + [[ $# -eq 1 ]] || die "Usage: ${FUNCNAME} <file>" + + local a=$1 + local m=$(echo "${a}" | tr '[:upper:]' '[:lower:]') + a=$(find_unpackable_file "${a}") + + # first figure out the decompression method + case ${m} in + *.bz2|*.tbz|*.tbz2) + local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(type -P pbzip2 || type -P bzip2)} + local bzuncmd=${PORTAGE_BUNZIP2_COMMAND:-${bzcmd} -d} + : ${UNPACKER_BZ2:=${bzuncmd}} + comp="${UNPACKER_BZ2} -c" + ;; + *.z|*.gz|*.tgz) + comp="gzip -dc" ;; + *.lzma|*.xz|*.txz) + comp="xz -dc" ;; + *.lz) + : ${UNPACKER_LZIP:=$(type -P plzip || type -P pdlzip || type -P lzip)} + comp="${UNPACKER_LZIP} -dc" ;; + *) comp="" ;; + esac + + # then figure out if there are any archiving aspects + arch="" + case ${m} in + *.tgz|*.tbz|*.tbz2|*.txz|*.tar.*|*.tar) + arch="tar --no-same-owner -xof" ;; + *.cpio.*|*.cpio) + arch="unpack_cpio" ;; + *.deb) + arch="unpack_deb" ;; + *.run) + arch="unpack_makeself" ;; + *.sh) + # Not all shell scripts are makeself + if head -n 30 "${a}" | grep -qs '#.*Makeself' ; then + arch="unpack_makeself" + fi + ;; + *.bin) + # Makeself archives can be annoyingly named + if head -c 100 "${a}" | grep -qs '#.*Makeself' ; then + arch="unpack_makeself" + fi + ;; + *.zip) + arch="unpack_zip" ;; + esac + + # finally do the unpack + if [[ -z ${arch}${comp} ]] ; then + unpack "$1" + return $? + fi + + [[ ${arch} != unpack_* ]] && unpack_banner "${a}" + + if [[ -z ${arch} ]] ; then + # Need to decompress the file into $PWD #408801 + local _a=${a%.*} + ${comp} "${a}" > "${_a##*/}" + elif [[ -z ${comp} ]] ; then + ${arch} "${a}" + else + ${comp} "${a}" | ${arch} - + fi + + assert "unpacking ${a} failed (comp=${comp} arch=${arch})" +} + +# @FUNCTION: unpacker +# @USAGE: [archives to unpack] +# @DESCRIPTION: +# This works in the same way that `unpack` does. If you don't specify +# any files, it will default to ${A}. +unpacker() { + local a + [[ $# -eq 0 ]] && set -- ${A} + for a ; do _unpacker "${a}" ; done +} + +# @FUNCTION: unpacker_src_unpack +# @DESCRIPTION: +# Run `unpacker` to unpack all our stuff. +unpacker_src_unpack() { + unpacker +} + +# @FUNCTION: unpacker_src_uri_depends +# @USAGE: [archives that we will unpack] +# @RETURN: Dependencies needed to unpack all the archives +# @DESCRIPTION: +# Walk all the specified files (defaults to $SRC_URI) and figure out the +# dependencies that are needed to unpack things. +# +# Note: USE flags are not yet handled. +unpacker_src_uri_depends() { + local uri deps d + + [[ $# -eq 0 ]] && set -- ${SRC_URI} + + for uri in "$@" ; do + case ${uri} in + *.cpio.*|*.cpio) + d="app-arch/cpio" ;; + *.deb) + # platforms like AIX don't have a good ar + d="kernel_AIX? ( app-arch/deb2targz )" ;; + *.rar|*.RAR) + d="app-arch/unrar" ;; + *.7z) + d="app-arch/p7zip" ;; + *.xz) + d="app-arch/xz-utils" ;; + *.zip) + d="app-arch/unzip" ;; + *.lz) + d="|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )" ;; + esac + deps+=" ${d}" + done + + echo "${deps}" +} + +EXPORT_FUNCTIONS src_unpack + +fi diff -uNr a/eclass/user.eclass b/eclass/user.eclass --- a/eclass/user.eclass false +++ b/eclass/user.eclass 19b006500720ded0d4371fff69e37d43b9c4028ab4fa81ea198d9c1645056579c806172548200908d7933b34f663097222508fb5f3a0a511a015b2cf0d14982f @@ -0,0 +1,469 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: user.eclass +# @MAINTAINER: +# base-system@gentoo.org (Linux) +# @BLURB: user management in ebuilds +# @DESCRIPTION: +# The user eclass contains a suite of functions that allow ebuilds +# to quickly make sure users in the installed system are sane. + +if [[ -z ${_USER_ECLASS} ]]; then +_USER_ECLASS=1 + +# @FUNCTION: _assert_pkg_ebuild_phase +# @INTERNAL +# @USAGE: <calling func name> +_assert_pkg_ebuild_phase() { + case ${EBUILD_PHASE} in + setup|preinst|postinst) ;; + *) + eerror "'$1()' called from '${EBUILD_PHASE}' phase which is not OK:" + eerror "You may only call from pkg_{setup,preinst,postinst} functions." + eerror "Package fails at QA and at life. Please file a bug." + die "Bad package! $1 is only for use in some pkg_* functions!" + esac +} + +# @FUNCTION: egetent +# @USAGE: <database> <key> +# @DESCRIPTION: +# Small wrapper for getent (Linux), nidump (< Mac OS X 10.5), +# dscl (Mac OS X 10.5), and pw (FreeBSD) used in enewuser()/enewgroup(). +# +# Supported databases: group passwd +egetent() { + local db=$1 key=$2 + + [[ $# -ge 3 ]] && die "usage: egetent <database> <key>" + + case ${db} in + passwd|group) ;; + *) die "sorry, database '${db}' not yet supported; file a bug" ;; + esac + + case ${CHOST} in + *-darwin[678]) + case ${key} in + *[!0-9]*) # Non numeric + nidump ${db} . | awk -F: "(\$1 ~ /^${key}\$/) {print;exit;}" + ;; + *) # Numeric + nidump ${db} . | awk -F: "(\$3 == ${key}) {print;exit;}" + ;; + esac + ;; + *-darwin*) + local mykey + case ${db} in + passwd) db="Users" mykey="UniqueID" ;; + group) db="Groups" mykey="PrimaryGroupID" ;; + esac + + case ${key} in + *[!0-9]*) # Non numeric + dscl . -read /${db}/${key} 2>/dev/null |grep RecordName + ;; + *) # Numeric + dscl . -search /${db} ${mykey} ${key} 2>/dev/null + ;; + esac + ;; + *-freebsd*|*-dragonfly*) + case ${db} in + passwd) db="user" ;; + *) ;; + esac + + # lookup by uid/gid + local opts + if [[ ${key} == [[:digit:]]* ]] ; then + [[ ${db} == "user" ]] && opts="-u" || opts="-g" + fi + + pw show ${db} ${opts} "${key}" -q + ;; + *-netbsd*|*-openbsd*) + grep "${key}:\*:" /etc/${db} + ;; + *) + # ignore output if nscd doesn't exist, or we're not running as root + nscd -i "${db}" 2>/dev/null + getent "${db}" "${key}" + ;; + esac +} + +# @FUNCTION: enewuser +# @USAGE: <user> [uid] [shell] [homedir] [groups] +# @DESCRIPTION: +# Same as enewgroup, you are not required to understand how to properly add +# a user to the system. The only required parameter is the username. +# Default uid is (pass -1 for this) next available, default shell is +# /bin/false, default homedir is /dev/null, and there are no default groups. +enewuser() { + if [[ ${EUID} != 0 ]] ; then + einfo "Insufficient privileges to execute ${FUNCNAME[0]}" + return 0 + fi + _assert_pkg_ebuild_phase ${FUNCNAME} + + # get the username + local euser=$1; shift + if [[ -z ${euser} ]] ; then + eerror "No username specified !" + die "Cannot call enewuser without a username" + fi + + # lets see if the username already exists + if [[ -n $(egetent passwd "${euser}") ]] ; then + return 0 + fi + einfo "Adding user '${euser}' to your system ..." + + # options to pass to useradd + local opts=() + + # handle uid + local euid=$1; shift + if [[ -n ${euid} && ${euid} != -1 ]] ; then + if [[ ${euid} -gt 0 ]] ; then + if [[ -n $(egetent passwd ${euid}) ]] ; then + euid="next" + fi + else + eerror "Userid given but is not greater than 0 !" + die "${euid} is not a valid UID" + fi + else + euid="next" + fi + if [[ ${euid} == "next" ]] ; then + for ((euid = 101; euid <= 999; euid++)); do + [[ -z $(egetent passwd ${euid}) ]] && break + done + fi + opts+=( -u ${euid} ) + einfo " - Userid: ${euid}" + + # handle shell + local eshell=$1; shift + if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then + if [[ ! -e ${ROOT}${eshell} ]] ; then + eerror "A shell was specified but it does not exist !" + die "${eshell} does not exist in ${ROOT}" + fi + if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then + eerror "Do not specify ${eshell} yourself, use -1" + die "Pass '-1' as the shell parameter" + fi + else + for eshell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do + [[ -x ${ROOT}${eshell} ]] && break + done + + if [[ ${eshell} == "/dev/null" ]] ; then + eerror "Unable to identify the shell to use, proceeding with userland default." + case ${USERLAND} in + GNU) eshell="/bin/false" ;; + BSD) eshell="/sbin/nologin" ;; + Darwin) eshell="/usr/sbin/nologin" ;; + *) die "Unable to identify the default shell for userland ${USERLAND}" + esac + fi + fi + einfo " - Shell: ${eshell}" + opts+=( -s "${eshell}" ) + + # handle homedir + local ehome=$1; shift + if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then + ehome="/dev/null" + fi + einfo " - Home: ${ehome}" + opts+=( -d "${ehome}" ) + + # handle groups + local egroups=$1; shift + local g egroups_arr + IFS="," read -r -a egroups_arr <<<"${egroups}" + if [[ ${#egroups_arr[@]} -gt 0 ]] ; then + local defgroup exgroups + for g in "${egroups_arr[@]}" ; do + if [[ -z $(egetent group "${g}") ]] ; then + eerror "You must add group ${g} to the system first" + die "${g} is not a valid GID" + fi + if [[ -z ${defgroup} ]] ; then + defgroup=${g} + else + exgroups+=",${g}" + fi + done + opts+=( -g "${defgroup}" ) + if [[ ! -z ${exgroups} ]] ; then + opts+=( -G "${exgroups:1}" ) + fi + fi + einfo " - Groups: ${egroups:-(none)}" + + # handle extra args + if [[ $# -gt 0 ]] ; then + die "extra arguments no longer supported; please file a bug" + else + local comment="added by portage for ${PN}" + opts+=( -c "${comment}" ) + einfo " - GECOS: ${comment}" + fi + + # add the user + case ${CHOST} in + *-darwin*) + ### Make the user + dscl . create "/users/${euser}" uid ${euid} + dscl . create "/users/${euser}" shell "${eshell}" + dscl . create "/users/${euser}" home "${ehome}" + dscl . create "/users/${euser}" realname "added by portage for ${PN}" + ### Add the user to the groups specified + for g in "${egroups_arr[@]}" ; do + dscl . merge "/groups/${g}" users "${euser}" + done + ;; + + *-freebsd*|*-dragonfly*) + pw useradd "${euser}" "${opts[@]}" || die + ;; + + *-netbsd*) + useradd "${opts[@]}" "${euser}" || die + ;; + + *-openbsd*) + # all ops the same, except the -g vs -g/-G ... + useradd -u ${euid} -s "${eshell}" \ + -d "${ehome}" -g "${egroups}" "${euser}" || die + ;; + + *) + useradd -r "${opts[@]}" "${euser}" || die + ;; + esac + + if [[ ! -e ${ROOT}/${ehome} ]] ; then + einfo " - Creating ${ehome} in ${ROOT}" + mkdir -p "${ROOT}/${ehome}" + chown "${euser}" "${ROOT}/${ehome}" + chmod 755 "${ROOT}/${ehome}" + fi +} + +# @FUNCTION: enewgroup +# @USAGE: <group> [gid] +# @DESCRIPTION: +# This function does not require you to understand how to properly add a +# group to the system. Just give it a group name to add and enewgroup will +# do the rest. You may specify the gid for the group or allow the group to +# allocate the next available one. +enewgroup() { + if [[ ${EUID} != 0 ]] ; then + einfo "Insufficient privileges to execute ${FUNCNAME[0]}" + return 0 + fi + _assert_pkg_ebuild_phase ${FUNCNAME} + + # get the group + local egroup=$1; shift + if [[ -z ${egroup} ]] ; then + eerror "No group specified !" + die "Cannot call enewgroup without a group" + fi + + # see if group already exists + if [[ -n $(egetent group "${egroup}") ]] ; then + return 0 + fi + einfo "Adding group '${egroup}' to your system ..." + + # handle gid + local egid=$1; shift + if [[ ! -z ${egid} ]] ; then + if [[ ${egid} -gt 0 ]] ; then + if [[ -n $(egetent group ${egid}) ]] ; then + egid="next available; requested gid taken" + fi + else + eerror "Groupid given but is not greater than 0 !" + die "${egid} is not a valid GID" + fi + else + egid="next available" + fi + einfo " - Groupid: ${egid}" + + # handle extra + if [[ $# -gt 0 ]] ; then + die "extra arguments no longer supported; please file a bug" + fi + + # Some targets need to find the next available GID manually + _enewgroup_next_gid() { + if [[ ${egid} == *[!0-9]* ]] ; then + # Non numeric + for ((egid = 101; egid <= 999; egid++)) ; do + [[ -z $(egetent group ${egid}) ]] && break + done + fi + } + + # add the group + case ${CHOST} in + *-darwin*) + _enewgroup_next_gid + dscl . create "/groups/${egroup}" gid ${egid} + dscl . create "/groups/${egroup}" passwd '*' + ;; + + *-freebsd*|*-dragonfly*) + _enewgroup_next_gid + pw groupadd "${egroup}" -g ${egid} || die + ;; + + *-netbsd*) + _enewgroup_next_gid + groupadd -g ${egid} "${egroup}" || die + ;; + + *) + local opts + if [[ ${egid} == *[!0-9]* ]] ; then + # Non numeric; let groupadd figure out a GID for us + opts="" + else + opts="-g ${egid}" + fi + # We specify -r so that we get a GID in the system range from login.defs + groupadd -r ${opts} "${egroup}" || die + ;; + esac +} + +# @FUNCTION: egethome +# @USAGE: <user> +# @DESCRIPTION: +# Gets the home directory for the specified user. +egethome() { + local pos + + [[ $# -eq 1 ]] || die "usage: egethome <user>" + + case ${CHOST} in + *-darwin*|*-freebsd*|*-dragonfly*) + pos=9 + ;; + *) # Linux, NetBSD, OpenBSD, etc... + pos=6 + ;; + esac + + egetent passwd "$1" | cut -d: -f${pos} +} + +# @FUNCTION: egetshell +# @USAGE: <user> +# @DESCRIPTION: +# Gets the shell for the specified user. +egetshell() { + local pos + + [[ $# -eq 1 ]] || die "usage: egetshell <user>" + + case ${CHOST} in + *-darwin*|*-freebsd*|*-dragonfly*) + pos=10 + ;; + *) # Linux, NetBSD, OpenBSD, etc... + pos=7 + ;; + esac + + egetent passwd "$1" | cut -d: -f${pos} +} + +# @FUNCTION: esethome +# @USAGE: <user> <homedir> +# @DESCRIPTION: +# Update the home directory in a platform-agnostic way. +# Required parameters is the username and the new home directory. +# Specify -1 if you want to set home to the enewuser default +# of /dev/null. +# If the new home directory does not exist, it is created. +# Any previously existing home directory is NOT moved. +esethome() { + _assert_pkg_ebuild_phase ${FUNCNAME} + + # get the username + local euser=$1; shift + if [[ -z ${euser} ]] ; then + eerror "No username specified !" + die "Cannot call esethome without a username" + fi + + # lets see if the username already exists + if [[ -z $(egetent passwd "${euser}") ]] ; then + ewarn "User does not exist, cannot set home dir -- skipping." + return 1 + fi + + # handle homedir + local ehome=$1; shift + if [[ -z ${ehome} ]] ; then + eerror "No home directory specified !" + die "Cannot call esethome without a home directory or '-1'" + fi + + if [[ ${ehome} == "-1" ]] ; then + ehome="/dev/null" + fi + + # exit with no message if home dir is up to date + if [[ $(egethome "${euser}") == ${ehome} ]]; then + return 0 + fi + + einfo "Updating home for user '${euser}' ..." + einfo " - Home: ${ehome}" + + # ensure home directory exists, otherwise update will fail + if [[ ! -e ${ROOT}/${ehome} ]] ; then + einfo " - Creating ${ehome} in ${ROOT}" + mkdir -p "${ROOT}/${ehome}" + chown "${euser}" "${ROOT}/${ehome}" + chmod 755 "${ROOT}/${ehome}" + fi + + # update the home directory + case ${CHOST} in + *-darwin*) + dscl . change "/users/${euser}" home "${ehome}" + ;; + + *-freebsd*|*-dragonfly*) + pw usermod "${euser}" -d "${ehome}" && return 0 + [[ $? == 8 ]] && eerror "${euser} is in use, cannot update home" + eerror "There was an error when attempting to update the home directory for ${euser}" + eerror "Please update it manually on your system:" + eerror "\t pw usermod \"${euser}\" -d \"${ehome}\"" + ;; + + *) + usermod -d "${ehome}" "${euser}" && return 0 + [[ $? == 8 ]] && eerror "${euser} is in use, cannot update home" + eerror "There was an error when attempting to update the home directory for ${euser}" + eerror "Please update it manually on your system (as root):" + eerror "\t usermod -d \"${ehome}\" \"${euser}\"" + ;; + esac +} + +fi diff -uNr a/eclass/vala.eclass b/eclass/vala.eclass --- a/eclass/vala.eclass false +++ b/eclass/vala.eclass 9121584f85f664de05c6b794d73841c888320b861f93595ccb4330d9f4600a87445b61092d2e9cfd35161d7d84494c052d0b22ef4e3c4351d8f116aa372542cd @@ -0,0 +1,148 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: vala.eclass +# @MAINTAINER: +# gnome@gentoo.org +# @AUTHOR: +# Alexandre Rostovtsev <tetromino@gentoo.org> +# @BLURB: Sets up the environment for using a specific version of vala. +# @DESCRIPTION: +# This eclass sets up commonly used environment variables for using a specific +# version of dev-lang/vala to configure and build a package. It is needed for +# packages whose build systems assume the existence of certain unversioned vala +# executables, pkgconfig files, etc., which Gentoo does not provide. +# +# This eclass provides one phase function: src_prepare. + +inherit eutils multilib + +case "${EAPI:-0}" in + 0) die "EAPI=0 is not supported" ;; + 1) ;; + *) EXPORT_FUNCTIONS src_prepare ;; +esac + +# @ECLASS-VARIABLE: VALA_MIN_API_VERSION +# @DESCRIPTION: +# Minimum vala API version (e.g. 0.32). +VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.32} + +# @ECLASS-VARIABLE: VALA_MAX_API_VERSION +# @DESCRIPTION: +# Maximum vala API version (e.g. 0.32). +VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.36} + +# @ECLASS-VARIABLE: VALA_USE_DEPEND +# @DEFAULT_UNSET +# @DESCRIPTION: +# USE dependencies that vala must be built with (e.g. vapigen). + +# @FUNCTION: vala_api_versions +# @DESCRIPTION: +# Outputs a list of vala API versions from VALA_MAX_API_VERSION down to +# VALA_MIN_API_VERSION. +vala_api_versions() { + [[ ${VALA_MIN_API_VERSION} =~ ^0\.[[:digit:]]+$ ]] || die "Invalid syntax of VALA_MIN_API_VERSION" + [[ ${VALA_MAX_API_VERSION} =~ ^0\.[[:digit:]]+$ ]] || die "Invalid syntax of VALA_MAX_API_VERSION" + + local minimal_supported_minor_version minor_version + + # Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}. + minimal_supported_minor_version="32" + + for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do + if ((minor_version >= minimal_supported_minor_version)); then + echo "0.${minor_version}" + fi + done +} + +# @FUNCTION: vala_depend +# @DESCRIPTION: +# Outputs a ||-dependency string on vala from VALA_MAX_API_VERSION down to +# VALA_MIN_API_VERSION +vala_depend() { + local u v versions=$(vala_api_versions) + [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]" + + echo -n "|| (" + for v in ${versions}; do + echo -n " dev-lang/vala:${v}${u}" + done + echo " )" +} + +# @FUNCTION: vala_best_api_version +# @DESCRIPTION: +# Returns the highest installed vala API version satisfying +# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND. +vala_best_api_version() { + local u v + [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]" + for v in $(vala_api_versions); do + has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return + done +} + +# @FUNCTION: vala_src_prepare +# @USAGE: [--ignore-use] [--vala-api-version api_version] +# @DESCRIPTION: +# Sets up the environment variables and pkgconfig files for the +# specified API version, or, if no version is specified, for the +# highest installed vala API version satisfying +# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND. +# Is a no-op if called without --ignore-use when USE=-vala. +# Dies if the USE check is passed (or ignored) and a suitable vala +# version is not available. +vala_src_prepare() { + local p d valafoo version ignore_use + + while [[ $1 ]]; do + case $1 in + "--ignore-use" ) + ignore_use=1 ;; + "--vala-api-version" ) + shift + version=$1 + [[ ${version} ]] || die "'--vala-api-version' option requires API version parameter." + esac + shift + done + + if [[ -z ${ignore_use} ]]; then + in_iuse vala && ! use vala && return 0 + fi + + if [[ ${version} ]]; then + has_version "dev-lang/vala:${version}" || die "No installed vala:${version}" + else + version=$(vala_best_api_version) + [[ ${version} ]] || die "No installed vala in $(vala_depend)" + fi + + export VALAC=$(type -P valac-${version}) + + valafoo=$(type -P vala-gen-introspect-${version}) + [[ ${valafoo} ]] && export VALA_GEN_INTROSPECT="${valafoo}" + + valafoo=$(type -P vapigen-${version}) + [[ ${valafoo} ]] && export VAPIGEN="${valafoo}" + + valafoo="${EPREFIX}/usr/share/vala/Makefile.vapigen" + [[ -e ${valafoo} ]] && export VAPIGEN_MAKEFILE="${valafoo}" + + export VAPIGEN_VAPIDIR="${EPREFIX}/usr/share/vala/vapi" + + mkdir -p "${T}/pkgconfig" || die "mkdir failed" + for p in libvala vapigen; do + for d in "${EPREFIX}/usr/$(get_libdir)/pkgconfig" "${EPREFIX}/usr/share/pkgconfig"; do + if [[ -e ${d}/${p}-${version}.pc ]]; then + ln -s "${d}/${p}-${version}.pc" "${T}/pkgconfig/${p}.pc" || die "ln failed" + break + fi + done + done + : ${PKG_CONFIG_PATH:="${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig"} + export PKG_CONFIG_PATH="${T}/pkgconfig:${PKG_CONFIG_PATH}" +} diff -uNr a/eclass/vcs-clean.eclass b/eclass/vcs-clean.eclass --- a/eclass/vcs-clean.eclass false +++ b/eclass/vcs-clean.eclass d2b3d8c121c6f93bdb506c474f0bd2d6d007cb88673d146827bc244e7b4e8bc7a8109bdb2cdfce05ed0f2117bc92c041e4ae9e173c7b83263d0506fc564ce521 @@ -0,0 +1,40 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: vcs-clean.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @AUTHOR: +# Benedikt Böhm <hollow@gentoo.org> +# @BLURB: helper functions to remove VCS directories + +# @FUNCTION: ecvs_clean +# @USAGE: [list of dirs] +# @DESCRIPTION: +# Remove CVS directories and .cvs* files recursively. Useful when a +# source tarball contains internal CVS directories. Defaults to ${PWD}. +ecvs_clean() { + [[ $# -eq 0 ]] && set -- . + find "$@" '(' -type d -name 'CVS' -prune -o -type f -name '.cvs*' ')' \ + -exec rm -rf '{}' + +} + +# @FUNCTION: esvn_clean +# @USAGE: [list of dirs] +# @DESCRIPTION: +# Remove .svn directories recursively. Useful when a source tarball +# contains internal Subversion directories. Defaults to ${PWD}. +esvn_clean() { + [[ $# -eq 0 ]] && set -- . + find "$@" -type d -name '.svn' -prune -exec rm -rf '{}' + +} + +# @FUNCTION: egit_clean +# @USAGE: [list of dirs] +# @DESCRIPTION: +# Remove .git* directories recursively. Useful when a source tarball +# contains internal Git directories. Defaults to ${PWD}. +egit_clean() { + [[ $# -eq 0 ]] && set -- . + find "$@" -type d -name '.git*' -prune -exec rm -rf '{}' + +} diff -uNr a/eclass/vcs-snapshot.eclass b/eclass/vcs-snapshot.eclass --- a/eclass/vcs-snapshot.eclass false +++ b/eclass/vcs-snapshot.eclass 105e02a33516c785f953d685f8679e0e0790ea2619ad5653e8fc6ea95562f93d50a694e32777844cff2ed14e7d2297147a0743e9c6636cbdd7cdf9c0ee19d9f3 @@ -0,0 +1,82 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: vcs-snapshot.eclass +# @MAINTAINER: +# mgorny@gentoo.org +# @BLURB: support eclass for unpacking VCS snapshot tarballs +# @DESCRIPTION: +# This eclass provides a convenience src_unpack() which does unpack all +# the tarballs in SRC_URI to locations matching their (local) names, +# discarding the original parent directory. +# +# The typical use case are VCS snapshots, coming from bitbucket +# and similar services. They have hash appended to the directory name +# which makes extracting them a painful experience. But if you just use +# a SRC_URI arrow to rename it (which you're likely have to do anyway), +# vcs-snapshot will just extract it into a matching directory. +# +# Please note that this eclass handles only tarballs (.tar, .tar.gz, +# .tar.bz2 & .tar.xz). For any other file format (or suffix) it will +# fall back to regular unpack. Support for additional formats may be +# added at some point so please keep your SRC_URIs clean. +# +# Note: this eclass is no longer needed with the new-style 'archive' +# GitHub URLs. They have sane directory names and stable contents, +# so you should really prefer them. +# +# @EXAMPLE: +# +# @CODE +# EAPI=6 +# inherit vcs-snapshot +# +# SRC_URI="https://github.com/example/${PN}/tarball/v${PV} -> ${P}.tar.gz +# https://github.com/example/${PN}-otherstuff/tarball/v${PV} -> ${P}-otherstuff.tar.gz" +# @CODE +# +# and however the tarballs were originally packed, all files will appear +# in ${WORKDIR}/${P} and ${WORKDIR}/${P}-otherstuff respectively. + +case ${EAPI:-0} in + 0|1|2|3|4|5|6) ;; + *) die "vcs-snapshot.eclass API in EAPI ${EAPI} not yet established." +esac + +EXPORT_FUNCTIONS src_unpack + +# @FUNCTION: vcs-snapshot_src_unpack +# @DESCRIPTION: +# Extract all the archives from ${A}. The .tar, .tar.gz, .tar.bz2 +# and .tar.xz archives will be unpacked to directories matching their +# local names. Other archive types will be passed down to regular +# unpack. +vcs-snapshot_src_unpack() { + debug-print-function ${FUNCNAME} "${@}" + + local f + + for f in ${A} + do + case "${f}" in + *.tar|*.tar.gz|*.tar.bz2|*.tar.xz) + local destdir=${WORKDIR}/${f%.tar*} + + debug-print "${FUNCNAME}: unpacking ${f} to ${destdir}" + + # XXX: check whether the directory structure inside is + # fine? i.e. if the tarball has actually a parent dir. + mkdir "${destdir}" || die + # -o (--no-same-owner) to avoid restoring original owner + tar -C "${destdir}" -x -o --strip-components 1 \ + -f "${DISTDIR}/${f}" || die + ;; + *) + debug-print "${FUNCNAME}: falling back to unpack for ${f}" + + # fall back to the default method + unpack "${f}" + ;; + esac + done +} diff -uNr a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass --- a/eclass/vdr-plugin-2.eclass false +++ b/eclass/vdr-plugin-2.eclass 2be3c1425e68dd7e76243ae45353b92666def1d14c121612b1e9fd6b9f4738d571d4bd19f5640899964e946c31f6be927bced882a60fe6328967b240606f57f1 @@ -0,0 +1,648 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: vdr-plugin-2.eclass +# @MAINTAINER: +# Gentoo VDR Project <vdr@gentoo.org> +# @AUTHOR: +# Matthias Schwarzott <zzam@gentoo.org> +# Joerg Bornkessel <hd_brummy@gentoo.org> +# Christian Ruppert <idl0r@gentoo.org> +# (undisclosed contributors) +# @BLURB: common vdr plugin ebuild functions +# @DESCRIPTION: +# Eclass for easing maintenance of vdr plugin ebuilds + +# @ECLASS-VARIABLE: VDR_CONFD_FILE +# @DEFAULT_UNSET +# @DESCRIPTION: +# A plugin config file can be specified through the $VDR_CONFD_FILE variable, it +# defaults to ${FILESDIR}/confd. Each config file will be installed as e.g. +# ${D}/etc/conf.d/vdr.${VDRPLUGIN} + +# @ECLASS-VARIABLE: VDR_RCADDON_FILE +# @DEFAULT_UNSET +# @DESCRIPTION: +# Installing rc-addon files is basically the same as for plugin config files +# (see above), it's just using the $VDR_RCADDON_FILE variable instead. +# The default value when $VDR_RCADDON_FILE is undefined is: +# ${FILESDIR}/rc-addon.sh and will be installed as +# ${VDR_RC_DIR}/plugin-${VDRPLUGIN}.sh +# +# The rc-addon files will be sourced by the startscript when the specific plugin +# has been enabled. +# rc-addon files may be used to prepare everything that is necessary for the +# plugin start/stop, like passing extra command line options and so on. +# +# NOTE: rc-addon files must be valid shell scripts! + +# @ECLASS-VARIABLE: GENTOO_VDR_CONDITIONAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# This is a hack for ebuilds like vdr-xineliboutput that want to +# conditionally install a vdr-plugin + +# @ECLASS-VARIABLE: PO_SUBDIR +# @DEFAULT_UNSET +# @DESCRIPTION: +# By default, translation are found in"${S}"/po but this +# default can be overridden by defining PO_SUBDIR. +# +# Example: +# @CODE +# PO_SUBDIR="bla foo/bla" +# @CODE + +# @ECLASS-VARIABLE: VDR_MAINTAINER_MODE +# @DEFAULT_UNSET +# @DESCRIPTION: +# Output from function vdr_dev_check if it is defined in ebuild or eclass, +# helpfull for gentoo ebuild developer +# +# This will also install any debug files in /usr/share/vdr/maintainer-data +# +# This is intended to be set by user in make.conf. Ebuilds must not set +# it. +# +# VDR_MAINTAINER_MODE=1 + +# @FUNCTION: fix_vdr_libsi_include +# @DESCRIPTION: +# Plugins failed on compile with wrong path of libsi includes, +# this can be fixed by 'function + space separated list of files' +# +# Example: +# @CODE +# fix_vdr_libsi_include bla.c foo.c +# @CODE + +# @FUNCTION: vdr_remove_i18n_include +# @DESCRIPTION: +# Compile will fail if plugin still use the old i18n language handling, +# most parts are fixed by vdr-plugin-2.eclass internal functions itself. +# Remove unneeded i18.n includes from files, if they are still wrong there, +# this can be fixed by 'function + space separated list of files" +# +# Example: +# @CODE +# vdr_remove_i18n_include bla.n foo.n +# @CODE + +# Applying your own local/user patches: +# This is done by using the +# (EAPI = 4,5) epatch_user() function of the eutils.eclass, +# (EAPI = 6) eapply_user function integrated in EAPI = 6. +# Simply add your patches into one of these directories: +# /etc/portage/patches/<CATEGORY>/<PF|P|PN>/ +# Quote: where the first of these three directories to exist will be the one to +# use, ignoring any more general directories which might exist as well. +# +# For more details about it please take a look at the eutils.class. + +[[ ${EAPI} == [45] ]] && inherit eutils multilib +inherit flag-o-matic toolchain-funcs unpacker + +case ${EAPI:-0} in + 4|5|6) + ;; + *) die "EAPI ${EAPI} unsupported." + ;; +esac + +EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config + +IUSE="" + +# Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes +VDRPLUGIN="${PN/#vdrplugin-/}" +VDRPLUGIN="${VDRPLUGIN/#vdr-/}" +VDRPLUGIN="${VDRPLUGIN/%-cvs/}" + +DESCRIPTION="vdr Plugin: ${VDRPLUGIN} (based on vdr-plugin-2.eclass)" + +# Works in most cases +S="${WORKDIR}/${VDRPLUGIN}-${PV}" + +# depend on headers for DVB-driver +COMMON_DEPEND=">=media-tv/gentoo-vdr-scripts-0.4.2" + +DEPEND="${COMMON_DEPEND} + virtual/linuxtv-dvb-headers" +RDEPEND="${COMMON_DEPEND} + >=app-eselect/eselect-vdr-0.0.2" + +if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]]; then + IUSE="${IUSE} vdr" + DEPEND="vdr? ( ${DEPEND} )" + RDEPEND="vdr? ( ${RDEPEND} )" +fi + +# New method of storing plugindb +# Called from src_install +# file maintained by normal portage-methods +vdr_create_plugindb_file() { + local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/ + local DB_FILE="${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}" + insinto "${NEW_VDRPLUGINDB_DIR}" + +# BUG: portage-2.1.4_rc9 will delete the EBUILD= line, so we cannot use this code. +# cat <<-EOT > "${D}/${DB_FILE}" +# VDRPLUGIN_DB=1 +# CREATOR=ECLASS +# EBUILD=${CATEGORY}/${PN} +# EBUILD_V=${PVR} +# EOT +# obsolet? fix me later... + { + echo "VDRPLUGIN_DB=1" + echo "CREATOR=ECLASS" + echo "EBUILD=${CATEGORY}/${PN}" + echo "EBUILD_V=${PVR}" + echo "PLUGINS=\"$@\"" + } > "${D}/${DB_FILE}" +} + +vdr_create_header_checksum_file() { + # Danger: Not using $ROOT here, as compile will also not use it !!! + # If vdr in $ROOT and / differ, plugins will not run anyway + + local CHKSUM="header-md5-vdr" + + if [[ -f ${VDR_CHECKSUM_DIR}/header-md5-vdr ]]; then + cp "${VDR_CHECKSUM_DIR}/header-md5-vdr" "${CHKSUM}" + elif type -p md5sum >/dev/null 2>&1; then + ( + cd "${VDR_INCLUDE_DIR}" + md5sum *.h libsi/*.h|LC_ALL=C sort --key=2 + ) > "${CHKSUM}" + else + die "Could not create md5 checksum of headers" + fi + + insinto "${VDR_CHECKSUM_DIR}" + local p_name + for p_name; do + newins "${CHKSUM}" "header-md5-${p_name}" + done +} + +fix_vdr_libsi_include() { + vdr_dev_check "Fixing include of libsi-headers" + local f + for f; do + sed -i "${f}" \ + -e '/#include/s:"$.*libsi.*$":<\1>:' \ + -e '/#include/s:<.*$libsi/.*$>:<vdr/\1>:' + done +} + +vdr_patchmakefile() { + einfo "Patching Makefile" + [[ -e Makefile ]] || die "Makefile of plugin can not be found!" + cp Makefile "${WORKDIR}"/Makefile.before + + # plugin makefiles use VDRDIR in strange ways + # assumptions: + # 1. $(VDRDIR) contains Make.config + # 2. $(VDRDIR) contains config.h + # 3. $(VDRDIR)/include/vdr contains the headers + # 4. $(VDRDIR) contains main vdr Makefile + # 5. $(VDRDIR)/locale exists + # 6. $(VDRDIR) allows to access vdr source files + # + # We only have one directory (for now /usr/include/vdr), + # that contains vdr-headers and Make.config. + # To satisfy 1-3 we do this: + # Set VDRDIR=/usr/include/vdr + # Set VDRINCDIR=/usr/include + # Change $(VDRDIR)/include to $(VDRINCDIR) + + sed -i Makefile \ + -e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \ + -e "/^VDRDIR/a VDRINCDIR = ${VDR_INCLUDE_DIR%/vdr}" \ + -e '/VDRINCDIR.*=/!s:$(VDRDIR)/include:$(VDRINCDIR):' \ + \ + -e 's:-I$(DVBDIR)/include::' \ + -e 's:-I$(DVBDIR)::' + + # may be needed for multiproto: + #sed -i Makefile \ + # -e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \ + # -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' + # obsolet? fix me later... + + if ! grep -q APIVERSION Makefile; then + ebegin " Converting to APIVERSION" + sed -i Makefile \ + -e 's:^APIVERSION = :APIVERSION ?= :' \ + -e 's:$(LIBDIR)/$@.$(VDRVERSION):$(LIBDIR)/$@.$(APIVERSION):' \ + -e '/VDRVERSION =/a\APIVERSION = $(shell sed -ne '"'"'/define APIVERSION/s/^.*"\$.*\$".*$$/\\1/p'"'"' $(VDRDIR)/config.h)' + eend $? + fi + + # Correcting Compile-Flags + # Do not overwrite CXXFLAGS, add LDFLAGS if missing + sed -i Makefile \ + -e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \ + -e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:' + + # Disabling file stripping, the package manager takes care of it + sed -i Makefile \ + -e '/@.*strip/d' \ + -e '/strip \$(LIBDIR)\/\$@/d' \ + -e 's/STRIP.*=.*$/STRIP = true/' + + # Use a file instead of a variable as single-stepping via ebuild + # destroys environment. + touch "${WORKDIR}"/.vdr-plugin_makefile_patched +} + +vdr_dev_check() { + # A lot useful debug infos + # set VDR_MAINTAINER_MODE="1" in make.conf + if [[ -n ${VDR_MAINTAINER_MODE} ]]; then + eerror "\t Gentoo Developer Debug: $@" + fi +} + +vdr_gettext_missing() { + # plugins without converting to gettext + + local GETTEXT_MISSING=$( grep xgettext Makefile ) + if [[ -z ${GETTEXT_MISSING} ]]; then + vdr_dev_check "Plugin isn't converted to gettext handling \n" + fi +} + +vdr_detect_po_dir() { + # helper function + + [[ -f po ]] && local po_dir="${S}" + local po_subdir=( ${S}/${PO_SUBDIR} ) + local f + + pofile_dir=( ${po_dir} ${po_subdir[*]} ) +} + +vdr_linguas_support() { +# Patching Makefile for linguas support. +# Only locales, enabled through the LINGUAS (make.conf) variable will be +# compiled and installed. + + einfo "Patching for Linguas support" + einfo "available Languages for ${P} are:" + + vdr_detect_po_dir + + for f in ${pofile_dir[*]}; do + PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) + einfo "LINGUAS=\"${PLUGIN_LINGUAS}\"" + + sed -i ${f}/Makefile \ + -e 's:\$(wildcard[[:space:]]*\$(PODIR)/\*.po):\$(foreach dir,\$(LINGUAS),\$(wildcard \$(PODIR)\/\$(dir)\*.po)):' \ + || die "sed failed for Linguas" + done + + strip-linguas ${PLUGIN_LINGUAS} en +} + +vdr_i18n() { +# i18n handling was deprecated since >=media-video/vdr-1.5.9, +# finally with >=media-video/vdr-1.7.27 it has been dropped entirely and some +# plugins will fail to compile because they're still using the old variant. +# Simply remove the i18n.o object from Makefile (OBJECT) and +# remove "static const tI18nPhrase*" from i18n.h. + + vdr_gettext_missing + + local I18N_OBJECT=$( grep i18n.o Makefile ) + if [[ -n ${I18N_OBJECT} ]]; then + + if [[ "${KEEP_I18NOBJECT:-no}" = "yes" ]]; then + vdr_dev_check "Forced to keep i18n.o" + else + sed -i "s:i18n.o::g" Makefile + vdr_dev_check "OBJECT i18n.o found" + vdr_dev_check "removed per sed \n" + fi + + else + vdr_dev_check "OBJECT i18n.o not found in Makefile" + vdr_dev_check "all fine or manual review needed? \n" + fi + + local I18N_STRING=$( [[ -e i18n.h ]] && grep tI18nPhrase i18n.h ) + if [[ -n ${I18N_STRING} ]]; then + sed -i "s:^extern[[:space:]]*const[[:space:]]*tI18nPhrase://static const tI18nPhrase:" i18n.h + vdr_dev_check "obsolete tI18nPhrase found" + vdr_dev_check "disabled per sed, please recheck \n" + else + vdr_dev_check "obsolete tI18nPhrase not found, fine..." + vdr_dev_check "please review, may be in subdir... \n" + fi +} + +vdr_remove_i18n_include() { + # remove uneeded i18.n includes + + local f + for f; do + sed -i "${f}" \ + -e "s:^#include[[:space:]]*\"i18n.h\"://:" + done + + vdr_dev_check "removed i18n.h include in ${@}" +} + +vdr-plugin-2_print_enable_command() { + local p_name c=0 l="" + for p_name in ${vdr_plugin_list}; do + c=$(( c+1 )) + l="$l ${p_name#vdr-}" + done + + elog + case $c in + 1) elog "Installed plugin${l}" ;; + *) elog "Installed $c plugins:${l}" ;; + esac + elog "To activate a plugin execute this command:" + elog "\teselect vdr-plugin enable <plugin_name> ..." + elog +} + +has_vdr() { + [[ -f "${VDR_INCLUDE_DIR}"/config.h ]] +} + +## exported functions + +vdr-plugin-2_pkg_setup() { + # missing ${chost}- tag + tc-export CC CXX + + # -fPIC is needed for shared objects on some platforms (amd64 and others) + append-flags -fPIC + + # Plugins need to be compiled with position independent code, otherwise linking + # VDR against it will fail + # depricated if fi, as we have only >=vdr-2 in the tree, fix me later... + if has_version ">=media-video/vdr-1.7.13"; then + append-cxxflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE + fi + + # Where should the plugins live in the filesystem + VDR_PLUGIN_DIR=$(pkg-config --variable=libdir vdr) + + VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums" + + VDR_RC_DIR="/usr/share/vdr/rcscript" + + # Pathes to includes + VDR_INCLUDE_DIR="/usr/include/vdr" + DVB_INCLUDE_DIR="/usr/include" + + TMP_LOCALE_DIR="${WORKDIR}/tmp-locale" + + LOCDIR=$(pkg-config --variable=locdir vdr) + + if ! has_vdr; then + # set to invalid values to detect abuses + VDRVERSION="eclass_no_vdr_installed" + APIVERSION="eclass_no_vdr_installed" + + if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]] && ! use vdr; then + einfo "VDR not found!" + else + # if vdr is required + die "VDR not found!" + fi + return + fi + + VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h) + APIVERSION=$(pkg-config --variable=apiversion vdr) + + einfo "Compiling against" + einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]" + + if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then + eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!" + eerror "Please move all your patches into" + eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}" + eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable." + die + fi +} + +vdr-plugin-2_src_util() { + while [ "$1" ]; do + case "$1" in + all) + vdr-plugin-2_src_util unpack add_local_patch patchmakefile linguas_patch i18n + ;; + prepare) + vdr-plugin-2_src_util add_local_patch patchmakefile linguas_patch i18n + ;; + unpack) + unpacker_src_unpack + ;; + add_local_patch) + cd "${S}" || die "Could not change to plugin-source-directory (src_util)" + if [[ ${EAPI} != [45] ]]; then + eapply_user + else + epatch_user + fi + ;; + patchmakefile) + cd "${S}" || die "Could not change to plugin-source-directory (src_util)" + vdr_patchmakefile + ;; + i18n) + vdr_i18n + ;; + linguas_patch) + vdr_linguas_support + ;; + esac + + shift + done +} + +vdr-plugin-2_src_unpack() { + if [[ -z ${VDR_INCLUDE_DIR} ]]; then + eerror "Wrong use of vdr-plugin-2.eclass." + eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_unpack." + echo + eerror "Please report this at bugs.gentoo.org." + die "vdr-plugin-2_src_unpack not called!" + fi + + if [ -z "$1" ]; then + vdr-plugin-2_src_util unpack + else + vdr-plugin-2_src_util $@ + fi +} + +vdr-plugin-2_src_prepare() { + if [[ -z ${VDR_INCLUDE_DIR} ]]; then + eerror "Wrong use of vdr-plugin-2.eclass." + eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_prepare." + echo + eerror "Please report this at bugs.gentoo.org." + die "vdr-plugin-2_src_prepare not called!" + fi + + [[ ${EAPI} == [45] ]] && [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + [[ ${EAPI} != [45] ]] && [[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" + + debug-print "$FUNCNAME: applying user patches" + + vdr-plugin-2_src_util prepare +} + +vdr-plugin-2_src_compile() { + [ -z "$1" ] && vdr-plugin-2_src_compile compile + + while [ "$1" ]; do + case "$1" in + compile) + if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then + eerror "Wrong use of vdr-plugin-2.eclass." + eerror "An ebuild for a vdr-plugin will not work without" + eerror "calling vdr-plugin-2_src_compile to patch the Makefile." + echo + eerror "Please report this at bugs.gentoo.org." + die "vdr-plugin-2_src_compile not called!" + fi + cd "${S}" || die "could not change to plugin source directory (src_compile)" + + emake all ${BUILD_PARAMS} \ + LOCALEDIR="${TMP_LOCALE_DIR}" \ + LOCDIR="${TMP_LOCALE_DIR}" \ + LIBDIR="${S}" \ + TMPDIR="${T}" \ + || die "emake all failed" + ;; + esac + + shift + done +} + +vdr-plugin-2_src_install() { + if [[ -z ${VDR_INCLUDE_DIR} ]]; then + eerror "Wrong use of vdr-plugin-2.eclass." + eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin-2_src_install." + echo + eerror "Please report this at bugs.gentoo.org." + die "vdr-plugin-2_src_install not called!" + fi + + cd "${WORKDIR}" || die "could not change to plugin workdir directory (src_install)" + + if [[ -n ${VDR_MAINTAINER_MODE} ]]; then + local mname="${P}-Makefile" + cp "${S}"/Makefile "${mname}.patched" + cp Makefile.before "${mname}.before" + + diff -u "${mname}.before" "${mname}.patched" > "${mname}.diff" + + insinto "/usr/share/vdr/maintainer-data/makefile-changes" + doins "${mname}.diff" + + insinto "/usr/share/vdr/maintainer-data/makefile-before" + doins "${mname}.before" + + insinto "/usr/share/vdr/maintainer-data/makefile-patched" + doins "${mname}.patched" + + fi + + cd "${S}" || die "could not change to plugin source directory (src_install)" + + local SOFILE_STRING=$(grep SOFILE Makefile) + if [[ -n ${SOFILE_STRING} ]]; then + emake install \ + ${BUILD_PARAMS} \ + TMPDIR="${T}" \ + DESTDIR="${D}" \ + || die "emake install (makefile target) failed" + else + vdr_dev_check "Plugin use still the old Makefile handling" + insinto "${VDR_PLUGIN_DIR}" + doins libvdr-*.so.* + fi + + if [[ -d ${TMP_LOCALE_DIR} ]]; then + einfo "Installing locales" + cd "${TMP_LOCALE_DIR}" || die "could not change to TMP_LOCALE_DIR" + + local linguas + for linguas in ${LINGUAS[*]}; do + insinto "${LOCDIR}" + cp -r --parents ${linguas}* ${D}/${LOCDIR} + done + fi + + cd "${D}/usr/$(get_libdir)/vdr/plugins" || die "could not change to D/usr/libdir/vdr/plugins" + + # create list of all created plugin libs + vdr_plugin_list="" + local p_name + for p in libvdr-*.so.*; do + p_name="${p%.so*}" + p_name="${p_name#lib}" + vdr_plugin_list="${vdr_plugin_list} ${p_name}" + done + + cd "${S}" || die "could not change to plugin source directory (src_install)" + + vdr_create_header_checksum_file ${vdr_plugin_list} + vdr_create_plugindb_file ${vdr_plugin_list} + + if [[ ${EAPI} != [45] ]]; then + einstalldocs + else + local docfile + for docfile in README* HISTORY CHANGELOG; do + [[ -f ${docfile} ]] && dodoc ${docfile} + done + fi + + # if VDR_CONFD_FILE is empty and ${FILESDIR}/confd exists take it + [[ -z ${VDR_CONFD_FILE} ]] && [[ -e ${FILESDIR}/confd ]] && VDR_CONFD_FILE=${FILESDIR}/confd + + if [[ -n ${VDR_CONFD_FILE} ]]; then + newconfd "${VDR_CONFD_FILE}" vdr.${VDRPLUGIN} + fi + + # if VDR_RCADDON_FILE is empty and ${FILESDIR}/rc-addon.sh exists take it + [[ -z ${VDR_RCADDON_FILE} ]] && [[ -e ${FILESDIR}/rc-addon.sh ]] && VDR_RCADDON_FILE=${FILESDIR}/rc-addon.sh + + if [[ -n ${VDR_RCADDON_FILE} ]]; then + insinto "${VDR_RC_DIR}" + newins "${VDR_RCADDON_FILE}" plugin-${VDRPLUGIN}.sh + fi +} + +vdr-plugin-2_pkg_postinst() { + vdr-plugin-2_print_enable_command + + if [[ -n "${VDR_CONFD_FILE}" ]]; then + elog "Please have a look at the config-file" + elog "\t/etc/conf.d/vdr.${VDRPLUGIN}" + elog + fi +} + +vdr-plugin-2_pkg_postrm() { +: +} + +vdr-plugin-2_pkg_config() { +: +} diff -uNr a/eclass/versionator.eclass b/eclass/versionator.eclass --- a/eclass/versionator.eclass false +++ b/eclass/versionator.eclass e5b19e983087a1196538d8f64ecc347ba62ee5ae2b45eeaf103df89967a437825120e085f4bd9d9f69a984e533225ad328f895001bae440f11327c2a8b552fd0 @@ -0,0 +1,516 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: versionator.eclass +# @MAINTAINER: +# Jonathan Callen <jcallen@gentoo.org> +# base-system@gentoo.org +# @BLURB: functions which simplify manipulation of ${PV} and similar version strings +# @DESCRIPTION: +# This eclass provides functions which simplify manipulating $PV and similar +# variables. Most functions default to working with $PV, although other +# values can be used. +# @EXAMPLE: +# Simple Example 1: $PV is 1.2.3b, we want 1_2.3b: +# MY_PV=$(replace_version_separator 1 '_' ) +# +# Simple Example 2: $PV is 1.4.5, we want 1: +# MY_MAJORV=$(get_major_version ) +# +# Rather than being a number, the index parameter can be a separator character +# such as '-', '.' or '_'. In this case, the first separator of this kind is +# selected. +# +# There's also: +# version_is_at_least want have +# which may be buggy, so use with caution. + +if [[ -z ${_VERSIONATOR_ECLASS} ]]; then +_VERSIONATOR_ECLASS=1 + +case ${EAPI:-0} in + 0|1|2|3|4|5|6) + ;; + *) + die "${ECLASS}: banned in EAPI=${EAPI}; use ver_* instead";; +esac + +inherit estack + +# @FUNCTION: get_all_version_components +# @USAGE: [version] +# @DESCRIPTION: +# Split up a version string into its component parts. If no parameter is +# supplied, defaults to $PV. +# 0.8.3 -> 0 . 8 . 3 +# 7c -> 7 c +# 3.0_p2 -> 3 . 0 _ p2 +# 20040905 -> 20040905 +# 3.0c-r1 -> 3 . 0 c - r1 +get_all_version_components() { + eshopts_push -s extglob + local ver_str=${1:-${PV}} result + result=() + + # sneaky cache trick cache to avoid having to parse the same thing several + # times. + if [[ ${VERSIONATOR_CACHE_VER_STR} == ${ver_str} ]] ; then + echo ${VERSIONATOR_CACHE_RESULT} + eshopts_pop + return + fi + export VERSIONATOR_CACHE_VER_STR=${ver_str} + + while [[ -n $ver_str ]] ; do + case "${ver_str::1}" in + # number: parse whilst we have a number + [[:digit:]]) + result+=("${ver_str%%[^[:digit:]]*}") + ver_str=${ver_str##+([[:digit:]])} + ;; + + # separator: single character + [-_.]) + result+=("${ver_str::1}") + ver_str=${ver_str:1} + ;; + + # letter: grab the letters plus any following numbers + [[:alpha:]]) + local not_match=${ver_str##+([[:alpha:]])*([[:digit:]])} + # Can't say "${ver_str::-${#not_match}}" in Bash 3.2 + result+=("${ver_str::${#ver_str} - ${#not_match}}") + ver_str=${not_match} + ;; + + # huh? + *) + result+=("${ver_str::1}") + ver_str=${ver_str:1} + ;; + esac + done + + export VERSIONATOR_CACHE_RESULT=${result[*]} + echo ${result[@]} + eshopts_pop +} + +# @FUNCTION: get_version_components +# @USAGE: [version] +# @DESCRIPTION: +# Get the important version components, excluding '.', '-' and '_'. Defaults to +# $PV if no parameter is supplied. +# 0.8.3 -> 0 8 3 +# 7c -> 7 c +# 3.0_p2 -> 3 0 p2 +# 20040905 -> 20040905 +# 3.0c-r1 -> 3 0 c r1 +get_version_components() { + local c=$(get_all_version_components "${1:-${PV}}") + echo ${c//[-._]/ } +} + +# @FUNCTION: get_major_version +# @USAGE: [version] +# @DESCRIPTION: +# Get the major version of a value. Defaults to $PV if no parameter is supplied. +# 0.8.3 -> 0 +# 7c -> 7 +# 3.0_p2 -> 3 +# 20040905 -> 20040905 +# 3.0c-r1 -> 3 +get_major_version() { + local c=($(get_all_version_components "${1:-${PV}}")) + echo ${c[0]} +} + +# @FUNCTION: get_version_component_range +# @USAGE: <range> [version] +# @DESCRIPTION: +# Get a particular component or range of components from the version. If no +# version parameter is supplied, defaults to $PV. +# 1 1.2.3 -> 1 +# 1-2 1.2.3 -> 1.2 +# 2- 1.2.3 -> 2.3 +get_version_component_range() { + eshopts_push -s extglob + local c v="${2:-${PV}}" range="${1}" range_start range_end + local -i i=-1 j=0 + c=($(get_all_version_components "${v}")) + range_start=${range%-*}; range_start=${range_start:-1} + range_end=${range#*-} ; range_end=${range_end:-${#c[@]}} + + while ((j < range_start)); do + i+=1 + ((i > ${#c[@]})) && eshopts_pop && return + [[ -n "${c[i]//[-._]}" ]] && j+=1 + done + + while ((j <= range_end)); do + echo -n ${c[i]} + ((i > ${#c[@]})) && eshopts_pop && return + [[ -n "${c[i]//[-._]}" ]] && j+=1 + i+=1 + done + eshopts_pop +} + +# @FUNCTION: get_after_major_version +# @USAGE: [version] +# @DESCRIPTION: +# Get everything after the major version and its separator (if present) of a +# value. Defaults to $PV if no parameter is supplied. +# 0.8.3 -> 8.3 +# 7c -> c +# 3.0_p2 -> 0_p2 +# 20040905 -> (empty string) +# 3.0c-r1 -> 0c-r1 +get_after_major_version() { + echo $(get_version_component_range 2- "${1:-${PV}}") +} + +# @FUNCTION: replace_version_separator +# @USAGE: <search> <replacement> [subject] +# @DESCRIPTION: +# Replace the $1th separator with $2 in $3 (defaults to $PV if $3 is not +# supplied). If there are fewer than $1 separators, don't change anything. +# 1 '_' 1.2.3 -> 1_2.3 +# 2 '_' 1.2.3 -> 1.2_3 +# 1 '_' 1b-2.3 -> 1b_2.3 +# Rather than being a number, $1 can be a separator character such as '-', '.' +# or '_'. In this case, the first separator of this kind is selected. +replace_version_separator() { + eshopts_push -s extglob + local w c v="${3:-${PV}}" + declare -i i found=0 + w=${1:-1} + c=($(get_all_version_components ${v})) + if [[ ${w} != *[[:digit:]]* ]] ; then + # it's a character, not an index + for ((i = 0; i < ${#c[@]}; i++)); do + if [[ ${c[i]} == ${w} ]]; then + c[i]=${2} + break + fi + done + else + for ((i = 0; i < ${#c[@]}; i++)); do + if [[ -n "${c[i]//[^-._]}" ]]; then + found+=1 + if ((found == w)); then + c[i]=${2} + break + fi + fi + done + fi + c=${c[*]} + echo ${c// } + eshopts_pop +} + +# @FUNCTION: replace_all_version_separators +# @USAGE: <replacement> [subject] +# @DESCRIPTION: +# Replace all version separators in $2 (defaults to $PV) with $1. +# '_' 1b.2.3 -> 1b_2_3 +replace_all_version_separators() { + local c=($(get_all_version_components "${2:-${PV}}")) + c=${c[@]//[-._]/$1} + echo ${c// } +} + +# @FUNCTION: delete_version_separator +# @USAGE: <search> [subject] +# @DESCRIPTION: +# Delete the $1th separator in $2 (defaults to $PV if $2 is not supplied). If +# there are fewer than $1 separators, don't change anything. +# 1 1.2.3 -> 12.3 +# 2 1.2.3 -> 1.23 +# 1 1b-2.3 -> 1b2.3 +# Rather than being a number, $1 can be a separator character such as '-', '.' +# or '_'. In this case, the first separator of this kind is deleted. +delete_version_separator() { + replace_version_separator "${1}" "" "${2}" +} + +# @FUNCTION: delete_all_version_separators +# @USAGE: [subject] +# @DESCRIPTION: +# Delete all version separators in $1 (defaults to $PV). +# 1b.2.3 -> 1b23 +delete_all_version_separators() { + replace_all_version_separators "" "${1}" +} + +# @FUNCTION: get_version_component_count +# @USAGE: [version] +# @DESCRIPTION: +# How many version components are there in $1 (defaults to $PV)? +# 1.0.1 -> 3 +# 3.0c-r1 -> 4 +get_version_component_count() { + local a=($(get_version_components "${1:-${PV}}")) + echo ${#a[@]} +} + +# @FUNCTION: get_last_version_component_index +# @USAGE: [version] +# @DESCRIPTION: +# What is the index of the last version component in $1 (defaults to $PV)? +# Equivalent to get_version_component_count - 1. +# 1.0.1 -> 2 +# 3.0c-r1 -> 3 +get_last_version_component_index() { + echo $(($(get_version_component_count "${1:-${PV}}" ) - 1)) +} + +# @FUNCTION: version_is_at_least +# @USAGE: <want> [have] +# @DESCRIPTION: +# Is $2 (defaults to $PVR) at least version $1? Intended for use in eclasses +# only. May not be reliable, be sure to do very careful testing before actually +# using this. +version_is_at_least() { + local want_s="$1" have_s="${2:-${PVR}}" r + version_compare "${want_s}" "${have_s}" + r=$? + case $r in + 1|2) + return 0 + ;; + 3) + return 1 + ;; + *) + die "versionator compare bug [atleast, ${want_s}, ${have_s}, ${r}]" + ;; + esac +} + +# @FUNCTION: version_compare +# @USAGE: <A> <B> +# @DESCRIPTION: +# Takes two parameters (A, B) which are versions. If A is an earlier version +# than B, returns 1. If A is identical to B, return 2. If A is later than B, +# return 3. You probably want version_is_at_least rather than this function. +# May not be very reliable. Test carefully before using this. +version_compare() { + eshopts_push -s extglob + local ver_a=${1} ver_b=${2} parts_a parts_b + local cur_tok_a cur_tok_b num_part_a num_part_b + local -i cur_idx_a=0 cur_idx_b=0 prev_idx_a prev_idx_b + parts_a=( $(get_all_version_components "${ver_a}" ) ) + parts_b=( $(get_all_version_components "${ver_b}" ) ) + + ### compare number parts. + local -i inf_loop=0 + while true; do + inf_loop+=1 + ((inf_loop > 20)) && \ + die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]" + + # Store the current index to test later + prev_idx_a=cur_idx_a + prev_idx_b=cur_idx_b + + # grab the current number components + cur_tok_a=${parts_a[cur_idx_a]} + cur_tok_b=${parts_b[cur_idx_b]} + + # number? + if [[ -n ${cur_tok_a} ]] && [[ -z ${cur_tok_a//[[:digit:]]} ]] ; then + cur_idx_a+=1 + [[ ${parts_a[cur_idx_a]} == . ]] \ + && cur_idx_a+=1 + else + cur_tok_a= + fi + + if [[ -n ${cur_tok_b} ]] && [[ -z ${cur_tok_b//[[:digit:]]} ]] ; then + cur_idx_b+=1 + [[ ${parts_b[cur_idx_b]} == . ]] \ + && cur_idx_b+=1 + else + cur_tok_b= + fi + + # done with number components? + [[ -z ${cur_tok_a} && -z ${cur_tok_b} ]] && break + + # if a component is blank, then it is the lesser value + [[ -z ${cur_tok_a} ]] && eshopts_pop && return 1 + [[ -z ${cur_tok_b} ]] && eshopts_pop && return 3 + + # According to PMS, if we are *not* in the first number part, and either + # token begins with "0", then we use a different algorithm (that + # effectively does floating point comparison) + if (( prev_idx_a != 0 && prev_idx_b != 0 )) \ + && [[ ${cur_tok_a} == 0* || ${cur_tok_b} == 0* ]] ; then + + # strip trailing zeros + cur_tok_a=${cur_tok_a%%+(0)} + cur_tok_b=${cur_tok_b%%+(0)} + + # do a *string* comparison of the resulting values: 2 > 11 + [[ ${cur_tok_a} < ${cur_tok_b} ]] && eshopts_pop && return 1 + [[ ${cur_tok_a} > ${cur_tok_b} ]] && eshopts_pop && return 3 + else + # to avoid going into octal mode, strip any leading zeros. otherwise + # bash will throw a hissy fit on versions like 6.3.068. + cur_tok_a=${cur_tok_a##+(0)} + cur_tok_b=${cur_tok_b##+(0)} + + # now if a component is blank, it was originally 0 -- make it so + : ${cur_tok_a:=0} + : ${cur_tok_b:=0} + + # compare + ((cur_tok_a < cur_tok_b)) && eshopts_pop && return 1 + ((cur_tok_a > cur_tok_b)) && eshopts_pop && return 3 + fi + done + + ### number parts equal. compare letter parts. + local letter_a= + letter_a=${parts_a[cur_idx_a]} + if [[ ${#letter_a} -eq 1 && -z ${letter_a/[a-z]} ]] ; then + cur_idx_a+=1 + else + letter_a=@ + fi + + local letter_b= + letter_b=${parts_b[cur_idx_b]} + if [[ ${#letter_b} -eq 1 && -z ${letter_b/[a-z]} ]] ; then + cur_idx_b+=1 + else + letter_b=@ + fi + + # compare + [[ ${letter_a} < ${letter_b} ]] && eshopts_pop && return 1 + [[ ${letter_a} > ${letter_b} ]] && eshopts_pop && return 3 + + ### letter parts equal. compare suffixes in order. + inf_loop=0 + while true ; do + inf_loop+=1 + ((inf_loop > 20)) && \ + die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]" + [[ ${parts_a[cur_idx_a]} == _ ]] && ((cur_idx_a++)) + [[ ${parts_b[cur_idx_b]} == _ ]] && ((cur_idx_b++)) + + cur_tok_a=${parts_a[cur_idx_a]} + cur_tok_b=${parts_b[cur_idx_b]} + num_part_a=0 + num_part_b=0 + + if has ${cur_tok_a%%+([0-9])} "alpha" "beta" "pre" "rc" "p"; then + cur_idx_a+=1 + num_part_a=${cur_tok_a##+([a-z])} + # I don't like octal + num_part_a=${num_part_a##+(0)} + : ${num_part_a:=0} + cur_tok_a=${cur_tok_a%%+([0-9])} + else + cur_tok_a= + fi + + if has ${cur_tok_b%%+([0-9])} alpha beta pre rc p; then + cur_idx_b+=1 + num_part_b=${cur_tok_b##+([a-z])} + # I still don't like octal + num_part_b=${num_part_b##+(0)} + : ${num_part_b:=0} + cur_tok_b=${cur_tok_b%%+([0-9])} + else + cur_tok_b= + fi + + if [[ ${cur_tok_a} != ${cur_tok_b} ]]; then + local suffix + for suffix in alpha beta pre rc "" p; do + [[ ${cur_tok_a} == ${suffix} ]] && eshopts_pop && return 1 + [[ ${cur_tok_b} == ${suffix} ]] && eshopts_pop && return 3 + done + elif [[ -z ${cur_tok_a} && -z ${cur_tok_b} ]]; then + break + else + ((num_part_a < num_part_b)) && eshopts_pop && return 1 + ((num_part_a > num_part_b)) && eshopts_pop && return 3 + fi + done + + # At this point, the only thing that should be left is the -r# part + [[ ${parts_a[cur_idx_a]} == - ]] && ((cur_idx_a++)) + [[ ${parts_b[cur_idx_b]} == - ]] && ((cur_idx_b++)) + + # Sanity check + if [[ ${parts_a[cur_idx_a]/r+([0-9])} || ${parts_b[cur_idx_b]/r+([0-9])} ]]; then + die "versionator compare bug [revisions, ${ver_a}, ${ver_b}]" + fi + + num_part_a=${parts_a[cur_idx_a]#r} + num_part_a=${num_part_a##+(0)} + : ${num_part_a:=0} + num_part_b=${parts_b[cur_idx_b]#r} + num_part_b=${num_part_b##+(0)} + : ${num_part_b:=0} + + ((num_part_a < num_part_b)) && eshopts_pop && return 1 + ((num_part_a > num_part_b)) && eshopts_pop && return 3 + + ### no differences. + eshopts_pop + return 2 +} + +# @FUNCTION: version_sort +# @USAGE: <version> [more versions...] +# @DESCRIPTION: +# Returns its parameters sorted, highest version last. We're using a quadratic +# algorithm for simplicity, so don't call it with more than a few dozen items. +# Uses version_compare, so be careful. +version_sort() { + eshopts_push -s extglob + local items= + local -i left=0 + items=("$@") + while ((left < ${#items[@]})); do + local -i lowest_idx=left + local -i idx=lowest_idx+1 + while ((idx < ${#items[@]})); do + version_compare "${items[lowest_idx]}" "${items[idx]}" + [[ $? -eq 3 ]] && lowest_idx=idx + idx+=1 + done + local tmp=${items[lowest_idx]} + items[lowest_idx]=${items[left]} + items[left]=${tmp} + left+=1 + done + echo ${items[@]} + eshopts_pop +} + +# @FUNCTION: version_format_string +# @USAGE: <format> [version] +# @DESCRIPTION: +# Reformat complicated version strings. The first argument is the string +# to reformat with while the rest of the args are passed on to the +# get_version_components function. You should make sure to single quote +# the first argument since it'll have variables that get delayed expansions. +# @EXAMPLE: +# P="cow-hat-1.2.3_p4" +# MY_P=$(version_format_string '${PN}_source_$1_$2-$3_$4') +# Now MY_P will be: cow-hat_source_1_2-3_p4 +version_format_string() { + local fstr=$1 + shift + set -- $(get_version_components "$@") + eval echo "${fstr}" +} + +fi diff -uNr a/eclass/vim-doc.eclass b/eclass/vim-doc.eclass --- a/eclass/vim-doc.eclass false +++ b/eclass/vim-doc.eclass f7324eb176933d1a7ce41499acfc3499680527ab9d11759ba8d6a99e38185ad72664304d4adfae6d616f0a6b56cda9a90ef0dec1e4810baa2101f3b4e69d6e4e @@ -0,0 +1,72 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# This eclass is used by vim.eclass and vim-plugin.eclass to update +# the documentation tags. This is necessary since vim doesn't look in +# /usr/share/vim/vimfiles/doc for documentation; it only uses the +# versioned directory, for example /usr/share/vim/vim62/doc +# +# We depend on vim being installed, which is satisfied by either the +# DEPEND in vim-plugin or by whatever version of vim is being +# installed by the eclass. + + +update_vim_helptags() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" + local vimfiles vim d s + + # This is where vim plugins are installed + vimfiles="${EROOT}"/usr/share/vim/vimfiles + + if [[ $PN != vim-core ]]; then + # Find a suitable vim binary for updating tags :helptags + vim=$(type -P vim 2>/dev/null) + [[ -z "$vim" ]] && vim=$(type -P gvim 2>/dev/null) + [[ -z "$vim" ]] && vim=$(type -P kvim 2>/dev/null) + if [[ -z "$vim" ]]; then + ewarn "No suitable vim binary to rebuild documentation tags" + fi + fi + + # Make vim not try to connect to X. See :help gui-x11-start + # in vim for how this evil trickery works. + if [[ -n "${vim}" ]] ; then + ln -s "${vim}" "${T}/tagvim" + vim="${T}/tagvim" + fi + + # Install the documentation symlinks into the versioned vim + # directory and run :helptags + for d in "${EROOT%/}"/usr/share/vim/vim[0-9]*; do + [[ -d "$d/doc" ]] || continue # catch a failed glob + + # Remove links, and possibly remove stale dirs + find $d/doc -name \*.txt -type l | while read s; do + [[ $(readlink "$s") = $vimfiles/* ]] && rm -f "$s" + done + if [[ -f "$d/doc/tags" && $(find "$d" | wc -l | tr -d ' ') = 3 ]]; then + # /usr/share/vim/vim61 + # /usr/share/vim/vim61/doc + # /usr/share/vim/vim61/doc/tags + einfo "Removing $d" + rm -r "$d" + continue + fi + + # Re-create / install new links + if [[ -d $vimfiles/doc ]]; then + ln -s $vimfiles/doc/*.txt $d/doc 2>/dev/null + fi + + # Update tags; need a vim binary for this + if [[ -n "$vim" ]]; then + einfo "Updating documentation tags in $d" + DISPLAY= $vim -u NONE -U NONE -T xterm -X -n -f \ + '+set nobackup nomore' \ + "+helptags $d/doc" \ + '+qa!' </dev/null &>/dev/null + fi + done + + [[ -n "${vim}" && -f "${vim}" ]] && rm "${vim}" +} diff -uNr a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass --- a/eclass/vim-plugin.eclass false +++ b/eclass/vim-plugin.eclass 4a7b0a4a7555a1b4054431ab992c5138a874434ee654885cac1266f1aae02e66e10a954609552e91f68282edd690c143b14c6b4352caa8241002821f7cae23bc @@ -0,0 +1,186 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: vim-plugin.eclass +# @MAINTAINER: +# vim@gentoo.org +# @BLURB: used for installing vim plugins +# @DESCRIPTION: +# This eclass simplifies installation of app-vim plugins into +# /usr/share/vim/vimfiles. This is a version-independent directory +# which is read automatically by vim. The only exception is +# documentation, for which we make a special case via vim-doc.eclass. + +inherit estack vim-doc +EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm + +VIM_PLUGIN_VIM_VERSION="${VIM_PLUGIN_VIM_VERSION:-7.3}" + +DEPEND="|| ( >=app-editors/vim-${VIM_PLUGIN_VIM_VERSION} + >=app-editors/gvim-${VIM_PLUGIN_VIM_VERSION} )" +RDEPEND="${DEPEND}" +if [[ ${PV} != 9999* ]] ; then + SRC_URI="mirror://gentoo/${P}.tar.bz2 + https://dev.gentoo.org/~radhermit/vim/${P}.tar.bz2" +fi +SLOT="0" + +# @FUNCTION: vim-plugin_src_install +# @DESCRIPTION: +# Overrides the default src_install phase. In order, this function: +# * fixes file permission across all files in ${S}. +# * installs help and documentation files. +# * installs all files in "${ED}"/usr/share/vim/vimfiles. +vim-plugin_src_install() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" + local f + + # When globbing, if nothing exists, the shell literally returns the glob + # pattern. So turn on nullglob and extglob options to avoid this. + eshopts_push -s extglob + eshopts_push -s nullglob + + ebegin "Cleaning up unwanted files and directories" + # We're looking for dotfiles, dotdirectories and Makefiles here. + local obj + eval "local matches=(@(.[^.]|.??*|Makefile*))" + for obj in "${matches[@]}"; do + rm -rv "${obj}" || die "cannot remove ${obj}" + done + eend $? + + # Turn those options back off. + eshopts_pop + eshopts_pop + + # Install non-vim-help-docs + cd "${S}" || die "couldn't cd in ${S}" + local f + for f in *; do + [[ -f "${f}" ]] || continue + if [[ "${f}" = *.html ]]; then + dohtml "${f}" + else + dodoc "${f}" + fi + rm "${f}" || die + done + + # Install remainder of plugin + cd "${WORKDIR}" || die "couldn't cd in ${WORKDIR}" + dodir /usr/share/vim + mv "${S}" "${ED}"/usr/share/vim/vimfiles || die \ + "couldn't move ${S} to ${ED}/usr/share/vim/vimfiles" + + # Set permissions + fperms -R a+rX /usr/share/vim/vimfiles +} + +# @FUNCTION: vim-plugin_pkg_postinst +# @DESCRIPTION: +# Overrides the pkg_postinst phase for this eclass. +# The following functions are called: +# * update_vim_helptags +# * update_vim_afterscripts +# * display_vim_plugin_help +vim-plugin_pkg_postinst() { + update_vim_helptags # from vim-doc + update_vim_afterscripts # see below + display_vim_plugin_help # see below +} + +# @FUNCTION: vim-plugin_pkg_postrm +# @DESCRIPTION: +# Overrides the pkg_postrm phase for this eclass. +# This function calls the update_vim_helptags and update_vim_afterscripts +# functions and eventually removes a bunch of empty directories. +vim-plugin_pkg_postrm() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + update_vim_helptags # from vim-doc + update_vim_afterscripts # see below + + # Remove empty dirs; this allows + # /usr/share/vim to be removed if vim-core is unmerged + find "${EPREFIX}/usr/share/vim/vimfiles" -depth -type d -exec rmdir {} \; 2>/dev/null || \ + die "rmdir failed" +} + +# @FUNCTION: update_vim_afterscripts +# @DESCRIPTION: +# Creates scripts in /usr/share/vim/vimfiles/after/* +# comprised of the snippets in /usr/share/vim/vimfiles/after/*/*.d +update_vim_afterscripts() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + local d f afterdir="${EROOT}"/usr/share/vim/vimfiles/after + + # Nothing to do if the dir isn't there + [ -d "${afterdir}" ] || return 0 + + einfo "Updating scripts in ${EPREFIX}/usr/share/vim/vimfiles/after" + find "${afterdir}" -type d -name \*.vim.d | while read d; do + echo '" Generated by update_vim_afterscripts' > "${d%.d}" || die + find "${d}" -name \*.vim -type f -maxdepth 1 -print0 | sort -z | \ + xargs -0 cat >> "${d%.d}" || die "update_vim_afterscripts failed" + done + + einfo "Removing dead scripts in ${EPREFIX}/usr/share/vim/vimfiles/after" + find "${afterdir}" -type f -name \*.vim | \ + while read f; do + [[ "$(head -n 1 ${f})" == '" Generated by update_vim_afterscripts' ]] \ + || continue + # This is a generated file, but might be abandoned. Check + # if there's no corresponding .d directory, or if the + # file's effectively empty + if [[ ! -d "${f}.d" || -z "$(grep -v '^"' "${f}")" ]]; then + rm "${f}" || die + fi + done +} + +# @FUNCTION: display_vim_plugin_help +# @DESCRIPTION: +# Displays a message with the plugin's help file if one is available. Uses the +# VIM_PLUGIN_HELPFILES env var. If multiple help files are available, they +# should be separated by spaces. If no help files are available, but the env +# var VIM_PLUGIN_HELPTEXT is set, that is displayed instead. Finally, if we +# have nothing else, this functions displays a link to VIM_PLUGIN_HELPURI. An +# extra message regarding enabling filetype plugins is displayed if +# VIM_PLUGIN_MESSAGES includes the word "filetype". +display_vim_plugin_help() { + local h + + if ! has_version ${CATEGORY}/${PN} ; then + if [[ -n "${VIM_PLUGIN_HELPFILES}" ]] ; then + elog " " + elog "This plugin provides documentation via vim's help system. To" + elog "view it, use:" + for h in ${VIM_PLUGIN_HELPFILES} ; do + elog " :help ${h}" + done + elog " " + + elif [[ -n "${VIM_PLUGIN_HELPTEXT}" ]] ; then + elog " " + while read h ; do + elog "$h" + done <<<"${VIM_PLUGIN_HELPTEXT}" + elog " " + + elif [[ -n "${VIM_PLUGIN_HELPURI}" ]] ; then + elog " " + elog "Documentation for this plugin is available online at:" + elog " ${VIM_PLUGIN_HELPURI}" + elog " " + fi + + if has "filetype" "${VIM_PLUGIN_MESSAGES}" ; then + elog "This plugin makes use of filetype settings. To enable these," + elog "add lines like:" + elog " filetype plugin on" + elog " filetype indent on" + elog "to your ~/.vimrc file." + elog " " + fi + fi +} diff -uNr a/eclass/vim-spell.eclass b/eclass/vim-spell.eclass --- a/eclass/vim-spell.eclass false +++ b/eclass/vim-spell.eclass 0575b094164611fb4408be3a643077952a065a00234fb8c7c51b80880a523ab1b557f988dd0f460b8d1e0fa00c8bae5ddabcdd32f684937b13f1432320c8a73b @@ -0,0 +1,153 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: vim-spell.eclass +# @MAINTAINER: +# Vim Maintainers <vim@gentoo.org> +# @AUTHOR: +# Ciaran McCreesh <ciaranm@gentoo.org> +# @BLURB: Eclass for managing Vim spell files. +# @DESCRIPTION: +# How to make a vim spell file package using prebuilt spell lists +# from upstream (${CODE} is the language's two letter code): +# +# * Get the ${CODE}.*.spl, ${CODE}.*.sug (if your language has them) and +# README_${CODE}.txt files. Currently they're at +# ftp://ftp.vim.org/pub/vim/unstable/runtime/spell/ (except for English, +# which should be taken from CVS instead). +# +# * Stick them in vim-spell-${CODE}-$(date --iso | tr -d - ).tar.bz2 . Make sure +# that they're in the appropriately named subdirectory to avoid having to mess +# with S=. +# +# * Upload the tarball to the Gentoo mirrors. +# +# * Add your spell file to package.mask next to the other vim things. Vim +# Project members will handle unmasking your spell packages when vim comes out +# of package.mask. +# +# * Create the app-vim/vim-spell-${CODE} package. You should base your ebuild +# upon app-vim/vim-spell-en. You will need to change VIM_SPELL_LANGUAGE, +# KEYWORDS and LICENSE. Check the license carefully! The README will tell +# you what it is. +# +# * Don't forget metadata.xml. You should list the Vim project and yourself +# as maintainers. There is no need to join the Vim project just for spell +# files. Here's an example of a metadata.xml file: +# +# <?xml version="1.0" encoding="UTF-8"?> +# <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +# <pkgmetadata> +# <maintainer type="person"> +# <email>your@email.tld</email> +# <name>Your Name</name> +# </maintainer> +# <maintainer type="project"> +# <email>vim@gentoo.org</email> +# <name>Vim Maintainers</name> +# </maintainer> +# +# <longdescription lang="en"> +# Vim spell files for French (fr). Supported character sets are +# UTF-8 and latin1. +# </longdescription> +# </pkgmetadata> +# +# * Send an email to vim@gentoo.org to let us know. +# +# Don't forget to update your package as necessary. +# +# If there isn't an upstream-provided pregenerated spell file for your language +# yet, read :help spell.txt from inside vim for instructions on how to create +# spell files. It's best to let upstream know if you've generated spell files +# for another language rather than keeping them Gentoo-specific. + +inherit eutils + +EXPORT_FUNCTIONS src_install pkg_postinst + +SRC_URI="mirror://gentoo/${P}.tar.bz2" +SLOT="0" + +# @ECLASS-VARIABLE: VIM_SPELL_LANGUAGE +# @DESCRIPTION: +# This variable defines the language for the spell package being +# installed. +# The default value is "English". +: ${VIM_SPELL_LANGUAGE:="English"} + +# @ECLASS-VARIABLE: VIM_SPELL_LOCALE +# @INTERNAL +# @DESCRIPTION: +# This variable defines the locale for the current ebuild. +# The default value is ${PN} stripped of the "vim-spell-" string. +: ${VIM_SPELL_LOCALE:="${PN/vim-spell-/}"} + +# @ECLASS-VARIABLE: VIM_SPELL_DIRECTORY +# @INTERNAL +# @DESCRIPTION: +# This variable defines the path to Vim spell files. +: ${VIM_SPELL_DIRECTORY:="${EPREFIX}/usr/share/vim/vimfiles/spell/"} + +# @ECLASS-VARIABLE: DESCRIPTION +# @DESCRIPTION: +# This variable defines the DESCRIPTION for Vim spell ebuilds. +: ${DESCRIPTION:="vim spell files: ${VIM_SPELL_LANGUAGE} (${VIM_SPELL_LOCALE})"} + +# @ECLASS-VARIABLE: HOMEPAGE +# @DESCRIPTION: +# This variable defines the HOMEPAGE for Vim spell ebuilds. +: ${HOMEPAGE:="https://www.vim.org"} + +# @FUNCTION: vim-spell_src_install +# @DESCRIPTION: +# This function installs Vim spell files. +vim-spell_src_install() { + dodir "${VIM_SPELL_DIRECTORY}" + insinto "${VIM_SPELL_DIRECTORY}" + + local had_spell_file= + local f + for f in *.spl; do + if [[ -f "${f}" ]]; then + doins "${f}" + had_spell_file="yes" + fi + done + + for f in *.sug; do + if [[ -f "${f}" ]]; then + doins "${f}" + fi + done + + for f in README*; do + dodoc "${f}" + done + + [[ -z "${had_spell_file}" ]] && die "Didn't install any spell files?" +} + +# @FUNCTION: vim-spell_pkg_postinst +# @DESCRIPTION: +# This function displays installed Vim spell files. +vim-spell_pkg_postinst() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" + echo + elog "To enable ${VIM_SPELL_LANGUAGE} spell checking, use" + elog " :setlocal spell spelllang=${VIM_SPELL_LOCALE}" + echo + elog "The following (Vim internal, not file) encodings are supported for" + elog "this language:" + local f enc + for f in "${EROOT}${VIM_SPELL_DIRECTORY}/${VIM_SPELL_LOCALE}".*.spl; do + enc="${f##*/${VIM_SPELL_LOCALE}.}" + enc="${enc%.spl}" + [[ -z "${enc}" ]] && continue + elog " ${enc}" + done + echo + elog "For further documentation, use:" + elog " :help spell" + echo +} diff -uNr a/eclass/virtualx.eclass b/eclass/virtualx.eclass --- a/eclass/virtualx.eclass false +++ b/eclass/virtualx.eclass 3306667fd9dfd8f88073ad46e81faf8f67d5515b5784d3d85ad8e80b5841d94a3bc851629b4401f7c496ed5352908dd6216625606c94d5eaf73c62bbf5b71032 @@ -0,0 +1,260 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: virtualx.eclass +# @MAINTAINER: +# x11@gentoo.org +# @AUTHOR: +# Original author: Martin Schlemmer <azarah@gentoo.org> +# @BLURB: This eclass can be used for packages that needs a working X environment to build. + +if [[ ! ${_VIRTUAL_X} ]]; then + +case "${EAPI:-0}" in + 0|1|2|3) + die "virtualx.eclass: EAPI ${EAPI} is too old." + ;; + 4|5|6) + ;; + *) + die "virtualx.eclass: EAPI ${EAPI} is not supported yet." + ;; +esac + +[[ ${EAPI} == [45] ]] && inherit eutils + +# @ECLASS-VARIABLE: VIRTUALX_REQUIRED +# @DESCRIPTION: +# Variable specifying the dependency on xorg-server and xhost. +# Possible special values are "always" and "manual", which specify +# the dependency to be set unconditionaly or not at all. +# Any other value is taken as useflag desired to be in control of +# the dependency (eg. VIRTUALX_REQUIRED="kde" will add the dependency +# into "kde? ( )" and add kde into IUSE. +: ${VIRTUALX_REQUIRED:=test} + +# @ECLASS-VARIABLE: VIRTUALX_DEPEND +# @DESCRIPTION: +# Dep string available for use outside of eclass, in case a more +# complicated dep is needed. +# You can specify the variable BEFORE inherit to add more dependencies. +VIRTUALX_DEPEND="${VIRTUALX_DEPEND} + !prefix? ( x11-base/xorg-server[xvfb] ) + x11-apps/xhost +" + +# @ECLASS-VARIABLE: VIRTUALX_COMMAND +# @DESCRIPTION: +# Command (or eclass function call) to be run in the X11 environment +# (within virtualmake function). +: ${VIRTUALX_COMMAND:="emake"} + +case ${VIRTUALX_REQUIRED} in + manual) + ;; + always) + DEPEND="${VIRTUALX_DEPEND}" + RDEPEND="" + ;; + optional|tests) + [[ ${EAPI} == [45] ]] \ + || die 'Values "optional" and "tests" for VIRTUALX_REQUIRED are banned in EAPI > 5' + # deprecated section YAY. + eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." + eqawarn "You can drop the variable definition completely from ebuild," + eqawarn "because it is default behaviour." + + if [[ -n ${VIRTUALX_USE} ]]; then + # so they like to specify the useflag + eqawarn "VIRTUALX_USE variable is deprecated." + eqawarn "Please read eclass manpage to find out how to use VIRTUALX_REQUIRED" + eqawarn "to achieve the same behaviour." + fi + + [[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test" + DEPEND="${VIRTUALX_USE}? ( ${VIRTUALX_DEPEND} )" + RDEPEND="" + IUSE="${VIRTUALX_USE}" + ;; + *) + DEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )" + RDEPEND="" + IUSE="${VIRTUALX_REQUIRED}" + ;; +esac + +# @FUNCTION: virtualmake +# @DESCRIPTION: +# Function which start new Xvfb session +# where the VIRTUALX_COMMAND variable content gets executed. +virtualmake() { + debug-print-function ${FUNCNAME} "$@" + + [[ ${EAPI} == [45] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx" + + # backcompat for maketype + if [[ -n ${maketype} ]]; then + [[ ${EAPI} == [45] ]] || die "maketype is banned in EAPI > 5" + eqawarn "ebuild is exporting \$maketype=${maketype}" + eqawarn "Ebuild should be migrated to use 'virtx command' instead." + VIRTUALX_COMMAND=${maketype} + fi + + virtx "${VIRTUALX_COMMAND}" "${@}" +} + + +# @FUNCTION: virtx +# @USAGE: <command> [command arguments] +# @DESCRIPTION: +# Start new Xvfb session and run commands in it. +# +# IMPORTANT: The command is run nonfatal !!! +# +# This means we are checking for the return code and raise an exception if it +# isn't 0. So you need to make sure that all commands return a proper +# code and not just die. All eclass function used should support nonfatal +# calls properly. +# +# The rational behind this is the tear down of the started Xfvb session. A +# straight die would leave a running session behind. +# +# Example: +# +# @CODE +# src_test() { +# virtx default +# } +# @CODE +# +# @CODE +# python_test() { +# virtx py.test --verbose +# } +# @CODE +# +# @CODE +# my_test() { +# some_command +# return $? +# } +# +# src_test() { +# virtx my_test +# } +# @CODE +virtx() { + debug-print-function ${FUNCNAME} "$@" + + [[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument" + + local i=0 + local retval=0 + local OLD_SANDBOX_ON="${SANDBOX_ON}" + local XVFB XHOST XDISPLAY + local xvfbargs="-screen 0 1280x1024x24 +extension RANDR" + XVFB=$(type -p Xvfb) || die + XHOST=$(type -p xhost) || die + + debug-print "${FUNCNAME}: running Xvfb hack" + export XAUTHORITY= + # The following is derived from Mandrake's hack to allow + # compiling without the X display + + einfo "Scanning for an open DISPLAY to start Xvfb ..." + # If we are in a chrooted environment, and there is already a + # X server started outside of the chroot, Xvfb will fail to start + # on the same display (most cases this is :0 ), so make sure + # Xvfb is started, else bump the display number + # + # Azarah - 5 May 2002 + XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i}) + debug-print "${FUNCNAME}: XDISPLAY=${XDISPLAY}" + + # We really do not want SANDBOX enabled here + export SANDBOX_ON="0" + + debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}" + ${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null & + sleep 2 + + local start=${XDISPLAY} + while [[ ! -f /tmp/.X${XDISPLAY}-lock ]]; do + # Stop trying after 15 tries + if ((XDISPLAY - start > 15)) ; then + eerror "'${XVFB} :${XDISPLAY} ${xvfbargs}' returns:" + echo + ${XVFB} :${XDISPLAY} ${xvfbargs} + echo + eerror "If possible, correct the above error and try your emerge again." + die "Unable to start Xvfb" + fi + ((XDISPLAY++)) + debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}" + ${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null & + sleep 2 + done + + # Now enable SANDBOX again if needed. + export SANDBOX_ON="${OLD_SANDBOX_ON}" + + einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." + + export DISPLAY=:${XDISPLAY} + # Do not break on error, but setup $retval, as we need + # to kill Xvfb + debug-print "${FUNCNAME}: $@" + nonfatal "$@" + retval=$? + + # Now kill Xvfb + kill $(cat /tmp/.X${XDISPLAY}-lock) + + # die if our command failed + [[ ${retval} -ne 0 ]] && die "Failed to run '$@'" + + return 0 # always return 0, it can be altered by failed kill for Xvfb +} + +# @FUNCTION: Xmake +# @DESCRIPTION: +# Same as "make", but set up the Xvfb hack if needed. +# Deprecated call. +Xmake() { + debug-print-function ${FUNCNAME} "$@" + + [[ ${EAPI} == [45] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 ....'" + + eqawarn "you should not execute make directly" + eqawarn "rather execute Xemake -j1 if you have issues with parallel make" + VIRTUALX_COMMAND="emake -j1" virtualmake "$@" +} + +# @FUNCTION: Xemake +# @DESCRIPTION: +# Same as "emake", but set up the Xvfb hack if needed. +Xemake() { + debug-print-function ${FUNCNAME} "$@" + + [[ ${EAPI} == [45] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake ....'" + + VIRTUALX_COMMAND="emake" virtualmake "$@" +} + +# @FUNCTION: Xeconf +# @DESCRIPTION: +# Same as "econf", but set up the Xvfb hack if needed. +Xeconf() { + debug-print-function ${FUNCNAME} "$@" + + [[ ${EAPI} == [45] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf ....'" + + VIRTUALX_COMMAND="econf" virtualmake "$@" +} + +_VIRTUAL_X=1 +fi diff -uNr a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass --- a/eclass/waf-utils.eclass false +++ b/eclass/waf-utils.eclass a0b0d7c3c5281a924e320d4056d787076aa5fff35c1faf9200f8caa881fd130807335d75e515dd51090914ade671106b2e82cea78e566e9614b7fbdc4d615be3 @@ -0,0 +1,119 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: waf-utils.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @AUTHOR: +# Original Author: Gilles Dartiguelongue <eva@gentoo.org> +# Various improvements based on cmake-utils.eclass: Tomáš Chvátal <scarabeus@gentoo.org> +# Proper prefix support: Jonathan Callen <jcallen@gentoo.org> +# @BLURB: common ebuild functions for waf-based packages +# @DESCRIPTION: +# The waf-utils eclass contains functions that make creating ebuild for +# waf-based packages much easier. +# Its main features are support of common portage default settings. + +[[ ${EAPI} == [45] ]] && inherit eutils +inherit multilib toolchain-funcs multiprocessing + +case ${EAPI:-0} in + 4|5|6) EXPORT_FUNCTIONS src_configure src_compile src_install ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +# @ECLASS-VARIABLE: WAF_VERBOSE +# @DESCRIPTION: +# Set to OFF to disable verbose messages during compilation +# this is _not_ meant to be set in ebuilds +: ${WAF_VERBOSE:=ON} + +# @FUNCTION: waf-utils_src_configure +# @DESCRIPTION: +# General function for configuring with waf. +waf-utils_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + local fail + if [[ ! ${_PYTHON_ANY_R1} && ! ${_PYTHON_SINGLE_R1} && ! ${_PYTHON_R1} ]]; then + eerror "Using waf-utils.eclass without any python-r1 suite eclass is not supported." + eerror "Please make sure to configure and inherit appropriate -r1 eclass." + eerror "For more information and examples, please see:" + eerror " https://wiki.gentoo.org/wiki/Project:Python/waf-utils_integration" + fail=1 + else + if [[ ! ${EPYTHON} ]]; then + eerror "EPYTHON is unset while calling waf-utils. This most likely means that" + eerror "the ebuild did not call the appropriate eclass function before calling waf." + if [[ ${_PYTHON_ANY_R1} ]]; then + eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()." + elif [[ ${_PYTHON_SINGLE_R1} ]]; then + eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()." + else # python-r1 + eerror "Please ensure that python_setup is called before waf-utils_src_configure()," + eerror "or that the latter is used within python_foreach_impl as appropriate." + fi + eerror + fail=1 + fi + + if [[ ${PYTHON_REQ_USE} != *threads* ]]; then + eerror "Waf requires threading support in Python. To accomodate this requirement," + eerror "please add 'threads(+)' to PYTHON_REQ_USE variable (above inherit line)." + eerror "For more information and examples, please see:" + eerror " https://wiki.gentoo.org/wiki/Project:Python/waf-utils_integration" + fail=1 + fi + fi + + [[ ${fail} ]] && die "Invalid use of waf-utils.eclass" + + local libdir=() + + # @ECLASS-VARIABLE: WAF_BINARY + # @DESCRIPTION: + # Eclass can use different waf executable. Usually it is located in "${S}/waf". + : ${WAF_BINARY:="${S}/waf"} + + # @ECLASS-VARIABLE: NO_WAF_LIBDIR + # @DEFAULT_UNSET + # @DESCRIPTION: + # Variable specifying that you don't want to set the libdir for waf script. + # Some scripts does not allow setting it at all and die if they find it. + [[ -z ${NO_WAF_LIBDIR} ]] && libdir=(--libdir="${EPREFIX}/usr/$(get_libdir)") + + tc-export AR CC CPP CXX RANLIB + echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${CFLAGS} ${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr ${libdir[@]} $@ configure" + + CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" "${WAF_BINARY}" \ + "--prefix=${EPREFIX}/usr" \ + "${libdir[@]}" \ + "$@" \ + configure || die "configure failed" +} + +# @FUNCTION: waf-utils_src_compile +# @DESCRIPTION: +# General function for compiling with waf. +waf-utils_src_compile() { + debug-print-function ${FUNCNAME} "$@" + local _mywafconfig + [[ "${WAF_VERBOSE}" ]] && _mywafconfig="--verbose" + + local jobs="--jobs=$(makeopts_jobs)" + echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs}" + "${WAF_BINARY}" ${_mywafconfig} ${jobs} || die "build failed" +} + +# @FUNCTION: waf-utils_src_install +# @DESCRIPTION: +# Function for installing the package. +waf-utils_src_install() { + debug-print-function ${FUNCNAME} "$@" + + echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install" + "${WAF_BINARY}" --destdir="${D}" install || die "Make install failed" + + # Manual document installation + einstalldocs +} diff -uNr a/eclass/webapp.eclass b/eclass/webapp.eclass --- a/eclass/webapp.eclass false +++ b/eclass/webapp.eclass ef0a5b129bb20505a1892777ddda01188f4d989b509163fa5cb95980e8ba401307c20c2b51c6972171292cce0fce17930118f093dc46dd7e208b8b9645d22b99 @@ -0,0 +1,577 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: webapp.eclass +# @MAINTAINER: +# web-apps@gentoo.org +# @BLURB: functions for installing applications to run under a web server +# @DESCRIPTION: +# The webapp eclass contains functions to handle web applications with +# webapp-config. Part of the implementation of GLEP #11 + +# @ECLASS-VARIABLE: WEBAPP_DEPEND +# @DESCRIPTION: +# An ebuild should use WEBAPP_DEPEND if a custom DEPEND needs to be built, most +# notably in combination with WEBAPP_OPTIONAL. +WEBAPP_DEPEND=">=app-admin/webapp-config-1.50.15" + +# @ECLASS-VARIABLE: WEBAPP_NO_AUTO_INSTALL +# @DESCRIPTION: +# An ebuild sets this to `yes' if an automatic installation and/or upgrade is +# not possible. The ebuild should overwrite pkg_postinst() and explain the +# reason for this BEFORE calling webapp_pkg_postinst(). + +# @ECLASS-VARIABLE: WEBAPP_OPTIONAL +# @DESCRIPTION: +# An ebuild sets this to `yes' to make webapp support optional, in which case +# you also need to take care of USE-flags and dependencies. + +if [[ "${WEBAPP_OPTIONAL}" != "yes" ]]; then + [[ "${WEBAPP_NO_AUTO_INSTALL}" == "yes" ]] || IUSE="vhosts" + SLOT="${PVR}" + DEPEND="${WEBAPP_DEPEND}" + RDEPEND="${DEPEND}" +fi + +EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm + +INSTALL_DIR="/${PN}" +IS_UPGRADE=0 +IS_REPLACE=0 + +INSTALL_CHECK_FILE="installed_by_webapp_eclass" +SETUP_CHECK_FILE="setup_by_webapp_eclass" + +ETC_CONFIG="${ROOT}etc/vhosts/webapp-config" +WEBAPP_CONFIG="${ROOT}usr/sbin/webapp-config" +WEBAPP_CLEANER="${ROOT}usr/sbin/webapp-cleaner" + +# ============================================================================== +# INTERNAL FUNCTIONS +# ============================================================================== + +# Load the config file /etc/vhosts/webapp-config +# Supports both the old bash version, and the new python version +webapp_read_config() { + debug-print-function $FUNCNAME $* + + if has_version '>=app-admin/webapp-config-1.50'; then + ENVVAR=$(${WEBAPP_CONFIG} --query ${PN} ${PVR}) || die "Could not read settings from webapp-config!" + eval ${ENVVAR} + elif [[ "${WEBAPP_OPTIONAL}" != "yes" ]]; then + # ETC_CONFIG might not be available + . ${ETC_CONFIG} || die "Unable to read ${ETC_CONFIG}" + elif [[ -f "${ETC_CONFIG}" ]]; then + # WEBAPP_OPTIONAL is set to yes + # and this must run only if ETC_CONFIG actually exists + . ${ETC_CONFIG} || die "Unable to read ${ETC_CONFIG}" + fi +} + +# Check whether a specified file exists in the given directory (`.' by default) +webapp_checkfileexists() { + debug-print-function $FUNCNAME $* + + local my_prefix=${2:+${2}/} + + if [[ ! -e "${my_prefix}${1}" ]]; then + msg="ebuild fault: file '${1}' not found" + eerror "$msg" + eerror "Please report this as a bug at https://bugs.gentoo.org/" + die "$msg" + fi +} + +webapp_check_installedat() { + debug-print-function $FUNCNAME $* + ${WEBAPP_CONFIG} --show-installed -h localhost -d "${INSTALL_DIR}" 2> /dev/null +} + +webapp_strip_appdir() { + debug-print-function $FUNCNAME $* + echo "${1#${MY_APPDIR}/}" +} + +webapp_strip_d() { + debug-print-function $FUNCNAME $* + echo "${1#${D}}" +} + +webapp_strip_cwd() { + debug-print-function $FUNCNAME $* + echo "${1/#.\///}" +} + +webapp_getinstalltype() { + debug-print-function $FUNCNAME $* + + if ! has vhosts ${IUSE} || use vhosts; then + return + fi + + local my_output + my_output="$(webapp_check_installedat)" + + if [[ $? -eq 0 ]]; then + # something is already installed there + # make sure it isn't the same version + + local my_pn="$(echo ${my_output} | awk '{ print $1 }')" + local my_pvr="$(echo ${my_output} | awk '{ print $2 }')" + + REMOVE_PKG="${my_pn}-${my_pvr}" + + if [[ "${my_pn}" == "${PN}" ]]; then + if [[ "${my_pvr}" != "${PVR}" ]]; then + elog "This is an upgrade" + IS_UPGRADE=1 + # for binpkgs, reset status, var declared in global scope + IS_REPLACE=0 + else + elog "This is a re-installation" + IS_REPLACE=1 + # for binpkgs, reset status, var declared in global scope + IS_UPGRADE=0 + fi + else + elog "${my_output} is installed there" + fi + else + # for binpkgs, reset status, var declared in global scope + IS_REPLACE=0 + IS_UPGRADE=0 + elog "This is an installation" + fi +} + +# ============================================================================== +# PUBLIC FUNCTIONS +# ============================================================================== + +# @FUNCTION: need_httpd +# @DESCRIPTION: +# Call this function AFTER your ebuilds DEPEND line if any of the available +# webservers are able to run this application. +need_httpd() { + DEPEND="${DEPEND} + || ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi )" +} + +# @FUNCTION: need_httpd_cgi +# @DESCRIPTION: +# Call this function AFTER your ebuilds DEPEND line if any of the available +# CGI-capable webservers are able to run this application. +need_httpd_cgi() { + DEPEND="${DEPEND} + || ( virtual/httpd-cgi virtual/httpd-fastcgi )" +} + +# @FUNCTION: need_httpd_fastcgi +# @DESCRIPTION: +# Call this function AFTER your ebuilds DEPEND line if any of the available +# FastCGI-capabale webservers are able to run this application. +need_httpd_fastcgi() { + DEPEND="${DEPEND} + virtual/httpd-fastcgi" +} + +# @FUNCTION: webapp_configfile +# @USAGE: <file> [more files ...] +# @DESCRIPTION: +# Mark a file config-protected for a web-based application. +webapp_configfile() { + debug-print-function $FUNCNAME $* + + local m + for m in "$@"; do + webapp_checkfileexists "${m}" "${D}" + + local my_file="$(webapp_strip_appdir "${m}")" + my_file="$(webapp_strip_cwd "${my_file}")" + + elog "(config) ${my_file}" + echo "${my_file}" >> ${D}/${WA_CONFIGLIST} + done +} + +# @FUNCTION: webapp_hook_script +# @USAGE: <file> +# @DESCRIPTION: +# Install a script that will run after a virtual copy is created, and +# before a virtual copy has been removed. +webapp_hook_script() { + debug-print-function $FUNCNAME $* + + webapp_checkfileexists "${1}" + + elog "(hook) ${1}" + cp "${1}" "${D}/${MY_HOOKSCRIPTSDIR}/$(basename "${1}")" || die "Unable to install ${1} into ${D}/${MY_HOOKSCRIPTSDIR}/" + chmod 555 "${D}/${MY_HOOKSCRIPTSDIR}/$(basename "${1}")" +} + +# @FUNCTION: webapp_postinst_txt +# @USAGE: <lang> <file> +# @DESCRIPTION: +# Install a text file containing post-installation instructions. +webapp_postinst_txt() { + debug-print-function $FUNCNAME $* + + webapp_checkfileexists "${2}" + + elog "(info) ${2} (lang: ${1})" + cp "${2}" "${D}/${MY_APPDIR}/postinst-${1}.txt" +} + +# @FUNCTION: webapp_postupgrade_txt +# @USAGE: <lang> <file> +# @DESCRIPTION: +# Install a text file containing post-upgrade instructions. +webapp_postupgrade_txt() { + debug-print-function $FUNCNAME $* + + webapp_checkfileexists "${2}" + + elog "(info) ${2} (lang: ${1})" + cp "${2}" "${D}/${MY_APPDIR}/postupgrade-${1}.txt" +} + +# helper for webapp_serverowned() +_webapp_serverowned() { + debug-print-function $FUNCNAME $* + + webapp_checkfileexists "${1}" "${D}" + local my_file="$(webapp_strip_appdir "${1}")" + my_file="$(webapp_strip_cwd "${my_file}")" + + echo "${my_file}" >> "${D}/${WA_SOLIST}" +} + +# @FUNCTION: webapp_serverowned +# @USAGE: [-R] <file> [more files ...] +# @DESCRIPTION: +# Identify a file which must be owned by the webserver's user:group settings. +# The ownership of the file is NOT set until the application is installed using +# the webapp-config tool. If -R is given directories are handled recursively. +webapp_serverowned() { + debug-print-function $FUNCNAME $* + + local a m + if [[ "${1}" == "-R" ]]; then + shift + for m in "$@"; do + find "${D}${m}" | while read a; do + a=$(webapp_strip_d "${a}") + _webapp_serverowned "${a}" + done + done + else + for m in "$@"; do + _webapp_serverowned "${m}" + done + fi +} + +# @FUNCTION: webapp_server_configfile +# @USAGE: <server> <file> [new name] +# @DESCRIPTION: +# Install a configuration file for the webserver. You need to specify a +# webapp-config supported <server>. if no new name is given `basename $2' is +# used by default. Note: this function will automagically prepend $1 to the +# front of your config file's name. +webapp_server_configfile() { + debug-print-function $FUNCNAME $* + + webapp_checkfileexists "${2}" + + # WARNING: + # + # do NOT change the naming convention used here without changing all + # the other scripts that also rely upon these names + + local my_file="${1}-${3:-$(basename "${2}")}" + + elog "(${1}) config file '${my_file}'" + cp "${2}" "${D}/${MY_SERVERCONFIGDIR}/${my_file}" +} + +# @FUNCTION: webapp_sqlscript +# @USAGE: <db> <file> [version] +# @DESCRIPTION: +# Install a SQL script that creates/upgrades a database schema for the web +# application. Currently supported database engines are mysql and postgres. +# If a version is given the script should upgrade the database schema from +# the given version to $PVR. +webapp_sqlscript() { + debug-print-function $FUNCNAME $* + + webapp_checkfileexists "${2}" + + dodir "${MY_SQLSCRIPTSDIR}/${1}" + + # WARNING: + # + # do NOT change the naming convention used here without changing all + # the other scripts that also rely upon these names + + if [[ -n "${3}" ]]; then + elog "(${1}) upgrade script for ${PN}-${3} to ${PVR}" + cp "${2}" "${D}${MY_SQLSCRIPTSDIR}/${1}/${3}_to_${PVR}.sql" + chmod 600 "${D}${MY_SQLSCRIPTSDIR}/${1}/${3}_to_${PVR}.sql" + else + elog "(${1}) create script for ${PN}-${PVR}" + cp "${2}" "${D}/${MY_SQLSCRIPTSDIR}/${1}/${PVR}_create.sql" + chmod 600 "${D}/${MY_SQLSCRIPTSDIR}/${1}/${PVR}_create.sql" + fi +} + +# @FUNCTION: webapp_src_preinst +# @DESCRIPTION: +# You need to call this function in src_install() BEFORE anything else has run. +# For now we just create required webapp-config directories. +webapp_src_preinst() { + debug-print-function $FUNCNAME $* + + # sanity checks, to catch bugs in the ebuild + if [[ ! -f "${T}/${SETUP_CHECK_FILE}" ]]; then + eerror + eerror "This ebuild did not call webapp_pkg_setup() at the beginning" + eerror "of the pkg_setup() function" + eerror + eerror "Please log a bug on https://bugs.gentoo.org" + eerror + eerror "You should use emerge -C to remove this package, as the" + eerror "installation is incomplete" + eerror + die "Ebuild did not call webapp_pkg_setup() - report to https://bugs.gentoo.org" + fi + + # Hint, see the webapp_read_config() function to find where these are + # defined. + dodir "${MY_HTDOCSDIR}" + dodir "${MY_HOSTROOTDIR}" + dodir "${MY_CGIBINDIR}" + dodir "${MY_ICONSDIR}" + dodir "${MY_ERRORSDIR}" + dodir "${MY_SQLSCRIPTSDIR}" + dodir "${MY_HOOKSCRIPTSDIR}" + dodir "${MY_SERVERCONFIGDIR}" +} + +# ============================================================================== +# EXPORTED FUNCTIONS +# ============================================================================== + +# @FUNCTION: webapp_pkg_setup +# @DESCRIPTION: +# The default pkg_setup() for this eclass. This will gather required variables +# from webapp-config and check if there is an application installed to +# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. +# +# You need to call this function BEFORE anything else has run in your custom +# pkg_setup(). +webapp_pkg_setup() { + debug-print-function $FUNCNAME $* + + # to test whether or not the ebuild has correctly called this function + # we add an empty file to the filesystem + # + # we used to just set a variable in the shell script, but we can + # no longer rely on Portage calling both webapp_pkg_setup() and + # webapp_src_install() within the same shell process + touch "${T}/${SETUP_CHECK_FILE}" + + # special case - some ebuilds *do* need to overwride the SLOT + if [[ "${SLOT}+" != "${PVR}+" && "${WEBAPP_MANUAL_SLOT}" != "yes" ]]; then + die "Set WEBAPP_MANUAL_SLOT=\"yes\" if you need to SLOT manually" + fi + + # pull in the shared configuration file + G_HOSTNAME="localhost" + webapp_read_config + + local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}" + + # if USE=vhosts is enabled OR no application is installed we're done here + if ! has vhosts ${IUSE} || use vhosts || [[ ! -d "${my_dir}" ]]; then + return + fi + + local my_output + my_output="$(webapp_check_installedat)" + + if [[ $? -ne 0 ]]; then + # okay, whatever is there, it isn't webapp-config-compatible + echo + ewarn + ewarn "You already have something installed in ${my_dir}" + ewarn + ewarn "Whatever is in ${my_dir}, it's not" + ewarn "compatible with webapp-config." + ewarn + ewarn "This ebuild may be overwriting important files." + ewarn + echo + elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then + echo + eerror "You already have ${my_output} installed in ${my_dir}" + eerror + eerror "I cannot upgrade a different application" + eerror + echo + die "Cannot upgrade contents of ${my_dir}" + fi + +} + +# @FUNCTION: webapp_src_install +# @DESCRIPTION: +# This is the default src_install(). For now, we just make sure that root owns +# everything, and that there are no setuid files. +# +# You need to call this function AFTER everything else has run in your custom +# src_install(). +webapp_src_install() { + debug-print-function $FUNCNAME $* + + # to test whether or not the ebuild has correctly called this function + # we add an empty file to the filesystem + # + # we used to just set a variable in the shell script, but we can + # no longer rely on Portage calling both webapp_src_install() and + # webapp_pkg_postinst() within the same shell process + touch "${D}/${MY_APPDIR}/${INSTALL_CHECK_FILE}" + + chown -R "${VHOST_DEFAULT_UID}:${VHOST_DEFAULT_GID}" "${D}/" + chmod -R u-s "${D}/" + chmod -R g-s "${D}/" + + keepdir "${MY_PERSISTDIR}" + fowners "root:0" "${MY_PERSISTDIR}" + fperms 755 "${MY_PERSISTDIR}" +} + +# @FUNCTION: webapp_pkg_postinst +# @DESCRIPTION: +# The default pkg_postinst() for this eclass. This installs the web application to +# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise +# display a short notice how to install this application with webapp-config. +# +# You need to call this function AFTER everything else has run in your custom +# pkg_postinst(). +webapp_pkg_postinst() { + debug-print-function $FUNCNAME $* + + webapp_read_config + + # sanity checks, to catch bugs in the ebuild + if [[ ! -f "${ROOT}${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then + eerror + eerror "This ebuild did not call webapp_src_install() at the end" + eerror "of the src_install() function" + eerror + eerror "Please log a bug on https://bugs.gentoo.org" + eerror + eerror "You should use emerge -C to remove this package, as the" + eerror "installation is incomplete" + eerror + die "Ebuild did not call webapp_src_install() - report to https://bugs.gentoo.org" + fi + + if has vhosts ${IUSE}; then + if ! use vhosts; then + echo + elog "vhosts USE flag not set - auto-installing using webapp-config" + + G_HOSTNAME="localhost" + webapp_read_config + + local my_mode=-I + webapp_getinstalltype + + if [[ "${IS_REPLACE}" == "1" ]]; then + elog "${PN}-${PVR} is already installed - replacing" + my_mode=-I + elif [[ "${IS_UPGRADE}" == "1" ]]; then + elog "${REMOVE_PKG} is already installed - upgrading" + my_mode=-U + else + elog "${PN}-${PVR} is not installed - using install mode" + fi + + my_cmd="${WEBAPP_CONFIG} -h localhost -u root -d ${INSTALL_DIR} ${my_mode} ${PN} ${PVR}" + elog "Running ${my_cmd}" + ${my_cmd} + + echo + local cleaner="${WEBAPP_CLEANER} -p -C ${CATEGORY}/${PN}" + einfo "Running ${cleaner}" + ${cleaner} + else + elog + elog "The 'vhosts' USE flag is switched ON" + elog "This means that Portage will not automatically run webapp-config to" + elog "complete the installation." + elog + elog "To install ${PN}-${PVR} into a virtual host, run the following command:" + elog + elog " webapp-config -h <host> -d ${PN} -I ${PN} ${PVR}" + elog + elog "For more details, see the webapp-config(8) man page" + fi + else + elog + elog "This ebuild does not support the 'vhosts' USE flag." + elog "This means that Portage will not automatically run webapp-config to" + elog "complete the installation." + elog + elog "To install ${PN}-${PVR} into a virtual host, run the following command:" + elog + elog " webapp-config -h <host> -d ${PN} -I ${PN} ${PVR}" + elog + elog "For more details, see the webapp-config(8) man page" + fi +} + +# @FUNCTION: webapp_pkg_prerm +# @DESCRIPTION: +# This is the default pkg_prerm() for this eclass. If USE=vhosts is not set +# remove all installed copies of this web application. Otherwise instruct the +# user to manually remove those copies. See bug #136959. +webapp_pkg_prerm() { + debug-print-function $FUNCNAME $* + + local my_output= + my_output="$(${WEBAPP_CONFIG} --list-installs ${PN} ${PVR})" + [[ $? -ne 0 ]] && return + + local x + if has vhosts ${IUSE} && ! use vhosts; then + echo "${my_output}" | while read x; do + if [[ -f "${x}"/.webapp ]]; then + . "${x}"/.webapp + if [[ -n "${WEB_HOSTNAME}" && -n "${WEB_INSTALLDIR}" ]]; then + ${WEBAPP_CONFIG} -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} -C ${PN} ${PVR} + fi + else + ewarn "Cannot find file ${x}/.webapp" + fi + done + elif [[ "${my_output}" != "" ]]; then + echo + ewarn + ewarn "Don't forget to use webapp-config to remove any copies of" + ewarn "${PN}-${PVR} installed in" + ewarn + + echo "${my_output}" | while read x; do + if [[ -f "${x}"/.webapp ]]; then + ewarn " ${x}" + else + ewarn "Cannot find file ${x}/.webapp" + fi + done + + ewarn + echo + fi +} diff -uNr a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass --- a/eclass/wxwidgets.eclass false +++ b/eclass/wxwidgets.eclass 6fdecf63e8bad49733b339c9df917347eb0d2296645ac8fe27733c7a6ca69f53a3370cdd7cb3961cd8bb7f412f07fc1f4d6721f2fb0ac9450c0b82380229ac32 @@ -0,0 +1,139 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: wxwidgets.eclass +# @MAINTAINER: +# wxwidgets@gentoo.org +# @BLURB: Manages build configuration for wxGTK-using packages. +# @DESCRIPTION: +# This eclass sets up the proper environment for ebuilds using the wxGTK +# libraries. Ebuilds using wxPython do not need to inherit this eclass. +# +# More specifically, this eclass controls the configuration chosen by the +# /usr/bin/wx-config wrapper. +# +# Using the eclass is simple: +# +# - set WX_GTK_VER equal to a SLOT of wxGTK +# - call setup-wxwidgets() +# +# The configuration chosen is based on the version required and the flags +# wxGTK was built with. + +if [[ -z ${_WXWIDGETS_ECLASS} ]]; then + +case ${EAPI} in + 0|1|2|3|4|5) + inherit eutils flag-o-matic multilib + + # This was used to set up a sane default for ebuilds so they could + # avoid calling need-wxwidgets if they didn't need a particular build. + # This was a bad idea for a couple different reasons, and because + # get_libdir() is now illegal in global scope in EAPI 6 we can't do it + # anymore. All ebuilds must now use setup-wxwidgets and this code is + # only here for backwards compatability. + if [[ -z ${WX_CONFIG} ]]; then + if [[ -n ${WX_GTK_VER} ]]; then + for _wxtoolkit in mac gtk2 base; do + # newer versions don't have a seperate debug config + for _wxdebug in xxx release- debug-; do + _wxconf="${_wxtoolkit}-unicode-${_wxdebug/xxx/}${WX_GTK_VER}" + + [[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf} ]] \ + || continue + + WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf}" + WX_ECLASS_CONFIG="${WX_CONFIG}" + break + done + [[ -n ${WX_CONFIG} ]] && break + done + [[ -n ${WX_CONFIG} ]] && export WX_CONFIG WX_ECLASS_CONFIG + fi + fi + unset _wxtoolkit + unset _wxdebug + unset _wxconf + ;; + 6) + inherit flag-o-matic multilib + ;; + *) + die "EAPI=${EAPI:-0} is not supported" + ;; +esac + +# @FUNCTION: setup-wxwidgets +# @DESCRIPTION: +# +# Call this in your ebuild to set up the environment for wxGTK. Besides +# controlling the wx-config wrapper this exports WX_CONFIG containing +# the path to the config in case it needs to be passed to a build system. +# +# In wxGTK-2.9 and later it also controls the level of debugging output +# from the libraries. In these versions debugging features are enabled +# by default and need to be disabled at the package level. Because this +# causes many warning dialogs to pop up during runtime we add -DNDEBUG to +# CPPFLAGS to disable debugging features (unless your ebuild has a debug +# USE flag and it's enabled). If you don't like this behavior you can set +# WX_DISABLE_NDEBUG to override it. +# +# See: http://docs.wxwidgets.org/trunk/overview_debugging.html + +setup-wxwidgets() { + local wxtoolkit wxdebug wxconf + + [[ -z ${WX_GTK_VER} ]] \ + && die "WX_GTK_VER must be set before calling $FUNCNAME." + + case "${WX_GTK_VER}" in + 3.0-gtk3) + wxtoolkit=gtk3 + if [[ -z ${WX_DISABLE_NDEBUG} ]]; then + ( in_iuse debug && use debug ) || append-cppflags -DNDEBUG + fi + ;; + 2.9|3.0) + wxtoolkit=gtk2 + if [[ -z ${WX_DISABLE_NDEBUG} ]]; then + ( in_iuse debug && use debug ) || append-cppflags -DNDEBUG + fi + ;; + 2.8) + wxtoolkit=gtk2 + wxdebug="release-" + has_version x11-libs/wxGTK:${WX_GTK_VER}[debug] && wxdebug="debug-" + ;; + *) + die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT" + ;; + esac + + # toolkit overrides + if has_version "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then + wxtoolkit="mac" + elif ! has_version "x11-libs/wxGTK:${WX_GTK_VER}[X]"; then + wxtoolkit="base" + fi + + wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}" + + [[ ! -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]] \ + && die "Failed to find configuration ${wxconf}" + + export WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}" + export WX_ECLASS_CONFIG="${WX_CONFIG}" + + echo + einfo "Requested wxWidgets: ${WX_GTK_VER}" + einfo "Using wxWidgets: ${wxconf}" + echo +} + +# deprecated +need-wxwidgets() { + setup-wxwidgets +} + +_WXWIDGETS_ECLASS=1 +fi diff -uNr a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass --- a/eclass/xdg-utils.eclass false +++ b/eclass/xdg-utils.eclass dd1da9770393893e0c1d851aa8ed7f7299f133117b4bae089ce72e38316df0e17c858591217e7c89957359f89c4471a3e0cee50293c2a627db54a4e85c3476ce @@ -0,0 +1,104 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: xdg-utils.eclass +# @MAINTAINER: +# gnome@gentoo.org +# @AUTHOR: +# Original author: Gilles Dartiguelongue <eva@gentoo.org> +# @BLURB: Auxiliary functions commonly used by XDG compliant packages. +# @DESCRIPTION: +# This eclass provides a set of auxiliary functions needed by most XDG +# compliant packages. +# It provides XDG stack related functions such as: +# * XDG .desktop files cache management +# * XDG mime information database management + +case "${EAPI:-0}" in + 0|1|2|3|4|5|6) ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +# @ECLASS-VARIABLE: DESKTOP_DATABASE_UPDATE_BIN +# @INTERNAL +# @DESCRIPTION: +# Path to update-desktop-database +: ${DESKTOP_DATABASE_UPDATE_BIN:="/usr/bin/update-desktop-database"} + +# @ECLASS-VARIABLE: DESKTOP_DATABASE_DIR +# @INTERNAL +# @DESCRIPTION: +# Directory where .desktop files database is stored +: ${DESKTOP_DATABASE_DIR="/usr/share/applications"} + +# @ECLASS-VARIABLE: MIMEINFO_DATABASE_UPDATE_BIN +# @INTERNAL +# @DESCRIPTION: +# Path to update-mime-database +: ${MIMEINFO_DATABASE_UPDATE_BIN:="/usr/bin/update-mime-database"} + +# @ECLASS-VARIABLE: MIMEINFO_DATABASE_DIR +# @INTERNAL +# @DESCRIPTION: +# Directory where .desktop files database is stored +: ${MIMEINFO_DATABASE_DIR:="/usr/share/mime"} + +# @FUNCTION: xdg_environment_reset +# @DESCRIPTION: +# Clean up environment for clean builds. +xdg_environment_reset() { + # Prepare XDG base directories + export XDG_DATA_HOME="${HOME}/.local/share" + export XDG_CONFIG_HOME="${HOME}/.config" + export XDG_CACHE_HOME="${HOME}/.cache" + export XDG_RUNTIME_DIR="${T}/run" + mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \ + "${XDG_RUNTIME_DIR}" || die + # This directory needs to be owned by the user, and chmod 0700 + # https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html + chmod 0700 "${XDG_RUNTIME_DIR}" || die + + unset DBUS_SESSION_BUS_ADDRESS +} + +# @FUNCTION: xdg_desktop_database_update +# @DESCRIPTION: +# Updates the .desktop files database. +# Generates a list of mimetypes linked to applications that can handle them +xdg_desktop_database_update() { + local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}" + + if [[ ${EBUILD_PHASE} != post* ]] ; then + die "xdg_desktop_database_update must be used in pkg_post* phases." + fi + + if [[ ! -x "${updater}" ]] ; then + debug-print "${updater} is not executable" + return + fi + + ebegin "Updating .desktop files database" + "${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}" + eend $? +} + +# @FUNCTION: xdg_mimeinfo_database_update +# @DESCRIPTION: +# Update the mime database. +# Creates a general list of mime types from several sources +xdg_mimeinfo_database_update() { + local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}" + + if [[ ${EBUILD_PHASE} != post* ]] ; then + die "xdg_mimeinfo_database_update must be used in pkg_post* phases." + fi + + if [[ ! -x "${updater}" ]] ; then + debug-print "${updater} is not executable" + return + fi + + ebegin "Updating shared mime info database" + "${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}" + eend $? +} diff -uNr a/eclass/xdg.eclass b/eclass/xdg.eclass --- a/eclass/xdg.eclass false +++ b/eclass/xdg.eclass 8911399c9882cef1266a2de474217d1cdda42ff4f3ae88a4759cac083eabe428ee3942fa9b9472a0201cbeb20e8cb2ac796ee5b969568a726a99143a27d96661 @@ -0,0 +1,94 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: xdg.eclass +# @MAINTAINER: +# freedesktop-bugs@gentoo.org +# @AUTHOR: +# Original author: Gilles Dartiguelongue <eva@gentoo.org> +# @BLURB: Provides phases for XDG compliant packages. +# @DESCRIPTION: +# Utility eclass to update the desktop and shared mime info as laid +# out in the freedesktop specs & implementations + +inherit xdg-utils + +case "${EAPI:-0}" in + 4|5|6) + EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm + ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +# Avoid dependency loop as both depend on glib-2 +if [[ ${CATEGORY}/${P} != dev-libs/glib-2.* ]] ; then +DEPEND=" + dev-util/desktop-file-utils + x11-misc/shared-mime-info +" +fi + +# @FUNCTION: xdg_src_prepare +# @DESCRIPTION: +# Prepare sources to work with XDG standards. +xdg_src_prepare() { + xdg_environment_reset + + has ${EAPI:-0} 6 && default +} + +# @FUNCTION: xdg_pkg_preinst +# @DESCRIPTION: +# Finds .desktop and mime info files for later handling in pkg_postinst. +# Locations are stored in XDG_ECLASS_DESKTOPFILES and XDG_ECLASS_MIMEINFOFILES +# respectively. +xdg_pkg_preinst() { + local f + + XDG_ECLASS_DESKTOPFILES=() + while IFS= read -r -d '' f; do + XDG_ECLASS_DESKTOPFILES+=( ${f} ) + done < <(cd "${D}" && find 'usr/share/applications' -type f -print0 2>/dev/null) + + XDG_ECLASS_MIMEINFOFILES=() + while IFS= read -r -d '' f; do + XDG_ECLASS_MIMEINFOFILES+=( ${f} ) + done < <(cd "${D}" && find 'usr/share/mime' -type f -print0 2>/dev/null) + + export XDG_ECLASS_DESKTOPFILES XDG_ECLASS_MIMEINFOFILES +} + +# @FUNCTION: xdg_pkg_postinst +# @DESCRIPTION: +# Handle desktop and mime info database updates. +xdg_pkg_postinst() { + if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then + xdg_desktop_database_update + else + debug-print "No .desktop files to add to database" + fi + + if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then + xdg_mimeinfo_database_update + else + debug-print "No mime info files to add to database" + fi +} + +# @FUNCTION: xdg_pkg_postrm +# @DESCRIPTION: +# Handle desktop and mime info database updates. +xdg_pkg_postrm() { + if [[ ${#XDG_ECLASS_DESKTOPFILES[@]} -gt 0 ]]; then + xdg_desktop_database_update + else + debug-print "No .desktop files to add to database" + fi + + if [[ ${#XDG_ECLASS_MIMEINFOFILES[@]} -gt 0 ]]; then + xdg_mimeinfo_database_update + else + debug-print "No mime info files to add to database" + fi +} + diff -uNr a/eclass/xemacs-elisp-common.eclass b/eclass/xemacs-elisp-common.eclass --- a/eclass/xemacs-elisp-common.eclass false +++ b/eclass/xemacs-elisp-common.eclass 1b423cccf9916405a9d84aab46ff08a6b7edcf53c941d33dca1f4d232b1ebd357f459d6a23420d2fb6bd6eb0a70003d2222916335f8a6c36d45434a4c6a7fa34 @@ -0,0 +1,310 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# Copyright 2007-2011 Hans de Graaff <graaff@gentoo.org> +# +# Based on elisp-common.eclass: +# Copyright 2007 Christian Faulhammer <opfer@gentoo.org> +# Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org> +# Copyright 2004-2005 Mamoru Komachi <usata@gentoo.org> +# Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com> +# Copyright 2007 Ulrich Müller <ulm@gentoo.org> +# +# @ECLASS: xemacs-elisp-common.eclass +# @MAINTAINER: +# xemacs@gentoo.org +# @BLURB: XEmacs-related installation utilities +# @DESCRIPTION: +# +# Usually you want to use this eclass for (optional) XEmacs support of +# your package. This is NOT for GNU Emacs! +# +# Many of the steps here are sometimes done by the build system of your +# package (especially compilation), so this is mainly for standalone elisp +# files you gathered from somewhere else. +# +# When relying on the xemacs USE flag, you need to add +# +# xemacs? ( app-editors/xemacs ) +# +# to your DEPEND/RDEPEND line and use the functions provided here to bring +# the files to the correct locations. +# +# @ROFF .SS +# src_compile() usage: +# +# An elisp file is compiled by the xemacs-elisp-compile() function +# defined here and simply takes the source files as arguments. +# +# xemacs-elisp-compile *.el +# +# In the case of interdependent elisp files, you can use the +# xemacs-elisp-comp() function which makes sure all files are +# loadable. +# +# xemacs-elisp-comp *.el +# +# Function xemacs-elisp-make-autoload-file() can be used to generate a +# file with autoload definitions for the lisp functions. It takes a +# list of directories (default: working directory) as its argument. +# Use of this function requires that the elisp source files contain +# magic ";;;###autoload" comments. See the XEmacs Lisp Reference Manual +# (node "Autoload") for a detailed explanation. +# +# @ROFF .SS +# src_install() usage: +# +# The resulting compiled files (.elc) should be put in a subdirectory +# of /usr/lib/xemacs/site-lisp/ which is named after the first +# argument of xemacs-elisp-install(). The following parameters are +# the files to be put in that directory. Usually the subdirectory +# should be ${PN}, but you can choose something else. +# +# xemacs-elisp-install ${PN} *.el *.elc +# +# To let the XEmacs support be activated by XEmacs on startup, you need +# to provide a site file (shipped in ${FILESDIR}) which contains the +# startup code (have a look in the documentation of your software). +# Normally this would look like this: +# +# (add-to-list 'load-path "@SITELISP@") +# (add-to-list 'auto-mode-alist '("\\.csv\\'" . csv-mode)) +# (autoload 'csv-mode "csv-mode" "Major mode for csv files." t) +# +# If your XEmacs support files are installed in a subdirectory of +# /usr/share/xemacs/site-packages/ (which is strongly recommended), you need +# to extend XEmacs' load-path as shown in the first non-comment line. +# The xemacs-elisp-site-file-install() function of this eclass will replace +# "@SITELISP@" by the actual path. +# +# The next line tells XEmacs to load the mode opening a file ending +# with ".csv" and load functions depending on the context and needed +# features. Be careful though. Commands as "load-library" or "require" +# bloat the editor as they are loaded on every startup. When having +# many XEmacs support files, users may be annoyed by the start-up time. +# Also avoid keybindings as they might interfere with the user's +# settings. Give a hint in pkg_postinst(), which should be enough. +# +# The naming scheme for this site-init file matches the shell pattern +# "[1-8][0-9]*-gentoo*.el", where the two digits at the beginning define +# the loading order (numbers below 10 or above 89 are reserved for +# internal use). So if your initialisation depends on another XEmacs +# package, your site file's number must be higher! If there are no such +# interdependencies then the number should be 50. Otherwise, numbers +# divisible by 10 are preferred. +# +# Best practice is to define a SITEFILE variable in the global scope of +# your ebuild (e.g., right after S or RDEPEND): +# +# SITEFILE="50${PN}-gentoo.el" +# +# Which is then installed by +# +# xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die +# +# in src_install(). Any characters after the "-gentoo" part and before +# the extension will be stripped from the destination file's name. +# For example, a file "50${PN}-gentoo-${PV}.el" will be installed as +# "50${PN}-gentoo.el". If your subdirectory is not named ${PN}, give +# the differing name as second argument. + +# @ECLASS-VARIABLE: XEMACS_SITELISP +# @DESCRIPTION: +# Directory where packages install indivivual XEmacs Lisp files. +XEMACS_SITELISP=/usr/share/xemacs/site-lisp + +# @ECLASS-VARIABLE: XEMACS_SITEPACKAGE +# @DESCRIPTION: +# Directory where packages install XEmacs Lisp packages. +XEMACS_SITEPACKAGE=/usr/share/xemacs/site-packages + +# @ECLASS-VARIABLE: XEMACS +# @DESCRIPTION: +# Path of XEmacs executable. +XEMACS=/usr/bin/xemacs + +# @ECLASS-VARIABLE: XEMACS_BATCH_CLEAN +# @DESCRIPTION: +# Invocation of XEMACS in batch mode. +XEMACS_BATCH_CLEAN="${XEMACS} --batch --no-site-file --no-init-file" + +# @FUNCTION: xemacs-elisp-compile +# @USAGE: <list of elisp files> +# @DESCRIPTION: +# Byte-compile elisp files with xemacs. This function will die when +# there is a problem compiling the lisp files. +xemacs-elisp-compile () { + { + ${XEMACS_BATCH_CLEAN} -f batch-byte-compile "$@" + xemacs-elisp-make-autoload-file "$@" + } || die "Compile lisp files failed" +} + +xemacs-elisp-make-autoload-file () { + ${XEMACS_BATCH_CLEAN} \ + -eval "(setq autoload-package-name \"${PN}\")" \ + -eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \ + -l autoload -f batch-update-autoloads "$@" +} + +# @FUNCTION: xemacs-elisp-install +# @USAGE: <subdirectory> <list of files> +# @DESCRIPTION: +# Install elisp source and byte-compiled files. All files are installed +# in site-packages in their own directory, indicated by the first +# argument to the function. This function will die if there is a problem +# installing the list files. + +xemacs-elisp-install () { + local subdir="$1" + shift + ( # use sub-shell to avoid possible environment polution + dodir "${XEMACS_SITEPACKAGE}"/lisp/"${subdir}" + insinto "${XEMACS_SITEPACKAGE}"/lisp/"${subdir}" + doins "$@" + ) || die "Installing lisp files failed" +} + +# @FUNCTION: xemacs-elisp-comp +# @USAGE: <list of elisp files> +# @DESCRIPTION: +# Byte-compile interdependent XEmacs lisp files. +# Originally taken from GNU autotools, but some configuration options +# removed as they don't make sense with the current status of XEmacs +# in Gentoo. + +xemacs-elisp-comp() { + # Copyright 1995 Free Software Foundation, Inc. + # François Pinard <pinard@iro.umontreal.ca>, 1995. + # This script byte-compiles all `.el' files which are part of its + # arguments, using XEmacs, and put the resulting `.elc' files into + # the current directory, so disregarding the original directories used + # in `.el' arguments. + # + # This script manages in such a way that all XEmacs LISP files to + # be compiled are made visible between themselves, in the event + # they require or load-library one another. + + test $# -gt 0 || return 1 + + einfo "Compiling XEmacs Elisp files ..." + + tempdir=elc.$$ + mkdir ${tempdir} + cp "$@" ${tempdir} + pushd ${tempdir} + + echo "(add-to-list 'load-path \"../\")" > script + ${XEMACS_BATCH_CLEAN} -l script -f batch-byte-compile *.el + local ret=$? + mv *.elc .. + + popd + rm -fr ${tempdir} + return ${ret} +} + +# @FUNCTION: xemacs-elisp-site-file-install +# @USAGE: <site-init file> [subdirectory] +# @DESCRIPTION: +# Install XEmacs site-init file in XEMACS_SITELISP directory. +# Automatically inserts a standard comment header with the name of the +# package (unless it is already present). Token @SITELISP@ is replaced +# by the path to the package's subdirectory in XEMACS_SITELISP. + +xemacs-elisp-site-file-install() { + local sf="${1##*/}" my_pn="${2:-${PN}}" ret + local header=";;; ${PN} site-lisp configuration" + + [[ ${sf} == [0-9][0-9]*-gentoo*.el ]] \ + || ewarn "xemacs-elisp-site-file-install: bad name of site-init file" + sf="${T}/${sf/%-gentoo*.el/-gentoo.el}" + ebegin "Installing site initialisation file for XEmacs" + [[ $1 = "${sf}" ]] || cp "$1" "${sf}" + sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \ + -e "s:@SITELISP@:${EPREFIX}${XEMACS_SITELISP}/${my_pn}:g" "${sf}" + ( # subshell to avoid pollution of calling environment + insinto "${XEMACS_SITELISP}/site-gentoo.d" + doins "${sf}" + ) + ret=$? + rm -f "${sf}" + eend ${ret} "xemacs-elisp-site-file-install: doins failed" +} + +# @FUNCTION: xemacs-elisp-site-regen +# @DESCRIPTION: +# Regenerate the site-gentoo.el file, based on packages' site +# initialisation files in the /usr/share/xemacs/site-lisp/site-gentoo.d/ +# directory. + +xemacs-elisp-site-regen() { + local sitelisp=${ROOT}${EPREFIX}${XEMACS_SITELISP} + local sf i line null="" page=$'\f' + local -a sflist + + if [ ! -d "${sitelisp}" ]; then + eerror "xemacs-elisp-site-regen: Directory ${sitelisp} does not exist" + return 1 + fi + + if [ ! -d "${T}" ]; then + eerror "xemacs-elisp-site-regen: Temporary directory ${T} does not exist" + return 1 + fi + + einfon "Regenerating site-gentoo.el for XEmacs (${EBUILD_PHASE}) ..." + + for sf in "${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el + do + [ -r "${sf}" ] || continue + # sort files by their basename. straight insertion sort. + for ((i=${#sflist[@]}; i>0; i--)); do + [[ ${sf##*/} < ${sflist[i-1]##*/} ]] || break + sflist[i]=${sflist[i-1]} + done + sflist[i]=${sf} + done + + cat <<-EOF >"${T}"/site-gentoo.el + ;;; site-gentoo.el --- site initialisation for Gentoo-installed packages + + ;;; Commentary: + ;; Automatically generated by xemacs-elisp-common.eclass + ;; DO NOT EDIT THIS FILE + + ;;; Code: + EOF + # Use sed instead of cat here, since files may miss a trailing newline. + sed '$q' "${sflist[@]}" </dev/null >>"${T}"/site-gentoo.el + cat <<-EOF >>"${T}"/site-gentoo.el + + ${page} + (provide 'site-gentoo) + + ;; Local ${null}Variables: + ;; no-byte-compile: t + ;; buffer-read-only: t + ;; End: + + ;;; site-gentoo.el ends here + EOF + + if cmp -s "${sitelisp}"/site-gentoo.el "${T}"/site-gentoo.el; then + # This prevents outputting unnecessary text when there + # was actually no change. + # A case is a remerge where we have doubled output. + rm -f "${T}"/site-gentoo.el + echo " no changes." + else + mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el + echo + case ${#sflist[@]} in + 0) ewarn "... Huh? No site initialisation files found." ;; + 1) einfo "... ${#sflist[@]} site initialisation file included." ;; + *) einfo "... ${#sflist[@]} site initialisation files included." ;; + esac + fi + + return 0 +} diff -uNr a/eclass/xemacs-elisp.eclass b/eclass/xemacs-elisp.eclass --- a/eclass/xemacs-elisp.eclass false +++ b/eclass/xemacs-elisp.eclass d90851fa432ac76a0b985db3d7b4fe8973b8e02f337810207055cf3c9b63cd0aa1f12d83df905f50e42a1e049e0fb3bc98b4f8471c86093a10454b47486cf23e @@ -0,0 +1,54 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# Copyright 2007-2011 Hans de Graaff <graaff@gentoo.org> +# +# Based on elisp.eclass: +# Copyright 2007 Christian Faulhammer <opfer@gentoo.org> +# Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org> +# Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com> +# +# @ECLASS: xemacs-elisp.eclass +# @MAINTAINER: +# xemacs@gentoo.org +# @BLURB: Eclass for XEmacs Lisp packages +# @DESCRIPTION: +# Emacs support for other than pure elisp packages is handled by +# xemacs-elisp-common.eclass where you won't have a dependency on XEmacs +# itself. All elisp-* functions are documented there. + +# @ECLASS-VARIABLE: SIMPLE_ELISP +# @DEFAULT_UNSET +# @DESCRIPTION: +# Setting SIMPLE_ELISP=t in an ebuild means, that the package's source +# is a single (in whatever way) compressed elisp file with the file name +# ${PN}-${PV}. This eclass will then redefine ${S}, and move +# ${PN}-${PV}.el to ${PN}.el in src_unpack(). + +inherit xemacs-elisp-common + +if [ "${SIMPLE_ELISP}" = 't' ]; then + S="${WORKDIR}/" +fi + + +DEPEND="app-editors/xemacs" +IUSE="" + +xemacs-elisp_src_unpack() { + unpack ${A} + if [ "${SIMPLE_ELISP}" = 't' ] + then + cd "${S}" && mv ${P}.el ${PN}.el + fi +} + +xemacs-elisp_src_compile() { + xemacs-elisp-compile *.el +} + +xemacs-elisp_src_install () { + xemacs-elisp-install "${PN}" *.el *.elc +} + +EXPORT_FUNCTIONS src_unpack src_compile src_install diff -uNr a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass --- a/eclass/xemacs-packages.eclass false +++ b/eclass/xemacs-packages.eclass 67dbdcd8aa81f888e5d80628e7df2093d3f4d00003207524866d010d69728db7f0d22838285311b22baedfcbdbe1d5c268dea7e5eaedc02d5a091d234c5cbae0 @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: xemacs-packages.eclass +# @MAINTAINER: +# xemacs@gentoo.org +# @BLURB: Eclass to support elisp packages distributed by XEmacs. +# @DESCRIPTION: +# This eclass supports ebuilds for packages distributed by XEmacs. + +# @ECLASS-VARIABLE: XEMACS_PKG_CAT +# @REQUIRED +# @DESCRIPTION: +# The package category that the package is in. Can be either standard, +# mule, or contrib. + +# @ECLASS-VARIABLE: XEMACS_EXPERIMENTAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set then the package is downloaded from the experimental packages +# repository, which is the staging area for packages upstream. Packages +# in the experimental repository are auto-generated from XEmacs VCS, so +# they may not be well-tested. + +EXPORT_FUNCTIONS src_unpack src_install + +RDEPEND="app-editors/xemacs" +S="${WORKDIR}" + +: ${HOMEPAGE:="http://xemacs.org/"} +: ${LICENSE:="GPL-2+"} + +# Backwards compatibility code, to be removed after 2017-05-03 +: ${XEMACS_PKG_CAT:=${PKG_CAT}} +: ${XEMACS_EXPERIMENTAL:=${EXPERIMENTAL}} + +if [[ -n ${XEMACS_EXPERIMENTAL} ]]; then + : ${SRC_URI:="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/${P}-pkg.tar.gz"} +else + : ${SRC_URI:="http://ftp.xemacs.org/pub/xemacs/packages/${P}-pkg.tar.gz"} +fi + +xemacs-packages_src_unpack() { :; } + +xemacs-packages_src_install() { + local install_dir + + case ${XEMACS_PKG_CAT} in + standard) install_dir="/usr/lib/xemacs/xemacs-packages" ;; + mule) install_dir="/usr/lib/xemacs/mule-packages" ;; + contrib) install_dir="/usr/lib/xemacs/site-packages" ;; + *) die "Unsupported package category in XEMACS_PKG_CAT (or unset)" ;; + esac + debug-print "install_dir is ${install_dir}" + + dodir "${install_dir}" + cd "${D}${EPREFIX}${install_dir}" || die + unpack ${A} +} diff -uNr a/eclass/xfconf.eclass b/eclass/xfconf.eclass --- a/eclass/xfconf.eclass false +++ b/eclass/xfconf.eclass 8ccecfa2579f3e15d1f527c01c8ce39ee66b0dd889ba61fcff43d9abb7c4f41037314623f2d276eff2e85b373cbb4a98cddd537eecdfe04d85dc3e12922bde60 @@ -0,0 +1,157 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: xfconf.eclass +# @MAINTAINER: +# XFCE maintainers <xfce@gentoo.org> +# @BLURB: Default XFCE ebuild layout +# @DESCRIPTION: +# Default XFCE ebuild layout + +# @ECLASS-VARIABLE: EAUTORECONF +# @DESCRIPTION: +# Run eautoreconf instead of elibtoolize if the variable is set + +if [[ -n ${EAUTORECONF} ]] ; then + AUTOTOOLS_AUTO_DEPEND=yes +else + : ${AUTOTOOLS_AUTO_DEPEND:=no} +fi + +# @ECLASS-VARIABLE: XFCONF +# @DESCRIPTION: +# This should be an array defining arguments for econf + +unset _xfconf_live +[[ $PV == *9999* ]] && _xfconf_live=git-2 + +inherit ${_xfconf_live} autotools eutils gnome2-utils libtool xdg-utils + +EGIT_BOOTSTRAP=autogen.sh +EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}" + +_xfconf_deps="" +_xfconf_m4=">=dev-util/xfce4-dev-tools-4.10" + +[[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}" +[[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}" + +RDEPEND="" +DEPEND="${_xfconf_deps}" + +unset _xfconf_deps +unset _xfconf_m4 + +case ${EAPI:-0} in + 5) ;; + *) die "Unknown EAPI." ;; +esac + +[[ -n $_xfconf_live ]] && _xfconf_live=src_unpack + +EXPORT_FUNCTIONS ${_xfconf_live} src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm + +# @FUNCTION: xfconf_use_debug +# @DESCRIPTION: +# If IUSE has debug, return --enable-debug=minimum. +# If USE debug is enabled, return --enable-debug which is the same as --enable-debug=yes. +# If USE debug is enabled and the XFCONF_FULL_DEBUG variable is set, return --enable-debug=full. +xfconf_use_debug() { + if has debug ${IUSE}; then + if use debug; then + if [[ -n $XFCONF_FULL_DEBUG ]]; then + echo "--enable-debug=full" + else + echo "--enable-debug" + fi + else + echo "--enable-debug=minimum" + fi + else + ewarn "${FUNCNAME} called without debug in IUSE" + fi +} + +# @FUNCTION: xfconf_src_unpack +# @DESCRIPTION: +# Run git-2_src_unpack if required +xfconf_src_unpack() { + NOCONFIGURE=1 git-2_src_unpack +} + +# @FUNCTION: xfconf_src_prepare +# @DESCRIPTION: +# Process PATCHES with epatch and run epatch_user followed by run of +# elibtoolize, or eautoreconf if EAUTORECONF is set. +xfconf_src_prepare() { + debug-print-function ${FUNCNAME} "$@" + + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + epatch_user + + if [[ -n $EAUTORECONF ]]; then + AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eautoreconf + else + elibtoolize + fi +} + +# @FUNCTION: xfconf_src_configure +# @DESCRIPTION: +# Run econf with opts from the XFCONF array +xfconf_src_configure() { + debug-print-function ${FUNCNAME} "$@" + [[ -n $_xfconf_live ]] && XFCONF+=( --enable-maintainer-mode ) + econf "${XFCONF[@]}" +} + +# @FUNCTION: xfconf_src_install +# @DESCRIPTION: +# Run emake install to DESTDIR, einstalldocs to process DOCS and +# prune_libtool_files --all to always remove libtool files (.la) +xfconf_src_install() { + debug-print-function ${FUNCNAME} "$@" + + # FIXME + if [[ -n $_xfconf_live ]] && ! [[ -e ChangeLog ]]; then + touch ChangeLog + fi + + emake DESTDIR="${D}" "$@" install + + einstalldocs + + prune_libtool_files --all +} + +# @FUNCTION: xfconf_pkg_preinst +# @DESCRIPTION: +# Run gnome2_icon_savelist +xfconf_pkg_preinst() { + debug-print-function ${FUNCNAME} "$@" + gnome2_icon_savelist +} + +# @FUNCTION: xfconf_pkg_postinst +# @DESCRIPTION: +# Run xdg_{desktop,mimeinfo}_database_update and gnome2_icon_cache_update +xfconf_pkg_postinst() { + debug-print-function ${FUNCNAME} "$@" + xdg_desktop_database_update + xdg_mimeinfo_database_update + if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then + gnome2_icon_cache_update + fi +} + +# @FUNCTION: xfconf_pkg_postrm +# @DESCRIPTION: +# Run xdg_{desktop,mimeinfo}_database_update and gnome2_icon_cache_update +xfconf_pkg_postrm() { + debug-print-function ${FUNCNAME} "$@" + xdg_desktop_database_update + xdg_mimeinfo_database_update + if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then + gnome2_icon_cache_update + fi +} diff -uNr a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass --- a/eclass/xorg-2.eclass false +++ b/eclass/xorg-2.eclass 18e54a66058741955152f3e159d344bf71500a8c17d2ea976a934a19bfdd84cdb51facff38a7640a1c54f60170e6ea455955bdf209a52dc80c84b38c0ff338d3 @@ -0,0 +1,580 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: xorg-2.eclass +# @MAINTAINER: +# x11@gentoo.org +# @AUTHOR: +# Author: Tomáš Chvátal <scarabeus@gentoo.org> +# Author: Donnie Berkholz <dberkholz@gentoo.org> +# @BLURB: Reduces code duplication in the modularized X11 ebuilds. +# @DESCRIPTION: +# This eclass makes trivial X ebuilds possible for apps, fonts, drivers, +# and more. Many things that would normally be done in various functions +# can be accessed by setting variables instead, such as patching, +# running eautoreconf, passing options to configure and installing docs. +# +# All you need to do in a basic ebuild is inherit this eclass and set +# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted +# with the other X packages, you don't need to set SRC_URI. Pretty much +# everything else should be automatic. + +GIT_ECLASS="" +if [[ ${PV} == *9999* ]]; then + GIT_ECLASS="git-r3" + XORG_EAUTORECONF="yes" +fi + +# If we're a font package, but not the font.alias one +FONT_ECLASS="" +if [[ ${PN} == font* \ + && ${CATEGORY} = media-fonts \ + && ${PN} != font-alias \ + && ${PN} != font-util ]]; then + # Activate font code in the rest of the eclass + FONT="yes" + FONT_ECLASS="font" +fi + +# @ECLASS-VARIABLE: XORG_MULTILIB +# @DESCRIPTION: +# If set to 'yes', the multilib support for package will be enabled. Set +# before inheriting this eclass. +: ${XORG_MULTILIB:="no"} + +# we need to inherit autotools first to get the deps +inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \ + flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS} + +if [[ ${XORG_MULTILIB} == yes ]]; then + inherit autotools-multilib +fi + +EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" +case "${EAPI:-0}" in + 3|4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; + *) die "EAPI=${EAPI} is not supported" ;; +esac + +# exports must be ALWAYS after inherit +EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} + +IUSE="" +HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/" + +# @ECLASS-VARIABLE: XORG_EAUTORECONF +# @DESCRIPTION: +# If set to 'yes' and configure.ac exists, eautoreconf will run. Set +# before inheriting this eclass. +: ${XORG_EAUTORECONF:="no"} + +# @ECLASS-VARIABLE: XORG_BASE_INDIVIDUAL_URI +# @DESCRIPTION: +# Set up SRC_URI for individual modular releases. If set to an empty +# string, no SRC_URI will be provided by the eclass. +: ${XORG_BASE_INDIVIDUAL_URI="https://www.x.org/releases/individual"} + +# @ECLASS-VARIABLE: XORG_MODULE +# @DESCRIPTION: +# The subdirectory to download source from. Possible settings are app, +# doc, data, util, driver, font, lib, proto, xserver. Set above the +# inherit to override the default autoconfigured module. +if [[ -z ${XORG_MODULE} ]]; then + case ${CATEGORY} in + app-doc) XORG_MODULE=doc/ ;; + media-fonts) XORG_MODULE=font/ ;; + x11-apps|x11-wm) XORG_MODULE=app/ ;; + x11-misc|x11-themes) XORG_MODULE=util/ ;; + x11-base) XORG_MODULE=xserver/ ;; + x11-drivers) XORG_MODULE=driver/ ;; + x11-libs) XORG_MODULE=lib/ ;; + *) XORG_MODULE= ;; + esac +fi + +# @ECLASS-VARIABLE: XORG_PACKAGE_NAME +# @DESCRIPTION: +# For git checkout the git repository might differ from package name. +# This variable can be used for proper directory specification +: ${XORG_PACKAGE_NAME:=${PN}} + +if [[ -n ${GIT_ECLASS} ]]; then + : ${EGIT_REPO_URI:="https://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"} +elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then + SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2" +fi + +: ${SLOT:=0} + +# Set the license for the package. This can be overridden by setting +# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages +# are under the MIT license. (This is what Red Hat does in their rpms) +: ${LICENSE:=MIT} + +# Set up autotools shared dependencies +# Remember that all versions here MUST be stable +XORG_EAUTORECONF_ARCHES="ppc-aix x86-winnt" +EAUTORECONF_DEPEND+=" + >=sys-devel/libtool-2.2.6a + sys-devel/m4" +if [[ ${PN} != util-macros ]] ; then + EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18" + # Required even by xorg-server + [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0" +fi +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" +for arch in ${XORG_EAUTORECONF_ARCHES}; do + EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )" +done +DEPEND+=" ${EAUTORECONF_DEPENDS}" +[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}" +unset EAUTORECONF_DEPENDS +unset EAUTORECONF_DEPEND + +if [[ ${FONT} == yes ]]; then + RDEPEND+=" media-fonts/encodings + x11-apps/mkfontscale + x11-apps/mkfontdir" + PDEPEND+=" media-fonts/font-alias" + DEPEND+=" >=media-fonts/font-util-1.2.0" + + # @ECLASS-VARIABLE: FONT_DIR + # @DESCRIPTION: + # If you're creating a font package and the suffix of PN is not equal to + # the subdirectory of /usr/share/fonts/ it should install into, set + # FONT_DIR to that directory or directories. Set before inheriting this + # eclass. + [[ -z ${FONT_DIR} ]] && FONT_DIR=${PN##*-} + + # Fix case of font directories + FONT_DIR=${FONT_DIR/ttf/TTF} + FONT_DIR=${FONT_DIR/otf/OTF} + FONT_DIR=${FONT_DIR/type1/Type1} + FONT_DIR=${FONT_DIR/speedo/Speedo} + + # Set up configure options, wrapped so ebuilds can override if need be + [[ -z ${FONT_OPTIONS} ]] && FONT_OPTIONS="--with-fontdir=\"${EPREFIX}/usr/share/fonts/${FONT_DIR}\"" + + [[ ${PN} = font-misc-misc || ${PN} = font-schumacher-misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls" +fi + +# If we're a driver package, then enable DRIVER case +[[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes" + +# @ECLASS-VARIABLE: XORG_STATIC +# @DESCRIPTION: +# Enables static-libs useflag. Set to no, if your package gets: +# +# QA: configure: WARNING: unrecognized options: --disable-static +: ${XORG_STATIC:="yes"} + +# Add static-libs useflag where usefull. +if [[ ${XORG_STATIC} == yes \ + && ${FONT} != yes \ + && ${CATEGORY} != app-doc \ + && ${CATEGORY} != x11-apps \ + && ${CATEGORY} != x11-drivers \ + && ${CATEGORY} != media-fonts \ + && ${PN} != util-macros \ + && ${PN} != xbitmaps \ + && ${PN} != xorg-cf-files \ + && ${PN/xcursor} = ${PN} ]]; then + IUSE+=" static-libs" +fi + +DEPEND+=" virtual/pkgconfig" + +# @ECLASS-VARIABLE: XORG_DRI +# @DESCRIPTION: +# Possible values are "always" or the value of the useflag DRI capabilities +# are required for. Default value is "no" +# +# Eg. XORG_DRI="opengl" will pull all dri dependant deps for opengl useflag +: ${XORG_DRI:="no"} + +DRI_COMMON_DEPEND=" + x11-base/xorg-server[-minimal] + x11-libs/libdrm +" +case ${XORG_DRI} in + no) + ;; + always) + COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}" + ;; + *) + COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )" + IUSE+=" ${XORG_DRI}" + ;; +esac +unset DRI_COMMON_DEPEND + +if [[ -n "${DRIVER}" ]]; then + COMMON_DEPEND+=" + x11-base/xorg-server[xorg] + " +fi +if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then + DEPEND+=" x11-base/xorg-proto" +fi +if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then + COMMON_DEPEND+=" + x11-libs/libpciaccess + " + DEPEND+=" x11-base/xorg-proto" +fi + +# @ECLASS-VARIABLE: XORG_DOC +# @DESCRIPTION: +# Possible values are "always" or the value of the useflag doc packages +# are required for. Default value is "no" +# +# Eg. XORG_DOC="manual" will pull all doc dependant deps for manual useflag +: ${XORG_DOC:="no"} + +DOC_DEPEND=" + doc? ( + app-text/asciidoc + app-text/xmlto + app-doc/doxygen + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.3 + ) +" +case ${XORG_DOC} in + no) + ;; + always) + DEPEND+=" ${DOC_DEPEND}" + ;; + *) + DEPEND+=" ${XORG_DOC}? ( ${DOC_DEPEND} )" + IUSE+=" ${XORG_DOC}" + ;; +esac +unset DOC_DEPEND + +# @ECLASS-VARIABLE: XORG_MODULE_REBUILD +# @DESCRIPTION: +# Describes whether a package contains modules that need to be rebuilt on +# xorg-server upgrade. This has an effect only since EAPI=5. +# Possible values are "yes" or "no". Default value is "yes" for packages which +# are recognized as DRIVER by this eclass and "no" for all other packages. +if [[ "${DRIVER}" == yes ]]; then + : ${XORG_MODULE_REBUILD:="yes"} +else + : ${XORG_MODULE_REBUILD:="no"} +fi + +if [[ ${XORG_MODULE_REBUILD} == yes ]]; then + case ${EAPI} in + 3|4) + ;; + *) + RDEPEND+=" x11-base/xorg-server:=" + ;; + esac +fi + +DEPEND+=" ${COMMON_DEPEND}" +RDEPEND+=" ${COMMON_DEPEND}" +unset COMMON_DEPEND + +debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}" +debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}" +debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}" + +# @FUNCTION: xorg-2_pkg_setup +# @DESCRIPTION: +# Setup prefix compat +xorg-2_pkg_setup() { + debug-print-function ${FUNCNAME} "$@" + + [[ ${FONT} == yes ]] && font_pkg_setup "$@" +} + +# @FUNCTION: xorg-2_src_unpack +# @DESCRIPTION: +# Simply unpack source code. +xorg-2_src_unpack() { + debug-print-function ${FUNCNAME} "$@" + + if [[ -n ${GIT_ECLASS} ]]; then + git-r3_src_unpack + else + unpack ${A} + fi + + [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" +} + +# @FUNCTION: xorg-2_patch_source +# @DESCRIPTION: +# Apply all patches +xorg-2_patch_source() { + debug-print-function ${FUNCNAME} "$@" + + # Use standardized names and locations with bulk patching + # Patch directory is ${WORKDIR}/patch + # See epatch() in eutils.eclass for more documentation + EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} + + [[ -d "${EPATCH_SOURCE}" ]] && epatch +} + +# @FUNCTION: xorg-2_reconf_source +# @DESCRIPTION: +# Run eautoreconf if necessary, and run elibtoolize. +xorg-2_reconf_source() { + debug-print-function ${FUNCNAME} "$@" + + case ${CHOST} in + *-aix* | *-winnt*) + # some hosts need full eautoreconf + [[ -e "./configure.ac" || -e "./configure.in" ]] \ + && AUTOTOOLS_AUTORECONF=1 + ;; + *) + # elibtoolize required for BSD + [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \ + && AUTOTOOLS_AUTORECONF=1 + ;; + esac +} + +# @FUNCTION: xorg-2_src_prepare +# @DESCRIPTION: +# Prepare a package after unpacking, performing all X-related tasks. +xorg-2_src_prepare() { + debug-print-function ${FUNCNAME} "$@" + + xorg-2_patch_source + xorg-2_reconf_source + autotools-utils_src_prepare "$@" +} + +# @FUNCTION: xorg-2_font_configure +# @DESCRIPTION: +# If a font package, perform any necessary configuration steps +xorg-2_font_configure() { + debug-print-function ${FUNCNAME} "$@" + + if has nls ${IUSE//+} && ! use nls; then + if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then + FONT_OPTIONS+=" + --disable-all-encodings + --enable-iso8859-1" + else + FONT_OPTIONS+=" + --disable-iso8859-2 + --disable-iso8859-3 + --disable-iso8859-4 + --disable-iso8859-5 + --disable-iso8859-6 + --disable-iso8859-7 + --disable-iso8859-8 + --disable-iso8859-9 + --disable-iso8859-10 + --disable-iso8859-11 + --disable-iso8859-12 + --disable-iso8859-13 + --disable-iso8859-14 + --disable-iso8859-15 + --disable-iso8859-16 + --disable-jisx0201 + --disable-koi8-r" + fi + fi +} + +# @FUNCTION: xorg-2_flags_setup +# @DESCRIPTION: +# Set up CFLAGS for a debug build +xorg-2_flags_setup() { + debug-print-function ${FUNCNAME} "$@" + + # Win32 require special define + [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ + # hardened ldflags + [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy + + # Quite few libraries fail on runtime without these: + if has static-libs ${IUSE//+}; then + filter-flags -Wl,-Bdirect + filter-ldflags -Bdirect + filter-ldflags -Wl,-Bdirect + fi +} + +# @FUNCTION: xorg-2_src_configure +# @DESCRIPTION: +# Perform any necessary pre-configuration steps, then run configure +xorg-2_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + xorg-2_flags_setup + + # @VARIABLE: XORG_CONFIGURE_OPTIONS + # @DESCRIPTION: + # Array of an additional options to pass to configure. + # @DEFAULT_UNSET + if [[ $(declare -p XORG_CONFIGURE_OPTIONS 2>&-) != "declare -a"* ]]; then + # fallback to CONFIGURE_OPTIONS, deprecated. + if [[ -n "${CONFIGURE_OPTIONS}" ]]; then + eqawarn "CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS" + eqawarn "to preserve namespace." + fi + + local xorgconfadd=(${CONFIGURE_OPTIONS} ${XORG_CONFIGURE_OPTIONS}) + else + local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}") + fi + + [[ -n "${FONT}" ]] && xorg-2_font_configure + + # Check if package supports disabling of dep tracking + # Fixes warnings like: + # WARNING: unrecognized options: --disable-dependency-tracking + if grep -q -s "disable-depencency-tracking" ${ECONF_SOURCE:-.}/configure; then + local dep_track="--disable-dependency-tracking" + fi + + # Check if package supports disabling of selective -Werror=... + if grep -q -s "disable-selective-werror" ${ECONF_SOURCE:-.}/configure; then + local selective_werror="--disable-selective-werror" + fi + + local myeconfargs=( + ${dep_track} + ${selective_werror} + ${FONT_OPTIONS} + "${xorgconfadd[@]}" + ) + + if [[ ${XORG_MULTILIB} == yes ]]; then + autotools-multilib_src_configure "$@" + else + autotools-utils_src_configure "$@" + fi +} + +# @FUNCTION: xorg-2_src_compile +# @DESCRIPTION: +# Compile a package, performing all X-related tasks. +xorg-2_src_compile() { + debug-print-function ${FUNCNAME} "$@" + + if [[ ${XORG_MULTILIB} == yes ]]; then + autotools-multilib_src_compile "$@" + else + autotools-utils_src_compile "$@" + fi +} + +# @FUNCTION: xorg-2_src_install +# @DESCRIPTION: +# Install a built package to ${D}, performing any necessary steps. +# Creates a ChangeLog from git if using live ebuilds. +xorg-2_src_install() { + debug-print-function ${FUNCNAME} "$@" + + local install_args=( docdir="${EPREFIX}/usr/share/doc/${PF}" ) + + if [[ ${XORG_MULTILIB} == yes ]]; then + autotools-multilib_src_install "${install_args[@]}" + else + autotools-utils_src_install "${install_args[@]}" + fi + + if [[ -n ${GIT_ECLASS} ]]; then + pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null || die + git log ${EGIT_COMMIT} > "${S}"/ChangeLog + popd > /dev/null || die + fi + + if [[ -e "${S}"/ChangeLog ]]; then + dodoc "${S}"/ChangeLog || die "dodoc failed" + fi + + # Don't install libtool archives (even for modules) + prune_libtool_files --all + + [[ -n ${FONT} ]] && remove_font_metadata +} + +# @FUNCTION: xorg-2_pkg_postinst +# @DESCRIPTION: +# Run X-specific post-installation tasks on the live filesystem. The +# only task right now is some setup for font packages. +xorg-2_pkg_postinst() { + debug-print-function ${FUNCNAME} "$@" + + if [[ -n ${FONT} ]]; then + create_fonts_scale + create_fonts_dir + font_pkg_postinst "$@" + + ewarn "Installed fonts changed. Run 'xset fp rehash' if you are using non-fontconfig applications." + fi +} + +# @FUNCTION: xorg-2_pkg_postrm +# @DESCRIPTION: +# Run X-specific post-removal tasks on the live filesystem. The only +# task right now is some cleanup for font packages. +xorg-2_pkg_postrm() { + debug-print-function ${FUNCNAME} "$@" + + if [[ -n ${FONT} ]]; then + # if we're doing an upgrade, postinst will do + if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then + create_fonts_scale + create_fonts_dir + font_pkg_postrm "$@" + fi + fi +} + +# @FUNCTION: remove_font_metadata +# @DESCRIPTION: +# Don't let the package install generated font files that may overlap +# with other packages. Instead, they're generated in pkg_postinst(). +remove_font_metadata() { + debug-print-function ${FUNCNAME} "$@" + + if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then + einfo "Removing font metadata" + rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} + fi +} + +# @FUNCTION: create_fonts_scale +# @DESCRIPTION: +# Create fonts.scale file, used by the old server-side fonts subsystem. +create_fonts_scale() { + debug-print-function ${FUNCNAME} "$@" + + if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then + ebegin "Generating fonts.scale" + mkfontscale \ + -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ + -- "${EROOT}/usr/share/fonts/${FONT_DIR}" + eend $? + fi +} + +# @FUNCTION: create_fonts_dir +# @DESCRIPTION: +# Create fonts.dir file, used by the old server-side fonts subsystem. +create_fonts_dir() { + debug-print-function ${FUNCNAME} "$@" + + ebegin "Generating fonts.dir" + mkfontdir \ + -e "${EROOT}"/usr/share/fonts/encodings \ + -e "${EROOT}"/usr/share/fonts/encodings/large \ + -- "${EROOT}/usr/share/fonts/${FONT_DIR}" + eend $? +} diff -uNr a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest --- a/mail-mta/nullmailer/Manifest false +++ b/mail-mta/nullmailer/Manifest 3973b133b93b3ab79496263ff534f7de7c99a44607c2c8468a4fcadf3860ac988461106dc0c850d6344198b14545b41f25d54413aaae0977f299efd0d0313ec0 @@ -0,0 +1,10 @@ +AUX init.d-nullmailer-r4 976 BLAKE2B bef0e403a51808dcb1a6d08a5a06746e8f164b8d1e2ce94cf6d4269df1addc1b6e8d61d945e4da20b08d565a327232eaa4926029a8f2c07bf89e3847aab36a29 SHA512 e08847554d483e2feb69296747b267585d7960b057ae12f4440a452cb9c1954b5c54bb0d0c4884563b31d83b252a11897cc599a47ec782ea740fc282e9f6c512 +AUX init.d-nullmailer-r5 1132 BLAKE2B 2ce6f056f336013fa8786523e3f32359ca5bbdd47343f2ef943b855569a9754d12f65e35ce4d49bf9425cf0d40b628d407b8f2064c0ddc0a742578a852c1c60f SHA512 34a31a53f5f7f1bec4b5cc25bd50e2928cd658360d8430256a5a80a87609a3858a2f2252fce0e5258ac85f1957286c9b449fb1ddb14ace2cfc0dc75cb53aefb9 +AUX init.d-nullmailer-r6 1180 BLAKE2B fdfc17abfac24faa184d9cfe8fe3597f09bfe258ca44c41db05d91e0a086c8b52ed12f722f0ce5ecf1b9b5b11fc420cf13cc9127b849150be87fdd7bce94d859 SHA512 951313ba50dacfbfef440ad32bb4196e276bbe9fb636f05d8e311bd7bfea8e89f135a8e48c9df797031517125c848421dddb41215553144e384d98587c74be8d +AUX nullmailer-1.13-unistd.h.patch 867 BLAKE2B 758af8df9518938f930f4095ce71c7c088b2ebcbd6a2814a2eba91521d4507df50f3d92a526cbb8f2a94df4cc080ef115c4d1b81dd0a31fb20c3949961ef91d7 SHA512 0a46f6a10a380a3b5b1527d60eef768f2e1b94b2848c4d866bf3088f9b1592b3fc464c69d2559309adfae6fc8f46f3897585d736b37947239106090c3449aaf3 +AUX nullmailer.service 401 BLAKE2B cca2fbdad581638f52a59caea902ca5701ca69e8b0e4a7c8fd87b8bfe3b9c233422ed0d93c0c583778e25998758c70cdf1602e35316739fa27018a590e28c8a5 SHA512 5aebb237972a7ff20a34d40d53d8d3146966c8f12b20695aa718831a6b32ecf4a0cc9d5af41067952c454166d02d52226fcb397b48310907b81deaa2d874adb7 +AUX remotes.sample-1.13 969 BLAKE2B f973a3866a31b5d6bf1ac227340df4484b570039c7237a7c4e44516b2ca796c627cd00473f42e1c017865915cf8933f4d3df856ead3439d9e1e97bdded8bf81e SHA512 379d307dc28b60e759ebe701d43508b45bc66560879ba2baa30c11c0a57ff67e55151624b5dd67962cb72b22702d14c309f6b6be59a5dd2d030576cb691bcbc6 +AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354 +DIST nullmailer-2.0.tar.gz 249538 BLAKE2B 2340fd0b3e67be0061aedb2a1dc0466c88e1253691c955e960244f2ce330af6798bd43f21908a9f12ce9572489dd5c48288e65ae688cd73a8afedd4f7bb6a49e SHA512 2a7c914c5effcf796f987256ac68836f0ba875cc7f2da1aeb8f23767e15a556da168b8da5cc52d9f800986883bbdbcd49a9610ae220f463164a906c1d82fbce6 +EBUILD nullmailer-2.0-r1.ebuild 3641 BLAKE2B 0f856d777485527c4b04ad21077c3646bb2106b69050100e20c663bf895ba1846759a423f23928fec9711ccd7595b8c74183e1d0e6eb51f1f82abc192b5f956d SHA512 bd858bf7830066e10c2ef859d8489a0ab124cb7873e327b14d011d286ab5cae94f4e80d86e64dfd13f1204580e6a57bf0495387f6dd361082a874db655bb69f6 +MISC metadata.xml 453 BLAKE2B f84aa721f7600dc6a0163a961bf8bbd21ef8b2ec4fc3ac49c6999eeeabff6e2dc504847e28d45cfcdd3f0d018167354f68e58d3e41f8ec5a856cdb86d3540656 SHA512 4e2a68ce12e2297f2853cc378d307771fe930ab8d6178c277504ccb308aa8c680822c90218ea43a6ce953b87b314faf4f51b1897aade664b6ec0915906227ea3 diff -uNr a/mail-mta/nullmailer/files/init.d-nullmailer-r4 b/mail-mta/nullmailer/files/init.d-nullmailer-r4 --- a/mail-mta/nullmailer/files/init.d-nullmailer-r4 false +++ b/mail-mta/nullmailer/files/init.d-nullmailer-r4 305fff6e5366c7dd262136058d6a7b341449a51cddc288b60eb95dccf48454ef04cf7f64b5ef5b5f7b3992ae15b679299b1fb8a51389a7f9632cbda88d12e893 @@ -0,0 +1,50 @@ +#!/sbin/openrc-run +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +command="/usr/sbin/nullmailer-send" + +start_stop_daemon_args="--chdir /var/nullmailer --user nullmail:nullmail" + +required_dirs="/var/nullmailer" +pidfile="/run/nullmailer.pid" +command_background="true" +command_args="-s" + +depend() { + use net logger +} + +checkconfig() { + local error=0 + local f=/etc/nullmailer/me + if [ ! -s ${f} ]; then + eerror "${f} does not exist" + error=1 + fi + f=/etc/nullmailer/defaultdomain + if [ ! -s ${f} ]; then + eerror "${f} does not exist" + error=1 + fi + if [ ${error} -eq 1 ]; then + einfo "You need to run 'emerge --config nullmailer'!" + fi + if [ -e /service/nullmailer ]; then + eerror "Nullmailer is already running under svscan!" + error=2 + fi + if [ ${error} -ne 0 ]; then + return 1 + else + return 0 + fi +} + +start_pre() { + checkconfig +} + +stop_pre() { + checkconfig # to avoid init.d stopping svscan instance +} diff -uNr a/mail-mta/nullmailer/files/init.d-nullmailer-r5 b/mail-mta/nullmailer/files/init.d-nullmailer-r5 --- a/mail-mta/nullmailer/files/init.d-nullmailer-r5 false +++ b/mail-mta/nullmailer/files/init.d-nullmailer-r5 65a123d3f84c68b52dd6b5ac1589394c4ef97efae39b74363a0659294096cb7a27bac381e2d2cb2255e00625cd724b050b92f78dc33e72b17e6426ba97abe7b4 @@ -0,0 +1,51 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +command="/usr/sbin/nullmailer-send" + +start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail" +start_stop_daemon_args+=" --stdout /var/log/nullmailer/nullmailer.log" +start_stop_daemon_args+=" --stderr /var/log/nullmailer/nullmailer.log" + +required_dirs="/var/spool/nullmailer /var/log/nullmailer" +pidfile="/run/nullmailer.pid" +command_background="true" + +depend() { + use net logger +} + +checkconfig() { + local error=0 + local f=/etc/nullmailer/me + if [ ! -s ${f} ]; then + eerror "${f} does not exist" + error=1 + fi + f=/etc/nullmailer/defaultdomain + if [ ! -s ${f} ]; then + eerror "${f} does not exist" + error=1 + fi + if [ ${error} -eq 1 ]; then + einfo "You need to run 'emerge --config nullmailer'!" + fi + if [ -e /service/nullmailer ]; then + eerror "Nullmailer is already running under svscan!" + error=2 + fi + if [ ${error} -ne 0 ]; then + return 1 + else + return 0 + fi +} + +start_pre() { + checkconfig +} + +stop_pre() { + checkconfig # to avoid init.d stopping svscan instance +} diff -uNr a/mail-mta/nullmailer/files/init.d-nullmailer-r6 b/mail-mta/nullmailer/files/init.d-nullmailer-r6 --- a/mail-mta/nullmailer/files/init.d-nullmailer-r6 false +++ b/mail-mta/nullmailer/files/init.d-nullmailer-r6 2da85610b9ff5caef8ceac842abef8b8f5f645beaba7bd07ee8d406d881809d04bf825d0f45c6546c514dc8e6723e0b67f948c65947578f097d2afa7e69e817f @@ -0,0 +1,51 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +command="/usr/sbin/nullmailer-send" + +start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail" +start_stop_daemon_args="${start_stop_daemon_args} --stdout /var/log/nullmailer/nullmailer.log" +start_stop_daemon_args="${start_stop_daemon_args} --stderr /var/log/nullmailer/nullmailer.log" + +required_dirs="/var/spool/nullmailer /var/log/nullmailer" +pidfile="/run/nullmailer.pid" +command_background="true" + +depend() { + use net logger +} + +checkconfig() { + local error=0 + local f=/etc/nullmailer/me + if [ ! -s ${f} ]; then + eerror "${f} does not exist" + error=1 + fi + f=/etc/nullmailer/defaultdomain + if [ ! -s ${f} ]; then + eerror "${f} does not exist" + error=1 + fi + if [ ${error} -eq 1 ]; then + einfo "You need to run 'emerge --config nullmailer'!" + fi + if [ -e /service/nullmailer ]; then + eerror "Nullmailer is already running under svscan!" + error=2 + fi + if [ ${error} -ne 0 ]; then + return 1 + else + return 0 + fi +} + +start_pre() { + checkconfig +} + +stop_pre() { + checkconfig # to avoid init.d stopping svscan instance +} diff -uNr a/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch --- a/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch false +++ b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch 742674fa75f6cb51750be40f455dcc47b581f32e7b1a55b595df647887bf40f367ff56d6519ad45eef11db3b05795470c00016ba5be59ba2f7d0442c6e3b5d5e @@ -0,0 +1,28 @@ +From 5e9316c669e752fcd9058b28952919bccd967640 Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" <blueness@gentoo.org> +Date: Sat, 31 Jan 2015 23:55:48 +0000 +Subject: [PATCH] lib/fdbuf/fdbuf.h: include <unistd.h> + +class fdobuf in lib/fdbuf/fdobuf.h makes use of uid_t and gid_t, +but these are defined in <unistd.h> according to POSIX. With libc's +that adhere strictly to standards, like musl, this breaks the build. + +We add <unistd.h> to fdbuf.h which is included by fdbuf.h. + +Signed-off-by: Anthony G. Basile <blueness@gentoo.org> +--- + lib/fdbuf/fdbuf.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/fdbuf/fdbuf.h b/lib/fdbuf/fdbuf.h +index 4b0e9cb..0054b01 100644 +--- a/lib/fdbuf/fdbuf.h ++++ b/lib/fdbuf/fdbuf.h +@@ -20,6 +20,7 @@ + #include "config.h" + #include <string.h> + #include <fcntl.h> ++#include <unistd.h> + + #ifdef _REENTRANT + #include <pthread.h> diff -uNr a/mail-mta/nullmailer/files/nullmailer.service b/mail-mta/nullmailer/files/nullmailer.service --- a/mail-mta/nullmailer/files/nullmailer.service false +++ b/mail-mta/nullmailer/files/nullmailer.service e6d70dbff14061718de8cd1f1bcbc4eb4d5b7a9f1446d659052c1a363216b61d77a31de61416f882e04d8524b34ac4944fd91ebbbdf334c3929d99faf8475304 @@ -0,0 +1,17 @@ +[Unit] +Description=Nullmailer relay-only MTA +Requires=network.target +After=local-fs.target syslog.target +ConditionPathExists=/var/nullmailer/queue +ConditionPathExists=/etc/nullmailer/defaultdomain +ConditionPathExists=/etc/nullmailer/me + +[Service] +WorkingDirectory=/var/nullmailer +ExecStart=/usr/sbin/nullmailer-send -s +User=nullmail +Group=nullmail +Restart=always + +[Install] +WantedBy=multi-user.target diff -uNr a/mail-mta/nullmailer/files/remotes.sample-1.13 b/mail-mta/nullmailer/files/remotes.sample-1.13 --- a/mail-mta/nullmailer/files/remotes.sample-1.13 false +++ b/mail-mta/nullmailer/files/remotes.sample-1.13 3364154e884301e5e11125da578e4e0b2433461c61b35ba3d5e3882c680af6ea6c836433d956d5f6370acb59f479d34ae6691ebdc4c98f51b750c83eccf363e4 @@ -0,0 +1,29 @@ +# Format is: HOST PROTOCOL [OPTIONS] +# HOST = IP or DNS +# PROTOCOL = smtp | qmtp +# OPTIONS = [--port=NUMBER] [--user] [--pass] [--starttls | --ssl [--insecure] ] +# +# Examples: +# A standard SMTP server: +# somesendmailserver.domain.com smtp +# +# A qmail server with QMQP setup: +# someqmailserver.domain.com qmqp +# +# A nonstandard SMTP server setup: +# someotherserver.domain.com smtp --port=2525 +# +# SMTP server supporting AUTH PLAIN +# mailserver smtp --user=<user> --pass=<pass> +# +# SMTP server supporting AUTH LOGIN +# mailserver smtp --user=<user> --pass=<pass> --auth-login +# +# SMTP server with smtps (legacy - use starttls instead) +# mailserver smtp --user=<user> --pass=<pass> --port=465 --ssl +# +# SMTP server on submission port with starttls +# mailserver smtp --user=<user> --pass=<pass> --port=587 --starttls +# +# SMTP server on submission port with starttls and self-signed certificate +# mailserver smtp --user=<user> --pass=<pass> --port=587 --starttls --insecure diff -uNr a/mail-mta/nullmailer/files/remotes.sample-2.0 b/mail-mta/nullmailer/files/remotes.sample-2.0 --- a/mail-mta/nullmailer/files/remotes.sample-2.0 false +++ b/mail-mta/nullmailer/files/remotes.sample-2.0 69ea924348c99fc5276b3be7ca8576488ab9c2a2111f96cc7671936906bb03a316ef11e3192321b250dee6f8def39e115bd6530e87b491873cd21ea81a74ef52 @@ -0,0 +1,30 @@ +# Format is: HOST PROTOCOL [OPTIONS] +# HOST = IP or DNS +# PROTOCOL = smtp | qmtp +# OPTIONS = [port=NUMBER] [user] [pass] [starttls | ssl [insecure] ] +# +# Examples: +# A standard SMTP server: +# somesendmailserver.domain.com smtp +# +# A qmail server with QMQP setup: +# someqmailserver.domain.com qmqp +# +# A nonstandard SMTP server setup: +# someotherserver.domain.com smtp port=2525 +# +# SMTP server supporting AUTH PLAIN +# mailserver smtp user=<user> pass=<pass> +# +# SMTP server supporting AUTH LOGIN +# mailserver smtp user=<user> pass=<pass> auth-login +# +# SMTP server with smtps (legacy - use starttls instead) +# mailserver smtp user=<user> pass=<pass> port=465 ssl +# +# SMTP server on submission port with starttls +# mailserver smtp user=<user> pass=<pass> port=587 starttls +# +# SMTP server on submission port with starttls and self-signed certificate +# mailserver smtp user=<user> pass=<pass> port=587 starttls insecure + diff -uNr a/mail-mta/nullmailer/metadata.xml b/mail-mta/nullmailer/metadata.xml --- a/mail-mta/nullmailer/metadata.xml false +++ b/mail-mta/nullmailer/metadata.xml 1359d58609d7de6ae5beea19a351b9cb8435b0a7d10474b17d37ce5b3aebcf1bfce301b389f89c944367dbcb4467bf6ab99a10ceb54f1141a226eef29bd83818 @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>robbat2@gentoo.org</email> + <name>Robin H. Johnson</name> + </maintainer> + <maintainer type="project"> + <email>net-mail@gentoo.org</email> + <name>Net-Mail</name> + </maintainer> + <upstream> + <remote-id type="github">bruceg/nullmailer</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild b/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild --- a/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild false +++ b/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild ea956762d3be5c960e4c5522396c6d8268e1bcf8fdbd39340bfd54484aa60ff8b93db333e50edc784d06b58abf6ebff49e900dae260f869c86112b93aca48c92 @@ -0,0 +1,137 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils flag-o-matic multilib systemd user + +DESCRIPTION="Simple relay-only local mail transport agent" +HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer" +SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="ssl" + +DEPEND=" + sys-apps/groff + ssl? ( net-libs/gnutls:0= )" +RDEPEND=" + virtual/logger + virtual/shadow + ssl? ( net-libs/gnutls:0= ) + !mail-mta/courier + !mail-mta/esmtp + !mail-mta/exim + !mail-mta/mini-qmail + !mail-mta/msmtp + !mail-mta/netqmail + !mail-mta/postfix + !mail-mta/qmail-ldap + !mail-mta/sendmail + !mail-mta/opensmtpd + !mail-mta/ssmtp" + +pkg_setup() { + enewgroup nullmail 88 + enewuser nullmail 88 -1 /var/spool/nullmailer nullmail +} + +src_prepare() { + default + sed -i.orig \ + -e '/\$(localstatedir)\/trigger/d' \ + "${S}"/Makefile.am || die "Sed failed" + sed \ + -e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \ + -i configure.ac || die + sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die + sed \ + -e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \ + -e 's:/usr/etc/:/etc/:g' \ + -i doc/nullmailer-send.8 || die + eautoreconf +} + +src_configure() { + # https://github.com/bruceg/nullmailer/pull/31/commits + append-lfs-flags #471102 + econf \ + --localstatedir="${EPREFIX}"/var \ + $(use_enable ssl tls) +} + +src_install() { + default + + # A small bit of sample config + insinto /etc/nullmailer + newins "${FILESDIR}"/remotes.sample-${PV} remotes + + # This contains passwords, so should be secure + fperms 0640 /etc/nullmailer/remotes + fowners root:nullmail /etc/nullmailer/remotes + + # daemontools stuff + dodir /var/spool/nullmailer/service{,/log} + + insinto /var/spool/nullmailer/service + newins scripts/nullmailer.run run + fperms 700 /var/spool/nullmailer/service/run + + insinto /var/spool/nullmailer/service/log + newins scripts/nullmailer-log.run run + fperms 700 /var/spool/nullmailer/service/log/run + + # usability + dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail + + # permissions stuff + keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue} + fperms 770 /var/log/nullmailer + fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq + fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq + + newinitd "${FILESDIR}"/init.d-nullmailer-r6 nullmailer + systemd_dounit scripts/${PN}.service +} + +pkg_postinst() { + if [ ! -e "${EROOT}var/spool/nullmailer/trigger" ]; then + mkfifo "${EROOT}var/spool/nullmailer/trigger" || die + fi + chown nullmail:nullmail \ + "${EROOT}"var/log/nullmailer \ + "${EROOT}"var/spool/nullmailer/{tmp,queue,trigger} || die + chmod 770 \ + "${EROOT}"var/log/nullmailer \ + "${EROOT}"var/spool/nullmailer/{tmp,queue} || die + chmod 660 "${EROOT}"var/spool/nullmailer/trigger || die + + # This contains passwords, so should be secure + chmod 0640 "${EROOT}"etc/nullmailer/remotes || die + chown root:nullmail "${EROOT}"etc/nullmailer/remotes || die + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "To create an initial setup, please do:" + elog "emerge --config =${CATEGORY}/${PF}" + fi +} + +pkg_postrm() { + if [[ -e "${EROOT}var/spool/nullmailer/trigger" ]]; then + rm "${EROOT}var/spool/nullmailer/trigger" || die + fi +} + +pkg_config() { + if [ ! -s "${EROOT}etc/nullmailer/me" ]; then + einfo "Setting /etc/nullmailer/me" + hostname --fqdn > "${EROOT}etc/nullmailer/me" + fi + if [ ! -s "${EROOT}etc/nullmailer/defaultdomain" ]; then + einfo "Setting /etc/nullmailer/defaultdomain" + hostname --domain > "${EROOT}etc/nullmailer/defaultdomain" + fi +} diff -uNr a/metadata/layout.conf b/metadata/layout.conf --- a/metadata/layout.conf false +++ b/metadata/layout.conf f71ca800b746ee1ecac2237cec311448d6ddb31909537ecc915bec4b221388291889190e28cee1f91dc1efbdb172118e7964720b819dde999dda43edc4b52bef @@ -0,0 +1 @@ +masters = cuntoo diff -uNr a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest --- a/net-dns/libidn2/Manifest false +++ b/net-dns/libidn2/Manifest ded914127dae3fb1f5540a838bf7220fbaa8d34906f18ae9622249757d6db78640f5aa70eab3c11291c0cd849e9ab6f604656c554bb510d5a07a3b70d0c4190d @@ -0,0 +1,3 @@ +DIST libidn2-2.0.4.tar.gz 2008524 BLAKE2B 7163e1eff498031c7433911533b34d993876b55d9b324aaef39c93db2cceee78dec4c8cfbf4d9dabd1dbbb03a8cbd65021f26a94758f57b32ef98dc869f744b6 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2 +EBUILD libidn2-2.0.4.ebuild 1237 BLAKE2B d0b1a78213888d195af827682340c16836fab292650cc904554e3bacba9e8b2e751b485ba2a7413b8a638bf64203849a2c49426e388d22eaaabd1db6f7c6cdca SHA512 66e24dc0ae01d8009783c0cc1722bbcbc73baf4a2a4332f35902f75c73bd7b9a3c05c752833b32e5e75ffc2b6c3b923572962b6d22777efdf21a44e66ec693fe +MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54 diff -uNr a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild --- a/net-dns/libidn2/libidn2-2.0.4.ebuild false +++ b/net-dns/libidn2/libidn2-2.0.4.ebuild 8cf23bb4fd3daaa6b5949ff8cbd50f05d5b514533b122b6dc47fb93dd3e7de6eadb9a24717d77df8c0dc26a5236a97f574060ecd191d72937ca9242b7bf1744f @@ -0,0 +1,51 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils flag-o-matic multilib-minimal + +DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)" +HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2" +SRC_URI=" + mirror://gnu/libidn/${P}.tar.gz +" + +LICENSE="GPL-2+ LGPL-3+" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +RDEPEND=" + dev-libs/libunistring[${MULTILIB_USEDEP}] +" +DEPEND=" + ${RDEPEND} + dev-lang/perl + sys-apps/help2man +" + +src_prepare() { + default + + if [[ ${CHOST} == *-darwin* ]] ; then + # Darwin ar chokes when TMPDIR doesn't exist (as done for some + # reason in the Makefile) + sed -i -e '/^TMPDIR = /d' Makefile.in || die + export TMPDIR="${T}" + fi + + multilib_copy_sources +} + +multilib_src_configure() { + econf \ + $(use_enable static-libs static) \ + --disable-doc \ + --disable-gtk-doc +} + +multilib_src_install() { + default + + prune_libtool_files +} diff -uNr a/net-dns/libidn2/metadata.xml b/net-dns/libidn2/metadata.xml --- a/net-dns/libidn2/metadata.xml false +++ b/net-dns/libidn2/metadata.xml 9c27d2ac63c0a680d580a6eca28be5f43b821dec463905d46071280e87d055b3d14077abc9b7fc0efe1a30a7c7b3df8f32c9f5a160d09c54e947e55385a55cfa @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> +<email>jer@gentoo.org</email> +</maintainer> +</pkgmetadata> diff -uNr a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest --- a/net-firewall/iptables/Manifest false +++ b/net-firewall/iptables/Manifest 2b56f59c422ef023790cb635bad4d38f06f463398583e5c2e06642e3507c97846e27d3b8f032cf6d6b5834cff9c59c255ae2529fb3b7ef7e87e164b164d224c3 @@ -0,0 +1,15 @@ +AUX ip6tables-1.4.13.confd 690 BLAKE2B 457beb9caaef166b8d98bddfd3e9f2799439bdfef4dd4acf4e5b7d619ac23b0d2c9f7ad62ab8fe70cb0970b378fbc4b179336c399a078babb2647cb127631b2e SHA512 8de9a5de4061bef217fbc07577688a8110f1116af7f3b936dfd18100a6a7a47ec6e70c456b24cf3432fb4f2034b741a487fe6af8d9740f174d51c6eb16945c6e +AUX iptables-1.4.13-r1.init 2766 BLAKE2B 1941ba5383055bfedd57b8eb6a390cab5fc3438bcf9f2b03a31f7a417ac7c2abaa590d23a8ae4500595c9bbb83da852e27d71f672a2758fe0be45691a461105c SHA512 9b74344043f48ce2a4691f09199cfa752bd7ee360d912d412fe1cf51de54821b0d082c9585a11b84020454f9759af78ff097d7dfc8f5148ef9e987e6d990edde +AUX iptables-1.4.13.confd 687 BLAKE2B 78b2242454b5f3228661f1e41b790aaa458c1225162a222da5a309a15eca56a531c756a5ceb49e506095461998305189efe136fde0bfe5916cc2d00661de1789 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70 +AUX iptables-1.4.21-configure.patch 1066 BLAKE2B 59bf725aeaae131b57e04b556957dd3316f2282ea5a1d9e931f63865dd48484831c9f7674085b7134e2ef4c2dcddbc3b06c8f8e85a45840746a25e386c390f86 SHA512 45445d1460072ed19ba617be983be82094fdd0535a25de4f6159173de4a08be9bee9da13c7aeea419291beb92402ca25efba3a0e269510e221f7eacc8bcd5176 +AUX iptables-1.4.21-static-connlabel-config.patch 2195 BLAKE2B 237c59c2fd3312efa26181f363c2ad4dfe19b0cb494f90048e50ff464ed8abbb8ec46d406df51b9f3ba75f717a045ebb4fa38cc0ca5741f5efbfc3322171e04f SHA512 d838773bf2db9f97548d2f7eaab0ce3205265a7ec8b274df479fcecb474ba09ed061abae50534c0379a1290479c2e94927595eca0f4570b27744ec165348b6b1 +AUX iptables.init 2787 BLAKE2B 79c17ba2970d63791dd4d137536b3ccf0f9b6a637d0445049a6fac338ca4e2d1fad927038dfa7ad42a1eb321feac1dc834af09ce0baec554fc9767f199e10b6b SHA512 317c71bee98f5b1bbfd17ea961e5e268532c2320fc865b7876f7cc4e02a66b6a012fc336f8880045a83e101f161197c0a1d106220af6240407cebafbf38022db +AUX systemd/ip6tables-restore.service 404 BLAKE2B 35cdf804e787aa5cc382cc638de523735ab47b878168c41d8eef85eb592e5bebd9319e75a10db28f0eba6618efae355c90f03ac0798239edeb80d01108e98a47 SHA512 34730df7464354bce11ca5bdceb5cf305e8ab7e2ded2c2689448379e74ff93252e7a83cfe05c2f3238f59a2ade69cd9c328291c28c43b6612bfb7b29fcb0feee +AUX systemd/ip6tables-store.service 243 BLAKE2B 30a0d955998a2a664c6a95b8e559898a1a48c681b77b6e3e1b2fa6f2ada7204f23df0f0894218599e95c2ccea71024e86cda7c82b6ff5a55d016d04d71cb1487 SHA512 7cee224f91d4c8348606ba176d0d689749a59229958cfdf4e75451d77271363e7cff71dbb7e30dbc4a5a837363a72d70d6960d2dfb218f3ad16456ae109cba10 +AUX systemd/ip6tables.service 133 BLAKE2B 28a81d41464015e0af5621612b0738f22d8afc8a1817a1303281c7440375e0f5fef1947a2e5ead4abffedbab0fb902748a8ed6f13dc77631b510a128fdc543c5 SHA512 f871e694a8c666a59840c4c7ae1f355dc47f481501b3472601b65460c1d6e163a7e33f7a6c42a84ac33131ddb96170b316e83507a43f1ede54d61446f81950dc +AUX systemd/iptables-restore.service 400 BLAKE2B cd7f700cf717a2efb6504770308f7dcb90a1968f64cca98ea5e7437cf3cf2a2e8f575e3743ac19eec8738c665f4243f537a101c00d5d1cc94648688d4e240a59 SHA512 8c005e321ad041068f243e4baa6588b24b0ffd69991f2129dfab0a34d0ebaf702ff2be8b7328126c84abdc3bbd300e1c387a690c5f6a002b50b2e9148feeb8ef +AUX systemd/iptables-store.service 240 BLAKE2B 7ddb4425e63cd41f421767fab25a7b055087fddde5927291b3fce6e0e978f0cb3b734bcacf02f78257eec99274056b69058436a847dcb366f5fb70032e410355 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e +AUX systemd/iptables.service 130 BLAKE2B 1b4881253eae9fd24c831931e5836efc3d3bb6f7ebb1762ca5aabb31813e3298e02d66d557efa73e6f252bf3f67898a2b646c863879dd993a613796b4c057019 SHA512 87114ccc7eb079d1ed43d77be35cf4c91702ca960883a4bbca5dfcf74aa6f086e44f4a4251441ac3a277c93eb10e7482157caf2d62bbf2a7f5327947ede25bef +DIST iptables-1.6.1.tar.bz2 620890 BLAKE2B b45ac26e1fb7e8b17a6df0afab3b6c0e2f0a5df9191367548136b3ce9aadc1bcb875b8bc0403e6f12fcf487054e96418f4ef34da827af8989fd4dcf83cd3cd8d SHA512 12280db6e6ef8e68da2537e9da59fc601790fd02b1ba38a37c90dbb56272018329dccb8be995f96ecd5d94fafa6043204f3e8f8ee96531685d9e3c55359d2ee8 +EBUILD iptables-1.6.1-r3.ebuild 3259 BLAKE2B ab9654520e56d76b8456467a2bb9619928d0a84aa4ce1963b4a996fc8ce07153e049f69eb3e67a722b6c5331090f1ef3f72686d84ad809033b7b0557551b5db8 SHA512 fa59e9c6ede4b1e4cd50272dfc8e5589a87d4fcc9754c82ab1a6f78e911effba59792e547b60aa4237cf4fcf6f0992937d9ed4bc895e30dd8a8d7c91264dbe41 +MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987 diff -uNr a/net-firewall/iptables/files/ip6tables-1.4.13.confd b/net-firewall/iptables/files/ip6tables-1.4.13.confd --- a/net-firewall/iptables/files/ip6tables-1.4.13.confd false +++ b/net-firewall/iptables/files/ip6tables-1.4.13.confd 079206f3883ca1ac606bee36dd602d7b0b7f14a14c3e826fdeb2c5aca749f863e6bc7dbe1e447b0a69b3b93c36a77cba3e6f6e599623db2beefb50cba24293e7 @@ -0,0 +1,19 @@ +# /etc/conf.d/ip6tables + +# Location in which iptables initscript will save set rules on +# service shutdown +IP6TABLES_SAVE="/var/lib/ip6tables/rules-save" + +# Options to pass to iptables-save and iptables-restore +SAVE_RESTORE_OPTIONS="-c" + +# Save state on stopping iptables +SAVE_ON_STOP="yes" + +# If you need to log iptables messages as soon as iptables starts, +# AND your logger does NOT depend on the network, then you may wish +# to uncomment the next line. +# If your logger depends on the network, and you uncomment this line +# you will create an unresolvable circular dependency during startup. +# After commenting or uncommenting this line, you must run 'rc-update -u'. +#rc_use="logger" diff -uNr a/net-firewall/iptables/files/iptables-1.4.13-r1.init b/net-firewall/iptables/files/iptables-1.4.13-r1.init --- a/net-firewall/iptables/files/iptables-1.4.13-r1.init false +++ b/net-firewall/iptables/files/iptables-1.4.13-r1.init bdaff8d483f2e4d340a881d0398ddf6b922137df2aaf006b2d5211e50926e4431e93b668b56f96948ee552768731a50c79a9bc8eec7df0ee8c2fd814532b3939 @@ -0,0 +1,129 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="check save panic" +extra_started_commands="reload" + +iptables_name=${SVCNAME} +case ${iptables_name} in +iptables|ip6tables) ;; +*) iptables_name="iptables" ;; +esac + +iptables_bin="/sbin/${iptables_name}" +case ${iptables_name} in + iptables) iptables_proc="/proc/net/ip_tables_names" + iptables_save=${IPTABLES_SAVE};; + ip6tables) iptables_proc="/proc/net/ip6_tables_names" + iptables_save=${IP6TABLES_SAVE};; +esac + +depend() { + need localmount #434774 + before net +} + +set_table_policy() { + local chains table=$1 policy=$2 + case ${table} in + nat) chains="PREROUTING POSTROUTING OUTPUT";; + mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";; + filter) chains="INPUT FORWARD OUTPUT";; + *) chains="";; + esac + local chain + for chain in ${chains} ; do + ${iptables_bin} -t ${table} -P ${chain} ${policy} + done +} + +checkkernel() { + if [ ! -e ${iptables_proc} ] ; then + eerror "Your kernel lacks ${iptables_name} support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} +checkconfig() { + if [ ! -f ${iptables_save} ] ; then + eerror "Not starting ${iptables_name}. First create some rules then run:" + eerror "/etc/init.d/${iptables_name} save" + return 1 + fi + return 0 +} + +start() { + checkconfig || return 1 + ebegin "Loading ${iptables_name} state and starting firewall" + ${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" + eend $? +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ] ; then + save || return 1 + fi + checkkernel || return 1 + ebegin "Stopping firewall" + local a + for a in $(cat ${iptables_proc}) ; do + set_table_policy $a ACCEPT + + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + done + eend $? +} + +reload() { + checkkernel || return 1 + checkrules || return 1 + ebegin "Flushing firewall" + local a + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + done + eend $? + + start +} + +checkrules() { + ebegin "Checking rules" + ${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" + eend $? +} + +check() { + # Short name for users of init.d script. + checkrules +} + +save() { + ebegin "Saving ${iptables_name} state" + checkpath -q -d "$(dirname "${iptables_save}")" + checkpath -q -m 0600 -f "${iptables_save}" + ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}" + eend $? +} + +panic() { + checkkernel || return 1 + if service_started ${iptables_name}; then + rc-service ${iptables_name} stop + fi + + local a + ebegin "Dropping all packets" + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + + set_table_policy $a DROP + done + eend $? +} diff -uNr a/net-firewall/iptables/files/iptables-1.4.13.confd b/net-firewall/iptables/files/iptables-1.4.13.confd --- a/net-firewall/iptables/files/iptables-1.4.13.confd false +++ b/net-firewall/iptables/files/iptables-1.4.13.confd 875144e2ed281833df409b2240c2fdd61b21e594c9bb60afb12a13ad0d273278869109b931258f4ccf30d7ec026f7f732c841e077180e2e8a4964e26c4a30dcf @@ -0,0 +1,19 @@ +# /etc/conf.d/iptables + +# Location in which iptables initscript will save set rules on +# service shutdown +IPTABLES_SAVE="/var/lib/iptables/rules-save" + +# Options to pass to iptables-save and iptables-restore +SAVE_RESTORE_OPTIONS="-c" + +# Save state on stopping iptables +SAVE_ON_STOP="yes" + +# If you need to log iptables messages as soon as iptables starts, +# AND your logger does NOT depend on the network, then you may wish +# to uncomment the next line. +# If your logger depends on the network, and you uncomment this line +# you will create an unresolvable circular dependency during startup. +# After commenting or uncommenting this line, you must run 'rc-update -u'. +#rc_use="logger" diff -uNr a/net-firewall/iptables/files/iptables-1.4.21-configure.patch b/net-firewall/iptables/files/iptables-1.4.21-configure.patch --- a/net-firewall/iptables/files/iptables-1.4.21-configure.patch false +++ b/net-firewall/iptables/files/iptables-1.4.21-configure.patch b745dfa6e9d557c674795da1b43cff8cd0d82fc05bd1a73434bb4ad64427d4dc2bfb5747877375f2fde55df8fcf0089300ebd946a90165310f7451ab38eee57f @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/557586 + +From b24e59fba39120bfdb9e521bbd0af8f33a60466e Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 15 Aug 2015 14:12:39 -0400 +Subject: [PATCH] configure: fix 3rd arg w/AC_ARG_ENABLE + +The 3rd arg is used when --{enable,disable}-foo are passed in, not when +the feature is enabled. Use the existing $enableval instead. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/configure ++++ b/configure +@@ -11898,14 +11898,14 @@ fi + + # Check whether --enable-bpf-compiler was given. + if test "${enable_bpf_compiler+set}" = set; then : +- enableval=$enable_bpf_compiler; enable_bpfc="yes" ++ enableval=$enable_bpf_compiler; enable_bpfc="$enableval" + else + enable_bpfc="no" + fi + + # Check whether --enable-nfsynproxy was given. + if test "${enable_nfsynproxy+set}" = set; then : +- enableval=$enable_nfsynproxy; enable_nfsynproxy="yes" ++ enableval=$enable_nfsynproxy; enable_nfsynproxy="$enableval" + else + enable_nfsynproxy="no" + fi diff -uNr a/net-firewall/iptables/files/iptables-1.4.21-static-connlabel-config.patch b/net-firewall/iptables/files/iptables-1.4.21-static-connlabel-config.patch --- a/net-firewall/iptables/files/iptables-1.4.21-static-connlabel-config.patch false +++ b/net-firewall/iptables/files/iptables-1.4.21-static-connlabel-config.patch de4a6983022413470351be64fb155504dd717c32fa26c16ca40509a2ef552243a3692ef864d9eb014b3f3817386a1125fde7fe34168d91e6aa5438af4ce2a641 @@ -0,0 +1,77 @@ +https://bugs.gentoo.org/558234 +http://git.netfilter.org/iptables/commit/?id=825fbda5482a7d5ec5a6619c81fe07ff865c7d6e + +From 825fbda5482a7d5ec5a6619c81fe07ff865c7d6e Mon Sep 17 00:00:00 2001 +From: Florian Westphal <fw@strlen.de> +Date: Fri, 5 Sep 2014 20:45:56 +0200 +Subject: [PATCH] extensions: libxt_connlabel: do not open config file from + _init hook + +else, static builds will print this for every iptables invocation, +even 'iptables -L'. Delay open until we need to translate a mapping. + +Reported-by: Thomas De Schampheleire <patrickdepinguin@gmail.com> +Signed-off-by: Florian Westphal <fw@strlen.de> +--- + extensions/libxt_connlabel.c | 27 ++++++++++++++++++++------- + 1 file changed, 20 insertions(+), 7 deletions(-) + +diff --git a/extensions/libxt_connlabel.c b/extensions/libxt_connlabel.c +index c84a167..1f83095 100644 +--- a/extensions/libxt_connlabel.c ++++ b/extensions/libxt_connlabel.c +@@ -29,11 +29,26 @@ static const struct xt_option_entry connlabel_mt_opts[] = { + XTOPT_TABLEEND, + }; + ++/* cannot do this via _init, else static builds might spew error message ++ * for every iptables invocation. ++ */ ++static void connlabel_open(void) ++{ ++ if (map) ++ return; ++ ++ map = nfct_labelmap_new(NULL); ++ if (!map && errno) ++ xtables_error(RESOURCE_PROBLEM, "cannot open connlabel.conf: %s\n", ++ strerror(errno)); ++} ++ + static void connlabel_mt_parse(struct xt_option_call *cb) + { + struct xt_connlabel_mtinfo *info = cb->data; + int tmp; + ++ connlabel_open(); + xtables_option_parse(cb); + + switch (cb->entry->id) { +@@ -54,7 +69,11 @@ static void connlabel_mt_parse(struct xt_option_call *cb) + + static const char *connlabel_get_name(int b) + { +- const char *name = nfct_labelmap_get_name(map, b); ++ const char *name; ++ ++ connlabel_open(); ++ ++ name = nfct_labelmap_get_name(map, b); + if (name && strcmp(name, "")) + return name; + return NULL; +@@ -114,11 +133,5 @@ static struct xtables_match connlabel_mt_reg = { + + void _init(void) + { +- map = nfct_labelmap_new(NULL); +- if (!map) { +- fprintf(stderr, "cannot open connlabel.conf, not registering '%s' match: %s\n", +- connlabel_mt_reg.name, strerror(errno)); +- return; +- } + xtables_register_match(&connlabel_mt_reg); + } +-- +2.4.4 + diff -uNr a/net-firewall/iptables/files/iptables.init b/net-firewall/iptables/files/iptables.init --- a/net-firewall/iptables/files/iptables.init false +++ b/net-firewall/iptables/files/iptables.init 7448151a6b4986d981a57e030182e42a789366b1e698fe5fd89007535a349d6d359743b5cf7fb2ba695f09b318ba741453a789a14f3497612863bece08fbf365 @@ -0,0 +1,129 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="check save panic" +extra_started_commands="reload" + +iptables_name=${SVCNAME} +case ${iptables_name} in +iptables|ip6tables) ;; +*) iptables_name="iptables" ;; +esac + +iptables_bin="/sbin/${iptables_name}" +case ${iptables_name} in + iptables) iptables_proc="/proc/net/ip_tables_names" + iptables_save=${IPTABLES_SAVE};; + ip6tables) iptables_proc="/proc/net/ip6_tables_names" + iptables_save=${IP6TABLES_SAVE};; +esac + +depend() { + need localmount #434774 + before net +} + +set_table_policy() { + local chains table=$1 policy=$2 + case ${table} in + nat) chains="PREROUTING POSTROUTING OUTPUT";; + mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";; + filter) chains="INPUT FORWARD OUTPUT";; + *) chains="";; + esac + local chain + for chain in ${chains} ; do + ${iptables_bin} -w -t ${table} -P ${chain} ${policy} + done +} + +checkkernel() { + if [ ! -e ${iptables_proc} ] ; then + eerror "Your kernel lacks ${iptables_name} support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} +checkconfig() { + if [ ! -f ${iptables_save} ] ; then + eerror "Not starting ${iptables_name}. First create some rules then run:" + eerror "/etc/init.d/${iptables_name} save" + return 1 + fi + return 0 +} + +start() { + checkconfig || return 1 + ebegin "Loading ${iptables_name} state and starting firewall" + ${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" + eend $? +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ] ; then + save || return 1 + fi + checkkernel || return 1 + ebegin "Stopping firewall" + local a + for a in $(cat ${iptables_proc}) ; do + set_table_policy $a ACCEPT + + ${iptables_bin} -w -F -t $a + ${iptables_bin} -w -X -t $a + done + eend $? +} + +reload() { + checkkernel || return 1 + checkrules || return 1 + ebegin "Flushing firewall" + local a + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} -w -F -t $a + ${iptables_bin} -w -X -t $a + done + eend $? + + start +} + +checkrules() { + ebegin "Checking rules" + ${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" + eend $? +} + +check() { + # Short name for users of init.d script. + checkrules +} + +save() { + ebegin "Saving ${iptables_name} state" + checkpath -q -d "$(dirname "${iptables_save}")" + checkpath -q -m 0600 -f "${iptables_save}" + ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}" + eend $? +} + +panic() { + checkkernel || return 1 + if service_started ${iptables_name}; then + rc-service ${iptables_name} stop + fi + + local a + ebegin "Dropping all packets" + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} -w -F -t $a + ${iptables_bin} -w -X -t $a + + set_table_policy $a DROP + done + eend $? +} diff -uNr a/net-firewall/iptables/files/systemd/ip6tables-restore.service b/net-firewall/iptables/files/systemd/ip6tables-restore.service --- a/net-firewall/iptables/files/systemd/ip6tables-restore.service false +++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service 92b309dc10c063f85cab9677c672b1ddf8142bc2e76e05dc560c3e25fce0d23e37b8180d84a1120e3dc35a8508daaa1b353db5d47aaafb3190b06ffed24af16b @@ -0,0 +1,14 @@ +[Unit] +Description=Restore ip6tables firewall rules +# if both are queued for some reason, don't store before restoring :) +Before=ip6tables-store.service +# sounds reasonable to have firewall up before any of the services go up +Before=network-pre.target +Wants=network-pre.target + +[Service] +Type=oneshot +ExecStart=/sbin/ip6tables-restore -w -- /var/lib/ip6tables/rules-save + +[Install] +WantedBy=basic.target diff -uNr a/net-firewall/iptables/files/systemd/ip6tables-store.service b/net-firewall/iptables/files/systemd/ip6tables-store.service --- a/net-firewall/iptables/files/systemd/ip6tables-store.service false +++ b/net-firewall/iptables/files/systemd/ip6tables-store.service 35b62f5ec199672c34c44c8fba020d432781c0ca152a78b54bf82833a32bdd4788164966d4dbdb15085037c74c09f5cb1182be1c4686dcc584457e59b68c0972 @@ -0,0 +1,11 @@ +[Unit] +Description=Store ip6tables firewall rules +Before=shutdown.target +DefaultDependencies=No + +[Service] +Type=oneshot +ExecStart=/bin/sh -c "/sbin/ip6tables-save --counters > /var/lib/ip6tables/rules-save" + +[Install] +WantedBy=shutdown.target diff -uNr a/net-firewall/iptables/files/systemd/ip6tables.service b/net-firewall/iptables/files/systemd/ip6tables.service --- a/net-firewall/iptables/files/systemd/ip6tables.service false +++ b/net-firewall/iptables/files/systemd/ip6tables.service fe67060163a4888988b2f274a84381ed5dc23120d49baa82789f6e4a27efc83e0909eb3d3314777b669ef370aa3ba29d17dfba3c2d2c8cf7de0d1eb98bb4225a @@ -0,0 +1,6 @@ +[Unit] +Description=Store and restore ip6tables firewall rules + +[Install] +Also=ip6tables-store.service +Also=ip6tables-restore.service diff -uNr a/net-firewall/iptables/files/systemd/iptables-restore.service b/net-firewall/iptables/files/systemd/iptables-restore.service --- a/net-firewall/iptables/files/systemd/iptables-restore.service false +++ b/net-firewall/iptables/files/systemd/iptables-restore.service f96abf221ad4f4eab9330913502ed1f07afc06dfcc543073126f2e334ca2d23d2ae67eaa32daf329b264fbe07e2b41a08eebe986422d3b9e2d81eeeec81c7353 @@ -0,0 +1,14 @@ +[Unit] +Description=Restore iptables firewall rules +# if both are queued for some reason, don't store before restoring :) +Before=iptables-store.service +# sounds reasonable to have firewall up before any of the services go up +Before=network-pre.target +Wants=network-pre.target + +[Service] +Type=oneshot +ExecStart=/sbin/iptables-restore -w -- /var/lib/iptables/rules-save + +[Install] +WantedBy=basic.target diff -uNr a/net-firewall/iptables/files/systemd/iptables-store.service b/net-firewall/iptables/files/systemd/iptables-store.service --- a/net-firewall/iptables/files/systemd/iptables-store.service false +++ b/net-firewall/iptables/files/systemd/iptables-store.service 8a2c2f0058ce807574c11f9f04c5d25cb9b60ff4857d8f5556c999b39d207204e979c14a37acf064b4e0ad2beca394ee421e0493c74125f133490732f1f620df @@ -0,0 +1,11 @@ +[Unit] +Description=Store iptables firewall rules +Before=shutdown.target +DefaultDependencies=No + +[Service] +Type=oneshot +ExecStart=/bin/sh -c "/sbin/iptables-save --counters > /var/lib/iptables/rules-save" + +[Install] +WantedBy=shutdown.target diff -uNr a/net-firewall/iptables/files/systemd/iptables.service b/net-firewall/iptables/files/systemd/iptables.service --- a/net-firewall/iptables/files/systemd/iptables.service false +++ b/net-firewall/iptables/files/systemd/iptables.service 0af329afa99f7e82f735d359b84e7f2788c61a15c8af4f4911798fdfa7cc5d42290668fa4de5c2d0f0aa23fbf787b6278f67fe3fa9079e86c11d60b8a163a6b0 @@ -0,0 +1,6 @@ +[Unit] +Description=Store and restore iptables firewall rules + +[Install] +Also=iptables-store.service +Also=iptables-restore.service diff -uNr a/net-firewall/iptables/iptables-1.6.1-r3.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild --- a/net-firewall/iptables/iptables-1.6.1-r3.ebuild false +++ b/net-firewall/iptables/iptables-1.6.1-r3.ebuild fc37d5a206eeaa06d24f5867203230a9d972016a2fe58a21b249c0ca11c5f3be49f0aa4d722f70b56228fa216c9273fdbf996e8c2fafb20e4ffd66059cd81c5d @@ -0,0 +1,119 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +# Force users doing their own patches to install their own tools +AUTOTOOLS_AUTO_DEPEND=no + +inherit eutils multilib systemd toolchain-funcs autotools flag-o-matic + +DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" +HOMEPAGE="https://www.netfilter.org/projects/iptables/" +SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2" + +LICENSE="GPL-2" +# Subslot tracks libxtables as that's the one other packages generally link +# against and iptables changes. Will have to revisit if other sonames change. +SLOT="0/12" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" +IUSE="conntrack ipv6 netlink nftables pcap static-libs" + +COMMON_DEPEND=" + conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) + netlink? ( net-libs/libnfnetlink ) + nftables? ( + >=net-libs/libmnl-1.0:0= + >=net-libs/libnftnl-1.0.5:0= + ) + pcap? ( net-libs/libpcap ) +" +DEPEND="${COMMON_DEPEND} + virtual/os-headers + >=sys-kernel/linux-headers-4.4:0 + virtual/pkgconfig + nftables? ( + sys-devel/flex + virtual/yacc + ) +" +RDEPEND="${COMMON_DEPEND} + nftables? ( + !<net-firewall/ebtables-2.0.10.4-r2 + !net-misc/ethertypes + ) +" + +src_prepare() { + # use the saner headers from the kernel + rm -f include/linux/{kernel,types}.h + + # Only run autotools if user patched something + epatch_user && eautoreconf || elibtoolize +} + +src_configure() { + # Some libs use $(AR) rather than libtool to build #444282 + tc-export AR + + # Hack around struct mismatches between userland & kernel for some ABIs. #472388 + use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct + + sed -i \ + -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \ + -e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \ + configure || die + + econf \ + --sbindir="${EPREFIX}/sbin" \ + --libexecdir="${EPREFIX}/$(get_libdir)" \ + --enable-devel \ + --enable-shared \ + $(use_enable nftables) \ + $(use_enable pcap bpf-compiler) \ + $(use_enable pcap nfsynproxy) \ + $(use_enable static-libs static) \ + $(use_enable ipv6) +} + +src_compile() { + # Deal with parallel build errors. + use nftables && emake -C iptables xtables-config-parser.h + emake V=1 +} + +src_install() { + default + dodoc INCOMPATIBILITIES iptables/iptables.xslt + + # all the iptables binaries are in /sbin, so might as well + # put these small files in with them + into / + dosbin iptables/iptables-apply + dosym iptables-apply /sbin/ip6tables-apply + doman iptables/iptables-apply.8 + + insinto /usr/include + doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) + insinto /usr/include/iptables + doins include/iptables/internal.h + + keepdir /var/lib/iptables + newinitd "${FILESDIR}"/${PN}.init iptables + newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables + if use ipv6 ; then + keepdir /var/lib/ip6tables + newinitd "${FILESDIR}"/iptables.init ip6tables + newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables + fi + + systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service + if use ipv6 ; then + systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service + fi + + # Move important libs to /lib #332175 + gen_usr_ldscript -a ip{4,6}tc iptc xtables + + prune_libtool_files +} diff -uNr a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml --- a/net-firewall/iptables/metadata.xml false +++ b/net-firewall/iptables/metadata.xml de91308b5a9d41830a8b080c1528ef1946cbc700701024373932ef155e36ec034b096fb24d42a964d9bc832796a7733e84eabc58aa8fdf5f25296622caeb9f91 @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="conntrack">Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag> + <flag name="netlink">Build against libnfnetlink which enables the nfnl_osf util</flag> + <flag name="nftables">Support nftables kernel interface</flag> + <flag name="pcap">Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag> + </use> + <longdescription> + iptables is the userspace command line program used to set up, maintain, and + inspect the tables of IPv4 packet filter rules in the Linux kernel. It's a + part of packet filtering framework which allows the stateless and stateful + packet filtering, all kinds of network address and port translation, and is a + flexible and extensible infrastructure with multiple layers of API's for 3rd + party extensions. The iptables package also includes ip6tables. ip6tables is + used for configuring the IPv6 packet filter. + + Note that some extensions (e.g. imq and l7filter) are not included into + official kernel sources so you have to patch the sources before installation. + </longdescription> + <upstream> + <remote-id type="cpe">cpe:/a:netfilter_core_team:iptables</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest --- a/net-libs/gnutls/Manifest false +++ b/net-libs/gnutls/Manifest 8a4729c6fe051e4054731b1efd62a289951235a8b84dcda7b8b6ff6c641416c3931c0838b4a54f34808598a2c951749ad876ded651aa4a332e5252cd3a1bf1ba @@ -0,0 +1,3 @@ +DIST gnutls-3.5.18.tar.xz 7261980 BLAKE2B 1c7df33aa331634885426196d1e39cf7c5748ba467323d7a48c4e865efcea03e3a59a7bb21cebb4cfe9d11a83a532bb785ae9a5824703c759e573de0f347004d SHA512 434cf33a4221fe2edce1b531cb53690d14a0991cb2056006021f625fb018987351f8ec917c3a7803e5e64179cf1647a3002ae783736ffca3188d2d294b76df52 +EBUILD gnutls-3.5.18.ebuild 4114 BLAKE2B c8ed07eabba11d072baac64ac6a1590e64df5aaf6bf38820887e7c0cd4650ff25aab67c01d163ce550cb6f44f85c698192436732a7272503479abdd4b719cd3c SHA512 0e62f7e93d007c27ae718ae6bd24bb6692afbb8b8e9fb6ad5f1848cacf98930c522dbb6b6c98e78d6c9fd0ea7b5a9eba20ad5204b70f0adc556bec086a0a1027 +MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992 diff -uNr a/net-libs/gnutls/gnutls-3.5.18.ebuild b/net-libs/gnutls/gnutls-3.5.18.ebuild --- a/net-libs/gnutls/gnutls-3.5.18.ebuild false +++ b/net-libs/gnutls/gnutls-3.5.18.ebuild d6901c05cc3aa52e4dcdb415b636c47305633e2de1c8caf1e7faf936b8c1635dd66c1f9ea9b55c81bfe6cc7b48d8ccf9ddde5edfdaf9d779eaaa92656b1423fb @@ -0,0 +1,133 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit libtool ltprune multilib-minimal versionator + +DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" +HOMEPAGE="http://www.gnutls.org/" +SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" + +LICENSE="GPL-3 LGPL-2.1" +SLOT="0/30" # libgnutls.so number +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" + +REQUIRED_USE=" + test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )" + +# NOTICE: sys-devel/autogen is required at runtime as we +# use system libopts +RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}] + >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] + tools? ( sys-devel/autogen ) + dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] ) + guile? ( >=dev-scheme/guile-1.8:=[networking] ) + nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) + pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + valgrind? ( dev-util/valgrind ) + test? ( + seccomp? ( sys-libs/libseccomp ) + ) + test-full? ( + guile? ( >=dev-scheme/guile-2 ) + app-crypt/dieharder + app-misc/datefudge + dev-libs/softhsm:2[-bindist] + net-dialup/ppp + net-misc/socat + )" + +DOCS=( + README.md + doc/certtool.cfg +) + +HTML_DOCS=() + +pkg_setup() { + # bug#520818 + export TZ=UTC + + use doc && HTML_DOCS+=( + doc/gnutls.html + ) +} + +src_prepare() { + default + + # force regeneration of autogen-ed files + local file + for file in $(grep -l AutoGen-ed src/*.c) ; do + rm src/$(basename ${file} .c).{c,h} || die + done + + # Use sane .so versioning on FreeBSD. + elibtoolize +} + +multilib_src_configure() { + LINGUAS="${LINGUAS//en/en@boldquot en@quot}" + + # remove magic of library detection + # bug#438222 + local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *$[^ ]*$ .*/\1/g')) + + # TPM needs to be tested before being enabled + libconf+=( --without-tpm ) + + # hardware-accell is disabled on OSX because the asm files force + # GNU-stack (as doesn't support that) and when that's removed ld + # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # Cygwin as does not understand these asm files at all + [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) + + ECONF_SOURCE=${S} econf \ + $(multilib_native_enable manpages) \ + $(multilib_native_use_enable doc gtk-doc) \ + $(multilib_native_use_enable doc) \ + $(multilib_native_use_enable guile) \ + $(multilib_native_use_enable seccomp seccomp-tests) \ + $(multilib_native_use_enable test tests) \ + $(multilib_native_use_enable test-full full-test-suite) \ + $(multilib_native_use_enable tools) \ + $(multilib_native_use_enable valgrind valgrind-tests) \ + $(use_enable cxx) \ + $(use_enable dane libdane) \ + $(use_enable nls) \ + $(use_enable openpgp openpgp-authentication) \ + $(use_enable openssl openssl-compatibility) \ + $(use_enable sslv2 ssl2-support) \ + $(use_enable sslv3 ssl3-support) \ + $(use_enable static-libs static) \ + $(use_enable tls-heartbeat heartbeat-support) \ + $(use_with idn libidn2) \ + $(use_with idn) \ + $(use_with pkcs11 p11-kit) \ + $(use_with zlib) \ + --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ + --without-included-libtasn1 \ + "${libconf[@]}" +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files --all + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} diff -uNr a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml --- a/net-libs/gnutls/metadata.xml false +++ b/net-libs/gnutls/metadata.xml be20a2ea52b488d5e089f779cdac6a68022b25331eb587364641ff2f216833f023583863e47fa29439ff0661f53f3a1847497f586ae5365864abd0104e1de57a @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>crypto@gentoo.org</email> + <name>Crypto</name> + </maintainer> + <use> + <flag name="dane"> + Build libgnutls-dane, implementing DNS-based Authentication of + Named Entities. Requires <pkg>net-dns/unbound</pkg> + </flag> + <flag name="openpgp"> + Enable openpgp support + </flag> + <flag name="openssl"> + Build openssl compatibility libraries + </flag> + <flag name="pkcs11"> + Add support for PKCS#11 through <pkg>app-crypt/p11-kit</pkg> + </flag> + <flag name="tools"> + Build extra tools + </flag> + <flag name="tls-heartbeat"> + Enable the Heartbeat Extension in TLS and DTLS + </flag> + <flag name="sslv2"> + Support for the old/insecure SSLv2 protocol + </flag> + <flag name="sslv3"> + Support for the old/insecure SSLv3 protocol + </flag> + <flag name="test-full"> + Enable full test mode + </flag> + <flag name="valgrind"> + Enable usage of <pkg>dev-util/valgrind</pkg> in debug + </flag> + </use> + <slots> + <subslots>Reflect ABI compatibility of libgnutls.so</subslots> + </slots> +</pkgmetadata> diff -uNr a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest --- a/net-libs/libmnl/Manifest false +++ b/net-libs/libmnl/Manifest 844f0ed29558e2b400d59a196deb0ad695d4a6743e337a690419e41def8baa5ab277ac82086df73adbda9caf4f9c120dadf1fb493478d15005e761b59e761f6f @@ -0,0 +1,3 @@ +DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9 +EBUILD libmnl-1.0.4.ebuild 747 BLAKE2B c92e003d2858147f4a602f53c446979476617ebabed0345bea38a9c79f8324ac3cb21af189356f10098aa40c1ebce20c97c32e5c099ad7537afb87bf2311c2a4 SHA512 de77e19c0380cfd6c20b4ae3c242a09352b84871cd4da362216bb3a8251c32871b03f98f5870e7ca4b528b6615d7b6b36eaf26dcfc6b493d18187119d6f3976f +MISC metadata.xml 664 BLAKE2B 4245edfc6318a54d3ea1f1cb29113cf0a97be7303aa8861eac42b591a92f79372d771f73cc73f6820496444f05dfef8d798bd7b30adf5911b53b0d969b9eeba7 SHA512 92caf3829016e88cd6560da7ac0bf8140068b69abe8341b5a5c88ee353bdb9bcd5a5b5a1563cc9114d91529b8a134b42b685734e62127b2834393a76e01c5cd7 diff -uNr a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild --- a/net-libs/libmnl/libmnl-1.0.4.ebuild false +++ b/net-libs/libmnl/libmnl-1.0.4.ebuild d93cf6b38ee26318951456d200bb8095902d5d4ba7ceeed6b27ec2be2c2a678462ab7591f87115258becf39980c3fb961987391f50275fb21a607a71dd2c5c44 @@ -0,0 +1,32 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils toolchain-funcs + +DESCRIPTION="Minimalistic netlink library" +HOMEPAGE="https://netfilter.org/projects/libmnl/" +SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0/0.2.0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux" +IUSE="examples static-libs" + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + default + + gen_usr_ldscript -a mnl + prune_libtool_files + + if use examples; then + find examples/ -name 'Makefile*' -delete + dodoc -r examples/ + docompress -x /usr/share/doc/${PF}/examples + fi +} diff -uNr a/net-libs/libmnl/metadata.xml b/net-libs/libmnl/metadata.xml --- a/net-libs/libmnl/metadata.xml false +++ b/net-libs/libmnl/metadata.xml c74faf9a457689ca940b6918ce63f8f3eac7ac134cbe70131c34044f2bbd10d5d3058f971ae4b38ebd15cc003a07f94dd0d7fbf27e02eeeb10a1d39be5cd466b @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> +</maintainer> +<longdescription lang="en"> + libmnl is a minimalistic user-space library oriented to Netlink developers. + There are a lot of common tasks in parsing, validating, constructing of both + the Netlink header and TLVs that are repetitive and easy to get wrong. This + library aims to provide simple helpers that allows you to re-use code and to + avoid re-inventing the wheel. +</longdescription> +</pkgmetadata> diff -uNr a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest --- a/net-misc/iputils/Manifest false +++ b/net-misc/iputils/Manifest 254d68529a9b01420d39ad14f10b2e2c73f9f31d1b95001d718a75bfd20f612822dafeeae37e20d212fc60cb214c13555f1c96ec321445e4ad20d19af4900ea4 @@ -0,0 +1,9 @@ +AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 +AUX iputils-99999999-musl.patch 1799 BLAKE2B d178697fd3f3dad9977b15d5a48f3742408f8d3d72fd3883ad512b11a16a719ce56c81ca00281bf754d934192dc3d980998f9947d66974dd3993ba0ed8760be0 SHA512 d3e4cd51591d1c1bb96b58aedd131bbadf6c4f523ce6ec0aebd991d4396fcd516a1aa3af180510efd8484852caf5301cfe4b0936a449b62caffb251d78794c54 +AUX iputils-99999999-tracepath46.patch 824 BLAKE2B c964390aad46b75bda363ca77a87f90856a5a7f23e7b66bacd640034e09b07620f413bde16c1879659d2f01ea9d99ace664141907406239e58841e0ffcda3097 SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443 +AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 +AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada +DIST iputils-20171016_pre.tar.gz 195254 BLAKE2B 1170db29d53dd8285b11d4df7b7da2ea3bd2be3599a3f0df85ca7e64247f2a534d03e43a2b6267ba4b9c0b65fcc58045151833ae2c1035a839ed728a389804af SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99 +DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd7a045063c289c244ba8fb4dc43caf2a8d52032b57ee6d86ee4dffd5351faa3124d4c83a33ca3365866568c2164b374eed9d70ec0 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9 +EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d +MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc diff -uNr a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch --- a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch false +++ b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch f26c6aa4804ffa225f519ea94c28f5a2859d379a10ad5b97a7767dfd754f2ed092f7860775bf96b0dabb19de510298b875082134b735c204a4eb868fb4b9ee0e @@ -0,0 +1,11 @@ +--- iputils-s20150815/ping.h ++++ iputils-s20150815/ping.h +@@ -61,7 +61,7 @@ + + #define MAXWAIT 10 /* max seconds to wait for response */ + #define MININTERVAL 10 /* Minimal interpacket gap */ +-#define MINUSERINTERVAL 200 /* Minimal allowed interval for non-root */ ++#define MINUSERINTERVAL 0 /* Minimal allowed interval for non-root */ + + #define SCHINT(a) (((a) <= MININTERVAL) ? MININTERVAL : (a)) + diff -uNr a/net-misc/iputils/files/iputils-99999999-musl.patch b/net-misc/iputils/files/iputils-99999999-musl.patch --- a/net-misc/iputils/files/iputils-99999999-musl.patch false +++ b/net-misc/iputils/files/iputils-99999999-musl.patch 4f496c06d056808714526bfe78bf2ceae76c4011148cd3aada749faed4340070a15fae927bed82821be15fad1d23d900f3fba9c3422d0c2618781367f24b8ab5 @@ -0,0 +1,92 @@ +From 58ed671d1003caf32f3c35260531e8e1cd7efb80 Mon Sep 17 00:00:00 2001 +From: Aric Belsito <lluixhi@gmail.com> +Date: Sun, 29 Oct 2017 23:17:03 +0100 +Subject: [PATCH] Fix build on MUSL + +Add missing AI_IDN and NI_IDN declarations. + +Bug: https://bugs.gentoo.org/503914 +--- + arping.c | 7 +++++++ + ping.h | 11 +++++++++++ + tracepath.c | 8 ++++++++ + traceroute6.c | 4 ++++ + 4 files changed, 30 insertions(+) + +diff --git a/arping.c b/arping.c +index 0ac18cd..5d2145e 100644 +--- a/arping.c ++++ b/arping.c +@@ -45,6 +45,13 @@ + #ifdef USE_IDN + #include <idna.h> + #include <locale.h> ++ ++#ifndef AI_IDN ++#define AI_IDN 0x0040 ++#endif ++#ifndef AI_CANONIDN ++#define AI_CANONIDN 0x0080 ++#endif + #endif + + #include "SNAPSHOT.h" +diff --git a/ping.h b/ping.h +index c5f0321..0391de0 100644 +--- a/ping.h ++++ b/ping.h +@@ -38,6 +38,17 @@ + #include <locale.h> + #include <idna.h> + #include <stringprep.h> ++ ++#ifndef AI_IDN ++#define AI_IDN 0x0040 ++#endif ++#ifndef AI_CANONIDN ++#define AI_CANONIDN 0x0080 ++#endif ++#ifndef NI_IDN ++#define NI_IDN 32 ++#endif ++ + #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN) + #define getnameinfo_flags NI_IDN + #else +diff --git a/tracepath.c b/tracepath.c +index b0eb911..c50e3ec 100644 +--- a/tracepath.c ++++ b/tracepath.c +@@ -30,6 +30,14 @@ + #ifdef USE_IDN + #include <idna.h> + #include <locale.h> ++ ++#ifndef AI_IDN ++#define AI_IDN 0x0040 ++#endif ++#ifndef NI_IDN ++#define NI_IDN 32 ++#endif ++ + #define getnameinfo_flags NI_IDN + #else + #define getnameinfo_flags 0 +diff --git a/traceroute6.c b/traceroute6.c +index 7807956..c6d868a 100644 +--- a/traceroute6.c ++++ b/traceroute6.c +@@ -247,6 +247,10 @@ + #include <idna.h> + #include <locale.h> + ++#ifndef NI_IDN ++#define NI_IDN 32 ++#endif ++ + #define getnameinfo_flags NI_IDN + #else + #define getnameinfo_flags 0 +-- +2.14.3 + diff -uNr a/net-misc/iputils/files/iputils-99999999-tracepath46.patch b/net-misc/iputils/files/iputils-99999999-tracepath46.patch --- a/net-misc/iputils/files/iputils-99999999-tracepath46.patch false +++ b/net-misc/iputils/files/iputils-99999999-tracepath46.patch 166dca770106c3bbad048352396baa5a672d33a3d1ef383fb4f2b68dfa9c5ec83a134b064c9c40f61a8135f65cbaa95da42e9394c25631b1f5f4087346177cd7 @@ -0,0 +1,30 @@ +From 2c4d0838dda90515d4971881d86e8b969baebe01 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <whissi@gentoo.org> +Date: Thu, 19 Oct 2017 17:38:20 +0200 +Subject: [PATCH] tracepath: Support calling `tracepath` as `tracepath4` or + `tracepath6` + +--- + tracepath.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/tracepath.c b/tracepath.c +index b0eb911..d2a6edf 100644 +--- a/tracepath.c ++++ b/tracepath.c +@@ -394,6 +394,12 @@ int main(int argc, char **argv) + setlocale(LC_ALL, ""); + #endif + ++ /* Support being called using `tracepath4` or `tracepath6` symlinks */ ++ if (argv[0][strlen(argv[0])-1] == '4') ++ hints.ai_family = AF_INET; ++ else if (argv[0][strlen(argv[0])-1] == '6') ++ hints.ai_family = AF_INET6; ++ + while ((ch = getopt(argc, argv, "46nbh?l:m:p:")) != EOF) { + switch(ch) { + case '4': +-- +2.14.3 + diff -uNr a/net-misc/iputils/files/rarpd.conf.d b/net-misc/iputils/files/rarpd.conf.d --- a/net-misc/iputils/files/rarpd.conf.d false +++ b/net-misc/iputils/files/rarpd.conf.d 1287491d5bfe293f63d8746ace6f524e1a3c4465eecb00b6900d75971439cfa27873d85dff78cb6458201ab53371d0fb8e2da249119d76013d0762cfcbc116bd @@ -0,0 +1,8 @@ +# Config file for /etc/init.d/rarpd + +# You probably want to select the interface for this to listen on. +# By default it uses loopback which most likely won't help. +RARPD_IFACE="lo" + +# See the rarpd(8) manpage for more info. +RARPD_OPTS="-b /tftpboot" diff -uNr a/net-misc/iputils/files/rarpd.init.d b/net-misc/iputils/files/rarpd.init.d --- a/net-misc/iputils/files/rarpd.init.d false +++ b/net-misc/iputils/files/rarpd.init.d 5bce17f1640faf0d6b5d5155997c907852bbd00a05719d5cb20aacf2b77be4dc3e6a3f2b7c19fd0ef60ffa857524d3c6b9f7115973f26624a88255927e3c236c @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +pidfile="/var/run/rarpd.pid" +command="/usr/sbin/rarpd" +# The -d option keeps it from forking. This way s-s-d can do the fork and +# set up the pidfile with the right value below. +command_args="-d ${RARPD_OPTS} ${RARPD_IFACE}" +start_stop_daemon_args="--background --make-pidfile" + +start_pre() { + if [ ! -f /etc/ethers ] ; then + eerror "Please create /etc/ethers with the following content:" + eerror "[MAC address] [name or IP]" + return 1 + fi + return 0 +} diff -uNr a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild --- a/net-misc/iputils/iputils-20171016_pre.ebuild false +++ b/net-misc/iputils/iputils-20171016_pre.ebuild 097981eb957933fc603cea4a6c80f93b8a5926d9d075660380b164739bd66cb4a3eae6a81e4555b2cfa9bb86ef2af2ada33c00b8b70b5353c5c47e015693bb5b @@ -0,0 +1,178 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# For released versions, we precompile the man/html pages and store +# them in a tarball on our mirrors. This avoids ugly issues while +# building stages, and reduces depedencies. +# To regenerate man/html pages emerge iputils-99999999[doc] with +# EGIT_COMMIT set to release tag and tar ${S}/doc folder. + +EAPI="6" + +inherit flag-o-matic toolchain-funcs fcaps + +MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf" + +PATCHES=( + "${FILESDIR}"/${PN}-99999999-tracepath46.patch + "${FILESDIR}"/${PN}-99999999-musl.patch +) + +if [[ ${PV} == "99999999" ]] ; then + EGIT_REPO_URI="https://github.com/iputils/iputils.git" + inherit git-r3 +else + SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Network monitoring tools including ping and ping6" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" + +LICENSE="BSD GPL-2+ rdisc" +SLOT="0" +IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" + +LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) + idn? ( net-dns/libidn:=[static-libs(+)] ) + ipv6? ( ssl? ( + gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) + nettle? ( dev-libs/nettle[static-libs(+)] ) + openssl? ( + !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + ) + ) )" +RDEPEND="arping? ( !net-misc/arping ) + rarpd? ( !net-misc/rarpd ) + traceroute? ( !net-analyzer/traceroute ) + !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/os-headers +" +if [[ ${PV} == "99999999" ]] ; then + DEPEND+="app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + " +fi + +REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )" + +[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" + +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +src_prepare() { + use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) + + default +} + +src_configure() { + use static && append-ldflags -static + + TARGETS=( + ping + $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) + ) + if use ipv6 ; then + TARGETS+=( + $(usex traceroute 'traceroute6' '') + ) + fi + + myconf=( + USE_CRYPTO=no + USE_GCRYPT=no + USE_NETTLE=no + ) + + if use ipv6 && use ssl ; then + myconf=( + USE_CRYPTO=$(usex openssl) + USE_GCRYPT=$(usex gcrypt) + USE_NETTLE=$(usex nettle) + ) + fi +} + +src_compile() { + tc-export CC + emake \ + USE_CAP=$(usex caps) \ + USE_IDN=$(usex idn) \ + IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \ + TARGETS="${TARGETS[*]}" \ + ${myconf[@]} + + if [[ ${PV} == "99999999" ]] ; then + emake man + + use doc && emake html + fi +} + +src_install() { + into / + dobin ping + dosym ping /bin/ping4 + if use ipv6 ; then + dosym ping /bin/ping6 + dosym ping.8 /usr/share/man/man8/ping6.8 + fi + doman doc/ping.8 + + if use arping ; then + dobin arping + doman doc/arping.8 + fi + + into /usr + + if use tracepath ; then + dosbin tracepath + doman doc/tracepath.8 + dosym tracepath /usr/sbin/tracepath4 + fi + + local u + for u in clockdiff rarpd rdisc tftpd ; do + if use ${u} ; then + case ${u} in + clockdiff) dobin ${u};; + *) dosbin ${u};; + esac + doman doc/${u}.8 + fi + done + + if use tracepath && use ipv6 ; then + dosym tracepath /usr/sbin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 + fi + + if use traceroute && use ipv6 ; then + dosbin traceroute6 + doman doc/traceroute6.8 + fi + + if use rarpd ; then + newinitd "${FILESDIR}"/rarpd.init.d rarpd + newconfd "${FILESDIR}"/rarpd.conf.d rarpd + fi + + dodoc INSTALL.md + + use doc && dodoc doc/*.html +} + +pkg_postinst() { + fcaps cap_net_raw \ + bin/ping \ + $(usex arping 'bin/arping' '') \ + $(usex clockdiff 'usr/bin/clockdiff' '') +} diff -uNr a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml --- a/net-misc/iputils/metadata.xml false +++ b/net-misc/iputils/metadata.xml e4e2c0b9256a0f646dffa7feed22fa5934e114ff49711fdbd35894dc3f1b39c0ad8c87733c4b690298346dee8bf84cea255370c8d7ee630675dc26a586655c92 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag> + <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag> + <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for md5 support</flag> + <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for md5 support</flag> + <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for md5 support</flag> + <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag> + <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag> + <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag> + <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag> + <flag name="traceroute">Build and install traceroute -- tool for tracing network paths (see also <pkg>net-analyzer/traceroute</pkg>)</flag> + <flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id> + <remote-id type="github">iputils/iputils</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest --- a/net-misc/netifrc/Manifest false +++ b/net-misc/netifrc/Manifest 2ee558276786a4f8cba18e8b6814e744cfd657ee7d404ce8431b9e7177b907205aac2a115dbd49707abbf47f4eb482f8f4828008590fd7b6695daf42ff9b97ed @@ -0,0 +1,4 @@ +AUX netifrc-0.4.0-interface-types.patch 902 BLAKE2B a0c46f3f55944c1390434906f7d526b2531dca133c5965ea2a34fce1759ebb6db386242c99c20492f8556341722e39a4e549fc5fed80749d3490405f7f7af2ec SHA512 ffc5e805e2130cee1f423bc0e10efc1c63e91ca6e7ac0329c38e9a2ea7e5197873c20a13d9f48c48f7c5927767a5817574d1b43acc2e443e7cdd92867d6b11e5 +DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710 +EBUILD netifrc-0.5.1.ebuild 2120 BLAKE2B 2b713fe73b37fc4910742562f71fdb52485125cd9adbf5e69c669ee1a05c8ec38266b1354e208adc50071c349724738209655ea653532916d2509cec0e7367c9 SHA512 a905529a725ab32d1dbbf34d1710e65a191d77c9c29ad84cd5dcf77f57651ea9be27bbb84bc311d8a27b64c6f1e557c0b29521ff0e20a7b4ab2b36e8cdf1574f +MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5 diff -uNr a/net-misc/netifrc/files/netifrc-0.4.0-interface-types.patch b/net-misc/netifrc/files/netifrc-0.4.0-interface-types.patch --- a/net-misc/netifrc/files/netifrc-0.4.0-interface-types.patch false +++ b/net-misc/netifrc/files/netifrc-0.4.0-interface-types.patch bd950e63f4542dcd2dba56a0ebeccac62a02fddd1ce9a38842d54bfb88f58a5620db19f336fce98f33a4710ec17c89204b0aed7b517366fdf325ab5e6971229a @@ -0,0 +1,26 @@ +From 18dd0598b29d2158529466f1e7097bf894e584dc Mon Sep 17 00:00:00 2001 +From: Andrey Volkov <volkov.am@ekb-info.ru> +Date: Fri, 15 Jul 2016 13:23:56 +0500 +Subject: Fix missing interface types + +(cherry picked from commit c8fe42141c95f5446dabf5c0b1f049151e51c2ad) +--- + net/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/Makefile b/net/Makefile +index a03c171..ce73c1e 100644 +--- a/net/Makefile ++++ b/net/Makefile +@@ -13,7 +13,7 @@ SRCS-Linux= iwconfig.sh.in udhcpc.sh.in + INC-Linux= adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \ + ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \ + ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \ +- vlan.sh macvlan.sh ip6rd.sh firewalld.sh ++ vlan.sh macvlan.sh ip6rd.sh firewalld.sh dummy.sh hsr.sh l2tp.sh + + SRCS-NetBSD= ifwatchd.sh.in + INC-NetBSD= ifwatchd.sh +-- +cgit v0.12 + diff -uNr a/net-misc/netifrc/metadata.xml b/net-misc/netifrc/metadata.xml --- a/net-misc/netifrc/metadata.xml false +++ b/net-misc/netifrc/metadata.xml a727e44fd1dd0749186d6004ce1bc54d1117c4a866dc634a3e194f94d77e72c32e726e0d942892dc7464162fbabfaff76775f199388f530dcace30e433893f87 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>netifrc@gentoo.org</email> + </maintainer> + <longdescription lang="en"> + This package contains the Gentoo network interface management + scripts, which were separated from OpenRC. + </longdescription> +</pkgmetadata> diff -uNr a/net-misc/netifrc/netifrc-0.5.1.ebuild b/net-misc/netifrc/netifrc-0.5.1.ebuild --- a/net-misc/netifrc/netifrc-0.5.1.ebuild false +++ b/net-misc/netifrc/netifrc-0.5.1.ebuild 2dda5d33d3c6bd2c9d6578daf4e8f0a0c3371753d2615c7c2cb3d35d90597497b87bb2b58b6e20cd1313067f6f7500bde808326f2df96f493978a576319f9ea7 @@ -0,0 +1,71 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils systemd udev + +DESCRIPTION="Gentoo Network Interface Management Scripts" +HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git" + #EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="" + +DEPEND="kernel_linux? ( virtual/pkgconfig ) + !<sys-fs/udev-172" +RDEPEND="sys-apps/gentoo-functions + >=sys-apps/openrc-0.15 + !<sys-fs/udev-init-scripts-27" + +src_prepare() { + if [[ ${PV} == "9999" ]] ; then + local ver="git-${EGIT_VERSION:0:6}" + sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die + einfo "Producing ChangeLog from Git history" + GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog + fi + + # Allow user patches to be applied without modifying the ebuild + epatch_user +} + +src_compile() { + MAKE_ARGS="${MAKE_ARGS} + UDEVDIR=${EPREFIX}$(get_udevdir) + LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" + + use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" + + emake ${MAKE_ARGS} all +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install + dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog + + # Install the service file + LIBEXECDIR=${EPREFIX}/lib/${PN} + UNIT_DIR="$(systemd_get_unitdir)" + sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die + systemd_newunit "${T}/net_at.service" 'net@.service' + dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service" +} + +pkg_postinst() { + if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then + elog "The network configuration scripts will use dhcp by" + elog "default to set up your interfaces." + elog "If you need to set up something more complete, see" + elog "${EROOT}/usr/share/doc/${P}/README" + fi +} diff -uNr a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest --- a/net-misc/openssh/Manifest false +++ b/net-misc/openssh/Manifest da0b7b76a94d8a8f915c8cf6a92bd1a838516e8d5388510849694f5307851bc3e18e5dddf755d343a02c3e055ac81abc9d5e3d817bc4ea23c18ffaffce595852 @@ -0,0 +1,31 @@ +AUX openssh-6.7_p1-openssl-ignore-status.patch 765 BLAKE2B 6ddc498cef115a38054eb8f1fddac34048b94592e54f8e31dc11717fe872f3d66a7e6877d2449102fbe18a0ee2a35732991abe946b1fe10abfa48bbec6871b26 SHA512 ab15d6dfdb8d59946684501f6f30ac0eb82676855b7b57f19f2027a7ada072f9062fcb96911111a50cfc3838492faddd282db381ec83d22462644ccddccf0ae7 +AUX openssh-7.3-mips-seccomp-n32.patch 634 BLAKE2B 12e931e6c2364d4cdd3f0d9ef8cf72665b65fedc7e8211a75250abe1bf359460afdf9707fdd7f9be8b8f8fd8fe40fdaddcd842da741c4b63fef94c364738cd26 SHA512 eba3e843d3714501a1df3161d02134c54c8ce584db3af698b87d303fc17c16635bd06db4d7c2d9bb47f461c3b211d870b480fd927f4563207e11c9ed2c446770 +AUX openssh-7.5_p1-CVE-2017-15906.patch 1180 BLAKE2B 37fca347fc1fa969f410d514a76b3d7133914aa14c7ef577e6eb0b2f96b936313b20635c6cc23b5e91e3643e26c899e992b82769a5df6568d058eb4f7a43fab8 SHA512 dfba25e9962e4398688d5e6f9311de44931ea5292d7d50c69d8056838ceb41ce099c44f849c204f7b421515c3aa40bde6e9b98b80b9e99aa113c222841daecd4 +AUX openssh-7.5_p1-GSSAPI-dns.patch 11137 BLAKE2B a54ed4d6f81632ae03523b7b61f750402d178d3213ec310bc0e57c0705ed67607a89a786d429599395722eaf40b2fb591c5b8de87ffc4f1dd7f6713b543c31c2 SHA512 f84e1d3fdda7a534d9351884caaefc136be7599e735200f0393db0acad03a57abe6585f9402018b50e3454e6842c3281d630120d479ff819f591c4693252dd0e +AUX openssh-7.5_p1-cross-cache.patch 1220 BLAKE2B 7176b86024b072ff601421143f8567e4e47de3d89b1d865bc92405da75bf7c64fa50b9f746d9c494dbf64bc09e04afc1960f673e68ea1d072a5381027afea63d SHA512 03cf3b5556fcf43c7053d1550c8aa35189759a0a2274a67427b28176ba7938b8d0019992de25fb614dc556c5f45a67649bb5d2d82889ac2c37edd986fc632550 +AUX openssh-7.5_p1-disable-conch-interop-tests.patch 554 BLAKE2B f5f45c000ec26c1f783669c3447ea3c80c5c0f9b971b86ca1e79e99e906a90a519abb6b14db462f5766572e9759180719ea44f048ef5aa8efc37efb61d2b6ef7 SHA512 f35b15f1e8d0eb276d748ee14c71004c6599ddb124c33e2f84623bc9eb02bb4fd4680d25d0ba0289d6a723a526c95c9a56b30496bdaa565bae853bf3d1bab61f +AUX openssh-7.5_p1-hpn-x509-10.1-glue.patch 2741 BLAKE2B 832a176c8c696981a4668a9c63786d09b6adf89bc82c2a3019d77f8550504c62c86e9ed2aae51d7a4b3054d7d368f79f8af6ac0c234736827872b9ce1ceb04d7 SHA512 940dd448f6768bb3e94987eb86b6002d17d918310ad5c1f38f1b3fd9df263439e0fecb9c8f09c05649bfd03cb507c31ef9320522e946850e954ffdd44fdd4b73 +AUX openssh-7.5_p1-hpn-x509-10.2-glue.patch 2847 BLAKE2B 8a6151ab121871e4f2d93ace0e07dce1106c6841031cacfb197e00cc76fc1d0cf153aae52757dcf98a5fb89971125493d0572bd4964d0e59cb3f391fd1256aef SHA512 bc23fdf5995ae38ff166f12f64082f79a2135ca28f2240e89bee42b1e3ba39ce94467ece9ddea99173f1829b09b069dbf56a0bce7dfd1ae5f63c12f73b5ffba7 +AUX openssh-7.5_p1-libressl_arc4random.patch 1077 BLAKE2B 6f525a3706e0fb5ed65dd8a2f5b5ff4a78502b0dd3badbd8264904d3beea09b17f493653472dbc528d117f62b1cb16c01f50e39568a32937a85abd44d05492bf SHA512 ae1945ab01dbf79dc9400ccb509a13f6f95ca3f9efb4f505ba475192cb7af2e065dde73d09b0c7dfc8bfa65091ddb2c889671e9e7d1079371bd8c66c4d111973 +AUX openssh-7.5_p1-s390-seccomp.patch 624 BLAKE2B 0bf595d72cd65993dde4e5aae0a3e091bb48021ef8affa84c988d55d9fe6a823b0329b6d9707c88e1556d45c304b6630ade7008f63fd649975594a75f570bb33 SHA512 058dc269eb032151e88e0ac79a0b0fd6fcd56d489e90e299ee431b1475a8f8080e8f4649244864af33e743820b081c9f90b32a1a93b8b60feeb491c0201a4d61 +AUX openssh-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e +AUX openssh-7.5p1-x509-libressl.patch 7027 BLAKE2B 28c51fb88259f7fce097e72dbbafb9623935cb8aaa5d9cf13432051971bf78e792c81c6b4ec7c3a90a6dc287dbfd95e13d682f100e2a0d8f13613ec87d728509 SHA512 0b5fcb58ee55de7ce61bf2bcad23e4a5cdc941d81121bbf8f0dadf5e1e158c055f45a2ef1aebe8fcb1856a33e079282f4c9f21d9da6892808d7e3c172dca3365 +AUX openssh-7.6_p1-hpn-x509-11.0-glue.patch 2182 BLAKE2B 02953663257816c71734fc8bf9f9b4619860d75cd49e7758d8895d8368acda7fb8117322747af61cac6a8b57f24a5080397af4307f9f681b0cf25caa75cc9cff SHA512 387222fe9b46f0f2df3cb9f6125995c46f7428955784175c718e902a36e90994f5bcecfbbe160d28fc810e4e43e6f070937c39546f0df36ebb9b47bda3c3e032 +AUX openssh-7.6_p1-permitopen.patch 1857 BLAKE2B f2f7e091b99d96e77ec95353789cfd8051ced60a198219a88ae409cdedde8751af9bea5b048c76a610411f86a4e802e488fb2c5b4045e1410a6b2f2cc1a34227 SHA512 1fc3410f52e86930af5188cadf9e9f1046e7a695639e27b95da9e25a781e8f4445e279c54cd010d280e7b4df58da404b97fce8e6192ae5d456d33b498aaf00c7 +AUX openssh-7.6_p1-warnings.patch 324 BLAKE2B d9fb6e710f797b687b285f70b7c7b32abaa34bd57aeb32558f5d9978df5b5eb5ba5dc1ac8c46ed430619318fa3cfd3475a9c24e3f594ad05d081decd0e4c2f36 SHA512 08a9caf1cbb4dbde2828f14075b41762dad24a8a88882cc61cb133783caa1200f63f052824409b0334c832365c0d934f44b2eeac947228ff52be24a09548cd22 +AUX openssh-7.7_p1-GSSAPI-dns.patch 11342 BLAKE2B e648273cdd04bcd46b25a2ae2b4ffdfff455c7ab04f6c56cb5ad91859231c267211564f6b2785d9fad1b78c4fe0a095302c7acf732357efdb2273ebab9ceebab SHA512 bbfe702786636006dfe4560d8245d9007f9a94768a2df17a3ca3ead7bd1351edd2960f993e322b96828a0054ad55f71fcb77793a05ba2e52d8d9286431cc538a +AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe +AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81 +AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c +AUX sshd.rc6.4 2108 BLAKE2B 55b66dddb45aadccde794667195f716f84c521576d886a3acc56f6f66087f0ff7167bde629c876da4ee1306a4995b8a4cd089eece35037616d17ee4b691b4cf8 SHA512 fe58e950514743a72467233ff2f2a63112c50e5db843d61e141a5ca3dd8ef8f42a616cd9de7748ae582054c47c2cc38ce48b638e2d88be39c1387f77e79c83e1 +AUX sshd.rc6.5 2723 BLAKE2B 3509a84c3f3d09ac3946f3e59c07ce615fb263ed7580815384589b9451e4c3df9c6c82a6d7cbd738e87d8b2dd2a4e7907e59b179250c828a191e395e25900fa9 SHA512 b65910477e6d255cb0eb8a49ffd2c43b1d8876f9e6cf8dd4c7161dbedd17ed757aea7ead4ebecc29d830e2675f66a0974c063fbcf93849c06f1599cbf0ff9d1b +AUX sshd.service 242 BLAKE2B e77eb1e0adad0641b60a59d243e911e0a6286a87acda25f3e478582068d8a7a2a12ec88e14bf2c01c7f4c2025ce2d2ce1b1273a93c096bc96da47a69878a823e SHA512 77f50c85a2c944995a39819916eb860cfdc1aff90986e93282e669a0de73c287ecb92d550fd118cfcc8ab538eab677e0d103b23cd959b7e8d9801bc37250c39c +AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42 +AUX sshd_at.service 176 BLAKE2B 316c2de6af05e97ad2271dfda9fc3276b5c049aa1e56ea7c4acc20d5dd6f4444b0ed3122db90959dc8c009e36f59dbe8e8b969f21eaca98c513ac46b4f80f46e SHA512 662a9c2668902633e6dbcb9435ac35bec3e224afdb2ab6a1df908618536ae9fc1958ba1d611e146c01fddb0c8f41eefdc26de78f45b7f165b1d6b2ee2f23be2a +DIST openssh-7.7p1-hpnssh14v15-gentoo2.patch.xz 22060 BLAKE2B 9ee654f689d4b90bd0fe4f71d57b4a8d9d957012be3a23ff2baa6c45ae99e2f1e4daf5de24479a6a3eb761ee6847deb3c6c3021d4cbabc9089f605d8d7270efc SHA512 856d28ac89c14d01c40c7d7e93cfaebd74b091188b5b469550eb62aa5445177aec1a5f47c1e2f7173013712e98e5f9f5e46bbb3dbd4ec7c5ee8256ef45cda0f8 +DIST openssh-7.7p1-patches-1.1.tar.xz 16476 BLAKE2B fca2885a9e29faec40700ece37a995ba83e40bd2a6875129a5327770d8ee43663a7c063de33b4653994ed7332adb03730f613c047550d874190b95c66e2e9efa SHA512 aa5e33ce4bb4be16abf27ac1bade1dc85c51d82002be546402e0b8b0685de3ec7029f0f56bf1295ec346eb3960a6bed7cfc882722e57957a19a732f3174b3039 +DIST openssh-7.7p1-sctp-1.1.patch.xz 7548 BLAKE2B 3b960c2377351955007005de560c2a3e8d0d059a0435e5beda14c63e444dad8b4357edaccd1cfe446c6268514f152b2bcfa7fa3612f1ae1324a31fecb0e85ac5 SHA512 093605865262a2b972db8c92990a49ed6178ed4567fb2626518c826c8472553d9be99a9e6052a6f5e545d81867b4118e9fd8a2c0c26a2739f1720b0f13282cba +DIST openssh-7.7p1-x509-11.3.1.patch.xz 362672 BLAKE2B 55b8b0ef00dc4d962a0db1115406b7b1e84110870c74198e9e4cb081b2ffde8daca67cb281c69d73b4c5cbffde361429d62634be194b57e888a0b434a0f42a37 SHA512 f84744f6d2e5a15017bce37bfa65ebb47dbafeac07ea9aab46bdc780b4062ff70687512d9d512cab81e3b9c701adb6ce17c5474f35cb4b49f57db2e2d45ac9ac +DIST openssh-7.7p1.tar.gz 1536900 BLAKE2B 7aee360f2cea5bfa3f8426fcbd66fde2568f05f9c8e623326b60f03b7c5f8abf223e178aa1d5958015b51627565bf5b1ace35b57f309638c908f5a7bf5500d21 SHA512 597252cb48209a0cb98ca1928a67e8d63e4275252f25bc37269204c108f034baade6ba0634e32ae63422fddd280f73096a6b31ad2f2e7a848dde75ca30e14261 +EBUILD openssh-7.7_p1-r6.ebuild 16414 BLAKE2B d457f4c48a544765677fa52e12a6289bc0f23da70807dfd55c41aef71c11b1ef98dcdbd272cf4b6c288d96fb5e24cfba62af0791d2ed4801f139ebc448322522 SHA512 5b948a0abf549bfccb133e813281dff6573eb59a9dc74ce60fb5236d1c41d7f34f0508d513c9fe04839baf0c21e10a7187dff7485c2039fa5cf2566340d6e13e +MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5 diff -uNr a/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch b/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch --- a/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch false +++ b/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch 5a1a81bfa36cd9092d32c402a24d94e371aa8103c3d5b89fd2efa77ffa1d167d9a636d1ac2ba1574648f932896f80d0189af13b5d36e669daa4d393bfd1722e4 @@ -0,0 +1,17 @@ +the last nibble of the openssl version represents the status. that is, +whether it is a beta or release. when it comes to version checks in +openssh, this component does not matter, so ignore it. + +https://bugzilla.mindrot.org/show_bug.cgi?id=2212 + +--- a/openbsd-compat/openssl-compat.c ++++ b/openbsd-compat/openssl-compat.c +@@ -58,7 +58,7 @@ ssh_compatible_openssl(long headerver, long libver) + * For versions >= 1.0.0, major,minor,status must match and library + * fix version must be equal to or newer than the header. + */ +- mask = 0xfff0000fL; /* major,minor,status */ ++ mask = 0xfff00000L; /* major,minor,status */ + hfix = (headerver & 0x000ff000) >> 12; + lfix = (libver & 0x000ff000) >> 12; + if ( (headerver & mask) == (libver & mask) && lfix >= hfix) diff -uNr a/net-misc/openssh/files/openssh-7.3-mips-seccomp-n32.patch b/net-misc/openssh/files/openssh-7.3-mips-seccomp-n32.patch --- a/net-misc/openssh/files/openssh-7.3-mips-seccomp-n32.patch false +++ b/net-misc/openssh/files/openssh-7.3-mips-seccomp-n32.patch b0dc687b5fe1e02956d8685f280f19eda0bf8b6b2338a70cc0fdda15c6173dc278c3db0f87a4d6747a75f163b61affd1c69adad98a77fabdafe0f03408ec1e7b @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/591392 +https://bugzilla.mindrot.org/show_bug.cgi?id=2590 + +7.3 added seccomp support to MIPS, but failed to handled the N32 +case. This patch is temporary until upstream fixes. + +--- openssh-7.3p1/configure.ac ++++ openssh-7.3p1/configure.ac +@@ -816,10 +816,10 @@ main() { if (NSVersionOfRunTimeLibrary(" + seccomp_audit_arch=AUDIT_ARCH_MIPSEL + ;; + mips64-*) +- seccomp_audit_arch=AUDIT_ARCH_MIPS64 ++ seccomp_audit_arch=AUDIT_ARCH_MIPS64N32 + ;; + mips64el-*) +- seccomp_audit_arch=AUDIT_ARCH_MIPSEL64 ++ seccomp_audit_arch=AUDIT_ARCH_MIPSEL64N32 + ;; + esac + if test "x$seccomp_audit_arch" != "x" ; then diff -uNr a/net-misc/openssh/files/openssh-7.5_p1-CVE-2017-15906.patch b/net-misc/openssh/files/openssh-7.5_p1-CVE-2017-15906.patch --- a/net-misc/openssh/files/openssh-7.5_p1-CVE-2017-15906.patch false +++ b/net-misc/openssh/files/openssh-7.5_p1-CVE-2017-15906.patch 535d786056e49693d595a29d21853d2c84c3f81723b80e226454274866a0470fa7d766737ae54b67e4932c2a4eb007343158f6c8e61a6b7d84bf0c653f230cb5 @@ -0,0 +1,31 @@ +From a6981567e8e215acc1ef690c8dbb30f2d9b00a19 Mon Sep 17 00:00:00 2001 +From: djm <djm@openbsd.org> +Date: Tue, 4 Apr 2017 00:24:56 +0000 +Subject: [PATCH] disallow creation (of empty files) in read-only mode; + reported by Michal Zalewski, feedback & ok deraadt@ + +--- + usr.bin/ssh/sftp-server.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c +index 2510d234a3a..42249ebd60d 100644 +--- a/usr.bin/ssh/sftp-server.c ++++ b/usr.bin/ssh/sftp-server.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: sftp-server.c,v 1.110 2016/09/12 01:22:38 deraadt Exp $ */ ++/* $OpenBSD: sftp-server.c,v 1.111 2017/04/04 00:24:56 djm Exp $ */ + /* + * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. + * +@@ -683,8 +683,8 @@ process_open(u_int32_t id) + logit("open \"%s\" flags %s mode 0%o", + name, string_from_portable(pflags), mode); + if (readonly && +- ((flags & O_ACCMODE) == O_WRONLY || +- (flags & O_ACCMODE) == O_RDWR)) { ++ ((flags & O_ACCMODE) != O_RDONLY || ++ (flags & (O_CREAT|O_TRUNC)) != 0)) { + verbose("Refusing open request in read-only mode"); + status = SSH2_FX_PERMISSION_DENIED; + } else { diff -uNr a/net-misc/openssh/files/openssh-7.5_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-7.5_p1-GSSAPI-dns.patch --- a/net-misc/openssh/files/openssh-7.5_p1-GSSAPI-dns.patch false +++ b/net-misc/openssh/files/openssh-7.5_p1-GSSAPI-dns.patch d22d7cb25363431a8009046f0aeac0ce652dd9d04e9497bf8f1ff644b4de9ade90c48c1158bb6129f61495dc611b14f305072392bd3dcdddd4f535ddc203ca03 @@ -0,0 +1,351 @@ +http://bugs.gentoo.org/165444 +https://bugzilla.mindrot.org/show_bug.cgi?id=1008 + +--- a/readconf.c ++++ b/readconf.c +@@ -148,6 +148,7 @@ + oClearAllForwardings, oNoHostAuthenticationForLocalhost, + oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, + oAddressFamily, oGssAuthentication, oGssDelegateCreds, ++ oGssTrustDns, + oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, + oSendEnv, oControlPath, oControlMaster, oControlPersist, + oHashKnownHosts, +@@ -194,9 +195,11 @@ + #if defined(GSSAPI) + { "gssapiauthentication", oGssAuthentication }, + { "gssapidelegatecredentials", oGssDelegateCreds }, ++ { "gssapitrustdns", oGssTrustDns }, + # else + { "gssapiauthentication", oUnsupported }, + { "gssapidelegatecredentials", oUnsupported }, ++ { "gssapitrustdns", oUnsupported }, + #endif + #ifdef ENABLE_PKCS11 + { "smartcarddevice", oPKCS11Provider }, +@@ -930,6 +933,10 @@ + intptr = &options->gss_deleg_creds; + goto parse_flag; + ++ case oGssTrustDns: ++ intptr = &options->gss_trust_dns; ++ goto parse_flag; ++ + case oBatchMode: + intptr = &options->batch_mode; + goto parse_flag; +@@ -1649,6 +1656,7 @@ + options->challenge_response_authentication = -1; + options->gss_authentication = -1; + options->gss_deleg_creds = -1; ++ options->gss_trust_dns = -1; + options->password_authentication = -1; + options->kbd_interactive_authentication = -1; + options->kbd_interactive_devices = NULL; +@@ -1779,6 +1787,8 @@ + options->gss_authentication = 0; + if (options->gss_deleg_creds == -1) + options->gss_deleg_creds = 0; ++ if (options->gss_trust_dns == -1) ++ options->gss_trust_dns = 0; + if (options->password_authentication == -1) + options->password_authentication = 1; + if (options->kbd_interactive_authentication == -1) +--- a/readconf.h ++++ b/readconf.h +@@ -46,6 +46,7 @@ + /* Try S/Key or TIS, authentication. */ + int gss_authentication; /* Try GSS authentication */ + int gss_deleg_creds; /* Delegate GSS credentials */ ++ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ + int password_authentication; /* Try password + * authentication. */ + int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ +--- a/ssh_config.5 ++++ b/ssh_config.5 +@@ -830,6 +830,16 @@ + Forward (delegate) credentials to the server. + The default is + .Cm no . ++Note that this option applies to protocol version 2 connections using GSSAPI. ++.It Cm GSSAPITrustDns ++Set to ++.Dq yes to indicate that the DNS is trusted to securely canonicalize ++the name of the host being connected to. If ++.Dq no, the hostname entered on the ++command line will be passed untouched to the GSSAPI library. ++The default is ++.Dq no . ++This option only applies to protocol version 2 connections using GSSAPI. + .It Cm HashKnownHosts + Indicates that + .Xr ssh 1 +--- a/sshconnect2.c ++++ b/sshconnect2.c +@@ -656,6 +656,13 @@ + static u_int mech = 0; + OM_uint32 min; + int ok = 0; ++ const char *gss_host; ++ ++ if (options.gss_trust_dns) { ++ extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns); ++ gss_host = auth_get_canonical_hostname(active_state, 1); ++ } else ++ gss_host = authctxt->host; + + /* Try one GSSAPI method at a time, rather than sending them all at + * once. */ +@@ -668,7 +674,7 @@ + /* My DER encoding requires length<128 */ + if (gss_supported->elements[mech].length < 128 && + ssh_gssapi_check_mechanism(&gssctxt, +- &gss_supported->elements[mech], authctxt->host)) { ++ &gss_supported->elements[mech], gss_host)) { + ok = 1; /* Mechanism works */ + } else { + mech++; + +need to move these two funcs back to canohost so they're available to clients +and the server. auth.c is only used in the server. + +--- a/auth.c ++++ b/auth.c +@@ -784,117 +784,3 @@ fakepw(void) + + return (&fake); + } +- +-/* +- * Returns the remote DNS hostname as a string. The returned string must not +- * be freed. NB. this will usually trigger a DNS query the first time it is +- * called. +- * This function does additional checks on the hostname to mitigate some +- * attacks on legacy rhosts-style authentication. +- * XXX is RhostsRSAAuthentication vulnerable to these? +- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) +- */ +- +-static char * +-remote_hostname(struct ssh *ssh) +-{ +- struct sockaddr_storage from; +- socklen_t fromlen; +- struct addrinfo hints, *ai, *aitop; +- char name[NI_MAXHOST], ntop2[NI_MAXHOST]; +- const char *ntop = ssh_remote_ipaddr(ssh); +- +- /* Get IP address of client. */ +- fromlen = sizeof(from); +- memset(&from, 0, sizeof(from)); +- if (getpeername(ssh_packet_get_connection_in(ssh), +- (struct sockaddr *)&from, &fromlen) < 0) { +- debug("getpeername failed: %.100s", strerror(errno)); +- return strdup(ntop); +- } +- +- ipv64_normalise_mapped(&from, &fromlen); +- if (from.ss_family == AF_INET6) +- fromlen = sizeof(struct sockaddr_in6); +- +- debug3("Trying to reverse map address %.100s.", ntop); +- /* Map the IP address to a host name. */ +- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), +- NULL, 0, NI_NAMEREQD) != 0) { +- /* Host name not found. Use ip address. */ +- return strdup(ntop); +- } +- +- /* +- * if reverse lookup result looks like a numeric hostname, +- * someone is trying to trick us by PTR record like following: +- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 +- */ +- memset(&hints, 0, sizeof(hints)); +- hints.ai_socktype = SOCK_DGRAM; /*dummy*/ +- hints.ai_flags = AI_NUMERICHOST; +- if (getaddrinfo(name, NULL, &hints, &ai) == 0) { +- logit("Nasty PTR record \"%s\" is set up for %s, ignoring", +- name, ntop); +- freeaddrinfo(ai); +- return strdup(ntop); +- } +- +- /* Names are stored in lowercase. */ +- lowercase(name); +- +- /* +- * Map it back to an IP address and check that the given +- * address actually is an address of this host. This is +- * necessary because anyone with access to a name server can +- * define arbitrary names for an IP address. Mapping from +- * name to IP address can be trusted better (but can still be +- * fooled if the intruder has access to the name server of +- * the domain). +- */ +- memset(&hints, 0, sizeof(hints)); +- hints.ai_family = from.ss_family; +- hints.ai_socktype = SOCK_STREAM; +- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { +- logit("reverse mapping checking getaddrinfo for %.700s " +- "[%s] failed.", name, ntop); +- return strdup(ntop); +- } +- /* Look for the address from the list of addresses. */ +- for (ai = aitop; ai; ai = ai->ai_next) { +- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, +- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && +- (strcmp(ntop, ntop2) == 0)) +- break; +- } +- freeaddrinfo(aitop); +- /* If we reached the end of the list, the address was not there. */ +- if (ai == NULL) { +- /* Address not found for the host name. */ +- logit("Address %.100s maps to %.600s, but this does not " +- "map back to the address.", ntop, name); +- return strdup(ntop); +- } +- return strdup(name); +-} +- +-/* +- * Return the canonical name of the host in the other side of the current +- * connection. The host name is cached, so it is efficient to call this +- * several times. +- */ +- +-const char * +-auth_get_canonical_hostname(struct ssh *ssh, int use_dns) +-{ +- static char *dnsname; +- +- if (!use_dns) +- return ssh_remote_ipaddr(ssh); +- else if (dnsname != NULL) +- return dnsname; +- else { +- dnsname = remote_hostname(ssh); +- return dnsname; +- } +-} +--- a/canohost.c ++++ b/canohost.c +@@ -202,3 +202,117 @@ get_local_port(int sock) + { + return get_sock_port(sock, 1); + } ++ ++/* ++ * Returns the remote DNS hostname as a string. The returned string must not ++ * be freed. NB. this will usually trigger a DNS query the first time it is ++ * called. ++ * This function does additional checks on the hostname to mitigate some ++ * attacks on legacy rhosts-style authentication. ++ * XXX is RhostsRSAAuthentication vulnerable to these? ++ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) ++ */ ++ ++static char * ++remote_hostname(struct ssh *ssh) ++{ ++ struct sockaddr_storage from; ++ socklen_t fromlen; ++ struct addrinfo hints, *ai, *aitop; ++ char name[NI_MAXHOST], ntop2[NI_MAXHOST]; ++ const char *ntop = ssh_remote_ipaddr(ssh); ++ ++ /* Get IP address of client. */ ++ fromlen = sizeof(from); ++ memset(&from, 0, sizeof(from)); ++ if (getpeername(ssh_packet_get_connection_in(ssh), ++ (struct sockaddr *)&from, &fromlen) < 0) { ++ debug("getpeername failed: %.100s", strerror(errno)); ++ return strdup(ntop); ++ } ++ ++ ipv64_normalise_mapped(&from, &fromlen); ++ if (from.ss_family == AF_INET6) ++ fromlen = sizeof(struct sockaddr_in6); ++ ++ debug3("Trying to reverse map address %.100s.", ntop); ++ /* Map the IP address to a host name. */ ++ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), ++ NULL, 0, NI_NAMEREQD) != 0) { ++ /* Host name not found. Use ip address. */ ++ return strdup(ntop); ++ } ++ ++ /* ++ * if reverse lookup result looks like a numeric hostname, ++ * someone is trying to trick us by PTR record like following: ++ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 ++ */ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_socktype = SOCK_DGRAM; /*dummy*/ ++ hints.ai_flags = AI_NUMERICHOST; ++ if (getaddrinfo(name, NULL, &hints, &ai) == 0) { ++ logit("Nasty PTR record \"%s\" is set up for %s, ignoring", ++ name, ntop); ++ freeaddrinfo(ai); ++ return strdup(ntop); ++ } ++ ++ /* Names are stored in lowercase. */ ++ lowercase(name); ++ ++ /* ++ * Map it back to an IP address and check that the given ++ * address actually is an address of this host. This is ++ * necessary because anyone with access to a name server can ++ * define arbitrary names for an IP address. Mapping from ++ * name to IP address can be trusted better (but can still be ++ * fooled if the intruder has access to the name server of ++ * the domain). ++ */ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_family = from.ss_family; ++ hints.ai_socktype = SOCK_STREAM; ++ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { ++ logit("reverse mapping checking getaddrinfo for %.700s " ++ "[%s] failed.", name, ntop); ++ return strdup(ntop); ++ } ++ /* Look for the address from the list of addresses. */ ++ for (ai = aitop; ai; ai = ai->ai_next) { ++ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, ++ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && ++ (strcmp(ntop, ntop2) == 0)) ++ break; ++ } ++ freeaddrinfo(aitop); ++ /* If we reached the end of the list, the address was not there. */ ++ if (ai == NULL) { ++ /* Address not found for the host name. */ ++ logit("Address %.100s maps to %.600s, but this does not " ++ "map back to the address.", ntop, name); ++ return strdup(ntop); ++ } ++ return strdup(name); ++} ++ ++/* ++ * Return the canonical name of the host in the other side of the current ++ * connection. The host name is cached, so it is efficient to call this ++ * several times. ++ */ ++ ++const char * ++auth_get_canonical_hostname(struct ssh *ssh, int use_dns) ++{ ++ static char *dnsname; ++ ++ if (!use_dns) ++ return ssh_remote_ipaddr(ssh); ++ else if (dnsname != NULL) ++ return dnsname; ++ else { ++ dnsname = remote_hostname(ssh); ++ return dnsname; ++ } ++} diff -uNr a/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch b/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch --- a/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch false +++ b/net-misc/openssh/files/openssh-7.5_p1-cross-cache.patch 8ba444b7af70de00751e63782e9b3ca4af3b7c65456ae1a1b530907f5c33271b90737919bc841104bc33fe205f825aaa9b2c96d1be196bb1824e67c43e5d7d5c @@ -0,0 +1,39 @@ +From d588d6f83e9a3d48286929b4a705b43e74414241 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@chromium.org> +Date: Wed, 24 May 2017 23:18:41 -0400 +Subject: [PATCH] configure: actually set cache vars when cross-compiling + +The cross-compiling fallback message says it's assuming the test +passed, but it didn't actually set the cache var which causes +later tests to fail. +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5cfea38c0a6c..895c5211ea93 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3162,7 +3162,8 @@ AC_RUN_IFELSE( + select_works_with_rlimit=yes], + [AC_MSG_RESULT([no]) + select_works_with_rlimit=no], +- [AC_MSG_WARN([cross compiling: assuming yes])] ++ [AC_MSG_WARN([cross compiling: assuming yes]) ++ select_works_with_rlimit=yes] + ) + + AC_MSG_CHECKING([if setrlimit(RLIMIT_NOFILE,{0,0}) works]) +@@ -3188,7 +3189,8 @@ AC_RUN_IFELSE( + rlimit_nofile_zero_works=yes], + [AC_MSG_RESULT([no]) + rlimit_nofile_zero_works=no], +- [AC_MSG_WARN([cross compiling: assuming yes])] ++ [AC_MSG_WARN([cross compiling: assuming yes]) ++ rlimit_nofile_zero_works=yes] + ) + + AC_MSG_CHECKING([if setrlimit RLIMIT_FSIZE works]) +-- +2.12.0 + diff -uNr a/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch b/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch --- a/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch false +++ b/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch 14fa6601425612f45f5e4c8b40b7c8c6ae4c984ca850341df15122422431c8de7d64aeb5ee695db36a8d6f9e512a4cc0695f56fbac1b7657d11f06014f857de8 @@ -0,0 +1,20 @@ +Disable conch interop tests which are failing when called +via portage for yet unknown reason and because using conch +seems to be flaky (test is failing when using Python2 but +passing when using Python3). + +Bug: https://bugs.gentoo.org/605446 + +--- a/regress/conch-ciphers.sh ++++ b/regress/conch-ciphers.sh +@@ -3,6 +3,10 @@ + + tid="conch ciphers" + ++# https://bugs.gentoo.org/605446 ++echo "conch interop tests skipped due to Gentoo bug #605446" ++exit 0 ++ + if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then + echo "conch interop tests not enabled" + exit 0 diff -uNr a/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch --- a/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch false +++ b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch 4c600526220bfea6467510b986c687215480a82a15064c179c487d0d018a376f01d2c0a2e02ce0d09d075bcbb861bb0410973f1317f7d2b79555d907a39c1010 @@ -0,0 +1,63 @@ +diff -ur a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch +--- a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch 2017-03-27 13:31:01.816551100 -0700 ++++ b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch 2017-03-27 13:51:03.894805846 -0700 +@@ -40,7 +40,7 @@ + @@ -44,7 +44,7 @@ CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ +- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ ++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ + -LIBS=@LIBS@ + +LIBS=@LIBS@ -lpthread + K5LIBS=@K5LIBS@ +@@ -1023,6 +1023,3 @@ + do_authenticated(authctxt); + + /* The connection has been terminated. */ +--- +-2.12.0 +- +diff -ur a/0004-support-dynamically-sized-receive-buffers.patch b/0004-support-dynamically-sized-receive-buffers.patch +--- a/0004-support-dynamically-sized-receive-buffers.patch 2017-03-27 13:31:01.816551100 -0700 ++++ b/0004-support-dynamically-sized-receive-buffers.patch 2017-03-27 13:49:44.513498976 -0700 +@@ -926,9 +926,9 @@ + @@ -526,10 +553,10 @@ send_client_banner(int connection_out, int minor1) + /* Send our own protocol version identification. */ + if (compat20) { +- xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", +-- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); +-+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); ++ xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n", ++- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION); +++ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION); + } else { + xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", + - PROTOCOL_MAJOR_1, minor1, SSH_VERSION); +@@ -943,11 +943,11 @@ + @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) + char remote_version[256]; /* Must be at least as big as buf. */ + +- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", +-- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, +-+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, ++ xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s", ++- major, minor, SSH_VERSION, comment, +++ major, minor, SSH_RELEASE, comment, + *options.version_addendum == '\0' ? "" : " ", +- options.version_addendum); ++ options.version_addendum, newline); + + @@ -1020,6 +1020,8 @@ server_listen(void) + int ret, listen_sock, on = 1; +@@ -1008,10 +1008,6 @@ + @@ -3,4 +3,5 @@ + #define SSH_VERSION "OpenSSH_7.5" + +- #define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ++-#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + +#define SSH_HPN "-hpn14v12" + +#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN +--- +-2.12.0 +- diff -uNr a/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.2-glue.patch b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.2-glue.patch --- a/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.2-glue.patch false +++ b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.2-glue.patch 61bb022c9bc702b1157e6ad1488c7a35e4511d2449f5e8cd27fc9144a313c43ccc00bc163334d08ce3b24c8c64b6c025574521293fa48abaa46b527d6ecf7d4f @@ -0,0 +1,67 @@ +diff -ur a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch +--- a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch 2017-03-27 13:31:01.816551100 -0700 ++++ b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch 2017-03-27 13:51:03.894805846 -0700 +@@ -40,7 +40,7 @@ + @@ -44,7 +44,7 @@ CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ +- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ ++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ + -LIBS=@LIBS@ + +LIBS=@LIBS@ -lpthread + K5LIBS=@K5LIBS@ +@@ -1023,6 +1023,3 @@ + do_authenticated(authctxt); + + /* The connection has been terminated. */ +--- +-2.12.0 +- +diff -ur a/0004-support-dynamically-sized-receive-buffers.patch b/0004-support-dynamically-sized-receive-buffers.patch +--- a/0004-support-dynamically-sized-receive-buffers.patch 2017-03-27 13:31:01.816551100 -0700 ++++ b/0004-support-dynamically-sized-receive-buffers.patch 2017-03-27 13:49:44.513498976 -0700 +@@ -926,9 +926,9 @@ + @@ -526,10 +553,10 @@ send_client_banner(int connection_out, int minor1) + /* Send our own protocol version identification. */ + if (compat20) { +- xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", +-- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); +-+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); ++ xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n", ++- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION); +++ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION); + } else { + xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", + - PROTOCOL_MAJOR_1, minor1, SSH_VERSION); +@@ -943,11 +943,11 @@ + @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) + char remote_version[256]; /* Must be at least as big as buf. */ + +- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", +-- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, +-+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, ++ xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s%s", ++- major, minor, SSH_VERSION, pkix_comment, +++ major, minor, SSH_RELEASE, pkix_comment, + *options.version_addendum == '\0' ? "" : " ", +- options.version_addendum); ++ options.version_addendum, newline); + + @@ -1020,6 +1020,8 @@ server_listen(void) + int ret, listen_sock, on = 1; +@@ -1006,12 +1008,9 @@ + --- a/version.h + +++ b/version.h +-@@ -3,4 +3,5 @@ ++@@ -3,4 +3,6 @@ + #define SSH_VERSION "OpenSSH_7.5" + +- #define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ++-#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" +++#define SSH_X509 ", PKIX-SSH " PACKAGE_VERSION + +#define SSH_HPN "-hpn14v12" + +#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN +--- +-2.12.0 +- diff -uNr a/net-misc/openssh/files/openssh-7.5_p1-libressl_arc4random.patch b/net-misc/openssh/files/openssh-7.5_p1-libressl_arc4random.patch --- a/net-misc/openssh/files/openssh-7.5_p1-libressl_arc4random.patch false +++ b/net-misc/openssh/files/openssh-7.5_p1-libressl_arc4random.patch 77b101fdf57f3e9784ba67aa0762695f3d54f830e4a346b942b93e2d6912ed500bf5382f155c853fcd34e790751cd194f3fafd66fc5a1eb78d8469966fe13391 @@ -0,0 +1,36 @@ +--- a/openbsd-compat/openbsd-compat.h ++++ b/openbsd-compat/openbsd-compat.h +@@ -179,20 +179,25 @@ int writev(int, struct iovec *, int); + int getpeereid(int , uid_t *, gid_t *); + #endif + +-#ifdef HAVE_ARC4RANDOM +-# ifndef HAVE_ARC4RANDOM_STIR +-# define arc4random_stir() +-# endif +-#else ++#if !defined(HAVE_ARC4RANDOM) || defined(LIBRESSL_VERSION_NUMBER) + unsigned int arc4random(void); ++#endif ++ ++#if defined(HAVE_ARC4RANDOM_STIR) + void arc4random_stir(void); +-#endif /* !HAVE_ARC4RANDOM */ ++#elif defined(HAVE_ARC4RANDOM) || defined(LIBRESSL_VERSION_NUMBER) ++/* Recent system/libressl implementation; no need for explicit stir */ ++# define arc4random_stir() ++#else ++/* openbsd-compat/arc4random.c provides arc4random_stir() */ ++void arc4random_stir(void); ++#endif + +-#ifndef HAVE_ARC4RANDOM_BUF ++#if !defined(HAVE_ARC4RANDOM_BUF) || defined(LIBRESSL_VERSION_NUMBER) + void arc4random_buf(void *, size_t); + #endif + +-#ifndef HAVE_ARC4RANDOM_UNIFORM ++#if !defined(HAVE_ARC4RANDOM_UNIFORM) || defined(LIBRESSL_VERSION_NUMBER) + u_int32_t arc4random_uniform(u_int32_t); + #endif + diff -uNr a/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch b/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch --- a/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch false +++ b/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch 8fdc3c79d4f74fd63648b4fa36e96ef2380baae1a5966957a4fa08bdd4af8ed98f0cd959cf9fdf56758255aa6df369ae5a6bc1b0601f28260012a7d8d1b401a8 @@ -0,0 +1,27 @@ +From 58b8cfa2a062b72139d7229ae8de567f55776f24 Mon Sep 17 00:00:00 2001 +From: Damien Miller <djm@mindrot.org> +Date: Wed, 22 Mar 2017 12:43:02 +1100 +Subject: [PATCH] Missing header on Linux/s390 + +Patch from Jakub Jelen +--- + sandbox-seccomp-filter.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index a8d472a63ccb..2831e9d1083c 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -50,6 +50,9 @@ + #include <elf.h> + + #include <asm/unistd.h> ++#ifdef __s390__ ++#include <asm/zcrypt.h> ++#endif + + #include <errno.h> + #include <signal.h> +-- +2.15.1 + diff -uNr a/net-misc/openssh/files/openssh-7.5_p1-x32-typo.patch b/net-misc/openssh/files/openssh-7.5_p1-x32-typo.patch --- a/net-misc/openssh/files/openssh-7.5_p1-x32-typo.patch false +++ b/net-misc/openssh/files/openssh-7.5_p1-x32-typo.patch 74505d936a6892c8cff6035be37acdc65fb9631cf441f1f280572c8a8ea89c63e50081811f35f63d1ffecb86763314ec40a70a636df2bd8105b8d486a15f7487 @@ -0,0 +1,25 @@ +From 596c432181e1c4a9da354388394f640afd29f44b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 20 Mar 2017 14:57:40 -0400 +Subject: [PATCH] seccomp sandbox: fix typo w/x32 check + +--- + sandbox-seccomp-filter.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 3a1aedce72c2..a8d472a63ccb 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -235,7 +235,7 @@ static const struct sock_filter preauth_insns[] = { + * x86-64 syscall under some circumstances, e.g. + * https://bugs.debian.org/849923 + */ +- SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT); ++ SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT), + #endif + + /* Default deny */ +-- +2.12.0 + diff -uNr a/net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch b/net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch --- a/net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch false +++ b/net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch 6b142cbf67c98e522d1a606431f2df3e2469057af0537740a2f1900ccfa0760b5953f2f3029728c3328ee3f84b21f29fac21c97a5a922b5dad2a95ee865408aa @@ -0,0 +1,202 @@ +diff -urN openssh-7.5p1.orig/a_utf8.c openssh-7.5p1/a_utf8.c +--- openssh-7.5p1.orig/a_utf8.c 1970-01-01 00:00:00.000000000 +0000 ++++ openssh-7.5p1/a_utf8.c 2017-03-30 17:38:25.179532110 +0000 +@@ -0,0 +1,186 @@ ++/* ++ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. ++ * ++ * Licensed under the OpenSSL license (the "License"). You may not use ++ * this file except in compliance with the License. You can obtain a copy ++ * in the file LICENSE in the source distribution or at ++ * https://www.openssl.org/source/license.html ++ */ ++ ++#include <stdio.h> ++ ++/* UTF8 utilities */ ++ ++/*- ++ * This parses a UTF8 string one character at a time. It is passed a pointer ++ * to the string and the length of the string. It sets 'value' to the value of ++ * the current character. It returns the number of characters read or a ++ * negative error code: ++ * -1 = string too short ++ * -2 = illegal character ++ * -3 = subsequent characters not of the form 10xxxxxx ++ * -4 = character encoded incorrectly (not minimal length). ++ */ ++ ++int UTF8_getc(const unsigned char *str, int len, unsigned long *val) ++{ ++ const unsigned char *p; ++ unsigned long value; ++ int ret; ++ if (len <= 0) ++ return 0; ++ p = str; ++ ++ /* Check syntax and work out the encoded value (if correct) */ ++ if ((*p & 0x80) == 0) { ++ value = *p++ & 0x7f; ++ ret = 1; ++ } else if ((*p & 0xe0) == 0xc0) { ++ if (len < 2) ++ return -1; ++ if ((p[1] & 0xc0) != 0x80) ++ return -3; ++ value = (*p++ & 0x1f) << 6; ++ value |= *p++ & 0x3f; ++ if (value < 0x80) ++ return -4; ++ ret = 2; ++ } else if ((*p & 0xf0) == 0xe0) { ++ if (len < 3) ++ return -1; ++ if (((p[1] & 0xc0) != 0x80) ++ || ((p[2] & 0xc0) != 0x80)) ++ return -3; ++ value = (*p++ & 0xf) << 12; ++ value |= (*p++ & 0x3f) << 6; ++ value |= *p++ & 0x3f; ++ if (value < 0x800) ++ return -4; ++ ret = 3; ++ } else if ((*p & 0xf8) == 0xf0) { ++ if (len < 4) ++ return -1; ++ if (((p[1] & 0xc0) != 0x80) ++ || ((p[2] & 0xc0) != 0x80) ++ || ((p[3] & 0xc0) != 0x80)) ++ return -3; ++ value = ((unsigned long)(*p++ & 0x7)) << 18; ++ value |= (*p++ & 0x3f) << 12; ++ value |= (*p++ & 0x3f) << 6; ++ value |= *p++ & 0x3f; ++ if (value < 0x10000) ++ return -4; ++ ret = 4; ++ } else if ((*p & 0xfc) == 0xf8) { ++ if (len < 5) ++ return -1; ++ if (((p[1] & 0xc0) != 0x80) ++ || ((p[2] & 0xc0) != 0x80) ++ || ((p[3] & 0xc0) != 0x80) ++ || ((p[4] & 0xc0) != 0x80)) ++ return -3; ++ value = ((unsigned long)(*p++ & 0x3)) << 24; ++ value |= ((unsigned long)(*p++ & 0x3f)) << 18; ++ value |= ((unsigned long)(*p++ & 0x3f)) << 12; ++ value |= (*p++ & 0x3f) << 6; ++ value |= *p++ & 0x3f; ++ if (value < 0x200000) ++ return -4; ++ ret = 5; ++ } else if ((*p & 0xfe) == 0xfc) { ++ if (len < 6) ++ return -1; ++ if (((p[1] & 0xc0) != 0x80) ++ || ((p[2] & 0xc0) != 0x80) ++ || ((p[3] & 0xc0) != 0x80) ++ || ((p[4] & 0xc0) != 0x80) ++ || ((p[5] & 0xc0) != 0x80)) ++ return -3; ++ value = ((unsigned long)(*p++ & 0x1)) << 30; ++ value |= ((unsigned long)(*p++ & 0x3f)) << 24; ++ value |= ((unsigned long)(*p++ & 0x3f)) << 18; ++ value |= ((unsigned long)(*p++ & 0x3f)) << 12; ++ value |= (*p++ & 0x3f) << 6; ++ value |= *p++ & 0x3f; ++ if (value < 0x4000000) ++ return -4; ++ ret = 6; ++ } else ++ return -2; ++ *val = value; ++ return ret; ++} ++ ++/* ++ * This takes a character 'value' and writes the UTF8 encoded value in 'str' ++ * where 'str' is a buffer containing 'len' characters. Returns the number of ++ * characters written or -1 if 'len' is too small. 'str' can be set to NULL ++ * in which case it just returns the number of characters. It will need at ++ * most 6 characters. ++ */ ++ ++int UTF8_putc(unsigned char *str, int len, unsigned long value) ++{ ++ if (!str) ++ len = 6; /* Maximum we will need */ ++ else if (len <= 0) ++ return -1; ++ if (value < 0x80) { ++ if (str) ++ *str = (unsigned char)value; ++ return 1; ++ } ++ if (value < 0x800) { ++ if (len < 2) ++ return -1; ++ if (str) { ++ *str++ = (unsigned char)(((value >> 6) & 0x1f) | 0xc0); ++ *str = (unsigned char)((value & 0x3f) | 0x80); ++ } ++ return 2; ++ } ++ if (value < 0x10000) { ++ if (len < 3) ++ return -1; ++ if (str) { ++ *str++ = (unsigned char)(((value >> 12) & 0xf) | 0xe0); ++ *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80); ++ *str = (unsigned char)((value & 0x3f) | 0x80); ++ } ++ return 3; ++ } ++ if (value < 0x200000) { ++ if (len < 4) ++ return -1; ++ if (str) { ++ *str++ = (unsigned char)(((value >> 18) & 0x7) | 0xf0); ++ *str++ = (unsigned char)(((value >> 12) & 0x3f) | 0x80); ++ *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80); ++ *str = (unsigned char)((value & 0x3f) | 0x80); ++ } ++ return 4; ++ } ++ if (value < 0x4000000) { ++ if (len < 5) ++ return -1; ++ if (str) { ++ *str++ = (unsigned char)(((value >> 24) & 0x3) | 0xf8); ++ *str++ = (unsigned char)(((value >> 18) & 0x3f) | 0x80); ++ *str++ = (unsigned char)(((value >> 12) & 0x3f) | 0x80); ++ *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80); ++ *str = (unsigned char)((value & 0x3f) | 0x80); ++ } ++ return 5; ++ } ++ if (len < 6) ++ return -1; ++ if (str) { ++ *str++ = (unsigned char)(((value >> 30) & 0x1) | 0xfc); ++ *str++ = (unsigned char)(((value >> 24) & 0x3f) | 0x80); ++ *str++ = (unsigned char)(((value >> 18) & 0x3f) | 0x80); ++ *str++ = (unsigned char)(((value >> 12) & 0x3f) | 0x80); ++ *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80); ++ *str = (unsigned char)((value & 0x3f) | 0x80); ++ } ++ return 6; ++} +diff -urN openssh-7.5p1.orig/Makefile.in openssh-7.5p1/Makefile.in +--- openssh-7.5p1.orig/Makefile.in 2017-03-30 17:33:30.983830629 +0000 ++++ openssh-7.5p1/Makefile.in 2017-03-30 17:39:28.392905858 +0000 +@@ -74,7 +74,7 @@ + @OCSP_ON@OCSP_OBJS=ssh-ocsp.o + @OCSP_OFF@OCSP_OBJS= + +-SSHX509_OBJS=ssh-x509.o ssh-xkalg.o x509_nm_cmp.o key-eng.o ++SSHX509_OBJS=ssh-x509.o ssh-xkalg.o x509_nm_cmp.o key-eng.o a_utf8.o + X509STORE_OBJS=x509store.o $(LDAP_OBJS) + + TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) diff -uNr a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch --- a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch false +++ b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch 8d3b9948c99baf5b4e328bc7e29dbda7f087474a492c2dea3721a60c9c942a3403feb70aad69f4023090dce50f69ceee04b20912dd1301ccf747d34d826a47df @@ -0,0 +1,50 @@ +--- a/openssh-7.6p1-hpnssh14v12/0004-support-dynamically-sized-receive-buffers.patch 2017-10-11 15:02:11.850912525 -0700 ++++ b/openssh-7.6p1-hpnssh14v12/0004-support-dynamically-sized-receive-buffers.patch 2017-10-11 15:35:06.223424844 -0700 +@@ -907,9 +907,9 @@ + @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1) + { + /* Send our own protocol version identification. */ +- xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", +-- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); +-+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); ++ xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n", ++- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION); +++ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION); + if (atomicio(vwrite, connection_out, client_version_string, + strlen(client_version_string)) != strlen(client_version_string)) + fatal("write: %.100s", strerror(errno)); +@@ -918,11 +918,11 @@ + --- a/sshd.c + +++ b/sshd.c + @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) +- char remote_version[256]; /* Must be at least as big as buf. */ ++ } + +- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", +-- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, +-+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, ++ xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s\r\n", ++- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment, +++ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment, + *options.version_addendum == '\0' ? "" : " ", + options.version_addendum); + +@@ -982,13 +982,14 @@ + index e093f623..83f0932d 100644 + --- a/version.h + +++ b/version.h +-@@ -3,4 +3,5 @@ ++@@ -3,3 +3,6 @@ + #define SSH_VERSION "OpenSSH_7.6" + +- #define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ++-#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" +++#define SSH_PORTABLE "p1" + +#define SSH_HPN "-hpn14v12" +++#define SSH_X509 "-PKIXSSH-11.0" +-+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN +++#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN + -- + 2.14.2 + diff -uNr a/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch b/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch --- a/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch false +++ b/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch ad30f104fbc76b7a72aaac5abdfb5b03e64e5afef69b92485ee1ddb412577f95164422f5af569efa4e1fe7319bc6fe85040fafd178eb0916642d37c6a1f7b80a @@ -0,0 +1,49 @@ +From 69bda0228861f3dacd4fb3d28b60ce9d103d254b Mon Sep 17 00:00:00 2001 +From: "djm@openbsd.org" <djm@openbsd.org> +Date: Wed, 4 Oct 2017 18:49:30 +0000 +Subject: [PATCH] upstream commit + +fix (another) problem in PermitOpen introduced during the +channels.c refactor: the third and subsequent arguments to PermitOpen were +being silently ignored; ok markus@ + +Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd +--- + servconf.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/servconf.c b/servconf.c +index 2c321a4a..95686295 100644 +--- a/servconf.c ++++ b/servconf.c +@@ -1,5 +1,5 @@ + +-/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */ ++/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */ + /* + * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland + * All rights reserved +@@ -1663,9 +1663,9 @@ process_server_config_line(ServerOptions *options, char *line, + if (!arg || *arg == '\0') + fatal("%s line %d: missing PermitOpen specification", + filename, linenum); +- i = options->num_permitted_opens; /* modified later */ ++ value = options->num_permitted_opens; /* modified later */ + if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) { +- if (*activep && i == 0) { ++ if (*activep && value == 0) { + options->num_permitted_opens = 1; + options->permitted_opens = xcalloc(1, + sizeof(*options->permitted_opens)); +@@ -1683,7 +1683,7 @@ process_server_config_line(ServerOptions *options, char *line, + if (arg == NULL || ((port = permitopen_port(arg)) < 0)) + fatal("%s line %d: bad port number in " + "PermitOpen", filename, linenum); +- if (*activep && i == 0) { ++ if (*activep && value == 0) { + options->permitted_opens = xrecallocarray( + options->permitted_opens, + options->num_permitted_opens, +-- +2.16.1 + diff -uNr a/net-misc/openssh/files/openssh-7.6_p1-warnings.patch b/net-misc/openssh/files/openssh-7.6_p1-warnings.patch --- a/net-misc/openssh/files/openssh-7.6_p1-warnings.patch false +++ b/net-misc/openssh/files/openssh-7.6_p1-warnings.patch 387a012fae0698a36fd566ed87ddd79e6e2636f065dddf0292c0482cdc22ab77a32451f8e1d6cd89a74fc09802b770e7cc817a441d0e6aa5509748ec66de18fc @@ -0,0 +1,12 @@ +diff --git a/openbsd-compat/freezero.c b/openbsd-compat/freezero.c +index 3af8f4a7..7f6bc7fa 100644 +--- a/openbsd-compat/freezero.c ++++ b/openbsd-compat/freezero.c +@@ -14,6 +14,7 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#include <string.h> + #include "includes.h" + + #ifndef HAVE_FREEZERO diff -uNr a/net-misc/openssh/files/openssh-7.7_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-7.7_p1-GSSAPI-dns.patch --- a/net-misc/openssh/files/openssh-7.7_p1-GSSAPI-dns.patch false +++ b/net-misc/openssh/files/openssh-7.7_p1-GSSAPI-dns.patch e4fd8c9a9fb9b769eefdddaba3c46a0967692ce9550a2a280cdbbc4b118af39b8abe030fdf5ac079f6a9bab9f9cdc77963cf44f874287c9884c20ec3126adeda @@ -0,0 +1,351 @@ +https://bugs.gentoo.org/165444 +https://bugzilla.mindrot.org/show_bug.cgi?id=1008 + +--- a/auth.c ++++ b/auth.c +@@ -728,120 +728,6 @@ fakepw(void) + return (&fake); + } + +-/* +- * Returns the remote DNS hostname as a string. The returned string must not +- * be freed. NB. this will usually trigger a DNS query the first time it is +- * called. +- * This function does additional checks on the hostname to mitigate some +- * attacks on legacy rhosts-style authentication. +- * XXX is RhostsRSAAuthentication vulnerable to these? +- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) +- */ +- +-static char * +-remote_hostname(struct ssh *ssh) +-{ +- struct sockaddr_storage from; +- socklen_t fromlen; +- struct addrinfo hints, *ai, *aitop; +- char name[NI_MAXHOST], ntop2[NI_MAXHOST]; +- const char *ntop = ssh_remote_ipaddr(ssh); +- +- /* Get IP address of client. */ +- fromlen = sizeof(from); +- memset(&from, 0, sizeof(from)); +- if (getpeername(ssh_packet_get_connection_in(ssh), +- (struct sockaddr *)&from, &fromlen) < 0) { +- debug("getpeername failed: %.100s", strerror(errno)); +- return strdup(ntop); +- } +- +- ipv64_normalise_mapped(&from, &fromlen); +- if (from.ss_family == AF_INET6) +- fromlen = sizeof(struct sockaddr_in6); +- +- debug3("Trying to reverse map address %.100s.", ntop); +- /* Map the IP address to a host name. */ +- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), +- NULL, 0, NI_NAMEREQD) != 0) { +- /* Host name not found. Use ip address. */ +- return strdup(ntop); +- } +- +- /* +- * if reverse lookup result looks like a numeric hostname, +- * someone is trying to trick us by PTR record like following: +- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 +- */ +- memset(&hints, 0, sizeof(hints)); +- hints.ai_socktype = SOCK_DGRAM; /*dummy*/ +- hints.ai_flags = AI_NUMERICHOST; +- if (getaddrinfo(name, NULL, &hints, &ai) == 0) { +- logit("Nasty PTR record \"%s\" is set up for %s, ignoring", +- name, ntop); +- freeaddrinfo(ai); +- return strdup(ntop); +- } +- +- /* Names are stored in lowercase. */ +- lowercase(name); +- +- /* +- * Map it back to an IP address and check that the given +- * address actually is an address of this host. This is +- * necessary because anyone with access to a name server can +- * define arbitrary names for an IP address. Mapping from +- * name to IP address can be trusted better (but can still be +- * fooled if the intruder has access to the name server of +- * the domain). +- */ +- memset(&hints, 0, sizeof(hints)); +- hints.ai_family = from.ss_family; +- hints.ai_socktype = SOCK_STREAM; +- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { +- logit("reverse mapping checking getaddrinfo for %.700s " +- "[%s] failed.", name, ntop); +- return strdup(ntop); +- } +- /* Look for the address from the list of addresses. */ +- for (ai = aitop; ai; ai = ai->ai_next) { +- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, +- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && +- (strcmp(ntop, ntop2) == 0)) +- break; +- } +- freeaddrinfo(aitop); +- /* If we reached the end of the list, the address was not there. */ +- if (ai == NULL) { +- /* Address not found for the host name. */ +- logit("Address %.100s maps to %.600s, but this does not " +- "map back to the address.", ntop, name); +- return strdup(ntop); +- } +- return strdup(name); +-} +- +-/* +- * Return the canonical name of the host in the other side of the current +- * connection. The host name is cached, so it is efficient to call this +- * several times. +- */ +- +-const char * +-auth_get_canonical_hostname(struct ssh *ssh, int use_dns) +-{ +- static char *dnsname; +- +- if (!use_dns) +- return ssh_remote_ipaddr(ssh); +- else if (dnsname != NULL) +- return dnsname; +- else { +- dnsname = remote_hostname(ssh); +- return dnsname; +- } +-} +- + /* + * Runs command in a subprocess wuth a minimal environment. + * Returns pid on success, 0 on failure. +--- a/canohost.c ++++ b/canohost.c +@@ -202,3 +202,117 @@ get_local_port(int sock) + { + return get_sock_port(sock, 1); + } ++ ++/* ++ * Returns the remote DNS hostname as a string. The returned string must not ++ * be freed. NB. this will usually trigger a DNS query the first time it is ++ * called. ++ * This function does additional checks on the hostname to mitigate some ++ * attacks on legacy rhosts-style authentication. ++ * XXX is RhostsRSAAuthentication vulnerable to these? ++ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) ++ */ ++ ++static char * ++remote_hostname(struct ssh *ssh) ++{ ++ struct sockaddr_storage from; ++ socklen_t fromlen; ++ struct addrinfo hints, *ai, *aitop; ++ char name[NI_MAXHOST], ntop2[NI_MAXHOST]; ++ const char *ntop = ssh_remote_ipaddr(ssh); ++ ++ /* Get IP address of client. */ ++ fromlen = sizeof(from); ++ memset(&from, 0, sizeof(from)); ++ if (getpeername(ssh_packet_get_connection_in(ssh), ++ (struct sockaddr *)&from, &fromlen) < 0) { ++ debug("getpeername failed: %.100s", strerror(errno)); ++ return strdup(ntop); ++ } ++ ++ ipv64_normalise_mapped(&from, &fromlen); ++ if (from.ss_family == AF_INET6) ++ fromlen = sizeof(struct sockaddr_in6); ++ ++ debug3("Trying to reverse map address %.100s.", ntop); ++ /* Map the IP address to a host name. */ ++ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), ++ NULL, 0, NI_NAMEREQD) != 0) { ++ /* Host name not found. Use ip address. */ ++ return strdup(ntop); ++ } ++ ++ /* ++ * if reverse lookup result looks like a numeric hostname, ++ * someone is trying to trick us by PTR record like following: ++ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 ++ */ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_socktype = SOCK_DGRAM; /*dummy*/ ++ hints.ai_flags = AI_NUMERICHOST; ++ if (getaddrinfo(name, NULL, &hints, &ai) == 0) { ++ logit("Nasty PTR record \"%s\" is set up for %s, ignoring", ++ name, ntop); ++ freeaddrinfo(ai); ++ return strdup(ntop); ++ } ++ ++ /* Names are stored in lowercase. */ ++ lowercase(name); ++ ++ /* ++ * Map it back to an IP address and check that the given ++ * address actually is an address of this host. This is ++ * necessary because anyone with access to a name server can ++ * define arbitrary names for an IP address. Mapping from ++ * name to IP address can be trusted better (but can still be ++ * fooled if the intruder has access to the name server of ++ * the domain). ++ */ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_family = from.ss_family; ++ hints.ai_socktype = SOCK_STREAM; ++ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { ++ logit("reverse mapping checking getaddrinfo for %.700s " ++ "[%s] failed.", name, ntop); ++ return strdup(ntop); ++ } ++ /* Look for the address from the list of addresses. */ ++ for (ai = aitop; ai; ai = ai->ai_next) { ++ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, ++ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && ++ (strcmp(ntop, ntop2) == 0)) ++ break; ++ } ++ freeaddrinfo(aitop); ++ /* If we reached the end of the list, the address was not there. */ ++ if (ai == NULL) { ++ /* Address not found for the host name. */ ++ logit("Address %.100s maps to %.600s, but this does not " ++ "map back to the address.", ntop, name); ++ return strdup(ntop); ++ } ++ return strdup(name); ++} ++ ++/* ++ * Return the canonical name of the host in the other side of the current ++ * connection. The host name is cached, so it is efficient to call this ++ * several times. ++ */ ++ ++const char * ++auth_get_canonical_hostname(struct ssh *ssh, int use_dns) ++{ ++ static char *dnsname; ++ ++ if (!use_dns) ++ return ssh_remote_ipaddr(ssh); ++ else if (dnsname != NULL) ++ return dnsname; ++ else { ++ dnsname = remote_hostname(ssh); ++ return dnsname; ++ } ++} +--- a/readconf.c ++++ b/readconf.c +@@ -160,6 +160,7 @@ typedef enum { + oClearAllForwardings, oNoHostAuthenticationForLocalhost, + oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, + oAddressFamily, oGssAuthentication, oGssDelegateCreds, ++ oGssTrustDns, + oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, + oSendEnv, oControlPath, oControlMaster, oControlPersist, + oHashKnownHosts, +@@ -200,9 +201,11 @@ static struct { + #if defined(GSSAPI) + { "gssapiauthentication", oGssAuthentication }, + { "gssapidelegatecredentials", oGssDelegateCreds }, ++ { "gssapitrustdns", oGssTrustDns }, + # else + { "gssapiauthentication", oUnsupported }, + { "gssapidelegatecredentials", oUnsupported }, ++ { "gssapitrustdns", oUnsupported }, + #endif + #ifdef ENABLE_PKCS11 + { "smartcarddevice", oPKCS11Provider }, +@@ -954,6 +957,10 @@ parse_time: + intptr = &options->gss_deleg_creds; + goto parse_flag; + ++ case oGssTrustDns: ++ intptr = &options->gss_trust_dns; ++ goto parse_flag; ++ + case oBatchMode: + intptr = &options->batch_mode; + goto parse_flag; +@@ -1766,6 +1773,7 @@ initialize_options(Options * options) + options->challenge_response_authentication = -1; + options->gss_authentication = -1; + options->gss_deleg_creds = -1; ++ options->gss_trust_dns = -1; + options->password_authentication = -1; + options->kbd_interactive_authentication = -1; + options->kbd_interactive_devices = NULL; +@@ -1908,6 +1916,8 @@ fill_default_options(Options * options) + options->gss_authentication = 0; + if (options->gss_deleg_creds == -1) + options->gss_deleg_creds = 0; ++ if (options->gss_trust_dns == -1) ++ options->gss_trust_dns = 0; + if (options->password_authentication == -1) + options->password_authentication = 1; + if (options->kbd_interactive_authentication == -1) +--- a/readconf.h ++++ b/readconf.h +@@ -43,6 +43,7 @@ typedef struct { + /* Try S/Key or TIS, authentication. */ + int gss_authentication; /* Try GSS authentication */ + int gss_deleg_creds; /* Delegate GSS credentials */ ++ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ + int password_authentication; /* Try password + * authentication. */ + int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ +--- a/ssh_config.5 ++++ b/ssh_config.5 +@@ -731,6 +731,16 @@ The default is + Forward (delegate) credentials to the server. + The default is + .Cm no . ++Note that this option applies to protocol version 2 connections using GSSAPI. ++.It Cm GSSAPITrustDns ++Set to ++.Dq yes to indicate that the DNS is trusted to securely canonicalize ++the name of the host being connected to. If ++.Dq no, the hostname entered on the ++command line will be passed untouched to the GSSAPI library. ++The default is ++.Dq no . ++This option only applies to protocol version 2 connections using GSSAPI. + .It Cm HashKnownHosts + Indicates that + .Xr ssh 1 +--- a/sshconnect2.c ++++ b/sshconnect2.c +@@ -643,6 +643,13 @@ userauth_gssapi(Authctxt *authctxt) + static u_int mech = 0; + OM_uint32 min; + int ok = 0; ++ const char *gss_host; ++ ++ if (options.gss_trust_dns) { ++ extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns); ++ gss_host = auth_get_canonical_hostname(active_state, 1); ++ } else ++ gss_host = authctxt->host; + + /* Try one GSSAPI method at a time, rather than sending them all at + * once. */ +@@ -655,7 +662,7 @@ userauth_gssapi(Authctxt *authctxt) + /* My DER encoding requires length<128 */ + if (gss_supported->elements[mech].length < 128 && + ssh_gssapi_check_mechanism(&gssctxt, +- &gss_supported->elements[mech], authctxt->host)) { ++ &gss_supported->elements[mech], gss_host)) { + ok = 1; /* Mechanism works */ + } else { + mech++; +-- diff -uNr a/net-misc/openssh/files/sshd-r1.confd b/net-misc/openssh/files/sshd-r1.confd --- a/net-misc/openssh/files/sshd-r1.confd false +++ b/net-misc/openssh/files/sshd-r1.confd 40134e29fa7e58a3cd888bce0953ae49a3dea915ede763d31383b42c8623abd6f4b675f97edb4373d2d07ef0fa47e0a8d8609c942e57dd19bd92ba5c3316b83d @@ -0,0 +1,33 @@ +# /etc/conf.d/sshd: config file for /etc/init.d/sshd + +# Where is your sshd_config file stored? + +SSHD_CONFDIR="${RC_PREFIX%/}/etc/ssh" + + +# Any random options you want to pass to sshd. +# See the sshd(8) manpage for more info. + +SSHD_OPTS="" + + +# Wait one second (length chosen arbitrarily) to see if sshd actually +# creates a PID file, or if it crashes for some reason like not being +# able to bind to the address in ListenAddress. + +#SSHD_SSD_OPTS="--wait 1000" + + +# Pid file to use (needs to be absolute path). + +#SSHD_PIDFILE="${RC_PREFIX%/}/run/sshd.pid" + + +# Path to the sshd binary (needs to be absolute path). + +#SSHD_BINARY="${RC_PREFIX%/}/usr/sbin/sshd" + + +# Path to the ssh-keygen binary (needs to be absolute path). + +#SSHD_KEYGEN_BINARY="${RC_PREFIX%/}/usr/bin/ssh-keygen" diff -uNr a/net-misc/openssh/files/sshd.confd b/net-misc/openssh/files/sshd.confd --- a/net-misc/openssh/files/sshd.confd false +++ b/net-misc/openssh/files/sshd.confd 9f9571343761d64b055b4c8bfd87d0db9625605c13f267b2bb33e85005931481cbbb8649f9e1998d886e11b13ac81b0bc486a3126faae5010ebde32293b2b71d @@ -0,0 +1,21 @@ +# /etc/conf.d/sshd: config file for /etc/init.d/sshd + +# Where is your sshd_config file stored? + +SSHD_CONFDIR="/etc/ssh" + + +# Any random options you want to pass to sshd. +# See the sshd(8) manpage for more info. + +SSHD_OPTS="" + + +# Pid file to use (needs to be absolute path). + +#SSHD_PIDFILE="/var/run/sshd.pid" + + +# Path to the sshd binary (needs to be absolute path). + +#SSHD_BINARY="/usr/sbin/sshd" diff -uNr a/net-misc/openssh/files/sshd.pam_include.2 b/net-misc/openssh/files/sshd.pam_include.2 --- a/net-misc/openssh/files/sshd.pam_include.2 false +++ b/net-misc/openssh/files/sshd.pam_include.2 6b030287fd9ce88bf3d8c0d9706415a0ba3d3f135db82e0c7b9bc15b1534f6d3268a129eca5dd0bb9a8b32aece94246fb87a167f699bf7585295f858320a52d4 @@ -0,0 +1,4 @@ +auth include system-remote-login +account include system-remote-login +password include system-remote-login +session include system-remote-login diff -uNr a/net-misc/openssh/files/sshd.rc6.4 b/net-misc/openssh/files/sshd.rc6.4 --- a/net-misc/openssh/files/sshd.rc6.4 false +++ b/net-misc/openssh/files/sshd.rc6.4 543501ac491da4c50085dc96216a4dac5c183bd475870069a59fa19781bd0b4205a7f02b068aa24c3a45d45733b17ce4e3fc88a5fd5d4902f77b6247f05a5064 @@ -0,0 +1,84 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="checkconfig" +extra_started_commands="reload" + +: ${SSHD_CONFDIR:=/etc/ssh} +: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config} +: ${SSHD_PIDFILE:=/var/run/${SVCNAME}.pid} +: ${SSHD_BINARY:=/usr/sbin/sshd} + +depend() { + use logger dns + if [ "${rc_need+set}" = "set" ] ; then + : # Do nothing, the user has explicitly set rc_need + else + local x warn_addr + for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do + case "${x}" in + 0.0.0.0|0.0.0.0:*) ;; + ::|\[::\]*) ;; + *) warn_addr="${warn_addr} ${x}" ;; + esac + done + if [ -n "${warn_addr}" ] ; then + need net + ewarn "You are binding an interface in ListenAddress statement in your sshd_config!" + ewarn "You must add rc_need=\"net.FOO\" to your /etc/conf.d/sshd" + ewarn "where FOO is the interface(s) providing the following address(es):" + ewarn "${warn_addr}" + fi + fi +} + +checkconfig() { + if [ ! -d /var/empty ] ; then + mkdir -p /var/empty || return 1 + fi + + if [ ! -e "${SSHD_CONFIG}" ] ; then + eerror "You need an ${SSHD_CONFIG} file to run sshd" + eerror "There is a sample file in /usr/share/doc/openssh" + return 1 + fi + + ssh-keygen -A || return 1 + + [ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \ + && SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}" + [ "${SSHD_CONFIG}" != "/etc/ssh/sshd_config" ] \ + && SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFIG}" + + "${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1 +} + +start() { + checkconfig || return 1 + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --exec "${SSHD_BINARY}" \ + --pidfile "${SSHD_PIDFILE}" \ + -- ${SSHD_OPTS} + eend $? +} + +stop() { + if [ "${RC_CMD}" = "restart" ] ; then + checkconfig || return 1 + fi + + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --exec "${SSHD_BINARY}" \ + --pidfile "${SSHD_PIDFILE}" --quiet + eend $? +} + +reload() { + checkconfig || return 1 + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --signal HUP \ + --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}" + eend $? +} diff -uNr a/net-misc/openssh/files/sshd.rc6.5 b/net-misc/openssh/files/sshd.rc6.5 --- a/net-misc/openssh/files/sshd.rc6.5 false +++ b/net-misc/openssh/files/sshd.rc6.5 91eb72f7c3a73ff9c50d9d961e4b833a941f251221d11c3ce7fede841066e5ba009ef4c6f7001650541525bb52459fcf5862bb96beb2996208ddd8c9e1fb90bd @@ -0,0 +1,89 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="checkconfig" +extra_started_commands="reload" + +: ${SSHD_CONFDIR:=${RC_PREFIX%/}/etc/ssh} +: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config} +: ${SSHD_PIDFILE:=${RC_PREFIX%/}/run/${SVCNAME}.pid} +: ${SSHD_BINARY:=${RC_PREFIX%/}/usr/sbin/sshd} +: ${SSHD_KEYGEN_BINARY:=${RC_PREFIX%/}/usr/bin/ssh-keygen} + +command="${SSHD_BINARY}" +pidfile="${SSHD_PIDFILE}" +command_args="${SSHD_OPTS} -o PidFile=${pidfile} -f ${SSHD_CONFIG}" + +# Wait one second (length chosen arbitrarily) to see if sshd actually +# creates a PID file, or if it crashes for some reason like not being +# able to bind to the address in ListenAddress (bug 617596). +: ${SSHD_SSD_OPTS:=--wait 1000} +start_stop_daemon_args="${SSHD_SSD_OPTS}" + +depend() { + # Entropy can be used by ssh-keygen, among other things, but + # is not strictly required (bug 470020). + use logger dns entropy + if [ "${rc_need+set}" = "set" ] ; then + : # Do nothing, the user has explicitly set rc_need + else + local x warn_addr + for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do + case "${x}" in + 0.0.0.0|0.0.0.0:*) ;; + ::|\[::\]*) ;; + *) warn_addr="${warn_addr} ${x}" ;; + esac + done + if [ -n "${warn_addr}" ] ; then + need net + ewarn "You are binding an interface in ListenAddress statement in your sshd_config!" + ewarn "You must add rc_need=\"net.FOO\" to your ${RC_PREFIX%/}/etc/conf.d/sshd" + ewarn "where FOO is the interface(s) providing the following address(es):" + ewarn "${warn_addr}" + fi + fi +} + +checkconfig() { + checkpath --directory "${RC_PREFIX%/}/var/empty" + + if [ ! -e "${SSHD_CONFIG}" ] ; then + eerror "You need an ${SSHD_CONFIG} file to run sshd" + eerror "There is a sample file in /usr/share/doc/openssh" + return 1 + fi + + ${SSHD_KEYGEN_BINARY} -A || return 2 + + "${command}" -t ${command_args} || return 3 +} + +start_pre() { + # If this isn't a restart, make sure that the user's config isn't + # busted before we try to start the daemon (this will produce + # better error messages than if we just try to start it blindly). + # + # If, on the other hand, this *is* a restart, then the stop_pre + # action will have ensured that the config is usable and we don't + # need to do that again. + if [ "${RC_CMD}" != "restart" ] ; then + checkconfig || return $? + fi +} + +stop_pre() { + # If this is a restart, check to make sure the user's config + # isn't busted before we stop the running daemon. + if [ "${RC_CMD}" = "restart" ] ; then + checkconfig || return $? + fi +} + +reload() { + checkconfig || return $? + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} diff -uNr a/net-misc/openssh/files/sshd.service b/net-misc/openssh/files/sshd.service --- a/net-misc/openssh/files/sshd.service false +++ b/net-misc/openssh/files/sshd.service dd49cc5262a189f3f29566db490a05cd5d725c27204be08db963bfd265d6463b038de2d0a023f9cfc6b7a18febcb05ef53c2a66743c2193f7e2126a78aa64e98 @@ -0,0 +1,11 @@ +[Unit] +Description=OpenSSH server daemon +After=syslog.target network.target auditd.service + +[Service] +ExecStartPre=/usr/bin/ssh-keygen -A +ExecStart=/usr/sbin/sshd -D -e +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff -uNr a/net-misc/openssh/files/sshd.socket b/net-misc/openssh/files/sshd.socket --- a/net-misc/openssh/files/sshd.socket false +++ b/net-misc/openssh/files/sshd.socket 4e62332f66c62b753c860145ca8c91279367d2205199eb139a6e08dcc2f89c51455841846cad30f371ac82f976b8a5481ddfff774f671308246fad35d6463150 @@ -0,0 +1,10 @@ +[Unit] +Description=OpenSSH Server Socket +Conflicts=sshd.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target diff -uNr a/net-misc/openssh/files/sshd_at.service b/net-misc/openssh/files/sshd_at.service --- a/net-misc/openssh/files/sshd_at.service false +++ b/net-misc/openssh/files/sshd_at.service c15e5f369b19feacfc4a328ba0a7a0b2129f6ecf83aecd4f2ea0403051399877a38e485bb0322adebc39888f3e0c39876fb3869af05098e46463f22c0ba5d968 @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSSH per-connection server daemon +After=syslog.target auditd.service + +[Service] +ExecStart=-/usr/sbin/sshd -i -e +StandardInput=socket +StandardError=syslog diff -uNr a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml --- a/net-misc/openssh/metadata.xml false +++ b/net-misc/openssh/metadata.xml e7cca6cf3b5663806f149ab10af2e2341952d4ecbfe25e3ea42159eabd5fcae46d8bd60410e47f66aa5673a7a416ce0793c245f62d8bb97144d906ce3529217a @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <maintainer type="person"> + <email>robbat2@gentoo.org</email> + <description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description> + </maintainer> + <longdescription> +OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that +increasing numbers of people on the Internet are coming to rely on. Many users of telnet, +rlogin, ftp, and other such programs might not realize that their password is transmitted +across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) +to effectively eliminate eavesdropping, connection hijacking, and other network-level attacks. +Additionally, OpenSSH provides a myriad of secure tunneling capabilities, as well as a variety +of authentication methods. + +The OpenSSH suite includes the ssh program which replaces rlogin and telnet, scp which +replaces rcp, and sftp which replaces ftp. Also included is sshd which is the server side of +the package, and the other basic utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, +ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and 2.0. +</longdescription> + <use> + <flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag> + <flag name="hpn">Enable high performance ssh</flag> + <flag name="ldap">Add support for storing SSH public keys in LDAP</flag> + <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag> + <flag name="livecd">Enable root password logins for live-cd environment.</flag> + <flag name="ssh1">Support the legacy/weak SSH1 protocol</flag> + <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag> + <flag name="X509">Adds support for X.509 certificate authentication</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:openssh:openssh</remote-id> + <remote-id type="sourceforge">hpnssh</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/net-misc/openssh/openssh-7.7_p1-r6.ebuild b/net-misc/openssh/openssh-7.7_p1-r6.ebuild --- a/net-misc/openssh/openssh-7.7_p1-r6.ebuild false +++ b/net-misc/openssh/openssh-7.7_p1-r6.ebuild 756370cf736c63aeb1ffdb2cacc5f4cae1d2094c37f45a0455012d481385aa8a4dc73123b97a46b0e32a9b662fe0b39af57379f3b4dff3d022cf6212dbee2996 @@ -0,0 +1,458 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user flag-o-matic multilib autotools pam systemd versionator + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +HPN_VER="14v15-gentoo2" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz" +SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" +X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz" + +# Disable LDAP support until someone will rewrite the patch, +# upstream removed auth_parse_options() via commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3 +#LDAP_VER="0.3.14" LDAP_PATCH="${PN}-lpk-7.7p1-${LDAP_VER}.patch.xz" + +PATCH_SET="openssh-7.7p1-patches-1.1" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz + ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )} + ${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )} + ${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~whissi/dist/openssh/${LDAP_PATCH} )} + ${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )} + " + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509" +REQUIRED_USE="ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !ldap !sctp ssl ) + test? ( ssl )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) + bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) + ssl? ( + !libressl? ( + >=dev-libs/openssl-1.0.1:0=[bindist=] + dev-libs/openssl:0=[static-libs(+)] + ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + ) + >=sys-libs/zlib-1.2.3:=[static-libs(+)]" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( virtual/pam ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/pkgconfig + virtual/os-headers + sys-devel/autoconf" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + userland_GNU? ( virtual/shadow ) + X? ( x11-apps/xauth )" + +S="${WORKDIR}/${PARCH}" + +pkg_pretend() { + # this sucks, but i'd rather have people unable to `emerge -u openssh` + # than not be able to log in to their server any more + maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } + local fail=" + $(use hpn && maybe_fail hpn HPN_PATCH) + $(use ldap && maybe_fail ldap LDAP_PATCH) + $(use sctp && maybe_fail sctp SCTP_PATCH) + $(use X509 && maybe_fail X509 X509_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + sed -i \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ + pathnames.h || die + + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex + eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch + + local PATCHSET_VERSION_MACROS=() + + if use X509 ; then + eapply "${WORKDIR}"/${X509_PATCH%.*} + + # We need to patch package version or any X.509 sshd will reject our ssh client + # with "userauth_pubkey: could not parse key: string is too large [preauth]" + # error + einfo "Patching package version for X.509 patch set ..." + sed -i \ + -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ + "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" + + einfo "Patching version.h to expose X.509 patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in X.509 patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) + + einfo "Disabling broken X.509 agent test ..." + sed -i \ + -e "/^ agent$/d" \ + "${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test" + + # The following patches don't apply on top of X509 patch + rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die + rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die + rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1_implement-EMFILE-mitigation-for-ssh-agent.patch || die + rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die + else + rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1-X509_implement-EMFILE-mitigation-for-ssh-agent.patch || die + rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1-X509_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die + fi + + if use ldap ; then + eapply "${WORKDIR}"/${LDAP_PATCH%.*} + + einfo "Patching version.h to expose LDAP patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE.*/a #define SSH_LDAP \"-ldap-${LDAP_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in LDAP patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_LDAP' ) + fi + + if use sctp ; then + eapply "${WORKDIR}"/${SCTP_PATCH%.*} + + einfo "Patching version.h to expose SCTP patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in SCTP patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) + + einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." + sed -i \ + -e "/\t\tcfgparse \\\/d" \ + "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" + fi + + if use hpn ; then + eapply "${WORKDIR}"/${HPN_PATCH%.*} + + einfo "Patching Makefile.in for HPN patch set ..." + sed -i \ + -e "/^LIBS=/ s/\$/ -lpthread/" \ + "${S}"/Makefile.in || die "Failed to patch Makefile.in" + + einfo "Patching version.h to expose HPN patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in HPN patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) + + if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + einfo "Disabling known non-working MT AES cipher per default ..." + + cat > "${T}"/disable_mtaes.conf <<- EOF + + # HPN's Multi-Threaded AES CTR cipher is currently known to be broken + # and therefore disabled per default. + DisableMTAES yes + EOF + sed -i \ + -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ + "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" + + sed -i \ + -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ + "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" + fi + fi + + if use X509 || use hpn ; then + einfo "Patching packet.c for X509 and/or HPN patch set ..." + sed -i \ + -e "s/const struct sshcipher/struct sshcipher/" \ + "${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)" + fi + + if use X509 || use sctp || use ldap || use hpn ; then + einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" + + einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" + + einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." + sed -i \ + -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ + "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" + fi + + sed -i \ + -e "/#UseLogin no/d" \ + "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" + + eapply "${WORKDIR}"/patch/*.patch + + use X509 || eapply "${FILESDIR}"/${PN}-7.5_p1-libressl_arc4random.patch + eapply_user #473004 + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable PATH reset, trust what portage gives us #254615 + -e 's:^PATH=/:#PATH=/:' + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # The -ftrapv flag ICEs on hppa #505182 + use hppa && sed_args+=( + -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' + -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' + ) + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX%/}"/etc/ssh + --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX%/}"/usr/share/openssh + --with-privsep-path="${EPREFIX%/}"/var/empty + --with-privsep-user=sshd + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) + # We apply the ldap and sctp patch conditionally, so can't pass --without-{ldap,sctp} + # unconditionally else we get unknown flag warnings. + $(use ldap && use_with ldap) + $(use sctp && use_with sctp) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with skey) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" \ + emake -k -j1 ${t} </dev/null \ + && passed+=( "${t}" ) \ + || failed+=( "${t}" ) + done + + einfo "Passed tests: ${passed[*]}" + [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}" + [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}" +} + +# Gentoo tweaks to default config files. +tweak_ssh_configs() { + local locale_vars=( + # These are language variables that POSIX defines. + # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 + LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME + + # These are the GNU extensions. + # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html + LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE + ) + + # First the server config. + cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config + + # Allow client to pass locale environment variables. #367017 + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM. #658540 + AcceptEnv COLORTERM + EOF + + # Then the client config. + cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config + + # Send locale environment variables. #367017 + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM. #658540 + SendEnv COLORTERM + EOF + + if use pam ; then + sed -i \ + -e "/^#UsePAM /s:.*:UsePAM yes:" \ + -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ + -e "/^#PrintMotd /s:.*:PrintMotd no:" \ + -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ + "${ED%/}"/etc/ssh/sshd_config || die + fi + + if use livecd ; then + sed -i \ + -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ + "${ED%/}"/etc/ssh/sshd_config || die + fi +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd.rc6.5 sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + + tweak_ssh_configs + + if use ldap && [[ -n ${LDAP_PATCH} ]] ; then + insinto /etc/openldap/schema/ + newins openssh-lpk_openldap.schema openssh-lpk.schema + fi + + doman contrib/ssh-copy-id.1 + dodoc CREDITS OVERVIEW README* TODO sshd_config + use hpn && dodoc HPN-README + use X509 || dodoc ChangeLog + + diropts -m 0700 + dodir /etc/skel/.ssh + + keepdir /var/empty + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +pkg_preinst() { + enewgroup sshd 22 + enewuser sshd 22 -1 /var/empty sshd +} + +pkg_postinst() { + if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + elog "" + elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" + elog "and therefore disabled at runtime per default." + elog "Make sure your sshd_config is up to date and contains" + elog "" + elog " DisableMTAES yes" + elog "" + elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." + elog "" + fi +} diff -uNr a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest --- a/net-misc/rsync/Manifest false +++ b/net-misc/rsync/Manifest fd81707bd6aec38c9de6ba255e9be2601f32b66ad32696d77614d5b954d1265e6c62f753306714818e7b4c656a5cf2a5c1794187ff0bcda21eef0306145d28b6 @@ -0,0 +1,10 @@ +AUX rsync-fix-musl-ipv6.patch 16153 BLAKE2B 446ea8831aaf54fc97ad5c9ba0ff6f71039082666cddcf6c0acb9e17dfa51da6fcf2317cc878be20ddc1923b72712d0170487c111bc72b5e077fdb0012a9375c SHA512 e204e5ca5cbaefaf8e3870ce31b5d22101e042b559bb0f819d03c96f373811a955309bae9ea42ebcf956b4ad710f442b6c9fe437c62b0ce8252a7a5248d1fd71 +AUX rsyncd.conf-3.0.9-r1 449 BLAKE2B 7cb543dc9430a05d21d10951c065ce588d8f774811b36d2380027bf18760776797d790f5c736eece3176a2dc206e695fc3486587dd8a92fbba96102e63dbf4e9 SHA512 8d51b452be88820c38639aa833490a001abc2edba03133441000634c2ec090d243598b0932fc11abdf1286afdab02eb6532df2b28a48bfde781c3a8b61fe8c6f +AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3 +AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a +AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968909e9ee0f109b9151de8157427b0aa8fb0ed89fa6cc4cab6ac6e0a9986c076531cd4aa87bea4e2d25 SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5 +AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 +AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 +DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 +EBUILD rsync-3.1.3.ebuild 2881 BLAKE2B 69f4f28b3fc7dbcb3e5a15b96ec43585c3e08f35c846f75fed0205cdb52ef60240f272965120b39b007632373b809aac795cf54e2e93452fd986c91c061f7a5d SHA512 68d8999dec11047aa0054db31b4f89605aef56092332ac39c53c13587f42a8a88a0090debf641a3f763f22f8a8bacd74688326b03fae5528f0aa34dcbfda72ce +MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920 diff -uNr a/net-misc/rsync/files/rsync-fix-musl-ipv6.patch b/net-misc/rsync/files/rsync-fix-musl-ipv6.patch --- a/net-misc/rsync/files/rsync-fix-musl-ipv6.patch false +++ b/net-misc/rsync/files/rsync-fix-musl-ipv6.patch 4320346c8dd3d8ca8e7d1fee5c547b8820329adb5b1a3083f12cb376e171d9740f64e87b3a9c0a00829845e748fd6141fc05c55ed8c6a4e4cc4e8d311089a249 @@ -0,0 +1,605 @@ +From 78621d2d5e12c9e7c54ab0a15bb90495d7927251 Mon Sep 17 00:00:00 2001 +From: Pierre-Olivier Mercier <nemunaire@nemunai.re> +Date: Wed, 8 Mar 2017 12:44:11 +0100 +Subject: [PATCH] musl compatibility + +--- + configure.ac | 138 +++++------------------- + configure.sh | 348 +++++++++++++---------------------------------------------- + 2 files changed, 102 insertions(+), 384 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1b32dfb..891f7b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -204,119 +204,37 @@ if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then + AC_SYS_LARGEFILE + fi + +-ipv6type=unknown +-ipv6lib=none +-ipv6trylibc=yes + ++# Checks if IPv6 is requested ++AC_MSG_CHECKING([whether to enable ipv6]) + AC_ARG_ENABLE(ipv6, +- AS_HELP_STRING([--disable-ipv6],[do not even try to use IPv6])) +-if test x"$enable_ipv6" != x"no"; then +- AC_MSG_CHECKING([ipv6 stack type]) +- for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta cygwin; do +- case $i in +- inria) +- # http://www.kame.net/ +- AC_EGREP_CPP(yes, [ +-#include <netinet/in.h> +-#ifdef IPV6_INRIA_VERSION +-yes +-#endif], +- [ipv6type=$i; +- AC_DEFINE(INET6, 1, [true if you have IPv6]) +- ]) +- ;; +- kame) +- # http://www.kame.net/ +- AC_EGREP_CPP(yes, [ +-#include <netinet/in.h> +-#ifdef __KAME__ +-yes +-#endif], +- [ipv6type=$i; +- AC_DEFINE(INET6, 1, [true if you have IPv6])]) +- ;; +- linux-glibc) +- # http://www.v6.linux.or.jp/ +- AC_EGREP_CPP(yes, [ +-#include <features.h> +-#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 +-yes +-#endif], +- [ipv6type=$i; +-AC_DEFINE(INET6, 1, [true if you have IPv6])]) +- ;; +- linux-inet6) +- # http://www.v6.linux.or.jp/ +- if test -d /usr/inet6 -o -f /usr/inet6/lib/libinet6.a; then +- ipv6type=$i +- ipv6lib=inet6 +- ipv6libdir=/usr/inet6/lib +- ipv6trylibc=yes; +- AC_DEFINE(INET6, 1, [true if you have IPv6]) +- CFLAGS="-I/usr/inet6/include $CFLAGS" +- fi +- ;; +- solaris) +- # http://www.sun.com +- AC_EGREP_CPP(yes, [ +-#include <netinet/ip6.h> +-#ifdef __sun +-yes +-#endif], +- [ipv6type=$i; +- AC_DEFINE(INET6, 1, [true if you have IPv6])]) +- ;; +- toshiba) +- AC_EGREP_CPP(yes, [ +-#include <sys/param.h> +-#ifdef _TOSHIBA_INET6 +-yes +-#endif], +- [ipv6type=$i; +- ipv6lib=inet6; +- ipv6libdir=/usr/local/v6/lib; +- AC_DEFINE(INET6, 1, [true if you have IPv6])]) +- ;; +- v6d) +- AC_EGREP_CPP(yes, [ +-#include </usr/local/v6/include/sys/v6config.h> +-#ifdef __V6D__ +-yes +-#endif], +- [ipv6type=$i; +- ipv6lib=v6; +- ipv6libdir=/usr/local/v6/lib; +- AC_DEFINE(INET6, 1, [true if you have IPv6])]) +- ;; +- zeta) +- AC_EGREP_CPP(yes, [ +-#include <sys/param.h> +-#ifdef _ZETA_MINAMI_INET6 +-yes +-#endif], +- [ipv6type=$i; +- ipv6lib=inet6; +- ipv6libdir=/usr/local/v6/lib; +- AC_DEFINE(INET6, 1, [true if you have IPv6])]) +- ;; +- cygwin) +- AC_EGREP_CPP(yes, [ +-#include <netinet/in.h> +-#ifdef _CYGWIN_IN6_H +-yes +-#endif], +- [ipv6type=$i; +- AC_DEFINE(INET6, 1, [true if you have IPv6])]) +- ;; +- esac +- if test "$ipv6type" != "unknown"; then +- break +- fi +- done +- AC_MSG_RESULT($ipv6type) ++[ --disable-ipv6 disable ipv6 support], ++[ case "$enableval" in ++ no) ++ AC_MSG_RESULT(no) ++ ;; ++ *) AC_MSG_RESULT(yes) ++ AC_DEFINE(INET6, 1, [true if you have IPv6]) ++ ;; ++ esac ], + +- AC_SEARCH_LIBS(getaddrinfo, inet6) +-fi ++ AC_TRY_RUN([ /* AF_INET6 avalable check */ ++#include <sys/types.h> ++#include <sys/socket.h> ++main() ++{ ++ exit(0); ++ if (socket(AF_INET6, SOCK_STREAM, 0) < 0) ++ exit(1); ++ else ++ exit(0); ++} ++], ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(INET6, 1, [true if you have IPv6]), ++ AC_MSG_RESULT(no), ++ AC_MSG_RESULT(no) ++)) + + dnl Do you want to disable use of locale functions + AC_ARG_ENABLE([locale], +diff --git a/configure.sh b/configure.sh +index d6e9c8d..cfaaa99 100755 +--- a/configure.sh ++++ b/configure.sh +@@ -1349,7 +1349,7 @@ Optional Features: + --enable-maintainer-mode + turn on extra debug features + --disable-largefile omit support for large files +- --disable-ipv6 do not even try to use IPv6 ++ --disable-ipv6 disable ipv6 support + --disable-locale disable locale features + --disable-iconv-open disable all use of iconv_open() function + --disable-iconv disable rsync's --iconv option +@@ -1577,6 +1577,37 @@ fi + + } # ac_fn_c_try_run + ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ ++} # ac_fn_c_check_header_compile ++ + # ac_fn_c_try_link LINENO + # ----------------------- + # Try to link conftest.$ac_ext, and return whether this succeeded. +@@ -1623,37 +1654,6 @@ fi + + } # ac_fn_c_try_link + +-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +-# ------------------------------------------------------- +-# Tests whether HEADER exists and can be compiled using the include files in +-# INCLUDES, setting the cache variable VAR accordingly. +-ac_fn_c_check_header_compile () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-#include <$2> +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval "$3=yes" +-else +- eval "$3=no" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_header_compile +- + # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES + # ------------------------------------------------------- + # Tests whether HEADER exists, giving a warning if it cannot be compiled using +@@ -4548,7 +4548,7 @@ else + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +@@ -4594,7 +4594,7 @@ else + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +@@ -4618,7 +4618,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +@@ -4663,7 +4663,7 @@ else + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +@@ -4687,7 +4687,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +@@ -4725,262 +4725,61 @@ fi + + fi + +-ipv6type=unknown +-ipv6lib=none +-ipv6trylibc=yes + ++# Checks if IPv6 is requested ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable ipv6" >&5 ++$as_echo_n "checking whether to enable ipv6... " >&6; } + # Check whether --enable-ipv6 was given. + if test "${enable_ipv6+set}" = set; then : +- enableval=$enable_ipv6; +-fi +- +-if test x"$enable_ipv6" != x"no"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5 +-$as_echo_n "checking ipv6 stack type... " >&6; } +- for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta cygwin; do +- case $i in +- inria) +- # http://www.kame.net/ +- +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <netinet/in.h> +-#ifdef IPV6_INRIA_VERSION +-yes +-#endif +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : +- ipv6type=$i; +- +-$as_echo "#define INET6 1" >>confdefs.h +- +- +-fi +-rm -f conftest* +- +- ;; +- kame) +- # http://www.kame.net/ +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <netinet/in.h> +-#ifdef __KAME__ +-yes +-#endif +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : +- ipv6type=$i; +- +-$as_echo "#define INET6 1" >>confdefs.h +- +-fi +-rm -f conftest* +- +- ;; +- linux-glibc) +- # http://www.v6.linux.or.jp/ +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <features.h> +-#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 +-yes +-#endif +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : +- ipv6type=$i; +- +-$as_echo "#define INET6 1" >>confdefs.h +- +-fi +-rm -f conftest* +- +- ;; +- linux-inet6) +- # http://www.v6.linux.or.jp/ +- if test -d /usr/inet6 -o -f /usr/inet6/lib/libinet6.a; then +- ipv6type=$i +- ipv6lib=inet6 +- ipv6libdir=/usr/inet6/lib +- ipv6trylibc=yes; +- +-$as_echo "#define INET6 1" >>confdefs.h +- +- CFLAGS="-I/usr/inet6/include $CFLAGS" +- fi +- ;; +- solaris) +- # http://www.sun.com +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <netinet/ip6.h> +-#ifdef __sun +-yes +-#endif +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : +- ipv6type=$i; +- +-$as_echo "#define INET6 1" >>confdefs.h +- +-fi +-rm -f conftest* +- +- ;; +- toshiba) +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <sys/param.h> +-#ifdef _TOSHIBA_INET6 +-yes +-#endif +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : +- ipv6type=$i; +- ipv6lib=inet6; +- ipv6libdir=/usr/local/v6/lib; +- +-$as_echo "#define INET6 1" >>confdefs.h +- +-fi +-rm -f conftest* +- +- ;; +- v6d) +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include </usr/local/v6/include/sys/v6config.h> +-#ifdef __V6D__ +-yes +-#endif +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : +- ipv6type=$i; +- ipv6lib=v6; +- ipv6libdir=/usr/local/v6/lib; +- +-$as_echo "#define INET6 1" >>confdefs.h +- +-fi +-rm -f conftest* +- +- ;; +- zeta) +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <sys/param.h> +-#ifdef _ZETA_MINAMI_INET6 +-yes +-#endif +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : +- ipv6type=$i; +- ipv6lib=inet6; +- ipv6libdir=/usr/local/v6/lib; +- +-$as_echo "#define INET6 1" >>confdefs.h +- +-fi +-rm -f conftest* +- +- ;; +- cygwin) +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <netinet/in.h> +-#ifdef _CYGWIN_IN6_H +-yes +-#endif +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : +- ipv6type=$i; ++ enableval=$enable_ipv6; case "$enableval" in ++ no) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ;; ++ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + + $as_echo "#define INET6 1" >>confdefs.h + +-fi +-rm -f conftest* ++ ;; ++ esac ++else ++ if test "$cross_compiling" = yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + +- ;; +- esac +- if test "$ipv6type" != "unknown"; then +- break +- fi +- done +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6type" >&5 +-$as_echo "$ipv6type" >&6; } +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5 +-$as_echo_n "checking for library containing getaddrinfo... " >&6; } +-if ${ac_cv_search_getaddrinfo+:} false; then : +- $as_echo_n "(cached) " >&6 + else +- ac_func_search_save_LIBS=$LIBS +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char getaddrinfo (); +-int +-main () ++ /* AF_INET6 avalable check */ ++#include <sys/types.h> ++#include <sys/socket.h> ++main() + { +-return getaddrinfo (); +- ; +- return 0; ++ exit(0); ++ if (socket(AF_INET6, SOCK_STREAM, 0) < 0) ++ exit(1); ++ else ++ exit(0); + } ++ + _ACEOF +-for ac_lib in '' inet6; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_search_getaddrinfo=$ac_res +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext +- if ${ac_cv_search_getaddrinfo+:} false; then : +- break +-fi +-done +-if ${ac_cv_search_getaddrinfo+:} false; then : ++if ac_fn_c_try_run "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++$as_echo "#define INET6 1" >>confdefs.h + + else +- ac_cv_search_getaddrinfo=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5 +-$as_echo "$ac_cv_search_getaddrinfo" >&6; } +-ac_res=$ac_cv_search_getaddrinfo +-if test "$ac_res" != no; then : +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +-fi + + # Check whether --enable-locale was given. + if test "${enable_locale+set}" = set; then : +@@ -5006,6 +4805,7 @@ $as_echo "#define SHUTDOWN_ALL_SOCKETS 1" >>confdefs.h + $as_echo "no" >&6; };; + esac + ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } + if ${ac_cv_header_stdc+:} false; then : +-- +2.10.2 diff -uNr a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 --- a/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 false +++ b/net-misc/rsync/files/rsyncd.conf-3.0.9-r1 64e4051298ab4c5f8b30e54e4531dfc0203681c7b7b02e4247cdb46066bd6b567eb080098c67bc99b51d9eb0201c810397ef13008d2cfbc72735e64753197d2c @@ -0,0 +1,15 @@ +# /etc/rsyncd.conf + +# Minimal configuration file for rsync daemon +# See rsync(1) and rsyncd.conf(5) man pages for help + +# This line is required by the /etc/init.d/rsyncd script +pid file = @GENTOO_PORTAGE_EPREFIX@/run/rsyncd.pid +use chroot = yes +read only = yes + +# Simple example for enabling your own local rsync server +#[gentoo-portage] +# path = @GENTOO_PORTAGE_EPREFIX@/usr/portage +# comment = Gentoo Portage tree +# exclude = /distfiles /packages diff -uNr a/net-misc/rsync/files/rsyncd.conf.d b/net-misc/rsync/files/rsyncd.conf.d --- a/net-misc/rsync/files/rsyncd.conf.d false +++ b/net-misc/rsync/files/rsyncd.conf.d 8c265afba850f887a434cbf262c966cdbcfd4f65c050ab944594b9a55f95c53acb481be793dc7e835040deb53c23074ef6e4273a852646a93547287bdd7bb4ae @@ -0,0 +1,5 @@ +# /etc/conf.d/rsyncd: config file for /etc/init.d/rsyncd + +# see man pages for rsync or run `rsync --help` +# for valid cmdline options +#RSYNC_OPTS="" diff -uNr a/net-misc/rsync/files/rsyncd.init.d-r1 b/net-misc/rsync/files/rsyncd.init.d-r1 --- a/net-misc/rsync/files/rsyncd.init.d-r1 false +++ b/net-misc/rsync/files/rsyncd.init.d-r1 31395715b946d71534b64751288ef1ffdee1ee1b9a58654ce563b1d9ed7264d27e9faa793b015065a43409945a8567b5de00e75a012055995abbabeb8bd3ed73 @@ -0,0 +1,11 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/bin/rsync" +command_args="--daemon ${RSYNC_OPTS}" +pidfile="/var/run/${SVCNAME}.pid" + +depend() { + use net +} diff -uNr a/net-misc/rsync/files/rsyncd.logrotate b/net-misc/rsync/files/rsyncd.logrotate --- a/net-misc/rsync/files/rsyncd.logrotate false +++ b/net-misc/rsync/files/rsyncd.logrotate e994c0365e597c1f663644105ca9d3b7acf491399dedf2be1d0912a195d6b459b4c6f396a8c10ca08e703f9c3757ca10735893b1d7be2ae0687d56079a79b0b7 @@ -0,0 +1,9 @@ +/var/log/rsync.log { + compress + maxage 365 + rotate 7 + size=+1024k + notifempty + missingok + copytruncate +} diff -uNr a/net-misc/rsync/files/rsyncd.service b/net-misc/rsync/files/rsyncd.service --- a/net-misc/rsync/files/rsyncd.service false +++ b/net-misc/rsync/files/rsyncd.service 9b7c6a3acb0baf23813cef3fae9d0afce31eb31ed261a8ba370a33082c705e7a2d5c87829d28120ac9f677eea1998a8b8a2348acbf42c1116c3df647e8706861 @@ -0,0 +1,12 @@ +[Unit] +Description=rsync daemon +After=networking.target + +[Service] +Type=simple +ExecStart=/usr/bin/rsync --daemon --no-detach +StandardOutput=syslog +StandardError=syslog + +[Install] +WantedBy=multi-user.target diff -uNr a/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1 b/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1 --- a/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1 false +++ b/net-misc/rsync/files/rsyncd.xinetd-3.0.9-r1 693eab16a629f5a04f4d1e5be2563fa1da9a4cbb66daa983b30ace84c3ae7b6bcec32f7e3b6a0037c5d75736232d4b3ce82e73398f5311892c86324a9002ad59 @@ -0,0 +1,10 @@ +service rsync +{ + socket_type = stream + protocol = tcp + wait = no + user = root + server = @GENTOO_PORTAGE_EPREFIX@/usr/bin/rsync + server_args = --daemon + disable = yes +} diff -uNr a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml --- a/net-misc/rsync/metadata.xml false +++ b/net-misc/rsync/metadata.xml b5cbb1b1cdedebfce780f9a9a3ffb32987c661a18e9bf2726caa949ed850c2db68eecc95e3f426cda5e3872e00c6f5edc8f852f418f04e76df1d8f6c0258ff18 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:samba:rsync</remote-id> + </upstream> + <use> + <flag name="stunnel">Provide helper scripts for using rsync via >=net-misc/stunnel-4</flag> + </use> +</pkgmetadata> diff -uNr a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild --- a/net-misc/rsync/rsync-3.1.3.ebuild false +++ b/net-misc/rsync/rsync-3.1.3.ebuild fd234e9c8b9b464f73eceb96a8c7c40680e266e1a5891f13a8efd82cf4b82f2dcffd9bc36e5ab216566d3c65b4884ae25773439f4f23bfd797364315a339665b @@ -0,0 +1,95 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils flag-o-matic prefix systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/" +SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz" +[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +[[ ${PV} = *_pre* ]] || \ +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="acl examples iconv ipv6 static stunnel xattr" + +LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) + xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) + >=dev-libs/popt-1.5[static-libs(+)]" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" + +PATCHES=( + "${FILESDIR}"/${PN}-fix-musl-ipv6.patch +) + +S="${WORKDIR}/${P/_/}" + +src_configure() { + use static && append-ldflags -static + local myeconfargs=( + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf + --without-included-popt + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable ipv6) + $(use_enable xattr xattr-support) + ) + econf "${myeconfargs[@]}" + touch proto.h-tstamp #421625 +} + +src_install() { + emake DESTDIR="${D}" install + + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + + dodoc NEWS OLDNEWS README TODO tech_report.tex + + insinto /etc + newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rsyncd.logrotate rsyncd + + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd + + # Install stunnel helpers + if use stunnel ; then + emake DESTDIR="${D}" install-ssl-client + emake DESTDIR="${D}" install-ssl-daemon + fi + + # Install the useful contrib scripts + if use examples ; then + exeinto /usr/share/rsync + doexe support/* + rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c} + fi + + eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd* + + systemd_dounit "${FILESDIR}/rsyncd.service" +} + +pkg_postinst() { + if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then + ewarn "You have disabled chroot support in your rsyncd.conf. This" + ewarn "is a security risk which you should fix. Please check your" + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." + fi + if use stunnel ; then + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." + einfo + einfo "You maybe have to update the certificates configured in" + einfo "${EROOT}/etc/stunnel/rsync.conf" + fi +} diff -uNr a/net-misc/wget/Manifest b/net-misc/wget/Manifest --- a/net-misc/wget/Manifest false +++ b/net-misc/wget/Manifest 04f63b07634f0d2fbbeadaa6db975430cd06ac58a5720cb8f5dc91b744cf9da77b2f1af7aeacc3c276da0fb1ba469b760f6cbe6d25fe17dd4fe5e302eaa50ab3 @@ -0,0 +1,3 @@ +DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b +EBUILD wget-1.19.5.ebuild 3174 BLAKE2B a17a950d485a5e0e7ab4467687f6a11b149ef746006eca83902c682e9babf62c66d7c21213108d8c74617be78ae87aab0d2521d4a3d9de62017b415066847e82 SHA512 e35deb63e5d9f9d176e4b7ae3125b8b1e9db63a9fb1bacb3bc01f485d9b6aa559f948ac8ace85ec816dc180fb328a69fd45a0c6ac79051ea6245b4692247d6db +MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c diff -uNr a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml --- a/net-misc/wget/metadata.xml false +++ b/net-misc/wget/metadata.xml 8a54d6ad7b846d0154906af205ef62af8eeb6b247d6c1e5478872988ed76be4f7b43d1d3ecf17715e63f1237e87591dc96e9c6e0737c290f084f744707fde1a6 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> +<use> + <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag> + <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag> +</use> +<upstream> + <remote-id type="cpe">cpe:/a:gnu:wget</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/net-misc/wget/wget-1.19.5.ebuild b/net-misc/wget/wget-1.19.5.ebuild --- a/net-misc/wget/wget-1.19.5.ebuild false +++ b/net-misc/wget/wget-1.19.5.ebuild 7f8e3597f1058d5c62b1c4db111babb567b52a9cc5b22a90c3baf35729d1845e19767ff6d5536e95d0e449b0e45b1ceb4865b77d85a256a0a74b86680c4640d2 @@ -0,0 +1,117 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{4,5,6} ) + +inherit flag-o-matic python-any-r1 toolchain-funcs + +DESCRIPTION="Network utility to retrieve files from the WWW" +HOMEPAGE="https://www.gnu.org/software/wget/" +SRC_URI="mirror://gnu/wget/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" +REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" + +# Force a newer libidn2 to avoid libunistring deps. #612498 +LIB_DEPEND=" + idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) + pcre? ( dev-libs/libpcre[static-libs(+)] ) + ssl? ( + gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) + !gnutls? ( + !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + ) + ) + uuid? ( sys-apps/util-linux[static-libs(+)] ) + zlib? ( sys-libs/zlib[static-libs(+)] ) +" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND=" + ${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig + static? ( ${LIB_DEPEND} ) + test? ( + ${PYTHON_DEPS} + dev-lang/perl + dev-perl/HTTP-Daemon + dev-perl/HTTP-Message + dev-perl/IO-Socket-SSL + ) + nls? ( sys-devel/gettext ) +" + +DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + # revert some hack that breaks linking, bug #585924 + if [[ ${CHOST} == *-darwin* ]] \ + || [[ ${CHOST} == *-solaris* ]] \ + || [[ ${CHOST} == *-uclibc* ]] \ + || [[ ${CHOST} == *-cygwin* ]] \ + ; then + sed -i \ + -e 's/^ LIBICONV=$/:/' \ + configure || die + fi +} + +src_configure() { + # fix compilation on Solaris, we need filio.h for FIONBIO as used in + # the included gnutls -- force ioctl.h to include this header + [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 + + if use static ; then + append-ldflags -static + tc-export PKG_CONFIG + PKG_CONFIG+=" --static" + fi + + # There is no flag that controls this. libunistring-prefix only + # controls the search path (which is why we turn it off below). + # Further, libunistring is only needed w/older libidn2 installs, + # and since we force the latest, we can force off libunistring. #612498 + local myeconfargs=( + --disable-assert + --disable-rpath + --without-included-libunistring + --without-libunistring-prefix + $(use_enable debug) + $(use_enable idn iri) + $(use_enable ipv6) + $(use_enable nls) + $(use_enable ntlm) + $(use_enable pcre) + $(use_enable ssl digest) + $(use_enable ssl opie) + $(use_with idn libidn) + $(use_with ssl ssl $(usex gnutls gnutls openssl)) + $(use_with uuid libuuid) + $(use_with zlib) + ) + ac_cv_libunistring=no \ + econf "${myeconfargs[@]}" +} + +src_install() { + default + + sed -i \ + -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ + "${ED%/}"/etc/wgetrc \ + "${ED%/}"/usr/share/man/man1/wget.1 \ + "${ED%/}"/usr/share/info/wget.info \ + || die +} diff -uNr a/perl-core/File-Path/File-Path-2.130.0.ebuild b/perl-core/File-Path/File-Path-2.130.0.ebuild --- a/perl-core/File-Path/File-Path-2.130.0.ebuild false +++ b/perl-core/File-Path/File-Path-2.130.0.ebuild 611ee460a760c980b507216dfb29d7e2d79f3b5248935f452bb12ff452b74d7870c0068d66f167af99c68bb55e6c9a8eb7a8cb9e5a2c0e7f40544084f1863b3c @@ -0,0 +1,15 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=JKEENAN +DIST_VERSION=2.13 +inherit perl-module + +DESCRIPTION="File path and name utilities" + +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +IUSE="" diff -uNr a/perl-core/File-Path/Manifest b/perl-core/File-Path/Manifest --- a/perl-core/File-Path/Manifest false +++ b/perl-core/File-Path/Manifest 0339f7315d3c0c9bd78c479a3943c7186cba2b106ae68b563351a0b38d212c172b867c7e7a6d4365e8f0ff69d9e78f34ae432a20397f63091275576e2cbde3dc @@ -0,0 +1,3 @@ +DIST File-Path-2.13.tar.gz 31094 BLAKE2B 5dba747c6c269dcebf833537f7d9ad5f72dd08dfa8446c98a5bce2ea933f83d7a664a1fb49fe79505d0ca13a11741bef18dcf74df571fd3f8c3bd88b777c5aae SHA512 9684737947bd46a3a4a1bd5f04b712d69cb08c3c6a2801c1017d2a796946162d8121bc614408cbdbb4749d2cdacfd5279ee4db11797e3053efef1d1ec7012562 +EBUILD File-Path-2.130.0.ebuild 488 BLAKE2B 267c5be1f569356f9890a45f9cc409815eb54a7cc830d895ac8bd91bfd6c59ebcab9cf7296e1b9a64d5b6cf1ee109b61c1fef43f940a8b2c86cf8e68f50777f4 SHA512 2e55f7c0f909c2742607d68a6cbda575e06833652f7f3fa48a7e748574128cbd2baff8864c82c5b584c2b47de356c8149a87318785f3c5e1339302c14f44a8b2 +MISC metadata.xml 390 BLAKE2B 2b39dc5085e9a51a5b412c525a4fbfd72a940cb84463ba731e07539791dd3ae842910b59cf70df301025044b7d8b34ea5feadd0b813d6857c10711062182285a SHA512 2da682f46b894808bf34ce21807ba65a0ef725a1336593a1070c7a738c1ee495c6c5884d28c5c4a9dae649b55410c8874a9dc080d6143f09fb9ea7a53acd35e9 diff -uNr a/perl-core/File-Path/metadata.xml b/perl-core/File-Path/metadata.xml --- a/perl-core/File-Path/metadata.xml false +++ b/perl-core/File-Path/metadata.xml 744edfc85316f1c3d2a105358190693092fb2b290795e937d46b5809d9b3819222bb7e06e22337dabc14bc421ac58055643dda3d4c65f1e275973ec7095707c7 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>perl@gentoo.org</email> + <name>Gentoo Perl Project</name> + </maintainer> + <upstream> + <remote-id type="cpan">File-Path</remote-id> + <remote-id type="cpan-module">File::Path</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/perl-core/File-Temp/File-Temp-0.230.400-r1.ebuild b/perl-core/File-Temp/File-Temp-0.230.400-r1.ebuild --- a/perl-core/File-Temp/File-Temp-0.230.400-r1.ebuild false +++ b/perl-core/File-Temp/File-Temp-0.230.400-r1.ebuild 045792333ec8b984fbe78b80c0b35585e44fe14bae1d744c48811d6f8ced4d27b5c560f9044d53ca5899a6978f56323bd3b5d117ea25c3c3563911119d813192 @@ -0,0 +1,19 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +MODULE_AUTHOR=DAGOLDEN +MODULE_VERSION=0.2304 +inherit perl-module + +DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way" + +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +# bug 390719 +PATCHES=( "${FILESDIR}/${PN}-0.230.0-symlink-safety.patch" ) + +SRC_TEST="do" diff -uNr a/perl-core/File-Temp/Manifest b/perl-core/File-Temp/Manifest --- a/perl-core/File-Temp/Manifest false +++ b/perl-core/File-Temp/Manifest c8cb31a22b2f962664f789857c4fc3787066636617b015251d3ab927588ccbc47f0cdbd3499f1f3eb138a493384f8d274b777bf9c5b579a91613cd5aa93b8be0 @@ -0,0 +1,4 @@ +AUX File-Temp-0.230.0-symlink-safety.patch 1120 BLAKE2B f12300564dc761ae438ebef6260858219bbd2de3400cdaae3933826c62bedac9593cb602f923e8bfbd7d6cd0926eabd90a7d09a699792aee5cd5c8e9d5bce710 SHA512 273fe8f86b8ddc91224c84091f6c37396d1c116dc0c6d97162945955ecdd605c884971c24cd260be18ea7a412c8b9c2b2737026182cd7bf97040e648480d0e48 +DIST File-Temp-0.2304.tar.gz 59505 BLAKE2B e207bdf9a63e06495b1f3a1c4ec78c3f049c91ddd3d51ad7665e5e20d379d199b11f93c55dc5c49216f260ccbf2cb391ff9db6b7be7634943c7917eedda8dc7b SHA512 823acf6ca42eb0548617feec4ce32e24da3fbbcb05d78dadea902e318797ed31bb16ef2b7fee50f79d52adb7dd561b8f97c1b9e11c56ba7d50735efbf639f1db +EBUILD File-Temp-0.230.400-r1.ebuild 638 BLAKE2B fad668f748dbf16fce1416c1399e17f30b7249da2e47bdf5e3a01e24a05f065d400f55a3003fa330c6b12861b184b2643efaf29cc798ecc0fb94026e1de27daf SHA512 05c51ad6ffa9a07f21bb7fe6a6a669fb53814b7d4296930ce6d08a1ac76fddcd3826b7d69c24939ca2d502775b3dd298d1a9f7eafca00a2830a95eee97d54b93 +MISC metadata.xml 452 BLAKE2B c0f858232a6e98b6aa5153894d24a70c3f0c44d618ea57e9c0a01f797fa70075017f526ccaaa99abdb3d2efebb40a5f07d5344f3fac02fe710b69009b69a16ed SHA512 f32f3ab3cea90b5d55cf3823d93d82e4b7c92e0e37e084f8a43c31ba26efd72660d488772a1ceacde0e03fc2298722852501a6dce04ecefe01af8d408ee13984 diff -uNr a/perl-core/File-Temp/files/File-Temp-0.230.0-symlink-safety.patch b/perl-core/File-Temp/files/File-Temp-0.230.0-symlink-safety.patch --- a/perl-core/File-Temp/files/File-Temp-0.230.0-symlink-safety.patch false +++ b/perl-core/File-Temp/files/File-Temp-0.230.0-symlink-safety.patch d75cd9fbb9623af218f352764cb4668ed8784851c24306981cf889de3fb321892a28c9334cb82668fda6d2858cde856ca8ece95cb674a7270115a93943266453 @@ -0,0 +1,37 @@ +From: John Lightsey <jd@cpanel.net> +Date: Mon, 27 Jun 2011 13:07:44 -0500 +Subject: [PATCH] symlink safety + +Add check for unsafe symbolic links to _is_safe() directory check. + + +diff -ruN File-Temp-0.23.orig/lib/File/Temp.pm File-Temp-0.23/lib/File/Temp.pm +--- File-Temp-0.23.orig/lib/File/Temp.pm 2013-03-14 22:56:59.000000000 +0100 ++++ File-Temp-0.23/lib/File/Temp.pm 2014-10-15 23:46:29.894611586 +0200 +@@ -672,7 +672,25 @@ + my $err_ref = shift; + + # Stat path +- my @info = stat($path); ++ my @info = lstat($path); ++ my $symlink_test_path = $path; ++ my $symlink_loop_count = 0; ++ while (-l _) { ++ if (++$symlink_loop_count >= 50) { ++ $$err_ref = "50 levels of symlinks encountered at $path"; ++ return 0; ++ } ++ if ( $info[4] <= File::Temp->top_system_uid() || $info[4] == $>) { ++ # safe to traverse ++ $symlink_test_path = readlink($symlink_test_path); ++ @info = lstat($symlink_test_path); ++ } ++ else { ++ $$err_ref = "Unsafe symlink at $path"; ++ return 0; ++ } ++ } ++ + unless (scalar(@info)) { + $$err_ref = "stat(path) returned no values"; + return 0; diff -uNr a/perl-core/File-Temp/metadata.xml b/perl-core/File-Temp/metadata.xml --- a/perl-core/File-Temp/metadata.xml false +++ b/perl-core/File-Temp/metadata.xml 7f43a2596433853152afde5f1d034a49d64d78bac4be59f0d62664f8a835c3cf1d08e2f7a6fdc0a2ec08f509bbd947de440e865f8e9e0fe0e5222283951b5c84 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>perl@gentoo.org</email> + <name>Gentoo Perl Project</name> + </maintainer> + <upstream> + <remote-id type="cpan">File-Temp</remote-id> + <remote-id type="cpan-module">File::Temp</remote-id> + <remote-id type="cpan-module">File::Temp::Dir</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/profiles/categories b/profiles/categories --- a/profiles/categories false +++ b/profiles/categories 197f94a1e05b89f33c21bee40df258eb63a2aa3a7b6c170a635719c49b7d78de957022800272d7dfaa49d08bd7006326c1ebde202789de413a775ca25b40957c @@ -0,0 +1,165 @@ +app-accessibility +app-admin +app-antivirus +app-arch +app-backup +app-benchmarks +app-cdr +app-crypt +app-dicts +app-doc +app-editors +app-emacs +app-emulation +app-eselect +app-forensics +app-i18n +app-laptop +app-leechcraft +app-metrics +app-misc +app-mobilephone +app-office +app-officeext +app-pda +app-portage +app-shells +app-text +app-vim +app-xemacs +dev-ada +dev-cpp +dev-db +dev-dotnet +dev-embedded +dev-erlang +dev-games +dev-go +dev-haskell +dev-java +dev-lang +dev-libs +dev-lisp +dev-lua +dev-ml +dev-perl +dev-php +dev-python +dev-qt +dev-ros +dev-ruby +dev-scheme +dev-tcltk +dev-tex +dev-texlive +dev-util +dev-vcs +games-action +games-arcade +games-board +games-emulation +games-engines +games-fps +games-kids +games-misc +games-mud +games-puzzle +games-roguelike +games-rpg +games-server +games-simulation +games-sports +games-strategy +games-util +gnome-base +gnome-extra +gnustep-apps +gnustep-base +gnustep-libs +java-virtuals +kde-apps +kde-frameworks +kde-misc +kde-plasma +lxde-base +lxqt-base +mail-client +mail-filter +mail-mta +mate-base +mate-extra +media-fonts +media-gfx +media-libs +media-plugins +media-radio +media-sound +media-tv +media-video +net-analyzer +net-dialup +net-dns +net-firewall +net-fs +net-ftp +net-im +net-irc +net-libs +net-mail +net-misc +net-nds +net-news +net-nntp +net-p2p +net-print +net-proxy +net-voip +net-vpn +net-wireless +perl-core +ros-meta +sci-astronomy +sci-biology +sci-calculators +sci-chemistry +sci-electronics +sci-geosciences +sci-libs +sci-mathematics +sci-misc +sci-physics +sci-visualization +sec-policy +sys-apps +sys-auth +sys-block +sys-boot +sys-cluster +sys-devel +sys-fabric +sys-firmware +sys-freebsd +sys-fs +sys-kernel +sys-libs +sys-power +sys-process +virtual +www-apache +www-apps +www-client +www-misc +www-plugins +www-servers +x11-apps +x11-base +x11-drivers +x11-libs +x11-misc +x11-plugins +x11-proto +x11-terms +x11-themes +x11-wm +xfce-base +xfce-extra diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/lib32/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/lib32/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/lib32/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/lib32/make.defaults ff4ded359ac2f1e9ddb9683177e95c791c2b535b2fa926ea8bc7f22cedf301a6a59fea3e7d35cf7cf6c7e4415a1bae7800a87238514947f976274bcae8cc1183 @@ -0,0 +1,5 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +LIBDIR_x86="lib32" +SYMLINK_LIB="yes" diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/lib32/parent b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/lib32/parent --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/lib32/parent false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/lib32/parent fc37e047c6586d4331a64ec9ae744fb8e1b76c2308868a3d5330b9b4049b68886154c02ca591f9784854f7251e811c32223d1dbb70b67e93fec1cb4e64f4867a @@ -0,0 +1 @@ +.. diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/make.defaults 1e334c9e33116e5a68fa73d9cfa8473684aa6abc10d7e2b6c7201a352d8e8eb63072f7e1cc3203df6d60507334af28816f66c22777b352da1bb859804a233438 @@ -0,0 +1,64 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +ARCH="amd64" +ACCEPT_KEYWORDS="${ARCH}" + +CHOST="x86_64-pc-linux-gnu" +CFLAGS="-O2 -pipe" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + +# 2006/06/07 - Danny van Dyk <kugelfang@gentoo.org> +# Multilib settings for all amd64 subprofiles. +MULTILIB_ABIS="amd64 x86" +DEFAULT_ABI="amd64" +# Do not remove this one, or all kinds of hell breaks loose. +ABI="amd64" + +LIBDIR_amd64="lib64" +LIBDIR_x86="lib" +LIBDIR_x32="libx32" +SYMLINK_LIB="no" + +# 64bit specific settings. +CFLAGS_amd64="-m64" +LDFLAGS_amd64="-m elf_x86_64" +CHOST_amd64="x86_64-pc-linux-gnu" + +# 32bit specific settings. +CFLAGS_x86="-m32" +LDFLAGS_x86="-m elf_i386" +CHOST_x86="i686-pc-linux-gnu" + +# 64-32bit specific settings. +CFLAGS_x32="-mx32" +LDFLAGS_x32="-m elf32_x86_64" +CHOST_x32="x86_64-pc-linux-gnux32" + +# 2006/10/24 - Simon Stelling <blubb@gentoo.org> +# They are masked, but we can enable them anyway for those who have +# >=portage-2.1.2_pre3-r4 +CPU_FLAGS_X86="mmx mmxext sse sse2" + +# Michał Górny <mgorny@gentoo.org> (03 Sep 2013) +# Enable abi_x86_64 for packages that don't have it forced. +ABI_X86="64" + +# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org> +# Defaults for video drivers +VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa" + +# 2006/12/22 - Danny van Dyk <kugelfang@gentoo.org> +# Default for ALSA_CARDS USE_EXPAND variable. +ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" + +# Michał Górny <mgorny@gentoo.org> (26 Jan 2013) +# Unhide the x86-specific USE_EXPANDs. +USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86" + +# Michał Górny <mgorny@gentoo.org> (25 Jun 2014) +# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied +# by non-multilib ebuilds when non-native ABIs are disabled. +IUSE_IMPLICIT="abi_x86_64" diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/make.defaults 0d87422b7bf6b3bf9025512b0187095991737c9136985d792898763b08a7ee92c161090fc3eaff2eba64d013d318bee70a984f24b17ed8f088e1a98b678711e2 @@ -0,0 +1,8 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +MULTILIB_ABIS="amd64" + +# Michał Górny <mgorny@gentoo.org> (26 Jan 2013) +# Hide the ABI_X86 USE_EXPAND back for non-multilib profile. +USE_EXPAND_HIDDEN="ABI_X86" diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.mask f6bb8cf8121280cb9b4c22e4e4043073aa027b1795daae8956c674e2c35c207a01c9e25e56cacac32c7c09d77b92f10d6d8950f90a6c16a796468ddb88325c54 @@ -0,0 +1,162 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Michał Górny <mgorny@gentoo.org> (07 Jan 2018) +# Requires 32-bit libraries. +<net-misc/teamviewer-13 + +# David Seifert <soap@gentoo.org> (03 Jan 2018) +# Requires 32-bit multilib compatibility +sys-block/megamgr + +# James Le Cuirot <chewi@gentoo.org> (13 Aug 2016) +# Steam requires amd64 multilib. These are steam-overlay packages. +dev-util/adobe-air-runtime +games-util/steam-client-meta +games-util/steam-games-meta +games-util/steam-launcher +games-util/steam-meta + +# Andreas K. Huettel <dilfridge@gentoo.org> +# Novell Groupwise Client sadly needs a 32bit java vm (bundled) +mail-client/novell-groupwise-client + +# AMD64 Team <amd64@gentoo.org> +# Mask packages that rely on amd64 multilib +>=app-i18n/atokx3-3.0.0 +app-accessibility/mbrola +app-accessibility/perlbox-voice +app-arch/stuffit +app-benchmarks/cpuburn +app-editors/emacs:18 +app-emulation/crossover-bin +app-emulation/playonlinux +app-emulation/q4wine +app-emulation/winetricks +app-office/ooextras +dev-embedded/libftd2xx +dev-embedded/openocd +dev-lang/icc +dev-lang/idb +dev-lang/ifc +dev-util/android-ndk +dev-util/android-sdk-update-manager +dev-util/android-studio +dev-util/biew +games-action/beathazardultra +games-action/brutal-legend +games-action/cs2d +games-action/descent3 +games-action/descent3-demo +games-action/heretic2 +games-action/heretic2-demo +games-action/hotline-miami +games-action/intrusion2 +games-action/lugaru +games-action/mutantstorm-demo +games-action/phobiaii +games-action/rune +games-action/shadowgrounds-bin +games-action/shadowgrounds-survivor-bin +games-action/solar2 +games-action/spacetripper-demo +games-action/swordandsworcery +games-action/trine-enchanted-edition +games-action/trine2 +games-arcade/aquaria +games-arcade/barbarian-bin +games-arcade/dynamitejack +games-arcade/gish-demo +games-arcade/jardinains +games-arcade/thinktanks-demo +games-emulation/caps +games-emulation/nestra +games-emulation/pcsx2 +games-emulation/zinc +games-emulation/zsnes +games-fps/avp +games-fps/doom3 +games-fps/doom3-cdoom +games-fps/doom3-chextrek +games-fps/doom3-data +games-fps/doom3-demo +games-fps/doom3-ducttape +games-fps/doom3-eventhorizon +games-fps/doom3-hellcampaign +games-fps/doom3-inhell +games-fps/doom3-lms +games-fps/doom3-mitm +games-fps/doom3-roe +games-fps/enemy-territory +games-fps/enemy-territory-etpro +games-fps/enemy-territory-omnibot +games-fps/enemy-territory-truecombat +games-fps/etqw-bin +games-fps/etqw-data +games-fps/etqw-demo +games-fps/glxquake-bin +games-fps/legends +games-fps/postal2 +games-fps/postal2mp-demo +games-fps/quake3-bin +games-fps/quake3-demo +games-fps/quake3-ra3 +games-fps/quake4-bin +games-fps/quake4-data +games-fps/quake4-demo +games-fps/rtcw +games-fps/rtcwmp-demo +games-fps/rtcwsp-demo +games-fps/sauerbraten +games-fps/serious-sam-tfe +games-fps/serious-sam-tse +games-fps/soldieroffortune +games-fps/soldieroffortune-demo +games-fps/unreal-tournament +games-fps/ut2003 +games-fps/ut2003-demo +games-fps/ut2004-demo +games-kids/crayon-physics +games-misc/little-inferno +games-misc/papers-please +games-puzzle/hoh-bin +games-roguelike/adom +games-rpg/baldurs-gate-ee +games-rpg/dear-esther +games-rpg/dungeon-defenders +games-rpg/eschalon-book-1-demo +games-rpg/penumbra-collection +games-rpg/wasteland2 +games-server/etqw-ded +games-server/nwn-ded +games-server/ut2003-ded +games-simulation/bcs-demo +games-strategy/darwinia +games-strategy/darwinia-demo +games-strategy/defcon-demo +games-strategy/dominions2 +games-strategy/heroes3 +games-strategy/heroes3-demo +games-strategy/knights-demo +games-strategy/majesty-demo +games-strategy/smac +games-strategy/spaz +media-sound/aucdtect +media-sound/ventrilo-server-bin +media-video/binkplayer +media-video/tsmuxer +net-misc/icaclient +net-misc/ps3mediaserver +net-print/cndrvcups-common-lb +net-print/cndrvcups-lb +sci-biology/foldingathome +sci-chemistry/cara-bin +sci-chemistry/mars +sci-electronics/eagle +sci-libs/ipp +sys-libs/lib-compat-loki + + +# AMD64 Team; <amd64@gentoo.org> +# grub-1 is not available on no-multilib-profiles +<sys-boot/grub-1.99 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.use.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.use.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.use.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.use.force be3245a34e1a784dafdf4226a2869ebf8d377fc43b14472b04e95457ec9e2e1b6d510fa43e25f1146c91c8dcb1848f10b688020c1f63b14c14e9fc56bbbea2cc @@ -0,0 +1,6 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Michał Górny <mgorny@gentoo.org> (08 Apr 2017) +# Undo multilib forcing. +sys-apps/sandbox -abi_x86_32 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/package.use.mask 0d9fed4c56b86c4cf1704de53a55e766e81c5eae8be3ca51086d69d1bce20587b38d1aee353488cd1dadab419116269395e89d3e22a890c9665516feb401acd8 @@ -0,0 +1,25 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Yixun Lan <dlan@gentoo.org> (12 Jul 2017) +# GLEP 73 Immutability, USE=ovmf requires hvm +app-emulation/xen-tools ovmf + +# NP-Hardass <NP-Hardass@gentoo.org> (11 Jul 2017) +# GLEP 73 Immutability, USE=test requires +# abi_x86_32 at this time. +app-emulation/wine-vanilla test +app-emulation/wine-staging test +app-emulation/wine-d3d9 test +app-emulation/wine-any test + +# Mike Frysinger <vapier@gentoo.org> (12 Aug 2016) +# Requires sys-boot/grub:0 which is masked here. +sys-apps/memtest86+ floppy + +# Intel Integrated Primitive (sci-libs/ipp) support +media-libs/opencv ipp + +# Alexis Ballier <aballier@gentoo.org> (13 Aug 2009) +# Requires wine +media-sound/lmms vst diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/no-multilib/use.mask 37ccaa98f4e4f8042ab407accc9f38056824822afdba3c85cb3f94a7f00690ae991053a11c7eb880bb365fd121da7ff5c435fbcae6cce18f984b7c8392a9e112 @@ -0,0 +1,16 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# USE flags masked because providing packages have ABI=x86 + +# 2007/08/29 Christoph Mende <angelos@gentoo.org> +# app-accessibility/mbrola is x86 only +mbrola + +# 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org> +# Mask multilib, since we cannot use it. +multilib + +# Michał Górny <mgorny@gentoo.org> (26 Jan 2013) +# Mask the multilib flags back for non-multilib profile. +abi_x86_32 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use 6e694d20d71d31624a9dd8888c6c6b5e077684c9f9b95b7cd894d542ff596238b36edfd179838f24189e763dfef22d2d0d227f950b1f338f3e1440e7e3a21cae @@ -0,0 +1,24 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Mike Gilbert <floppym@gentoo.org> (17 Nov 2016) +# Enable both efi and pc by default. +# https://bugs.gentoo.org/600110 +sys-boot/grub:2 grub_platforms_efi-64 grub_platforms_pc + +# Michał Górny <mgorny@gentoo.org> (24 Sep 2016) +# Enable the GPU targets matching the default VIDEO_CARDS +sys-devel/clang llvm_targets_AMDGPU llvm_targets_NVPTX +sys-devel/llvm llvm_targets_AMDGPU llvm_targets_NVPTX + +# James Le Cuirot <chewi@gentoo.org> (01 Aug 2016) +# Most users don't need a multilib JVM. +dev-java/icedtea-bin -multilib + +# Michał Górny <mgorny@gentoo.org> (28 Jun 2014) +# Packages that should be multilib by default. +x11-drivers/nvidia-drivers abi_x86_32 + +# Doug Goldstein <cardoe@gentoo.org> (29 Oct 2012) +# Enable the native arch as the default qemu target +app-emulation/qemu qemu_softmmu_targets_x86_64 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.force e0183e256fde2447d07bbecf6ab5d121fa4ef429341e28eb7254681bd782927ed8b0043e4d6c3f196706d9bb6e7357da8e3fa8ed28ff76dd81f7e1d596e17e48 @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Georgy Yakovlev <ya@sysdump.net> (14 May 2018) +# Force the host target to avoid dependency hell +dev-lang/rust llvm_targets_X86 + +# NP-Hardass <NP-Hardass@gentoo.org> (23 May 2017) +# Packages with optional 64-bit variant +app-emulation/wine-vanilla -abi_x86_64 +app-emulation/wine-staging -abi_x86_64 +app-emulation/wine-d3d9 -abi_x86_64 +app-emulation/wine-any -abi_x86_64 +virtual/wine -abi_x86_64 + +# Michał Górny <mgorny@gentoo.org> (08 Apr 2017) +# Require sandbox to be multilib-capable to avoid failures when building +# multilib packages, #611292. +sys-apps/sandbox abi_x86_32 + +# Michał Górny <mgorny@gentoo.org> (24 Sep 2016) +# Force the host target to avoid dependency hell +sys-devel/clang llvm_targets_X86 +sys-devel/llvm llvm_targets_X86 + +# Michał Górny <mgorny@gentoo.org> (02 Sep 2013) +# Packages with optional 64-bit variant. +www-plugins/adobe-flash -abi_x86_64 + +# Diego Elio Pettenò <flameeyes@gmail.com> (21 Apr 2011) +# The plugin is 32-bit only (and I'm not even sure if it works with +# modern iscan); make sure it only installs the firmware for amd64! +media-gfx/iscan-plugin-gt-f500 minimal + +# <blubb@gentoo.org> (23 Oct 2006) +# upstream forces sse2 on regardless of what the use flag is +dev-libs/openssl cpu_flags_x86_sse2 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.mask 3ab5974b5150f5f495e8fa6f89bf99d3f0aa673c3847f9777a3ee9a00c52f7e8a415249676e93d613c1b4ac35f7b623c08913eabf8085d166daa37fd71abf9fb @@ -0,0 +1,292 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# When you add an entry to the top of this file, add your name, the date, and +# an explanation of why something is getting masked. Please be extremely +# careful not to commit atoms that are not valid, as it can cause large-scale +# breakage, especially if it ends up in the daily snapshot. +# +## Example: +## +## # Dev E. Loper <developer@gentoo.org> (28 Jun 2012) +## # Masking foo USE flag until we can get the +## # foo stuff to work properly again (bug 12345) +## =media-video/mplayer-0.90_pre5 foo +## =media-video/mplayer-0.90_pre5-r1 foo +# + +#--- END OF EXAMPLES --- + +# Nick Sarnie <sarnex@gentoo.org> (29 Apr 2018) +# media-libs/vulkan-loader and app-emulation/vkd3d are keyworded on amd64 +app-emulation/wine-any -vkd3d -vulkan +app-emulation/wine-d3d9 -vkd3d -vulkan +app-emulation/wine-staging -vkd3d -vulkan +app-emulation/wine-vanilla -vkd3d -vulkan + +# Richard Yao <ryao@gentoo.org> (16 Apr 2018) +# sys-fs/zfs is keyworded on amd64 +sys-cluster/ceph -zfs +sys-boot/grub -libzfs + +# Amy Liffey <amynka@gentoo.org> (19 Sep 2017) +# [cuda] is unmasked in this profiles. +media-libs/opencv -contrib_xfeatures2d + +# Brian Evans <grknight@gentoo.org> (21 Jul 2017) +# app-crypt/argon2 is keyworded on amd64 +dev-lang/php -argon2 + +# David Seifert <soap@gentoo.org> (20 May 2017) +# cpyrit-cuda does not support GCC 4.9 or later +net-wireless/pyrit cuda + +# Rick Farina <zerochaos@gentoo.org> (11 May 2017) +# nexpose and openvas work on amd64 +net-analyzer/metasploit nexpose openvas + +# Thomas Deutschmann <whissi@gentoo.org> (01 Mar 2017) +# dev-libs/libmaxminddb is keyworded on amd64 +app-admin/rsyslog -mdblookup + +# Alexis Ballier <aballier@gentoo.org> (21 Feb 2017) +# spacetime works on amd64 +# https://caml.inria.fr/pub/docs/manual-ocaml/spacetime.html +dev-lang/ocaml -spacetime + +# Alexis Ballier <aballier@gentoo.org> (31 Jan 2017) +# nvidia drivers are unmasked here +media-video/ffmpeg -nvenc + +# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (04 Jan 2017) +# Assembly optimisations are supported on amd64 for all versions +dev-libs/libsecp256k1 -asm + +# Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2016) +# on behalf of Andreas K. Hüttel <dilfridge@gentoo.org> (14 Dec 2016) +# Fails to build with newly unmasked ffmpeg-3, so mask this useflag +# Workaround; leaving a real fix to the maintainers... bug 580630 +media-libs/mlt vdpau + +# Ettore Di Giacinto <mudler@gentoo.org> (18 Oct 2016) +# Enable gambit and scm only on supported architectures +>=dev-scheme/slib-3.2.5 -gambit -scm + +# Thomas Deutschmann <whissi@gentoo.org> (22 Sep 2016) +# Enable MQTT support on supported architectures +app-metrics/collectd -collectd_plugins_mqtt + +# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016) +# Enable numa support on supported architectures +dev-db/mysql -numa +dev-db/percona-server -numa + +# Brian Evans <grknight@gentoo.org> (23 Aug 2016) +# It's only supported on amd64 +dev-db/percona-server -tokudb -tokudb-backup-plugin + +# Brian Evans <grknight@gentoo.org> (18 Aug 2016) +# Allow jdbc on this arch +dev-db/mariadb -jdbc + +# Andrew Savchenko <bircoph@gentoo.org> (11 Aug 2016) +# PGO is fixed on amd64 +>=www-client/firefox-48 -pgo + +# James Le Cuirot <chewi@gentoo.org> (26 Jul 2016) +# Only available on some architectures. +dev-java/icedtea -shenandoah + +# Mike Gilbert <floppym@gentoo.org> (23 Jun 2016) +# This flag only has meaning on amd64 +sys-boot/grub:2 -grub_platforms_xen-32 + +# Nathan Phillip Brink <binki@gentoo.org> (26 Sep 2015) +# git useflag requires dev-libs/libgit2 which few arches support +dev-util/geany-plugins -git + +# Brian Evans <grknight@gentoo.org (14 Sep 2015) +# Unmask new USE flags for mariadb on supported arches +>=dev-db/mariadb-10.1.0 -mroonga -sst-xtrabackup -galera + +# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015) +# sys-boot/gnu-efi is not supported on all archs. +sys-apps/systemd -gnuefi + +# James Le Cuirot <chewi@gentoo.org> (28 Jul 2015) +# JavaFX and the browser plugin are included on x64 Linux. +dev-java/oracle-jdk-bin -javafx -nsplugin +dev-java/oracle-jre-bin -javafx -nsplugin + +# Michael Sterrett <mr_bones_@gentoo.org> (21 Apr 2015) +# None of the fusionsound deps support multilib currently, maybe later. +# Hiding the use flag fixes bug #545662 for now. +media-libs/libsdl2 fusionsound + +# Ben de Groot <yngwin@gentoo.org> (15 Mar 2015) +# media-libs/libbdplus is keyworded on amd64, so unmask the useflag +media-libs/libbluray -bdplus + +# Michał Górny <mgorny@gentoo.org> (01 Mar 2015) +# pidgin-opensteamworks is only available for amd64, ppc32 and x86 +net-im/telepathy-connection-managers -steam + +# Mike Frysinger <vapier@gentoo.org> (04 Aug 2014) +# Unmask flashrom drivers that only work on x86 due to in/out asm insns #454024 +sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv + +# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (24 Apr 2014) +# It's only supported on amd64 +dev-db/mariadb -tokudb + +# Matt Turner <mattst88@gentoo.org> (07 Mar 2014) +# media-libs/libomxil-bellagio keyworded on amd64/x86 +media-libs/mesa -openmax + +# Samuli Suominen <ssuominen@gentoo.org> (16 Feb 2014) +# Still considered experimental by upstream: +# https://sourceforge.net/p/mikmod/bugs/16/#17ea +media-libs/libmikmod cpu_flags_x86_sse2 + +# Andreas K. Huettel <dilfridge@gentoo.org> (4 Jan 2014) +# While globally masked, the needed amd64 keywords are already present +dev-vcs/git -mediawiki -mediawiki-experimental + +# Sergey Popov <pinkbyte@gentoo.org> (27 Dec 2013) +# Boost.Context can be built on amd64 +dev-libs/boost -context + +# Michał Górny <mgorny@gentoo.org> (15 Dec 2013) +# mupen64plus' 2.0 new dynamic recompiler is supported on x86 and arm +# only. +games-emulation/mupen64plus-core new-dynarec + +# Jeff Horelick <jdhore@gentoo.org> (1 Sep 2013) +# Dependency (media-libs/libsidplayfp) only keyworded +# on x86 and amd64. (masked in base) +>=media-plugins/audacious-plugins-3.4 -sid + +# Tim Harder <radhermit@gentoo.org> (13 Aug 2013) +# dev-lang/luajit keyworded for amd64 (masked in base) +# dev-scheme/racket keyworded for amd64 (masked in base) +app-editors/vim -luajit -racket +app-editors/gvim -luajit -racket + +# Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013) +# Works on amd64 +sys-apps/hwloc -gl + +# Michał Górny <mgorny@gentoo.org> (22 Jul 2013) +# Meaningless on amd64 (it controls the 32-bit x86 JIT). +dev-python/pypy cpu_flags_x86_sse2 +dev-python/pypy-bin cpu_flags_x86_sse2 +dev-python/pypy3 cpu_flags_x86_sse2 +dev-python/pypy3-bin cpu_flags_x86_sse2 + +# Christoph Junghans <junghans@gentoo.org> (26 Dec 2012) +# cuda works on x86/amd64 (masked in base) +sci-chemistry/gromacs -mkl + +# Diego Elio Pettenò <flameeyes@gentoo.org> (3 Nov 2012) +# Unmask here, as it's masked in base. +net-libs/gnutls -dane + +# Ben de Groot <yngwin@gentoo.org> (30 Jul 2012) +# dependency keyworded here, masked in base +media-libs/freetype -infinality + +# Alexandre Rostovtsev <tetromino@gentoo.org> (12 Apr 2012) +# Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for +# gobject-introspection[doctool], bug #411761 +dev-libs/gobject-introspection -doctool + +# Michał Górny <mgorny@gentoo.org> (11 Apr 2012) +# JIT compilation in zpaq generates code for x86/amd64. +app-arch/zpaq -jit + +# Arun Raghavan <ford_prefect@gentoo.org> (29 Mar 2012) +# webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be +# added. +media-sound/pulseaudio -webrtc-aec + +# Bernard Cafarelli <voyageur@gentoo.org> (27 Feb 2012) +# Masked in base profile, supported on this arch +gnustep-base/gnustep-make -libobjc2 + +# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012) +# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so +# it's masked in base profile and unmasked here (bug #396313). +net-libs/webkit-gtk -jit +www-client/midori -jit + +# Davide Pesavento <pesa@gentoo.org> (30 Nov 2011) +# The QML (V4) and JSC JITs are supported only on amd64/arm/x86, +# so the flag is masked in the base profile and unmasked here. +dev-qt/qtdeclarative -jit +dev-qt/qtscript -jit +dev-qt/qtwebkit -jit + +# Robin H. Johnson <robbat2@gentoo.org> (10 Jul 2011) +# PPS should work on all arches, but only keyworded on amd64/x86 +>=net-misc/ntp-4.2.6_p3-r1 -parse-clocks + +# Tim Harder <radhermit@gentoo.org> (13 Feb 2011) +# Masked in base, unmask for amd64/x86 +>=media-video/mplayer-1.0_rc4_p20101219 -bluray + +# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (28 Nov 2010) +# sys-devel/llvm is keyworded on amd64 +media-libs/mesa -llvm + +# Tomáš Chvátal <scarabeus@gentoo.org> (4 Apr 2010) +# x86 platforms works +sys-power/pm-utils -video_cards_intel -video_cards_radeon + +# Jean-Noël Rivasseau <elvanor@gentoo.org> (23 Sep 2009) +# X use flag only for amd64/x86, bug 285951. +media-gfx/iscan -X + +# Bernard Cafarelli <voyageur@gentoo.org> (20 Mar 2009) +# Depends on packages not yet keyworded for amd64, cf bug #22042 +app-backup/backup-manager s3 + +# Jeremy Olexa <darkside@gentoo.org> (07 Feb 2009) +# USE=mmx on imlib2 causes issues with other apps. See bug 218382 (comments +# 11-12) +media-libs/imlib2 cpu_flags_x86_mmx + +# Jeremy Olexa <darkside@gentoo.org> (27 Dec 2008) +# Mask static USE flag because it just doesn't work on amd64. See bug 236591 +>=app-arch/p7zip-4.58 static + +# Jeremy Olexa <darkside@gentoo.org> (24 Dec 2008) +# unmask USE=bindist on amd64 - also unmasking the other flags that were under a +# bad comment heading. see bug #246144 +media-video/mplayer -cpudetection + +# assembler-section + +# Oct 23th 2006; blubb@gentoo.org +# upstream forces sse2 for amd64; mmx flag does nothing +app-crypt/johntheripper cpu_flags_x86_mmx + +# Oct 23th 2006; blubb@gentoo.org +# x86 asm only: +media-libs/libfame cpu_flags_x86_mmx +media-libs/sdl-gfx cpu_flags_x86_mmx +media-libs/smpeg cpu_flags_x86_mmx +x11-terms/eterm cpu_flags_x86_mmx + +# x86_64 opts are enabled with USE sse. so masking the rest +media-sound/mpg123 cpu_flags_x86_mmx cpu_flags_x86_3dnow cpu_flags_x86_3dnowext + +# 8 May 2007: Alistair Bush <ali_bush@gentoo.org> +# Mask doc flag for fop as nearly impossible to +# run javadoc target. see #177585 +>=dev-java/fop-0.93 doc + +# 8 Aug 2008: Alexis Ballier <aballier@gentoo.org> +# x86 asm only, it won't be built on amd64 if mmx useflag is enabled but that +# saves people from needlessly installing nasm +# Refs bug #93279 +media-sound/lame cpu_flags_x86_mmx diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.stable.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.stable.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.stable.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/package.use.stable.mask 20ac6f1b4a96f1e093778d290426c2a26833120889e3f922c6451490f8b2edeacd94bc06b2d5d4f9f7f2e3b5ab128dba86551c6b3681a4974b8b85afcc35fa96 @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# When you add an entry to the top of this file, add your name, the date, and +# an explanation of why something is getting masked. Please be extremely +# careful not to commit atoms that are not valid, as it can cause large-scale +# breakage, especially if it ends up in the daily snapshot. +# +## Example: +## +## # Dev E. Loper <developer@gentoo.org> (28 Jun 2012) +## # Masking foo USE flag until we can get the +## # foo stuff to work properly again (bug 12345) +## =media-video/mplayer-0.90_pre5 foo +## =media-video/mplayer-0.90_pre5-r1 foo +# + +#--- END OF EXAMPLES --- + +# Thomas Deutschmann <whissi@gentoo.org> (01 Jun 2018) +net-analyzer/wireshark -doc + +# Thomas Beierlein <tomjbe@gentoo.org> (20 Apr 2018) +# Needs asciidoctor which pulls a lot unstable ruby deps +media-radio/wsjtx doc + +# Mikle Kolyada <zlogene@gentoo.org> (18 Mar 2018) +# Pulls too much unstable ruby deps (some are not even keyworded) +net-misc/chrony html + +# Michael Palimaka <kensington@gentoo.org> (30 Sep 2017) +# Required dependeny is not stable +sci-libs/gdal oracle + +# NP-Hardass <NP-Hardass@gentoo.org> (27 Sep 2017) +# patchset variants are not stable +virtual/wine d3d9 staging + +# Tim Harder <radhermit@gentoo.org> (11 Sep 2017) +# Pulls in dev-ruby/asciidoctor which has too large of a ruby testing +# dep tree to be stabilized at this time. +>=net-irc/weechat-1.7 doc + +# Andreas Sturmlechner <asturm@gentoo.org> (01 Mar 2017) +# Requires not yet stabilised dev-db/oracle-instantclient. +sci-geosciences/qgis oracle + +# Christoph Junghans <junghans@gentoo.org> (26 Feb 2017) +# Stable mask some fabrics (bug #525534) +sys-cluster/openmpi openmpi_fabrics_psm openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_ofed openmpi_fabrics_dapl openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover + +# Brian Evans <grknight@gentoo.org> (17 Jan 2017) +# Stable mask groonga on mariadb as I don't know how stable +# the dependencies really are +dev-db/mariadb mroonga + +# Bernard Cafarelli <voyageur@gentoo.org> (09 Jan 2017) +# Requires more testing +# and additional unstable dependencies +gnustep-base/gnustep-make libobjc2 + +# Pacho Ramos <pacho@gentoo.org> (08 Mar 2015) +# mayavi is broken, bug #500104 +dev-python/apptools test + +# Michał Górny <mgorny@gentoo.org> (30 Mar 2014) +# Don't apply stable masks to python-exec since we're forcing every +# impl there anyway. Please keep this in sync with use.stable.mask. +dev-lang/python-exec -python_targets_pypy +dev-lang/python-exec -python_targets_pypy3 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/parent b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/parent --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/parent false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/parent a18e5b10986c63313aea262d5ebf92021bbec20f1a669436834a907d58f18f365c38ee279fb604f41534b9a40dbfbc3b4a3dd7aadc8beda2b702dae69003a237 @@ -0,0 +1,2 @@ +../base +../../features/multilib diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.force cd512a036fa592d32d43d9167655f37a92811af700817508acf1d06e131bd5451eeb624df4d4e2d0cd5bc733eb98f692a59be37537620d5b68de1d3203204a32 @@ -0,0 +1,6 @@ +# Force the flag which corresponds to ARCH. +amd64 + +# Michał Górny <mgorny@gentoo.org> (26 Jan 2013) +# Force the flag corresponding to the default ABI. +abi_x86_64 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.mask 5fca22299ce9b24413889620fb082ab2d0545235074dd2df0b4411898d14281a2e59d1d30700657237202fde934b68fe6a84bd328c66b0ab280ba386e4209b90 @@ -0,0 +1,175 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Unmask the flag which corresponds to ARCH. +-amd64 + +# SECTION: Unmask + +# Michael Orlitzky <mjo@gentoo.org> (07 Jan 2018) +# Oracle database stuff should work on amd64. +-oci8 +-oci8-instant-client +-oracle + +# Michael Palimaka <kensington@gentoo.org> (03 Jun 2017) +# Unmask elogind since it is keyworded here. +-elogind + +# Sven Wegener <swegener@gentoo.org> (31 May 2017) +# libvirt is supported on amd64 +-libvirt + +# Andreas K. Hüttel <dilfridge@gentoo.org> (26 May 2017) +# dev-db/firebird is keyworded ~amd64 +-firebird + +# cilk has been ported to this arch. +-cilk + +# Mike Gilbert <floppym@gentoo.org> (19 Oct 2014) +# sys-libs/libapparmor +-apparmor + +# Alexey Shvetsov <alexxy@gentoo.org> (08 Apr 2014) +# Cuda works here +-cuda + +# Michał Górny <mgorny@gentoo.org> (30 Mar 2014) +# PyPy is keyworded on this arch. +-python_targets_pypy +-python_single_target_pypy +-python_targets_pypy3 +-python_single_target_pypy3 + +# Michał Górny <mgorny@gentoo.org> (4 May 2013) +# Unmask systemd since it is keyworded here. +-systemd + +# Andrey Grozin <grozin@gentoo.org> (25 Jun 2014) +# keyworded on amd64 +-clisp +-clozurecl +-ecls +-gcl +-sbcl + +# Michał Górny <mgorny@gentoo.org> (26 Jan 2013) +# Unmask the multilib flags for this arch. +-abi_x86_32 +-abi_x86_64 + +# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Dec 2012) +# Orc optimisations work fine on amd64 and x86 +-orc + +# Diego Elio Pettenò <flameeyes@gentoo.org> (21 Aug 2012) +# IPMI is only implemented for x86, amd64 and ia64 +-ipmi + +# Ralph Sennhauser <sera@gentoo.org> (31 Jul 2012) +# Keyworded on amd64 +-python_targets_jython2_7 +-python_single_target_jython2_7 + +# Joerg Bornkessel <hd_brummy@gentoo.org> (05. Mar 2012) +# Unmask, works with v4l2, #350211 +-dxr3 + +# 2011/12/22 - Alexis Ballier <aballier@gentoo.org> +# Unmask vdpau as its supported here +-vdpau + +# 2011/07/01 - Alexey Shvetsov <alexxy@gentoo.org> +# Infiniband stuff works here +-infiniband + +# 2010/02/14 - Samuli Suominen <ssuominen@gentoo.org> +# Unmask amd64/x86 only SANE_BACKENDS +-sane_backends_canon_pp +-sane_backends_hpsj5s +-sane_backends_mustek_pp +-sane_backends_qcam + +# 2010/05/03 - Alex Legler <a3li@gentoo.org> +# Add support for Ruby Enterprise Edition targets where rubyee is available +# -ruby_targets_ree18 + +# 2011/10/21 - Hans de Graaff <graaff@gentoo.org> +# Add support for Rubinius targets where rbx is available +#-ruby_targets_rbx + +# Lilo works on amd64, so ... +-lilo + +# 2007/03/10 - Mike Frysinger <vapier@gentoo.org> +# NVRAM works on x86/amd64 hosts +-nvram + +# 2005/09/14 - Diego Pettenò <flameeyes@gentoo.org> +# nVidia XvMC support works on amd64 +-nvidia + +# 2006/01/28 - Donnie Berkholz <dberkholz@gentoo.org> +# Modular X: unmask for architectures on which they are available +-input_devices_synaptics +-input_devices_vmmouse +-input_devices_wacom +-video_cards_ast +-video_cards_i915 +-video_cards_i965 +-video_cards_intel +-video_cards_nvidia +-video_cards_siliconmotion +-video_cards_vesa +-video_cards_via +-video_cards_virtualbox +-video_cards_vmware +-video_cards_qxl + +# Feb 16th 2007; Simon Stelling <blubb@gentoo.org> +# Since this profile forces >=portage-2.1.2, we can unmask all +# SIMD assembler flags +-mpx +-cpu_flags_x86_3dnow +-cpu_flags_x86_3dnowext +-cpu_flags_x86_aes +-cpu_flags_x86_avx +-cpu_flags_x86_avx2 +-cpu_flags_x86_fma3 +-cpu_flags_x86_fma4 +-cpu_flags_x86_mmx +-cpu_flags_x86_mmxext +-cpu_flags_x86_padlock +-cpu_flags_x86_popcnt +-cpu_flags_x86_sse +-cpu_flags_x86_sse2 +-cpu_flags_x86_sse3 +-cpu_flags_x86_sse4_1 +-cpu_flags_x86_sse4_2 +-cpu_flags_x86_sse4a +-cpu_flags_x86_ssse3 +-cpu_flags_x86_xop + +# George Shapovalov <george@gentoo.org> (8 Apr 2007) +# supported on amd64 +-ada + +# Robert Buchholz <rbu@gentoo.org> (03 Jun 2007) +# Unmask as it works on amd64 +-lcd_devices_luise + +# SECTION: Unavailable/Broken + +# 2004/06/22 - Taken from 2004.0 profile +# masked +3dfx + +# 2007/02/04 - Simon Stelling <blubb@gentoo.org> +# games-emulation/caps is 32bit only, while app-emulation/e-uae is 64bit; bug 158416 +capslib + +# fdk-aac is already keyworded here +-fdk + +# NOT NECESSARY - SECTION diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.stable.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.stable.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.stable.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/amd64/use.stable.mask fcb03cf529fb16b63b1d984fdc8b2f5ee5f539078232b6314acb44d60aed35262f788eb17b5601f0c4ec262fdefbf36a4f095fe4025930ad7ee6dcd9c59b4f65 @@ -0,0 +1,24 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# This file requires eapi 5 or later. New entries go on top. +# Please use the same syntax as in use.mask + +# Andreas K. Hüttel <dilfridge@gentoo.org> (26 May 2017) +# dev-db/firebird is keyworded ~amd64 +firebird + +# Michał Górny <mgorny@gentoo.org> (20 May 2017) +# The modern versions of CUDA SDK are not suitable for stabilization. +cuda + +# Andrey Grozin <grozin@gentoo.org> (25 Jun 2014) +# no stable versions on amd64 +clozurecl + +# Michał Górny <mgorny@gentoo.org> (30 Mar 2014) +# PyPy is unstable on this arch. +python_targets_pypy +python_single_target_pypy +python_targets_pypy3 +python_single_target_pypy3 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/make.defaults 60b6b076700d13143454c4c13bdc0f520cd2dc4a520c785a9f3c9bbbae33edf23aed4f5009e8b9bc0d215cadedf6ea12c6ed0779aa9ef571654d97b544e9a257 @@ -0,0 +1,8 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +USE_EXPAND_UNPREFIXED="ARCH" +USE_EXPAND_IMPLICIT="ARCH" +USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" + +PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH" diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/package.use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/package.use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/package.use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/package.use.mask 4c58398541f08b27a80e2929854578d8ee80eb7cb6b0054cf7da8492b974f897c455518238e854d83037000eb2e73c2de345a238455c717736a4073126359a7b @@ -0,0 +1,228 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Nick Sarnie <sarnex@gentoo.org> (29 Apr 2018) +# media-libs/vulkan-loader and app-emulation/vkd3d are not available everywhere +app-emulation/wine-any vkd3d vulkan +app-emulation/wine-d3d9 vkd3d vulkan +app-emulation/wine-staging vkd3d vulkan +app-emulation/wine-vanilla vkd3d vulkan + +# Richard Yao <ryao@gentoo.org> (16 Apr 2018) +# sys-fs/zfs is not available everywhere. +sys-cluster/ceph zfs + +# Michał Górny <mgorny@gentoo.org> (30 Dec 2017) +# Moved from use.mask since it is a flag local to one package: +# Joseph Jezak <josejx@gentoo.org> (11 Mar 2007) +# Only for x86 and amd64 (in pbbuttonsd) +app-laptop/pbbuttonsd macbook + +# Amy Liffey <amynka@gentoo.org> (19 Sep 2017) +# Requires [cuda] which is masked in most of the profiles. +media-libs/opencv contrib_xfeatures2d + +# Rick Farina <zerochaos@gentoo.org> (11 May 2017) +# the needed deps are amd64/x86 only +net-analyzer/metasploit nexpose openvas + +# Thomas Deutschmann <whissi@gentoo.org> (01 Mar 2017) +# dev-libs/libmaxminddb is only keyworded on amd64 and x86 at the moment +app-admin/rsyslog mdblookup + +# Alexis Ballier <aballier@gentoo.org> (21 Feb 2017) +# spacetime is only supported on amd64 at the moment. +# https://caml.inria.fr/pub/docs/manual-ocaml/spacetime.html +dev-lang/ocaml spacetime + +# Alexis Ballier <aballier@gentoo.org> (31 Jan 2017) +# nvenc requires nvidia drivers, apply same mask logic +media-video/ffmpeg nvenc + +# Thomas Deutschmann <whissi@gentoo.org> (30 Jan 2017) +# media-libs/raspberrypi-userland not keyworded +media-video/motion mmal + +# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (04 Jan 2017) +# Mask assembly optimisations that are platform-specific +dev-libs/libsecp256k1 asm + +# Ettore Di Giacinto <mudler@gentoo.org> (18 Oct 2016) +# Enable gambit and scm only on supported arches +>=dev-scheme/slib-3.2.5 gambit scm + +# Thomas Deutschmann <whissi@gentoo.org> (22 Sep 2016) +# Dependency is only keyworded on amd64 and x86 +app-metrics/collectd collectd_plugins_mqtt + +# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016) +# It's only supported on amd64, ia64, powerpc and x86 +dev-db/mysql numa +dev-db/percona-server numa + +# Brian Evans <grknight@gentoo.org> (23 Aug 2016) +# It's only supported on amd64 +dev-db/percona-server tokudb tokudb-backup-plugin + +# Brian Evans <grknight@gentoo.org> (18 Aug 2016) +# Mask jdbc as most arches don't support java +dev-db/mariadb jdbc + +# James Le Cuirot <chewi@gentoo.org> (26 Jul 2016) +# Only available on some architectures. +dev-java/icedtea shenandoah + +# Mike Gilbert <floppym@gentoo.org> (23 Jun 2016) +# This flag only has meaning on amd64 +sys-boot/grub:2 grub_platforms_xen-32 + +# Ian Delaney <idella4@gentoo.org> (06 Apr 2016) +# on behalf of Ilya Tumaykin <itumaykin+gentoo@gmail.com> +# Raspberry Pi support is only available on arm. +# Mask raspberry-pi USE globally, unmask on arm. +media-video/mpv raspberry-pi + +# Alexis Ballier <aballier@gentoo.org> (14 Nov 2015) +# MMAL is only available on the Raspberry Pi: +# Mask it globally, unmask it on arm. +media-video/ffmpeg mmal + +# Nathan Phillip Brink <binki@gentoo.org> (26 Sep 2015) +# git useflag requires dev-libs/libgit2 which few arches support +dev-util/geany-plugins git + +# Brian Evans <grknight@gentoo.org (14 Sep 2015) +# Mask new USE flags for mariadb which all arches do not yet have dependencies +>=dev-db/mariadb-10.1.0 mroonga sst-xtrabackup galera + +# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015) +# sys-boot/gnu-efi is not supported on all archs. +sys-apps/systemd gnuefi + +# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015) +# JavaFX and the browser plugin are not included on some platforms. +dev-java/oracle-jdk-bin javafx nsplugin +dev-java/oracle-jre-bin javafx nsplugin + +# Ben de Groot <yngwin@gentoo.org> (15 Mar 2015) +# Mask bdplus support and unmask on arches where libbdplus is keyworded. +media-libs/libbluray bdplus + +# Michał Górny <mgorny@gentoo.org> (01 Mar 2015) +# pidgin-opensteamworks is only available for amd64, ppc32 and x86 +net-im/telepathy-connection-managers steam + +# Ben de Groot <yngwin@gentoo.org> (07 Feb 2015) +# Mask for all arches, can be unmasked on arm once keyworded there +games-board/stockfish armv7 + +# Mike Frysinger <vapier@gentoo.org> (04 Aug 2014) +# Mask flashrom drivers that only work on x86 due to in/out asm insns #454024 +sys-apps/flashrom atahpt nic3com nicnatsemi nicrealtek rayer_spi satamv + +# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (24 Apr 2014) +# It's only supported on amd64 +dev-db/mariadb tokudb + +# Lars Wendler <polynomial-c@gentoo.org> (23 Apr 2014) +# Not working on 64bit systems +media-sound/lmms vst + +# Alexey Shvetsov <alexxy@gentoo.org> (16 Apr 2014) +# libehca only works on ppc* +sys-fabric/ofed ofed_drivers_ehca + +# Andreas K. Huettel <dilfridge@gentoo.org> (4 Jan 2014) +# Mask until dependencies are keyworded (bug 497068) +dev-vcs/git mediawiki mediawiki-experimental + +# Sergey Popov <pinkbyte@gentoo.org> (27 Dec 2013) +# Mask because Boost.Context library does not work on most of arches +dev-libs/boost context + +# Jeff Horelick <jdhore@gentoo.org> (1 Sep 2013) +# Dependency (media-libs/libsidplayfp) only keyworded +# on x86 and amd64. Will unmask there. +>=media-plugins/audacious-plugins-3.4 sid + +# Tim Harder <radhermit@gentoo.org> (13 Aug 2013) +# Related deps dev-lang/luajit and dev-scheme/racket are not keyworded by most arches. +app-editors/vim luajit racket +app-editors/gvim luajit racket + +# Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013) +# Doesn't work on most profiles. Easier to mask here and +# unmask in particular profiles +sys-apps/hwloc gl + +# Christoph Junghans <junghans@gentoo.org> (26 Dec 2012) +# mkl only works on x86/amd64 +sci-chemistry/gromacs mkl + +# Diego Elio Pettenò <flameeyes@gentoo.org> (3 Nov 2012) +# Requires net-dns/unbound which is not keyworded by most arches +net-libs/gnutls dane + +# Ben de Groot <yngwin@gentoo.org> (30 Jul 2012) +# fontconfig-infinality dependency not yet keyworded on most arches +media-libs/freetype infinality + +# Mike Gilbert <floppym@gentoo.org> (29 Jun 2012) +# sys-fs/zfs is not available everywhere. +sys-boot/grub libzfs + +# Michał Górny <mgorny@gentoo.org> (11 Apr 2012) +# JIT compilation in libzpaq generates code for x86/amd64. +app-arch/zpaq jit + +# Arun Raghavan <ford_prefect@gentoo.org> (28 Mar 2012) +# webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be +# added. +media-sound/pulseaudio webrtc-aec + +# Christoph Junghans <junghans@gentoo.org> (04 Feb 2012) +# mips only use flags +>=sci-libs/fftw-3 zbus + +# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012) +# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so +# it's masked here and unmasked in individual profiles (bug #396313). +net-libs/webkit-gtk jit +www-client/midori jit + +# Samuli Suominen <ssuominen@gentoo.org> (06 Dec 2011) +# NuppelVideo is available on x86 only +media-video/transcode nuv pic + +# Davide Pesavento <pesa@gentoo.org> (30 Nov 2011) +# The QML (V4) and JSC JITs are supported only on amd64/arm/x86, so +# mask the flag here and unmask it in the appropriate arch profiles. +dev-qt/qtdeclarative jit +dev-qt/qtscript jit +dev-qt/qtwebkit jit + +# Samuli Suominen <ssuominen@gentoo.org> (25 Nov 2011) +# Expose USE="suid" for USE="svga" only for x86 users, +# see arch/x86/package.use.mask +www-client/links suid + +# Robin H. Johnson <robbat2@gentoo.org> (10 Jul 2011) +# PPS should work on all arches, but only keyworded on amd64/x86 +>=net-misc/ntp-4.2.6_p3-r1 parse-clocks + +# Tomáš Chvátal <scarabeus@gentoo.org> (4 Apr 2010) +# Masked because tools pulled in are not supported on most archs. +sys-power/pm-utils video_cards_intel video_cards_radeon + +# Jean-Noël Rivasseau <elvanor@gentoo.org> (23 Sep 2009) +# X use flag only for amd64/x86, bug 285951. +media-gfx/iscan X + +# Raúl Porcel <armin76@gentoo.org> (09 Nov 2008) +# CPU opts: This needs amd64, x86 and ppc on some of them +# dvdnav: hard masked dependency +media-video/mplayer cpudetection + +# Ian Whyman <thev00d00@gentoo.org> (22 May 2016) +# Mask raspberry-pi except on arm. +dev-libs/libcec raspberry-pi diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/use.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/use.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/use.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/use.force f00e72848c78928c5f5258d0e276c51de22d51e9f405136c989d5d8c63cd3ffd2bd1271dd4022dab471fb4769dc3563f558f985162c61239ae19c2d16feff020 @@ -0,0 +1,6 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# James Le Cuirot <chewi@gentoo.org> (29 Jun 2017) +# Forced and masked by default. Unmask where necessary. +big-endian diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/arch/base/use.mask bd2e0d1f6c0be8192ff7824d7e5e6582bcc128efe1e2bddd7d78cf588fd92c62d8eccc58800427deb9aa355063ee3535e05c3e88ab4236a054d9c3eddde974bf @@ -0,0 +1,242 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# James Le Cuirot <chewi@gentoo.org> (29 Jun 2017) +# Forced and masked by default. Unmask where necessary. +big-endian + +# Sven Wegener <swegener@gentoo.org> (31 May 2017) +# libvirt is only supported on specific architectures +libvirt + +# Michael Orlitzky <mjo@gentoo.org> (7 Jan 2017) +# The dev-db/firebird and dev-db/oracle-instantclient* packages +# only support amd64 and x86. +firebird +oci8 + +# cilk has been ported only to x86 systems +cilk + +# cuda only works on amd64/x86 +cuda + +# masking here, and unmasking in arch/x86/use.mask +vidix + +# vdpau is currently only available with binary nvidia-drivers, thus amd64/x86* +vdpau + +# Infiniband stuff should generaly work on all arches but keyworded only on amd64/x86 +infiniband + +# These need libieee1284 which is amd64/x86 only. +sane_backends_canon_pp +sane_backends_hpsj5s +sane_backends_mustek_pp +sane_backends_qcam + +# amd64/x86 arch specific USE flags +lilo +mpx +svga +nvram +cpu_flags_x86_3dnow +cpu_flags_x86_3dnowext +cpu_flags_x86_aes +cpu_flags_x86_avx +cpu_flags_x86_avx2 +cpu_flags_x86_fma3 +cpu_flags_x86_fma4 +cpu_flags_x86_mmx +cpu_flags_x86_mmxext +cpu_flags_x86_padlock +cpu_flags_x86_popcnt +cpu_flags_x86_sse +cpu_flags_x86_sse2 +cpu_flags_x86_sse3 +cpu_flags_x86_sse4_1 +cpu_flags_x86_sse4_2 +cpu_flags_x86_sse4a +cpu_flags_x86_ssse3 +cpu_flags_x86_xop + +# ppc arch specific USE flags +altivec +ppcsha1 +power8 + +# mips arch specific USE flags +fixed-point +loongson2f +mipsdspr1 +mipsdspr2 +mipsfpu + +# ppc64 arch specific USE flags +ibm +ps3 + +# sparc arch specific USE flags +vis + +# arm arch specific USE flags +cpu_flags_arm_v4 +cpu_flags_arm_v5 +cpu_flags_arm_v6 +cpu_flags_arm_v7 +cpu_flags_arm_v8 +cpu_flags_arm_aes +cpu_flags_arm_crc32 +cpu_flags_arm_edsp +cpu_flags_arm_iwmmxt +cpu_flags_arm_neon +cpu_flags_arm_sha1 +cpu_flags_arm_sha2 +cpu_flags_arm_thumb +cpu_flags_arm_thumb2 +cpu_flags_arm_vfp +cpu_flags_arm_vfpv3 +cpu_flags_arm_vfpv4 +cpu_flags_arm_vfp-d32 + +# [old] arm arch specific USE flags +armvfp +armv5te +armv6 +armv6t2 +iwmmxt +neon + +# nVidia XvMC requires nvidia-drivers/nvidia-legacy-drivers +nvidia + +# dev-db/oracle-instantclient-basic is only available on x86 +oci8-instant-client +oracle + +# not keyworded on non-x86 systems +video_cards_geode +video_cards_voodoo + +# not needed on non-mips systems +video_cards_newport + +# not needed on non-x86, non-amd64 systems +input_devices_vmmouse +video_cards_ast +video_cards_i915 +video_cards_i965 +video_cards_intel +video_cards_nvidia +video_cards_vesa +video_cards_via +video_cards_vmware +video_cards_virtualbox + +# not needed on non-x86, non-amd64, non-mips systems +video_cards_siliconmotion + +# not needed on non-arm systems +video_cards_exynos +video_cards_freedreno +video_cards_imx +video_cards_omap +video_cards_tegra +video_cards_vc4 + +# James Le Cuirot <chewi@gentoo.org> +# Vivante is only available for arm and mips. +video_cards_vivante + +# linux-only drivers +video_cards_qxl + +# not needed on non-x86, non-amd64, non-ppc systems +input_devices_synaptics +input_devices_wacom + +# Robert Buchholz <rbu@gentoo.org> (03 Jun 2007) +# Only works on x86 or amd64 +lcd_devices_svga +lcd_devices_luise + +# George Shapovalov <george@gentoo.org> (8 Apr 2007) +# Ada is supported only on x86, amd64 and ppc at present +ada + +# Alex Legler <a3li@gentoo.org> (7 Dec 2009) +# Rubinius is whitelisted on supported arches +ruby_targets_rbx + +# Samuli Suominen <ssuominen@gentoo.org> (03 Oct 2011) +# RealMagic Hollywood+/Creative DXR3 support +# Still using obsolete V4L1 wrt bug 350211 +# If fixed, should be unmasked in amd64/x86/ppc32 use.mask +dxr3 + +# Diego Elio Pettenò <flameeyes@gentoo.org> (21 Aug 2012) +# IPMI is only implemented for x86, amd64 and ia64 +ipmi + +# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Dec 2012) +# dev-lang/orc is useful only for some specific arches (amd64/x86/arm/...) +orc + +# Mike Gilbert <floppym@gentoo.org> (02 Jan 2013) +# PyPy is unkeyworded on most arches. If you are running amd64 or x86, +# please switch to one of the testing 13.0 profiles to get it. +python_targets_pypy +python_single_target_pypy +python_targets_pypy3 +python_single_target_pypy3 + +# Michał Górny <mgorny@gentoo.org> (26 Jan 2013) +# Mask the multilib flags globally. Unmasked in specific arches. +abi_x86_32 +abi_x86_64 +abi_x86_x32 +# Matt Turner <mattst88@gentoo.org> (29 Jul 2013) +abi_mips_o32 +abi_mips_n32 +abi_mips_n64 +abi_ppc_32 +abi_ppc_64 +abi_s390_32 +abi_s390_64 + +# Andrey Grozin <grozin@gentoo.org> (25 Jun 2014) +# These lisps are available only on some arches +clisp +clozurecl +cmucl +ecls +gcl +sbcl + +# Michał Górny <mgorny@gentoo.org> (4 May 2013) +# Mask systemd flag globally, unmasked on arches on which systemd +# is keyworded. +systemd + +# Mike Gilbert <floppym@gentoo.org> (19 Oct 2014) +# sys-libs/libapparmor +apparmor + +# Mask flags that correspond to all possible ARCH values. +alpha +amd64 +amd64-fbsd +arm +arm64 +hppa +ia64 +m68k +mips +ppc +ppc64 +s390 +sh +sparc +x86 +x86-fbsd diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/make.defaults fae00ea6c26785a7d49b0d871593b2a11226f0fc846ff681fc4e6c4ebb5a592b25ddcad24e6cdc1ecdb006cd6bb67def8895546a41db34777a468f5c75444275 @@ -0,0 +1,169 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# System-wide defaults for the Portage system +# See portage(5) manpage + +# Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later) +IUSE_IMPLICIT="prefix prefix-chain prefix-guest" +USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND" +USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt" +USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt" +USE_EXPAND_VALUES_USERLAND="BSD GNU" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@lists.gentoo.org. +USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CALLIGRA_EXPERIMENTAL_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" + +# USE_EXPAND variables whose contents are not shown in package manager +# output. Changes need discussion on gentoo-dev. +USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" + +CONFIG_PROTECT="/etc" +CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" + +# EAPI 7 environment variable blacklist. +# +# DBUS_SESSION_BUS_ADDRESS to avoid trying to access the user's session +# bus. +# +# DISPLAY and XAUTHORITY to avoid trying to access the user's X11. +# +# XDG_* since the values coming from user environment can collide with +# ebuild-set ${HOME} (e.g. by referring to user's home directory). +# We exclude XDG_DATA_DIRS & XDG_CONFIG_DIRS as those are set in env.d. +# +# PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX: +# These are guaranteed to confuse perl module installation. Pre-EAPI7 +# the Perl eclasses bail out if they are set. Now we declare them here. +ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX" + +# Variables that are set exclusively by the profile +# and not by user configuration files. +PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND" + +# 'Sane' defaults +ELIBC="glibc" +KERNEL="linux" +USERLAND="GNU" +INPUT_DEVICES="keyboard mouse" + +# Tomáš Chvátal <scarabeus@gentoo.org> (23 Mar 2013) +# By default enable libreoffice implementation only. +OFFICE_IMPLEMENTATION="libreoffice" + +# Tomáš Chvátal <scarabeus@gentoo.org> (12 Aug 2011) +# By default do not build any grub platform and let it guess. +GRUB_PLATFORMS="" + +# Tomáš Chvátal <scarabeus@gentoo.org> (05 May 2013) +# By default enable all extensions with no dependencies +LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" + +# Tomáš Chvátal <scarabeus@gentoo.org> (15 May 2011) +# Andreas K. Hüttel <dilfridge@gentoo.org> (19 Aug 2011, 25 Mar 2012) +# Johannes Huber <johu@gentoo.org> (15 Apr 2018) +# By default build all calligra features. +CALLIGRA_FEATURES="karbon plan sheets stage words" + +# Andreas K. Huettel <dilfridge@gentoo.org> (28 Sep 2010) +# Small default list of enabled plugins for collectd +COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" + +# Tomáš Chvátal <scarabeus@gentoo.org> (26 Oct 2010) +# By default enable all protocols for average GPS user +GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" + +# Benedikt Böhm <hollow@gentoo.org> (27 Nov 2007) +# Sane defaults for built-in apache modules +# Patrick Lauer <patrick@gentoo.org> (12 Oct 2012) +# extend for apache 2.4 +APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" + +# Peter Volkov <pva@gentoo.org> (29 Apr 2010) +# Set some defaults or package will fail to build (Check mconfig in package sources) +XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" + +# Robert Buchholz <rbu@gentoo.org> (17 Jan 2006) +# Some common lcd devices +LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" + +# Miroslav Šulc <fordfrog@gentoo.org> (19 Nov 2008) +# Netbeans modules/clusters +NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml" + +# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org> +# https://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml +# Build kernel modules from linux-mod by default: +USE="${USE} modules" + +# Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015) +# Default Ruby build target +# Updated to include ruby23 on 21 Jan 2018 +RUBY_TARGETS="ruby23" + +# Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009) +# Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx +# instead of USE nocxx. +# https://archives.gentoo.org/gentoo-dev/msg_a181cd0d36600067b599f4b996c6989f.xml +USE="${USE} cxx" + +# Enable extended filesystem attribute support by default. +# https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0 +USE="${USE} xattr" + +# Tiziano Müller <dev-zero@gentoo.org> (24 Jan 2010) +# We usually don't want python to (re)write .py[co] files during phase runs +# since it could cause sandbox violations +PYTHONDONTWRITEBYTECODE="1" + +# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011) +# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE +# Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-* ${BOOTSTRAP_USE}" +# This MUST be kept in sync with the PYTHON_TARGETS below +# Mike Gilbert <floppym@gentoo.org> (23 May 2018) +# sys-apps/baslayout-2.5 needs split-usr enabled. +BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_5 python_targets_python2_7" + +# Mike Gilbert <floppym@gentoo.org> (15 May 2012) +# Default target(s) for python-r1.eclass +# Updated to python3_5 on 28 Nov 2017 +PYTHON_TARGETS="python2_7 python3_5" +PYTHON_SINGLE_TARGET="python3_5" + +# Michał Górny <mgorny@gentoo.org> (10 Aug 2013) +# Moved from portage's make.globals. +# 1) do not uninstall kernel modules and therefore allow replacing them, +# 2) allow replacing unowned compiled Python modules (python-r1 migration), +# 3) allow replacing unowned dropin.cache files (twisted-r1 migration). +# 4) protect /var/{run,lock} symlinks for bug 519620 +COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class */dropin.cache" +UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock" + +# Andreas K. Hüttel <dilfridge@gentoo.org> (23 Aug 2013) +# Make emerge messages default to English as per Council decision +LC_MESSAGES="C" + +# Brian Dolbec <dolsen@gentoo.org> (16 Jun 2017) +# disable twisted's plugin cache update to prevent access violations +# call /usr/bin/twisted-regen-cache in pkg_postinst() +TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE="1" + +# Aaron W. Swenson <titanofold@gentoo.org> (9 Jul 2017) +# Default target(s) for postgres{,-multi}.eclass +POSTGRES_TARGETS="postgres9_5" + +# Michael Orlitzky <mjo@gentoo.org> (17 Nov 2017) +# +# Default PHP targets, used only for extensions at the moment. +# +# The value of this variable should be chosen to be "least annoying by +# default." For example, some packages support only php-5.x and some +# only php-7.x. By having both "php5-6" and php7-0" in PHP_TARGETS, we +# ensure that users who don't care one way or the other don't have to +# mess with this variable in order to install those packages. +# +# Moreover, it should only contain targets that have a stable version +# of PHP, to avoid pulling in an unstable PHP on stable systems. +# +PHP_TARGETS="php5-6 php7-0" diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.mask 4ac7de0acfdb2ce4651e02d96c5cb22fc8d04eb8eabd80a71951dca12259188b831d6a650b5a8b0bb71b32bba5e391a9e559d27128a4960f7e88b2d872cd5b39 @@ -0,0 +1,2 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use 02df6dddc203e96083c6841b019481478f89dd54e8b42eb5af5ad2797ec2c405ff854f52cbee4eee1d1d2ff113eccc9c0d12237a48b8226eca0fc0f27d445f88 @@ -0,0 +1,32 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# David Seifert <soap@gentoo.org> (17 Apr 2017) +# These py2-only packages also support pypy, enable +# Python 2.7 as the default implementation, preparing +# for the eventual switch to py3 in PYTHON_SINGLE_TARGET +app-text/asciidoc python_single_target_python2_7 python_targets_python2_7 +app-text/wklej python_single_target_python2_7 python_targets_python2_7 +dev-vcs/git-bz python_single_target_python2_7 python_targets_python2_7 +gnome-base/libglade python_single_target_python2_7 python_targets_python2_7 +sci-chemistry/pdb-tools python_single_target_python2_7 python_targets_python2_7 + +# Michał Górny <mgorny@gentoo.org> (24 Sep 2016) +# Enable the BPF target by default +sys-devel/clang llvm_targets_BPF +sys-devel/llvm llvm_targets_BPF + +# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (27 Jul 2012) +# Modular X: Build the Xorg X server by default +x11-base/xorg-server xorg + +# Diego Elio Pettenò <flameeyes@gentoo.org> (11 Apr 2011) +# Disable ldap support by default in sudo, as it seem to lack +# developers maintaining that particular support and is, thus, vastly +# untested. +app-admin/sudo -ldap + +# Zac Medico <zmedico@gentoo.org> (04 Dec 2009) +# Bug #295615 - Disable cxx by default, in order to avoid a die +# in pkg_setup with default USE settings (cxx requires sasl). +net-nds/openldap -cxx diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.force 21f454cd7d5e142807a476a5d0b8ec0b375dc8b3e4d739d48ca5a108c659630f7aa53efc477d00e6208f0874510f719332a44f74e6e8fa71b5a0c466c2d4ccce @@ -0,0 +1,81 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Michał Górny <mgorny@gentoo.org> (05 Jun 2017) +# (on behalf of Treecleaner project) +# www-apache/mod_python is masked for removal, force agent-only builds. +net-analyzer/check_mk agent-only + +# NP-Hardass <NP-Hardass@gentoo.org> (10 Apr 2017) +# Always force patch on appropriate variant to ensure +# similar experience when using app-emulation/wine-any +app-emulation/wine-staging staging +app-emulation/wine-d3d9 d3d9 + +# David Seifert <soap@gentoo.org> (07 Mar 2017) +# Only ever use system ffmpeg, allow kodi bundled ffmpeg +# only for debug pruposes. +media-tv/kodi system-ffmpeg + +# Sam Jorna <wraeth@gentoo.org> (15 Dec 2016) +# Known to build unbootable EFI binaries on some systems when built with +# UDK. Forcing use of gnu-efi until it's more stable. +sys-boot/refind gnuefi + +# Mike Gilbert <floppym@gentoo.org> (13 Oct 2016) +# Python without threads breaks in many ways. +dev-lang/python threads + +# Maciej Mrozowski <reavertm@gentoo.org> (1 Sept 2016) +# Workaround until resolved upstream (bug #586840) +>=dev-games/simgear-2016.2.1 dns + +# Lars Wendler <polynomial-c@gentoo.org> (11 Sep 2015) +# Package fails to build with dbus USE flag being disabled (bug #560208) +=x11-wm/afterstep-2.2.12 dbus + +# Justin Lecher <jlec@gentoo.org> (10 Aug 2014) +# Doesn't work without acl support +# No patch yet, #516626 +>=net-fs/netatalk-3.1.3 acl + +# Pawel Hajdan jr <phajdan.jr@gentoo.org> (12 Jun 2014) +# Chromium builds in PIC mode on most arches anyway, +# i.e. this use flag has no effect on them. +www-client/chromium pic + +# Zac Medico <zmedico@gentoo.org> (4 Dec 2012) +# Force app-shells/bash[readline] in stage1 builds, so that compgen is +# available for sys-apps/portage (see bug #445576). +app-shells/bash:0 readline + +# Michał Górny <mgorny@gentoo.org> (14 Oct 2012) +# Force-enable all PYTHON_TARGETS for python-exec to avoid using private +# API. Please remember to keep it in sync with python_targets.desc. +dev-lang/python-exec python_targets_python2_7 +dev-lang/python-exec python_targets_python3_4 +dev-lang/python-exec python_targets_python3_5 +dev-lang/python-exec python_targets_python3_6 +dev-lang/python-exec python_targets_jython2_7 +dev-lang/python-exec python_targets_pypy +dev-lang/python-exec python_targets_pypy3 + +# Zac Medico <zmedico@gentoo.org> (20 Oct 2010) +# Force ipc USE flag since it should remain enabled unless +# it is found to be incompatible with a specific profile +# or environment. When enabled, it fixes bug #278895, +# bug #315615, and makes subshell die support more robust +# (so that repoman's ebuild.nesteddie check is irrelevant). +sys-apps/portage ipc +sys-apps/portage-mgorny ipc + +# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> +# Python should use wide Unicode implementation by default. +# Switching of "wide-unicode" USE flag changes ABI of Python +# and requires reinstallation of many Python modules. +dev-lang/python wide-unicode + +# Peter Alfredsen <loki_val@gentoo.org> (11 Apr 2009) +# Forcing w.r.t. bug 265336. When unicode use-flag is +# turned off, ABI is broken without a .so bump. +dev-libs/libpcre unicode diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.mask fd9687a58b55f01a3db59948a002b62face0d10deccc8f07229e33ba5faf08cc4794be3e0bf5f992f0b18b29bbc28bff610f84cb81ab821542c9bcebabaeea9a @@ -0,0 +1,656 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# This file requires >=portage-2.1.1 +# New entries go on top. + +# This file is only for generic masks. For arch-specific masks (i.e. +# mask everywhere, unmask on arch/*) use arch/base. + +# Michał Górny <mgorny@gentoo.org> (16 May 2018) +# Depends on last-rited sci-libs/coinhsl. +sci-libs/ipopt hsl + +# Mike Gilbert <floppym@gentoo.org> (01 May 2018) +# Requires >=media-video/ffmpeg-4 (bug 654208). +>=www-client/chromium-67 system-ffmpeg + +# Göktürk Yüksek <gokturk@gentoo.org> (4 Apr 2018) +# libewf is getting treecleaned (#547418). +# Starting with sleuthkit-4.6.0, we statically link sleuthkit to a +# locally compiled libewf. Mask the prior versions. +<app-forensics/sleuthkit-4.6.0 ewf + +# Mart Raudsepp <leio@gentoo.org> (1 Apr 2018) +# rust[extended] file collides with dev-util/cargo, while everything +# in tree uses the latter at the moment (#645562) +dev-lang/rust extended + +# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018) +# app-backup/holland-lib-mysql will be removed (#643502) +app-backup/holland mysql + +# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018) +# media-sound/mp3gain and media-sound/aacgain will be removed (#630954). +media-sound/abcde lame +media-sound/split2flac mp3 mp4 + +# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018) +# dev-python/visual will be removed (#630252) +net-analyzer/scapy visual + +# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018) +# net-dns/hesiod will be removed (#606652) +net-mail/fetchmail hesiod +sys-freebsd/freebsd-lib hesiod + +# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018) +# app-misc/cwiid will be removed (#608780) +media-sound/supercollider wiimote + +# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018) +# sys-fabric/mstflint will be removed (#594908) +sys-fabric/ofed mstflint + +# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018) +# x11-themes/vdrgraphtft-avp is being removed (#592066) +media-plugins/vdr-music graphtft + +# Lars Wendler <polynomial-c@gentoo.org> (14 Mar 2018) +# Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having +# no active upstream anymore. +net-fs/samba dmapi + +# Jan Ziak <0xe2.0x9a.0x9b@gmail.com> (14 Mar 2018) +# Mask local USE flag to satisfy repoman +app-emulation/fuse backend-svga + +# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018) +# libewf is going to be removed, bug #547418 +app-admin/testdisk ewf + +# Patrick McLean <chutzpah@gentoo.org> (6 Mar 2018) +# Requires dev-libs/boost-1.66 that is unkeyworded/masked +>=sys-cluster/ceph-12.2.4 system-boost + +# Brian Evans <grknight@gentoo.org> (5 Mar 2018) +# Mask embedded USE on virtual/mysql and friends to transition it to be obsolete +virtual/mysql embedded +dev-db/mariadb embedded +dev-db/mariadb-galera embedded +dev-db/mysql embedded +dev-db/mysql-cluster embedded +dev-perl/DBD-mysql embedded + +# Brian Evans <grknight@gentoo.org> (28 Feb 2018) +# Mask client-libs USE to force users to install alternative standard pacakges +dev-db/mariadb client-libs +dev-db/mariadb-galera client-libs +dev-db/mysql client-libs +dev-db/percona-server client-libs + +# Andreas Sturmlechner <asturm@gentoo.org> (25 Feb 2018) +# Depends on obsolete media-libs/phonon[qt4] +dev-qt/designer:4 phonon +dev-qt/qtdemo:4 phonon +dev-python/PyQt4 phonon +dev-python/pyside:0 phonon + +# Andreas K. Hüttel <dilfridge@gentoo.org> (2 Feb 2018) +# This feature is not ready yet, see bug 146882 comment 26 +sys-libs/glibc compile-locales + +# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018) +# Depends on last-rited sci-visualization/xds-viewer +sci-chemistry/xds-bin X + +# Mart Raudsepp <leio@gentoo.org> (10 Jan 2018) +# Failing tests, with extra deps that aren't keyworded due to that +>=gnome-base/gnome-settings-daemon-3.24 test + +# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018) +# sys-apps/raidutils is going to be removed (#638634) +net-analyzer/nagios-plugin-check_raid i2o + +# Andrey Utkin <andrey_utkin@gentoo.org> (29 Dec 2017) +# This flag can be sensibly enabled only on macos. +# Can be unmasked in prefix/darwin/macos profiles. Bug #637482 +media-video/ffmpeg appkit + +# James Le Cuirot <chewi@gentoo.org> (17 Dec 2017) +# Java 9 is not yet fully supported on Gentoo. Having a masked +# gentoo-vm flag allows us to provide it without it breaking Gentoo +# packages. Those who wish to experiment with it as a fully recognised +# Gentoo JVM can unmask the flag. +dev-java/oracle-jdk-bin:9 gentoo-vm +dev-java/oracle-jre-bin:9 gentoo-vm + +# Andreas K. Hüttel <dilfridge@gentoo.org> (04 Nov 2017) +# Requires audacious, which is masked. Bug 632513 +media-libs/freeverb3 jack + +# Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017) +# USE=qt4 depends on masked dev-qt/qtwebkit:4, bug #620754 +sci-physics/root qt4 + +# Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017) +# Depends on masked dev-qt/qtwebkit:4, bug #620684 +dev-qt/assistant:4 webkit +dev-qt/designer:4 webkit +dev-qt/qt-meta:4 webkit +dev-qt/qtdeclarative:4 webkit +dev-qt/qtdemo:4 webkit +dev-python/PyQt4 webkit +dev-python/pyside:0 webkit + +# Pawel Hajdan jr <phajdan.jr@gentoo.org> (18 Sep 2017) +# Ian Stakenvicius <axs@gentoo.org> (27 Sep 2017) +# Depends on >=icu-59, still masked. +>=www-client/chromium-62.0.3202.9 system-icu +>=www-client/firefox-56.0 system-icu + +# Andreas K. Huettel <dilfridge@gentoo.org> (9 Sep 2017) +# Potentially destructive. Use it only if you know what you're doing. +sys-libs/glibc vanilla + +# Michael Orlitzky <mjo@gentoo.org> (24 Aug 2017) +# This is a security risk if not used carefully, bug 628596. +net-analyzer/nrpe command-args + +# Michał Górny <mgorny@gentoo.org> (04 Aug 2017) +# sys-kernel/openvz-sources is being treecleaned wrt #580516. +app-emulation/libvirt openvz + +# Michał Górny <mgorny@gentoo.org> (30 Jul 2017) +# The Z3 backend is unstable and causes assertion failures. Mask it +# until upstream fixes it properly. +sys-devel/clang z3 + +# Brian Evans <grknight@gentoo.org> (21 Jul 2017) +# Mask USE flag which has limited keywords for app-crypt/argon2 +dev-lang/php argon2 + +# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Jul 2017) +# Causes build to fail with ffmpeg-3, #602786 +www-plugins/gnash vaapi + +# Mike Gilbert <floppym@gentoo.org> (09 Jul 2017) +# Matthias Dahl <matthias.dahl@binary-island.eu> (05 Jul 2017) +# Both are not your typical garden-variety Linux programs and are +# rather sensitive when it comes to compiler flags, resulting in +# black screens, hangs or crashes. The average joe should have no +# need or even advantage to set custom compiler flags at all. +# Example: https://bugs.gentoo.org/619628 +sys-boot/gnu-efi custom-cflags +sys-boot/refind custom-cflags + +# Michał Górny <mgorny@gentoo.org> (8 Jul 2017) +# The clutter backend is broken with new GTK+3 versions and upstream +# haven't been able to fix it so far. Enforcing an old GTK+3 version +# is not a good solution long-term, so mask the flag entirely. +media-video/parole clutter + +# Michał Górny <mgorny@gentoo.org> (29 Jun 2017) +# Upstream switched to CMake and no longer provides option to build +# static and shared libs. The flag is preserved not to break USE +# depenencies. +>=app-arch/snappy-1.1.5 static-libs + +# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (18 Jun 2017) +# Libav is basically unsupported by mpv, see upstream issues 3923, 3925. +# Needs patch to even build, subs are broken and not supported anymore. +media-video/mpv libav + +# Michał Górny <mgorny@gentoo.org> (05 Jun 2017) +# (on behalf of Treecleaner project) +# dev-libs/dee is masked for removal, mask flags that requires it. +gnome-extra/zeitgeist icu + +# Michał Górny <mgorny@gentoo.org> (05 Jun 2017) +# (on behalf of Treecleaner project) +# www-apache/mod_python is masked for removal, mask flags that +# require it. +net-analyzer/check_mk livestatus wato + +# Matthias Maier <tamiko@gentoo.org> (31 May 2017) +# mask dependencies on old paraview versions, bug #561084 +<sci-libs/openfoam-2.4.0 paraview + +# Andreas K. Hüttel <dilfridge@gentoo.org> (29 May 2017) +# Does not build +sci-libs/linux-gpib php + +# Michał Górny <mgorny@gentoo.org> (20 May 2017) +# CUDA support in nvtt does not support GCC 4.5+. +media-gfx/nvidia-texture-tools cuda + +# Michał Górny <mgorny@gentoo.org> (15 May 2017) +# Mask ruby20-only compatible packages +=media-libs/libcaca-0.99_beta19 ruby + +# Matthias Maier <tamiko@gentoo.org> (11 May 2017) +# Globally mask pie use flag. Selectively unmask on specific profiles. +sys-devel/gcc pie + +# Mike Gilbert <floppym@gentoo.org> (28 Apr 2017) +# Needs sandbox-2.11 (masked) +>=www-client/chromium-59 tcmalloc + +# Michał Górny <mgorny@gentoo.org> (18 Mar 2017) +# Requires removed old version of media-gfx/graphviz. +media-gfx/nip2 graphviz + +# Matt Turner <mattst88@gentoo.org> (04 Mar 2017) +# Requires dev-util/cmdtest stabilization, bug 611052 +x11-apps/xauth test + +# Pawel Hajdan jr <phajdan.jr@gentoo.org> (02 Mar 2017) +# Known build issue with system libvpx: +# https://bugs.gentoo.org/show_bug.cgi?id=611394 +>=www-client/chromium-58.0.3026.3 system-libvpx + +# Michał Górny <mgorny@gentoo.org> (17 Feb 2017) +# Python 2 package relies on gedit[python] which is py3 only. +dev-vcs/rabbitvcs gedit + +# Mike Gilbert <floppym@gentoo.org> (16 Feb 2017) +# Multiple test failures. +sys-boot/grub:2 test + +# Ian Stakenvicius (25 Jan 2017) +# rust on mozilla packages is experimental +www-client/firefox rust +mail-client/thunderbird rust + +# Lars Wendler <polynomial-c@gentoo.org> (19 Jan 2017) +# Masked until system heimdal can finally be used with AD DC +net-fs/samba system-heimdal + +# Magnus Granberg <zorry@gentoo.org> (18 Jan 2017) +# Adding the mask so that end users and devlopers are notified of the removal and have some +# time to migrate. There is no support for gcj in gcc-7 +>=sys-devel/gcc-6.3.0 gcj + +# Robin H. Johnson <robbat2@gentoo.org> (04 Dec 2016) +# Additional HAProxy functionality waiting for related stuff to land in the +# tree. +# bug 541042 - lua 5.3 +net-proxy/haproxy lua +# bug (none) - 51Degrees +net-proxy/haproxy 51degrees +# bug (none) - WURFL +net-proxy/haproxy wurfl + +# Pacho Ramos <pacho@gentoo.org> (27 Nov 2016) +# Not rely on monodevelop, bug #596656 +# dev-dotnet/zeitgeist-sharp is going to be removed, bug #582894 +net-irc/hexchat theme-manager + +# Pacho Ramos <pacho@gentoo.org> (27 Nov 2016) +# Avoid the usage of dead net-dialup/capi4k-utils +app-emulation/crossover-bin capi + +# Ettore Di Giacinto <mudler@gentoo.org> (10 Nov 2016) +# Dependency has no stable keyword +# and as for now we have only stable mate versions +mate-base/mate bluetooth + +# Ulrich Müller <ulm@gentoo.org> (15 Oct 2016) +# The --with-cairo option is considered as experimental by upstream +# and causes problems with updating the X window, bug #592238 +app-editors/emacs cairo +app-editors/emacs-vcs cairo + +# Michał Górny <mgorny@gentoo.org> (28 Aug 2016) +# lldb fails to build in the current RC, and needs a lot of minor fixes. +# It's no longer available in -9999 line, and it won't be in 3.9.0 +# either unless somebody steps up to fix it. +>=sys-devel/llvm-3.9.0_rc lldb + +# Brian Evans <grknight@gentoo.org> (22 Aug 2016) +# Depends on masked, end-of-life php versions +<=dev-libs/ossp-uuid-1.6.2-r4 php + +# Gilles Dartiguelongue <eva@gentoo.org> (21 Aug 2016) +# Needs a Gstreamer plugin from gst-plugins-bad that is not packaged to date +media-plugins/grilo-plugins chromaprint + +# Pacho Ramos <pacho@gentoo.org> (21 Aug 2016) +# x11-libs/libsvg-cairo is being removed, bug #537918 +dev-ml/cairo-ocaml svg + +# Lars Wendler <polynomial-c@gentoo.org> (19 Aug 2016) +# gnutls is broken for years +>=net-libs/gsoap-2.8.0 gnutls + +# Michał Górny <mgorny@gentoo.org> (05 Jul 2016) +# Mask system-clang support as it requires llvm-3.4 that is subject +# to security bug cleanup, #585102. +dev-util/intel-ocl-sdk system-clang + +# Matthew Brewer <tomboy64@sina.cn> (02 June 2016) +# Acked-by: Amy Winston <amynka@gentoo.org> +# Currently broken upstream. +>=dev-lang/rakudo-2016.05 java + +# Michał Górny <mgorny@gentoo.org> (14 May 2016) +# (on behalf of QA team) +# sys-devel/gcc[jit]: +# - violates strict multilib rules, #569608 +# - causes collisions between multiple gcc versions, #583010 +# Masking the flag until it is fixed. +sys-devel/gcc jit + +# Mike Frysinger <vapier@gentoo.org> (08 May 2016) +# Most targets do not support VTV #547040. +sys-devel/gcc vtv + +# Matthew Brewer <tomboy64@sina.cn> (08 May 2016) +# Acked-by: Amy Winston <amynka@gentoo.org> +# Upstream supports using Clang's address sanitizer, but apparently +# invokes it wrong. +dev-lang/moarvm asan + +# Patrice Clement <monsieurp@gentoo.org> +# Merged on behalf of: +# Jonathan Scruggs <j.scruggs@gmail.com> (28 Sep 2017) +# Newer versions have a patch to fix the python issues. +<=media-libs/openimageio-1.6.13 python + +# Ian Stakenvicius <axs@gentoo.org> (28 Apr 2016) +# system-cairo support causes lots of crashing in mozilla pkgs +# (see bug #556378 and others) +www-client/firefox system-cairo +mail-client/thunderbird system-cairo +>=www-client/seamonkey-2.41 system-cairo + +# James Le Cuirot <chewi@gentoo.org> (10 Apr 2016) +# Slower and less reliable than HotSpot and we don't support Java on +# any non-HotSpot platforms. Don't unmask these unless you know what +# you're doing. This has upstream's approval. +dev-java/icedtea cacao jamvm + +# Lars Wendler <polynomial-c@gentoo.org> (20 Mar 2016) +# Need vulnerable libotr version (see bug #576914). +=net-im/climm-0.7.1 otr + +# Patrice Clement <monsieurp@gentoo.org> (27 Nov 2015) +# Unsastified dependencies are upsetting repoman. Needs investigation. +app-arch/cfv bittorrent + +# Rick Farina <zerochaos@gentoo.org> (06 Oct 2015) +# forward porting this patch is non-trivial, mask for now +>=net-wireless/wpa_supplicant-2.5 wimax + +# Justin Lecher <jlec@gentoo.org> (22 Sep 2015) +# Downloads files during installation +# https://bugs.gentoo.org/show_bug.cgi?id=533876 +>=sci-libs/vtk-6.1.0 examples + +# Fabian Groffen <grobian@gentoo.org> (08 Sep 2015) +# GnuTLS support is currently broken/causes hang, bug #559834 +# http://dev.mutt.org/trac/ticket/3772 +<mail-client/mutt-1.9.0 gnutls + +# Jason Zaman <perfinion@gentoo.org> (06 Sep 2015) +# This is for cgmanager which is linux only. +# Unmasked in default/linux/package.use.mask. +sys-auth/consolekit cgroups + +# Manuel Rüger <mrueg@gentoo.org> (03 Sep 2015) +# Mask USE=ruby for packages that solely rely on the soon to be deprecated +# ruby 1.9 +# See bug #541648 +<dev-libs/Ice-3.6 ruby + +# James Le Cuirot <chewi@gentoo.org> (18 Aug 2015) +# gcc[awt] is only used by gcj-jdk[awt] and that isn't needed by +# anything in the tree. The toolchain folks aren't keen to support it +# and it should probably only be used if you really know what you're +# doing *and* your name is gnu_andrew. ;) See bug #531900. +sys-devel/gcc awt +dev-java/gcj-jdk awt + +# Heather Cynede <cynede@gentoo.org> (13 Aug 2015) +# mono currently fails with doc most likely because of xattr +# Gentoo bug: 554484 +>=dev-lang/mono-3.12.1 doc + +# Manuel Rüger <mrueg@gentoo.org> (05 Jul 2015) +# app-text/migemo is masked because it fails for ruby20 +app-text/cmigemo emacs + +# Mike Gilbert <floppym@gentoo.org> (16 May 2015) +# dev-lang/python[berkdb] fails with recent multilib sys-libs/db (bug 519584). +dev-lang/python berkdb +net-nds/nsscache nssdb + +# Jason Zaman <perfinion@gentoo.org> (08 May 2015) +# java wrappers fail to build (bug #548858) +=app-admin/setools-3.3.8-r7 java + +# James Le Cuirot <chewi@gentoo.org> (05 Apr 2015) +# dev-java/sun-j2me-bin is going away. +dev-java/proguard j2me + +# Lars Wendler <polynomial-c@gentoo.org> (19 Mar 2015) +# >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2 +games-strategy/freeciv system-lua + +# Brian Evans <grknight@gentoo.org> (17 Mar 2015) +# Mask the cluster flag for deprecation. Use dev-db/mysql-cluster if +# you need NDB. +dev-db/mariadb cluster +dev-db/mysql cluster + +# Andrew Savchenko <bircoph@gentoo.org> (11 Feb 2015) +# Cluster code is still under development, only base functionality +# is implemented. Masking for testing and evaluation. +app-admin/clsync cluster mhash + +# Brian Evans <grknight@gentoo.org> (29 Nov 2014) +# Strongly recommened by upstream to disable lzo and zlib due to memory leaks +# https://github.com/groonga/groonga/issues/6 (Japanese) +app-text/groonga lzo zlib + +# Jeroen Roovers <jer@gentoo.org> (18 Nov 2014) +# Requires dev-lang/lua-5.2 (bug #253269) +net-analyzer/nmap system-lua + +# Mike Frysinger <vapier@gentoo.org> (21 Oct 2014) +# Most targets do not support ASAN/etc... #504200. +sys-devel/gcc sanitize + +# Pacho Ramos <pacho@gentoo.org> (19 Oct 2014) +# swfdec is masked for removal, bug #525834 +dev-libs/DirectFB swfdec + +# Rick Farina <zerochaos@gentoo.org> (26 Aug 2014) +# mirisdr does not seem to like making releases +<net-wireless/gr-osmosdr-9999 mirisdr + +# Maxim Koltsov <maksbotan@gentoo.org> (05 Aug 2014) +# net-libs/tox is in mva overlay only ATM +app-leechcraft/lc-azoth sarin + +# Brian Evans <grknight@gentoo.org> (30 Jul 2014) +# Mask embedded due to upstream not supporting +# https://bugs.launchpad.net/bugs/1236873 +dev-db/percona-server embedded + +# Thomas Sachau <tommy@gentoo.org> (30 Jun 2014) +# Mask pixman USE flag of dev-libs/efl for future removal, bug 501074 +dev-libs/efl pixman + +# Manuel Rüger <mrueg@gentoo.org> (05 Jun 2014) +# Fails to build with net-libs/libotr-4.0.0 +net-im/climm otr + +# Pacho Ramos <pacho@gentoo.org> (01 Jun 2014) +# Needs hardmasked lua-5.2 +>=media-plugins/grilo-plugins-0.2.12 lua + +# Rick Farina <zerochaos@gentoo.org> (30 Dec 2015) +# mask test use flag since tests do not pass +# mask development use flag since most of it isn't packaged (or useful) +net-analyzer/metasploit development test + +# Tom Wijsman <TomWij@gentoo.org> (14 May 2014) +# Documentation generation needs APIviz which is not in the Portage tree yet. +# Tracked in Gentoo bug #509602. +dev-java/jboss-logging doc + +# Manuel Rüger <mrueg@gentoo.org> (07 Mar 2014) +# Mask ruby18-only compatible flags +# Bugs: 483104, 483102 +<media-libs/libcaca-0.99_beta19 ruby +media-sound/podcatcher bittorrent + +# Mike Frysinger <vapier@gentoo.org> (03 Feb 2014) +# Upstream says to not use this for now. +dev-libs/elfutils threads + +# Gilles Dartiguelongue <eva@gentoo.org> (23 Dec 2013) +# Gstreamer support fails to build due to libtool shortcomings when using +# an intermediate library as a dependency of another libtool target dependency. +# Since this is new and unused yet, keep it masked for now and check +# with upstream if there is something that can be done to fix the issue. +media-libs/cogl gstreamer + +# Michał Górny <mgorny@gentoo.org> (10 Nov 2013) +# (on behalf of python@) +# USE=sandbox is not done properly in Gentoo and results in crippled +# PyPy install that is not usable for non-sandbox clients (and there are +# no real sandbox clients right now). Masked until the flag is +# re-implemented or dropped. For more details, bug #429372. +dev-python/pypy sandbox +dev-python/pypy3 sandbox + +# Julian Ospald <hasufell@gentoo.org> (31 Aug 2013) +# Randomly breaks consumers at runtime. Do not report +# gentoo bugs. +media-libs/libsdl2 custom-cflags + +# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) +# Causes build to fail, issue is being discussed with upstream +>=www-plugins/gnash-0.8.10_p20130822 openvg + +# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013) +# GL/GLES support in cairo is mutually exclusive, bug #428770. +x11-libs/cairo gles2 +dev-libs/weston rpi + +# Kacper Kowalik <xarthisius@gentoo.org> (19 May 2013) +# Fails to build, haven't had time to debug +app-doc/doxygen sqlite + +# Alexis Ballier <aballier@gentoo.org> (08 May 2013) +# On behalf of Pavel Sanda <ps@twin.jikos.cz> +# Lyx is currently not working with subversion 1.7 and needs 1.6. +app-office/lyx subversion + +# Christian Faulhammer <fauli@gentoo.org> (08 May 2013) +# Will not build successfully yet +mail-client/claws-mail gtk3 + +# Bernard Cafarelli <voyageur@gentoo.org> (04 Apr 2013) +# Broken for now (segmentation fault on play) +gnustep-apps/cynthiune flac + +# Richard Freeman <rich0@gentoo.org> (24 Mar 2013) +# Dependency is masked for buffer overflows for now +dev-python/pyocr cuneiform + +# Tom Wijsman <TomWij@gentoo.org> (10 Mar 2013) +# Experimental, masked until it compiles and works. +media-libs/avidemux-core system-ffmpeg + +# Julian Ospald <hasufell@gentoo.org> (20 Feb 2013) +# Unsupported and experimental. +# NP-Hardass <NP-Hardass@gentoo.org> (18 Jun 2015) +# Change to <10 +<net-misc/teamviewer-10 system-wine + +# Jory A. Pratt <anarchy@gentoo.org> (15 Dec 2012) +# PGO is known to be busted with most configurations +www-client/firefox pgo + +# Sergey Popov <pinkbyte@gentoo.org> (26 Nov 2012) +# PDF docs building failed with sandbox violation +media-libs/opencolorio pdf + +# Diego Elio Pettenò (27 Aug 2012) +# The libpci access is only used for linux. +net-analyzer/net-snmp pci + +# Diego Elio Pettenò (20 Aug 2012) +# The prevent-removal USE flag is only implemented for Linux. +sys-auth/pam_mktemp prevent-removal + +# Andreas K. Huettel <dilfridge@gentoo.org> (25 Mai 2012) +# Requires icc which does not emerge (distfile unavailable) +media-libs/opencv ipp + +# Samuli Suominen <ssuominen@gentoo.org> (20 Mar 2012) +# This is for udev-acl. Unmasked in default/linux/package.use.mask. +sys-auth/consolekit acl + +# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (25 Feb 2012) +# directfb build issues, bug #405817. +www-plugins/gnash directfb + +# Bernard Cafarelli <voyageur@gentoo.org> (08 Feb 2012) +# libobjc2/clang experimental support +>=gnustep-base/gnustep-make-2.6.2 libobjc2 + +# Samuli Suominen <ssuominen@gentoo.org> (10 Jan 2012) +# This is required only for Linux, so mask it here and unmask in +# default/linux/package.use.mask. Bug 354923. +app-arch/libarchive e2fsprogs + +# Mike Frysinger <vapier@gentoo.org> (06 Dec 2011) +# No one should be mucking with libssp unless they really know what they're +# doing. Force extra work on the smart peeps to protect the not-so-smart. +sys-devel/gcc libssp + +# Andrey Grozin <grozin@gentoo.org> (29 Mar 2011) +# dev-lang/swig-2.0.2 with -octave generated .cpp files +# incompatible with >=sci-mathematics/octave-3.4.0 +sci-libs/mathgl octave + +# Diego E. Pettenò <flameeyes@gentoo.org> (27 Mar 2011) +# +# Mask pdnsd's Linux-specific USE flags. +net-dns/pdnsd isdn urandom + +# Raúl Porcel <armin76@gentoo.org> (13 Feb 2011) +# Masked until devs know how to use repoman +<media-video/mplayer-9999 bluray + +# Justin Lecher <jlec@gentoo.org> (17 Nov 2010) +# Upstream didn't release patches for aria yet +>=sci-chemistry/cns-1.3 aria + +# Tomas Touceda <chiiph@gentoo.org> (13 Apr 2010) +# Masked because libsvm module is broken with this release on every arch. +dev-lisp/clisp svm + +# Diego E. Pettenò <flameeyes@gmail.com> (18 Jan 2010) +# Don't use system-wide mode unless you *really* know what you're doing. +# Keep it masked here so that I don't need to manage two versions every time. +media-sound/pulseaudio system-wide + +# Jeremy Olexa <darkside@gentoo.org> (10 Jan 2010) +# Upsteam doesn't support ioctl backend and neither does Gentoo. ioctl USE flag +# will eventually be removed unless the backend is re-written by upstream. bug +# 299674 +>net-misc/wicd-1.6.2.2 ioctl + +# These are for BSD only +net-proxy/squid ipf-transparent pf-transparent + +# Alexis Ballier <aballier@gentoo.org> <16 Feb 2011> +# Win32 specific useflags for vlc. Can be used for cross-compiling. +media-video/vlc directx dxva2 +# Mac OSX / iPhone OS specific useflags +media-video/vlc audioqueue macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.stable.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.stable.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.stable.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.stable.force 4a6149b20e29cc36dfaf5c640e26f2d6f377a501585eb6e08b7fc5b363e64082bf798874364b3a14d1a4bf8c274b2953732d412064a32f998bef69e0367dc1a2 @@ -0,0 +1,5 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# This file requires eapi 5 or later. New entries go on top. +# Please use the same syntax as in package.use.force diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.stable.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.stable.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.stable.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/package.use.stable.mask 6416a717219b4309834d4cf543ef3b49d1b5f461349ab20e321fa42e5e69235c2ecc5e13a2f808aad73aab5bc020901ee5bfeeea2b9b8190e966b205e75cfa6d @@ -0,0 +1,229 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# This file requires eapi 5 or later. New entries go on top. +# Please use the same syntax as in package.use.mask + +# Thomas Deutschmann <whissi@gentoo.org> (01 Jun 2018) +# Needs dev-ruby/asciidoctor which has a lot of unstable deps +net-analyzer/wireshark doc + +# Andreas Sturmlechner <asturm@gentoo.org> (29 May 2018) +# Depends on unstable media-libs/libaom, net-libs/srt +media-video/vlc aom srt + +# Andreas Sturmlechner <asturm@gentoo.org> (21 May 2018) +# Depends on lots of unstable dependencies +dev-python/s3fs test + +# Andreas Sturmlechner <asturm@gentoo.org> (22 Apr 2018) +# Not ready for stable, crashes LO on some systems. +>=app-office/libreoffice-6.0 kde + +# Michał Górny <mgorny@gentoo.org> (21 Apr 2018) +# Apparently requires newer dev-python/django stable. +=dev-python/django-tastypie-0.13.3 doc + +# Andreas Sturmlechner <asturm@gentoo.org> (03 Mar 2018) +# Depends on unstable dependencies; qt3d bug #652046 +sci-geosciences/qgis 3d grass + +# Thomas Beierlein <tomjbe@gentoo.org> (21 Mar 2018) +# ~app-backup/bacula-9.0.6 does not compile with USE=libressl (bug #641492) +~app-backup/bacula-9.0.6 libressl + +# Matthias Maier <tamiko@gentoo.org> (18 Mar 2018) +# dev-libs/capstone hasn't been stabilized yet +app-emulation/qemu capstone + +# Zac Medico <zmedico@gentoo.org> (9 Mar 2018) +# The rsync-verify support is not really stable yet. +# Bugs #649276, #647964 +<sys-apps/portage-2.3.28 rsync-verify + +# Kent Fredric <kentnl@gentoo.org> (3 Mar 2018) +# Not an officially supported configuration, as it causes unpredictable +# fragility and/or dependency headaches due to the very narrow interop window +# Bugs #649408, #641108, #640724 +dev-perl/DBD-SQLite system-sqlite + +# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (13 Feb 2018) +# Requires >=dev-lang/mujs-1.0.0 stabilized. mpv-0.27.2 is stabilized +# due to a security bug, so we won't bother with javascript this time. +~media-video/mpv-0.27.2 javascript + +# Andrey Grozin <grozin@gentoo.org> (24 Jan 2018) +# Depends on unstable dev-python/sphinx-gallery. +# Bug #643840. +dev-python/matplotlib doc + +# Michał Górny <mgorny@gentoo.org> (20 Jan 2018) +# Requires proprietary fetch-restricted package that is not suitable +# for stabilization. Bug #645092. +net-proxy/haproxy device-atlas + +# Bernard Cafarelli <voyageur@gentoo.org> (27 Nov 2017) +# Dependencies have no stable keyword +app-backup/backup-manager s3 + +# Brian Evans <grknight@gentoo.org (6 Nov 2017) +# Requires stable phpunit +dev-php/PEAR-Text_Password test + +# Andreas Sturmlechner <asturm@gentoo.org> (22 Oct 2017) +# Requires unmaintained unstable dependency net-libs/gloox. +# The go flag requires stable masked dev-lang/go[gccgo]. +www-servers/uwsgi go pypy uwsgi_plugins_alarm_xmpp + +# Michael Palimaka <kensington@gentoo.org> (30 Sep 2017) +# Required dependeny is not stable +sci-libs/gdal mdb + +# Tim Harder <radhermit@gentoo.org> (11 Sep 2017) +# Requires guile-2 which is still unstable. +>=net-irc/weechat-1.7 guile + +# Michael Palimaka <kensington@gentoo.org) (11 Aug 2017) +# Unstable dependencies. +dev-util/rpmdevtools emacs + +# Patrick McLean <chutzpah@gentoo.org> (11 Jul 2017) +# Requires >=net-dns/libidn2-2.0 stabilization +net-dns/dnsmasq libidn2 + +# Andreas Sturmlechner <asturm@gentoo.org> (23 Mar 2017) +# Requires dev-lang/julia stabilisation, bug #613576 +kde-apps/cantor julia + +# Brian Dolbec <dolsen@gentoo.org> (14 Feb 2017) +# This is stable masked as g-sorcery is being not actively developed. +app-portage/layman g-sorcery + +# David Seifert <soap@gentoo.org> (12 Feb 2017) +# Unknown future, stable deps are hopelessly +# broken, only allow for unstable keywords +# Bug: #581058 +net-misc/asterisk osplookup + +# Johannes Huber <johu@gentoo.org> (28 Jan 2017) +# Unstable dependencies. +media-plugins/kipi-plugins mediawiki vkontakte + +# Michael Palimaka <kensington@gentoo.org (26 Jan 2017) +# Requires testing version of media-libs/opencv +media-libs/mlt opencv + +# Matthias Maier <tamiko@gentoo.org> (22 Jan 2017) +# sys-fs/zfs isn't going to be marked stable anytime soon +app-emulation/libvirt zfs + +# Michael Palimaka <kensington@gentoo.org (18 Jan 2017) +# www-client/weboob is horribly outdated and not stable +app-office/kmymoney weboob + +# Andreas K. Hüttel <dilfridge@gentoo.org> (15 Jan 2017) +# Has no stable reverse deps requiring this useflag +# Stable-masking it so Boost 1.62 stabilization can go ahead +sci-libs/vtk mpi + +# Doug Goldstein <cardoe@gentoo.org> (04 Jan 2017) +# libcxx is not stable so we can't let users use it +dev-lang/rust libcxx + +# Alon Bar-Lev <alonbl@gentoo.org> (01 Jan 2017) +# Will always require unstable packages. +net-libs/gnutls test-full + +# Lars Wendler <polynomial-c@gentoo.org> (15 Dev 2016) +# Requires php:7.0 and ruby:2.2 being stable +>=dev-libs/Ice-3.6.3 php ruby + +# Pacho Ramos <pacho@gentoo.org> (19 Aug 2016) +# Not ready to be stabilized yet. +app-admin/packagekit-base entropy + +# Kristian Fiskerstrand <k_f@gentoo.org> (18 Aug 2016) +# Dropping stable for xtrabackup-bin, stable masking use +# flag until a source based version that doesn't depend +# on a vulnerable libgcrypt version is in tree +dev-db/mariadb sst-xtrabackup +dev-db/mariadb-galera sst-xtrabackup + +# William Hubbs <williamh@gentoo.org (13 Apr 2016) +# Needs gcc-5 which is currently unstable +dev-lang/go gccgo + +# Sergey Popov <pinkbyte@gentoo.org> (15 Feb 2016) +# Mask monitoring capabilities of Ganeti on stable branches +app-emulation/ganeti monitoring + +# Pacho Ramos <pacho@gentoo.org> (15 May 2015) +# Version compatible with current ffmpeg is not ready to be stabilized +# bug #539212 +app-emulation/vice ffmpeg + +# Jeroen Roovers <jer@gentoo.org> (26 Apr 2015) +# mongodb support is nice, but dev-libs/mongo-c-driver upstream is not ready +# yet (bug #542210) +net-analyzer/pmacct mongodb + +# Pacho Ramos <pacho@gentoo.org> +# sci-visualization/paraview is not ready for stabilization yet +# See bug #541012 +sci-libs/openfoam paraview + +# Ben de Groot <yngwin@gentoo.org> +# Mask experimental feature on stable. This also needs not yet stable mupdf. +app-text/qpdfview fitz + +# Andreas K. Huettel <dilfridge@gentoo.org> (12 Feb 2015) +# Pulls in way too many unstable sci packages +app-office/libreoffice coinmp + +# Andreas K. Huettel <dilfridge@gentoo.org> (30 Oct 2014) +# Pulls in sci-libs/vtk with a lot of new dependencies; stabilizing +# that will take some more time +media-libs/opencv vtk + +# Mikle Kolyada <zlogene@gentoo.org> (16 Aug 2014) +# Not yet stabilized dependency, need more testing +>=dev-perl/PDL-2.4.11 pdl2 pgplot + +# Samuli Suominen <ssuominen@gentoo.org> (01 Aug 2014) +# Optional (not required by anything in gentoo-x86) and fragile (based on +# host system, like Java JRE version). Keep masked indefinately until +# something starts requiring these. +# https://bugs.gentoo.org/483372 and https://bugs.gentoo.org/508564 +media-libs/libcaca java mono + +# Alon Bar-Lev <alonbl@gentoo.org> (21 Jul 2014) +# dev-libs/opencryptoki will not be stabile any time soon (bug#510204) +app-crypt/tpm-tools pkcs11 + +# Sergey Popov <pinkbyte@gentoo.org> (28 Oct 2013) +# sys-cluster/cman is still in ~arch. +sys-cluster/pacemaker cman + +# Samuli Suominen <ssuominen@gentoo.org> (01 Aug 2013) +# The dependencies for these flags are still in ~arch. +sys-fs/lvm2 clvm cman + +# Doug Goldstein <cardoe@gentoo.org> (12 Sep 2013) +# Waiting on glusterfs maintainers in bug #484016 +app-emulation/qemu glusterfs + +# Ian Delaney <idella4@gentoo.org> (09 Dec 2013) +# subsequent to the total inaction of the maintainer of +# ocaml to honour / respond in any way to +# Bug #486076, ocaml masked to allow xen to once again +# become a stabilisable package +app-emulation/xen-tools ocaml + +# Samuli Suominen <ssuominen@gentoo.org> (19 Mar 2014) +# Some open source OpenCL providers cause sandbox violation while accessing /dev/dri/card* +# from a command like eg. `/usr/bin/mogrify -version`, see bug #472766 +media-gfx/imagemagick opencl + +# Andreas K. Huettel <dilfridge@gentoo.org> (28 Mar 2013) +# Depends on unstable sci-libs/avogadrolibs +kde-apps/kalzium editor diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/packages b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/packages --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/packages false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/packages 12b35cd2e699e556e871af6c37a21c74434b446d5087ef5b46c9ad871a10c3fa1eaa47d3ab53fe762c3d2e7856b2c68e33542e92b201b0ac9653ab987c93e34c @@ -0,0 +1,66 @@ +# Copyright 1999-2014 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +# Gentoo Base Profile + +# NOTE: THIS IS THE BASE PROFILE FOR *ANY* GENTOO BASED OPERATING SYSTEM. +# NO MODIFICATIONS MAY BE MADE TO THIS FILE WITHOUT PRIOR DISCUSSION. IF +# YOU ARE CREATING A NEW PROFILE, YOU SIMPLY NEED TO INHERIT THIS BASE +# PROFILE IN YOUR PROFILE DIRECTORY'S "parent" FILE. + + +# OK, you're staring at this file and you have no idea what these stars are +# for. Here's the scoop. An initial "*" marks a package that is part of +# the official BASE system profile. If there is a "*" then `emerge system` +# will use the line in its calculations of what should be installed for the +# base profile. Lines without a "*" prefix will be ignored for profile +# system calculations. + +# Please note that this file is rarely used as a package inclusion mask +# file, because it affects EVERY SINGLE gentoo profile. As can be seen, +# we've limited the inclusion mask to a version of portage which supports +# cascaded profiles, but apart from that, there should be no version +# specific information in here. This file serves as a high level description +# of the minimum set of packages needed for any Gentoo based system. + +*>=sys-apps/baselayout-2 +*app-arch/bzip2 +*app-arch/gzip +*app-arch/tar +*app-arch/xz-utils +*app-shells/bash:0 +*net-misc/iputils +*net-misc/rsync +*net-misc/wget +*sys-apps/coreutils +*sys-apps/diffutils +*sys-apps/file +# Much of the tree relies on newer features like "-exec +". +# Force a recent stable version so people stay up-to-date. +*>=sys-apps/findutils-4.4 +*sys-apps/gawk +*sys-apps/grep +*sys-apps/kbd +# temporary bugfix for #398295 +*sys-apps/less +*sys-process/procps +*sys-process/psmisc +*sys-apps/sed +*sys-apps/which +*sys-devel/binutils +*sys-devel/gcc +*sys-devel/gnuconfig +*sys-devel/make +*>=sys-devel/patch-2.7 +*sys-fs/e2fsprogs +*virtual/dev-manager +*virtual/editor +*virtual/libc +*virtual/man +*virtual/modutils +*virtual/os-headers +*virtual/package-manager +*virtual/pager +*virtual/service-manager +*virtual/shadow +*virtual/ssh diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.force 3a60c6b0d1abeba9e878e844f04b6ff04351cebad6ebc03e4e01d005ee5cbd7846bfa22f246ce997ac8f0cf36530604ad2cdcd3f75116b0633e6edc8caaf4888 @@ -0,0 +1,8 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Force the GNU/Linux ELIBC, KERNEL, and USERLAND +# flags that apply to the majority of profiles. +elibc_glibc +kernel_linux +userland_GNU diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.mask 11aa14593b2ed48620f012788a804fec40d142d0e58899dfbf120f121952147e104004d418ac7118e1becfe0174f6688d32c3e0febd35b516006796a8fede412 @@ -0,0 +1,111 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# This file is only for generic masks. For arch-specific masks (i.e. +# mask everywhere, unmask on arch/*) use arch/base. + +# Matt Turner <mattst88@gentoo.org> (23 Nov 2017) +# For ancient hardware. Tired of maintaining. Masked for removal in 30 days. +# Bug #606132. +video_cards_tdfx + +# Andreas K. Hüttel <dilfridge@gentoo.org> (04 Nov 2017) +# ... since audacious is being last-rited ... bug 632513 +audacious + +# Patrick Lauer <patrick@gentoo.org> (22 Oct 2017) +# postgres-9.2 is EOL and masked +postgres_targets_postgres9_2 + +# Michael Palimaka <kensington@gentoo.org> (03 Jun 2017) +# Unkeyworded on most arches, unmasked in supported arch profiles. +elogind + +# CURL_SSL=winssl is for prefix/windows/winnt only +curl_ssl_winssl + +# masking here and unmasking in default/linux/ +kmod + +# not ready for primetime +packagekit + +# profile specific USE flags +# Don't put hardened in here. +# TODO: move multilib into arch/base once inherit order is fixed +selinux +uclibc +multilib + +# Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles. +userland_BSD + +elibc_AIX +elibc_bionic +elibc_Cygwin +elibc_Darwin +elibc_DragonFly +elibc_FreeBSD +elibc_HPUX +elibc_Interix +elibc_mintlib +elibc_musl +elibc_NetBSD +elibc_OpenBSD +elibc_SunOS +elibc_uclibc +elibc_Winnt + +kernel_AIX +kernel_Darwin +kernel_FreeBSD +kernel_freemint +kernel_HPUX +kernel_NetBSD +kernel_OpenBSD +kernel_SunOS +kernel_Winnt + +# Diego Pettenò <flameeyes@gentoo.org> (30 Dec 2006) +# These are specific of Mac OS X +aqua +coreaudio + +# Jeremy Olexa <darkside@gentoo.org> +# The prefix USE flags should never be used on non prefix profiles +prefix +prefix-chain +prefix-guest + +# Diego E. Pettenò <flameeyes@gentoo.org> (19 Oct 2010) +# masking flags that only apply to FreeBSD +kqueue + +# Ralph Sennhauser <sera@gentoo.org> (31 Jul 2012) +# Unmask in arch specific profiles when jython implementaton is available. +python_targets_jython2_7 +python_single_target_jython2_7 + +# Diego Elio Pettenò <flameeyes@gentoo.org> (18 Aug 2012) +# Prelude is being masked for removal +prelude + +# Diego Elio Pettenò <flameeyes@gentoo.org> (27 Aug 2012) +# netlink is a Linux-specific interface +netlink + +# Pacho Ramos <pacho@gentoo.org> (28 Sep 2013) +# This USE flag is available after long dicussion in +# http://www.gossamer-threads.com/lists/gentoo/dev/276077 +# to let some prople not able to run systemd to skip the dep (#480336). +# Enabling this you will get a fully unsupported Gnome setup that +# could suffer unexpected problem, don't expect support for it then. +openrc-force + +# Brian Evans <grknight@gentoo.org> (2 Dec 2015) +# php 5.4 is end of life, masked for removal +php_targets_php5-4 + +# Brian Evans <grknight@gentoo.org> (22 Aug 2016) +# php 5.5 is end of life, masked for removal +php_targets_php5-5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.stable.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.stable.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.stable.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.stable.force 2fdb7a97a0fcfe50b1cedeb46ed53fc870810ec1518c6aefc91ec7c2ec9eb9a206c9b41fbaa7d9370e3f7eeaea0b155037a854613b5ffe6e368c0708e810601a @@ -0,0 +1,5 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# This file requires eapi 5 or later. New entries go on top. +# Please use the same syntax as in use.force diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.stable.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.stable.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.stable.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/base/use.stable.mask a0ce9f09b86aba19a9891cbec15393b1defe15ffd064226b5c4ba206520fa47558ad8ef2722aa19b0a31be55cf3e54ceba3743b175496fc6b055bda47e7bb19a @@ -0,0 +1,25 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# This file requires eapi 5 or later. New entries go on top. +# Please use the same syntax as in use.mask + +# Brian Evans <grknight@gentoo.org> (14 Aug 2017) +# Needs dev-lang/php:7.2 stable +php_targets_php7-2 + +# Zac Medico <zmedico@gentoo.org> (01 Sep 2016) +# Needs virtual/pypy* stable +python_targets_pypy +python_single_target_pypy +python_targets_pypy3 +python_single_target_pypy3 + +# Hans de Graaff <graaff@gentoo.org> (25 Dec 2017) +# Currently in testing and not ready to go stable yet. +ruby_targets_ruby24 +ruby_targets_ruby25 + +# Patrick Lauer <patrick@gentoo.org> (28 Apr 2015) +# dependencies not stable yet +ayatana diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/make.defaults fdb2b2339eb85e7a4d2697357189d755742aaa51cdbaf9e94f0672e2d24d287c05e4bbbd8e6a7f5583b7041b69b11f0a0882ddac0c13819f293234c10b51cd24 @@ -0,0 +1,10 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +CHOST="x86_64-gentoo-linux-musl" + +# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014) +# Multilib-related setup, bug #515130 +MULTILIB_ABIS="amd64" +CHOST_amd64="${CHOST}" +LIBDIR_amd64="lib" diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/parent b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/parent --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/parent false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/musl/parent 35c79f27d5d7c281db3a9bf3e00ed46e3b6deef2e50059c2e564423dafff05aa6b29b10d1c2724fd6ebfe4e5474b8d488d2e74e38bf39368e5677d9fdabbe935 @@ -0,0 +1,3 @@ +.. +../../../../../arch/amd64/no-multilib +../../../../../features/musl/ diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/parent b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/parent --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/parent false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/17.0/parent 8969a30c89199d5860e92b048a0bc90c8f9e2e5389b7c0d03e0cbb38ea7fd287468bbd13923f69c1cf21b5ba0146584add75ace5837a5f49037eab4110e5a8af @@ -0,0 +1,3 @@ +.. +../../../../arch/amd64/lib32 +../../../../releases/17.0 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/package.use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/package.use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/package.use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/package.use.mask 0d58a6d092d285fad7dfaed0da2d075a6f0f8f9c7ed440f257c21aab7701ae6a893e1e95a345ecd8d00ba8c959eee098e818837a825c3ef8325afc6104902d56 @@ -0,0 +1,10 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Mike Frysinger <vapier@gentoo.org> (08 May 2016) +# This target supports VTV #547040. +>=sys-devel/gcc-4.9 -vtv + +# Mike Frysinger <vapier@gentoo.org> (21 Oct 2014) +# This target supports ASAN/etc... #504200. +sys-devel/gcc -sanitize diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/parent b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/parent --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/parent false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/amd64/parent 759708dcd0bbe5349157c2dc329ef0cc453baf6b507d8e4e2f2c4ad1adb4553a330863cd9723bd93095f19ea6853bbcedbda6877f8cad0a672cd46304baab833 @@ -0,0 +1,2 @@ +../../../base +.. diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/make.defaults c882469eb156a214d3d49f3df73ae2ee89608eeb1f27aab7fcab8fee752c6eb26771189ebec9998ed02b28e8e4e2d5b1b509bf0c2175b87eb66ae929f3c6c71a @@ -0,0 +1,60 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# System-wide defaults for the Portage system +# See portage(5) manpage +# +# Please avoid enabling things by default in here if possible. Understand any +# implications with core packages. For example, if "java" is in USE and db +# has a conditional dependency on java (which it does,) then a JDK will be +# pulled in during *emerge system*! + + +# Default starting set of USE flags for all default/linux profiles. +USE="berkdb crypt ipv6 ncurses nls pam readline ssl tcpd zlib" + +# make sure toolchain has sane defaults <tooclhain@gentoo.org> +USE="${USE} fortran openmp" + +# Security ftw. +USE="${USE} seccomp" + +# 2010/10/21 - Ole Markus With <olemarkus@gentoo.org> +# These USE flags were originally inserted here because of PHP +# and were later removed by me. Reinserting the USE flags again because they are +# global USE flags that may be expected to be set by other packages. +USE="${USE} cli pcre" + +# 2006/03/07 - Donnie Berkholz <dberkholz@gentoo.org> +# Modular X: Support direct rendering by default +# 2013/01/21 - Andreas K. Huettel <dilfridge@gentoo.org> +# Re-added following discussion with chithead +USE="${USE} dri" + +# 2006/10/28 - Luca Barbato <lu_zero@gentoo.org> +# on glibc system you cannot turn it off +USE="${USE} iconv" + +# 2017/01/17 - Matt Turner <mattst88@gentoo.org> +# Sane defaults for input drivers +INPUT_DEVICES="libinput" + +# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org> +# Lowest common denominator defaults for video drivers, +# except hppa, which lacks v4l so removes it in the hppa profile +VIDEO_CARDS="dummy fbdev v4l" + +# 2008/07/09 - Doug Goldstein <cardoe@gentoo.org> +# Adding LDFLAGS="-Wl,-O1 for all Linux profiles by default +# after discussion on the gentoo-dev ML. As we bang out a clear +# direction with how LDFLAGS will be set by default, this entry +# may move. +# 2010/07/12 - Samuli Suominen <ssuominen@gentoo.org> +# Note that adding LDFLAGS="-Wl,-O1 ${LDFLAGS}" breaks dev-util/boost-build +# because of whitespace. +LDFLAGS="-Wl,-O1 -Wl,--as-needed" + +# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org> +# https://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml +# Build kernel modules from linux-mod by default: +USE="${USE} modules" diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/package.use b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/package.use --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/package.use false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/package.use 314ec6cb1151ac2f36a23a61df980a8db5a36bf40e106e987e94b8c4f5b1887e68fe70eff97f2d792c8dcc99485ac9fe170ebec994eb2d92a59c69e295846536 @@ -0,0 +1,15 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Mike Gilbert <floppym@gentoo.org> (29 Oct 2017) +# Override default from make.defaults, bug 635822. +net-libs/mbedtls -zlib + +# Mike Frysinger <vapier@gentoo.org> (12 Nov 2015) +# We want busybox statically linked by default as it is the system rescue shell. +# But we cannot statically link pam, so turn that off by default. #468580 +sys-apps/busybox -pam static + +# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> (13 Feb 2011) +# Disable deprecated bsddb module of Python 2 by default. +=dev-lang/python-2* -berkdb diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/package.use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/package.use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/package.use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/package.use.mask fa747b7b4263c92c3428da77621c44be46aebfdcca487d499bf488a9136ecf3d69872bb0da6b8ef75f2dc292410752495458a5b36d04c8f08519d8eef928efb8 @@ -0,0 +1,64 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Jason Zaman <perfinion@gentoo.org> (06 Sep 2015) +# This is masked in base/package.use.mask as Linux only. +sys-auth/consolekit -cgroups + +# Michael Palimaka <kensington@gentoo.org> (03 Sep 2015) +# Native inotify support is preferred on linux. +kde-frameworks/kdelibs fam +kde-frameworks/kcoreaddons fam + +# Christian Ruppert <idl0r@gentoo.org> (23 Aug 2015) +# seccomp seems completely broken currently but has been added as global default +# apparently... #558100 +# https://archives.gentoo.org/gentoo-dev/message/38503d86a1c41bccfa607745467b1be7 +net-dns/bind seccomp + +# Matt Turner <mattst88@gentoo.org> (07 Mar 2014) +# media-libs/libomxil-bellagio keyworded on amd64/x86 +media-libs/mesa openmax + +# Diego Elio Pettenò (27 Aug 2012) +# The libpci access is only used for linux. +net-analyzer/net-snmp -pci + +# Richard Yao <ryao@gentoo.org> (22 August 2012) +# USE=kernel-builtin is dangerous. Only those that know what they are doing +# should use it until documentation improves. +sys-fs/zfs kernel-builtin + +# Diego Elio Pettenò (20 Aug 2012) +# The prevent-removal USE flag is only implemented for Linux. +sys-auth/pam_mktemp -prevent-removal + +sys-devel/gcc hardened +sys-libs/glibc hardened + +# Samuli Suominen <ssuominen@gentoo.org> (30 Apr 2012) +# This is replaced by native CONFIG_INOTIFY_USER support wrt #413403 +=dev-libs/glib-2* fam + +# Samuli Suominen <ssuominen@gentoo.org (20 Mar 2012) +# This is masked in base/package.use.mask as Linux only. +sys-auth/consolekit -acl + +# Samuli Suominen <ssuominen@gentoo.org> (10 Jan 2012) +# Masked in base/package.use.mask as Linux -only feature +app-arch/libarchive -e2fsprogs + +# Diego E. Pettenò <flameeyes@gentoo.org> (20 Aug 2009) +# +# Mask oss USE flag for PulseAudio; it's present for compatibility +# with FreeBSD and other operating systems that have no better +# interfaces, but people would probably abuse it with Linux as well. +# +# Older versions also had an OSS compatibility wrapper on that USE so +# they are excluded. +>=media-sound/pulseaudio-0.9.16_rc5 oss + +# Diego E. Pettenò <flameeyes@gentoo.org> (27 Mar 2011) +# +# Unmask pdnsd's Linux-specific USE flags. +net-dns/pdnsd -isdn -urandom diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/packages b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/packages --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/packages false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/packages 713c49279748c928f2589ea043ef68a3b8b7c94796db494a31fff5356fbcb956ce0902748209bed6a3d31b567bc2596919abb07d21a6ed54bac5fd47be6c500c @@ -0,0 +1,13 @@ +# Copyright 2004-2015 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# This file extends the base packages file for the default profile that all +# architectures will enjoy. Please note that default is what most architectures +# will have. Some will have an selinux profile (see ${PORTDIR}/profiles/selinux). +# The idea is to only create a new family of profiles when absolutely necessary. + +*sys-apps/busybox +*sys-apps/iproute2 +*sys-apps/man-pages +*sys-apps/net-tools +*sys-apps/util-linux diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/packages.build b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/packages.build --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/packages.build false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/packages.build 2f4b6b2a01e6d4aa58d3196661a6ea5143ca72a39311ba2274ce525c8fff4ae6de1d41901cce6c629574de53b4cf6296239a9d58955718060a5f04ceb8b1f50f @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# This file describes the packages needed to build a stage1 based on this +# profile. Packages in this file are built in order. + +# While shadow could be in here, it breaks stage 1 and stage 2 building for the +# releases. PLEASE DO NOT ENABLE THIS UNLESS YOU HAVE THOROUGHLY TESTED IT! + +app-arch/bzip2 +app-arch/gzip +app-arch/xz-utils +app-arch/tar +app-shells/bash:0 +net-misc/rsync +net-misc/wget +sys-devel/autoconf +sys-devel/automake +sys-devel/libtool +sys-apps/baselayout +sys-apps/makedev +sys-apps/coreutils +sys-apps/diffutils +sys-apps/file +sys-apps/findutils +sys-apps/gawk +sys-apps/grep +sys-apps/less +sys-apps/net-tools +sys-apps/portage +sys-apps/sed +sys-devel/binutils +sys-devel/bison +sys-devel/flex +sys-devel/gcc +sys-devel/gettext +sys-devel/gnuconfig +sys-devel/make +sys-devel/patch +virtual/editor +virtual/libc +virtual/os-headers +virtual/pkgconfig +virtual/shadow +sys-apps/which diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/default/linux/use.mask b7da43be8dc8c4242fb0f9d8952ba2799f8087c76fb0fc383623c188a7cfa625f5c32b35f68b8f7c4fbc383bde854b83076915535fde388caf3eda8334f1bb01 @@ -0,0 +1,15 @@ +# Copyright 1999-2015 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# This file masks out USE flags that are simply NOT allowed in the default +# profile for any architecture. This works, for example, if a non-default +# profile (such as the selinux profiles) have a USE flag associated with +# them. + +# Diego Elio Pettenò <flameeyes@gentoo.org> (27 Aug 2012) +# netlink is a Linux-specific interface +-netlink + +# Samuli Suominen <ssuominen@gentoo.org> (19 Apr 2013) +# Linux specific module loading/unloading support +-kmod diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/make.defaults 55f651833a46741511aa664ba1b211b27bfb3f1f10f52e2d8c1a2ed67f9b5799d1c8e8db80139b6fd4eb1f6e3a06afde97b76e945835ca3bf110d3776baee815 @@ -0,0 +1,16 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011) +# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value +# This is so we build with multilib from the start +BOOTSTRAP_USE="${BOOTSTRAP_USE} multilib" + +# Default USE=multilib to on. This rarely impact packages as they should be +# using the multilib eclass anyways. #435094 +USE="multilib" + +# FEATURES="multilib-strict" specific settings. +MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib" +MULTILIB_STRICT_DENY="64-bit.*shared object" +MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage|udev|systemd|clang|python-exec|llvm)" diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/package.use b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/package.use --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/package.use false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/package.use 86c886e070e416f4c440ae91e06e3e82d53444fe60c347c770095b58a70a08bcb47c9026767539895cee8033754f4717d191530ac446578fa5e53dd78f759b15 @@ -0,0 +1,6 @@ +# Copyright 1999-2016 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +# Enable all ABIs by default so we can protect any non-native binaries that +# might be executed. +sys-apps/sandbox abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_o32 abi_mips_n32 abi_mips_n64 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/package.use.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/package.use.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/package.use.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/package.use.force 597a3a8723b639367948e31690a770f8cc4dead096c6a5db000a1659ae4f884dfdc7751272b5cf4f2c3577ed9c486381eb5266677d7afd34d0b8d900f4225ade @@ -0,0 +1,6 @@ +# Copyright 2004-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +# These packages must have multilib turned on in order to work sanely. +sys-devel/gcc multilib +sys-libs/glibc multilib diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/multilib/use.mask 3785ffedd868d9263ed2232344b3c932f8ef4320faceb37b38ca578dd26c67139ea1aab69b44a96d6ffab8c0dfae578eac578720db9e708f680ab42087b843c6 @@ -0,0 +1,8 @@ +# Copyright 2004-2008 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +# SECTION: Unmask + +# 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org> +# Unmask multilib, since we need to use it. +-multilib diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/make.defaults fbc89a9fda181cac9250f0b39b7193b87bdc17a59f988c4d23bf830f696e9140410014a354e1902fef0148cacd82336a71c015e03c004aa04cc13c5e0a98d61e @@ -0,0 +1,18 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +PORTAGE_LIBC="musl" +ELIBC="musl" + +FEATURES="sandbox sfperms strict" + +USE="nptl unicode -berkdb -gdbm" +BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb -gdbm" + +# All libraries are in /lib or /usr/lib +SYMLINK_LIB="no" +FEATURES="-multilib-strict" + +# TODO: fix so musl doesn't generate this for all packages +# that use a charset, it causes package collisons. +INSTALL_MASK="charset.alias" diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.mask 9caa6e17edc6950611985ee9b880bc0b781a9d1f7b59f9accb7aa0733512162de23e8c3811c87789444ff8f3963ffe3df3119a36ee4b3d1d3c8dfb70fe833945 @@ -0,0 +1,23 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +sys-libs/uclibc +sys-libs/uclibc-ng +sys-libs/glibc + +# Older versions of net-mail/mailutils fail on musl, bug #604212 +<net-mail/mailutils-3.2 + +# We use eudev which is tested on both uclibc and musl +sys-apps/systemd +sys-fs/udev + +# dev-libs/elfutils needs a port to musl, bug #602126 +dev-libs/elfutils +>virtual/libelf-2 + +# Ian Stakenvicius, 2017-06-14 +# on behalf of mozilla@gentoo.org +# Mask firefox-54 and above as it requires rust +# now, and rust reportedly will not build yet. +>=www-client/firefox-54.0 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use 54743a7479bb06e68a5f18e3f5b1187ec08b23cf7ac3a8cae7df340d33ff2e5dfd60a61e6cbdf743e43128311f4e382a4436e983954de2790bfd664750b54e2f @@ -0,0 +1,7 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Anthony G. Basile <blueness@gentoo.org> (14 Jul 2016) +# We need this to break a circular dependency with +# 'sys-libs/libcap pam' in stage3 catalyst builds +sys-libs/pam -filecaps diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use.force d6a481b6a5f801098a921b9369184591acafd48606ff8b600b50f8133ee0d277a0c64892a2f32d6119662067f3a19b8ec06b248a29b4b278efa728e2dce2bfbc @@ -0,0 +1,9 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Force system-libevent use flag on mozilla packages, since the building of +# bundled libevent cannot accomodate a system without sysctl.h +# See bug 574830 for more info. +>=www-client/firefox-45.0 system-libevent +>=www-client/seamonkey-2.40 system-libevent +>=mail-client/thunderbird-45.0 system-libevent diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/package.use.mask d35ee46c8d30355fdce5990e0b3b436ebf5ff879d95417b327996f1e1311421e805085b033ed1640ad611779701442002eb6397ef4faa004a35ee99a94ab53b0 @@ -0,0 +1,24 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# See bug #604542 +net-misc/iputils idn + +# See bug #504200 +sys-devel/gcc sanitize vtv + +# llvm's sanitizers are also incompatible with musl +sys-devel/llvm sanitize + +# These cause collisions with <libintl.h> +# even with --without-included-gettext +sys-devel/gettext nls +sys-fs/e2fsprogs nls + +# See bug #576928 +media-libs/mesa nptl + +# bash-malloc relies on sbrk which is implemented +# as a fail-only stub in musl. breaks horribly if enabled. +# bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated) +app-shells/bash mem-scramble diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/packages b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/packages --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/packages false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/packages 43d44e554c54c0dc8c088ae2331e3c0cf368373a5b28c9d3c2f68819a7910dce1446c3e32f4286d4fe43fef42024fc58d76878d5a37db59c053c959604ddb20a @@ -0,0 +1,6 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +*app-misc/pax-utils +*sys-apps/sandbox +-*sys-apps/man-pages diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/packages.build b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/packages.build --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/packages.build false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/packages.build 1bd29acc3e369fe0a690ed0a94b0bddc2fbec03c76c68eae99e8845ab8d7839071052b1aa56ef37dc7359ddf35c42502851bc046783aff586571921320978efd @@ -0,0 +1,10 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# This file lists extra packages needed to build for +# a stage 1 based on this profile. + +dev-util/pkgconf +sys-apps/attr +sys-apps/sandbox +dev-python/pyxattr diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/use.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/use.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/use.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/use.force 4e5918fe2e422827f34682b3b40c03c8d62f43c9f529d9871cc7a716b5177871da611c49606a4efded49054dac79fc7670f453a46d4d1db6a960b0132dc4274f @@ -0,0 +1,6 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Select the correct ELIBC +elibc_musl + diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/features/musl/use.mask 35547b0df95378f41c5f41281663c8356d28c063a2d1662ee3ee365bc321958b8bd7184094188918979f94e626426794e6423e66e62c48d498f3c10b01d58ac8 @@ -0,0 +1,7 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Select the correct ELIBC +-elibc_musl +elibc_uclibc +elibc_glibc diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/make.defaults d997bfa56b8f23734c5d27d1aeb04792de10419090dd8f30fe735bcf338ee03cf29c221034da359c2ccdbf93a27fba79834481bd8195de1a3fe31b1eaa46272d @@ -0,0 +1,5 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Adding this one, since it makes sense. +USE="bzip2" diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.mask accd2838a76aa1eb05cb7d2208bfbcf56c0f26727094c4642d95df2ec8442e9bb178c93e8a8f1c150e77fc28901531a85f4131ead687e8d6227d4fd1b8fadf53 @@ -0,0 +1,25 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Andreas K. Huettel <dilfridge@gentoo.org> (27 May 2017) +# In the 17.0 profiles we assume that our system compiler uses C++14 +# or later as default language setting. This means it has to be at +# least GCC 6. If you need an older compiler for specific purposes, +# feel free to unmask it, however, using it for normal emerging of +# packages is neither recommended nor supported in any way. +<sys-devel/gcc-6 + +# Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017) +# The following packages require GCC 5 or earlier and are therefore +# masked in the 17.0 profiles. +app-text/pdftk +dev-java/ecj-gcj +dev-java/gcj-jdk +<dev-util/nvidia-cuda-toolkit-9 +<dev-util/nvidia-cuda-sdk-9 +<dev-libs/dietlibc-0.34_pre20140729-r1 + +# Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017) +# The following packages require pdftk and are therefore +# masked in the 17.0 profiles. +app-office/auto-multiple-choice diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.force b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.force --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.force false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.force a759577c35202b261ea7005d2762cebcb1b55a2b63fb394f32fd8d5cfb43de9074a659127c9c4e8b7ed8620f2a57ab9ef2e368a7b5a1b2b84ac705648af5bf3d @@ -0,0 +1,6 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2017) +# Force default-PIE build on 17.0 profiles. +sys-devel/gcc pie diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.mask b781f6a9e4e1205e3b926e8f87955a11067d6ca8ce1feb0174c3111bdea8421766827a9bb2a2294c2b11a7058fa8cee3f4ff2e732e1bbee5d1498437e220f431 @@ -0,0 +1,21 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2017) +# Unmask default-PIE on 17.0 profiles. +sys-devel/gcc -pie + +# Andreas K. Hüttel <dilfridge@gentoo.org> (7 June 2017) +# Qt-4 will never work with >=icu-59, see bug 618638 and bug 618640 +dev-qt/qtcore:4 icu + +# Ian Stakenvicius <axs@gentoo.org> (27 Sep 2017) +# Remove system-icu masks (see base/package.use.mask) +# that prevent the >=icu-59 dependency +>=www-client/chromium-62.0.3202.9 -system-icu +>=www-client/firefox-56.0 -system-icu + +# Andreas K. Hüttel <dilfridge@gentoo.org> (1 Dec 2017) +# The following need pdftk, which is masked now +app-text/getxbook pdf +dev-util/diffoscope pdf diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.stable.mask b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.stable.mask --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.stable.mask false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/package.use.stable.mask 989f2a6a773d8f034c3259fbf3aeafb23c4fe612c371763e1e03da87f269572f43199b16db91582228a284cbb35cf29e72d10e1ad8f5c8ad4b23b66cb17614eb @@ -0,0 +1,10 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# This file requires eapi 5 or later. New entries go on top. +# Please use the same syntax as in package.use.mask + +# Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017) +# Remove when ICU 59 or later becomes stable +>=www-client/chromium-62.0.3202.9 system-icu + diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/parent b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/parent --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/parent false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/17.0/parent fc37e047c6586d4331a64ec9ae744fb8e1b76c2308868a3d5330b9b4049b68886154c02ca591f9784854f7251e811c32223d1dbb70b67e93fec1cb4e64f4867a @@ -0,0 +1 @@ +.. diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/eapi b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/eapi --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/eapi false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/eapi 6cacc333a395dd8eb8207cec5db73e4109194d403762a576fb219b24ab9acb63ed91257e86fd99c1f790bf7ce640a88d7b07f4d7f66a480ccb3c1073ab7d4fb2 @@ -0,0 +1 @@ +5 diff -uNr a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/make.defaults b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/make.defaults --- a/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/make.defaults false +++ b/profiles/home/irina/tmsr_dev/cuntoo/2018_12_cuntoo/build/usr/portage/profiles/releases/make.defaults fbb90ee3ade90624305b9ac79ddea05238bcc1477fc61279043bc94812aac7195970706cef30e51399032bdd0d9c41e054ea11b55a6b052ea8e6afcb8d025da0 @@ -0,0 +1,6 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# These USE flags are what is common between the various sub-profiles. Stages 2 +# and 3 are built against these, so be careful what you add. +USE="acl gdbm nptl unicode" diff -uNr a/profiles/repo_name b/profiles/repo_name --- a/profiles/repo_name false +++ b/profiles/repo_name 4882863dc968750db095ba634dc45232085cea9e762f0ea17329a0bbc98fd2cbf0c3b7ef3947faafbc5b6cabd5ccbbe58f4a0d67a078ecaa3cd15310de4b2b0b @@ -0,0 +1 @@ +cuntoo diff -uNr a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest --- a/sys-apps/attr/Manifest false +++ b/sys-apps/attr/Manifest 7e6aad5a79bb5d5160aead89ea3471b4e11d3e7acb967031d2c948e9c2f9d3a24e57234b1fc7cc5c7acc0a1ee551b2f4ab461f6f1f043a90a26f60709fd7b186 @@ -0,0 +1,5 @@ +AUX attr-2.4.47-cdecls.patch 791 BLAKE2B 4a3f138f4a892aceda1fb0c6127cf18e3ba9baf2bb3aa8bf595839152a06c1723840e01614ae73629a46bc9e26c645af0b543741d4824dc26f26b4599dbdbb1a SHA512 9ea5f950a944ccfaab47ed1b5f361215053a9e0f49425e03d07a7654baed31a5f755c839140553472147bb71c0c245cbc6f94564dbd957f3b4d494f225fa55e2 +AUX attr-2.4.47-fix-missing-sys_types_h.patch 432 BLAKE2B 6fe1c415ff43d36e4435707e2d8c1dd0ae232c964831c62aeddfb6a0325e7b5b437fb476eb0bce12fb60561059f8b90c0e8233cc9fe9036bc93abe1627f66be2 SHA512 9d6c3885c88f1b67d862205ee447adf4254e816745f9ef02e33f2253503299bbd7f5f39ffe1a53d8e801dde9001efd45afacb2fdc8cd4f8d7923e62e3b7256ec +DIST attr-2.4.47.src.tar.gz 343692 BLAKE2B af4d509f156cb2e693f0faebf1a6cfb4a27cbdd3fd7f8b436cc01419c905ff9ac36214ada2ca8269e49c2e276917b1178dcda97050cf25cecd65382f22bdf9bb SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 +EBUILD attr-2.4.47-r2.ebuild 1751 BLAKE2B d5dd736515a8db9d76822a83b44540c602ba02d1b088776c765cd5ee05e57e307c4094a5fa95bf72504d8b60eae03aa3a95881ea0372534207f00d496ba01f1c SHA512 f472aabfc1f5e46b8a6751cb554e74f142731c0563f1f79157aa4ecb1c632ec5836e81785fae7662264533722a95e4b5fedeb1bbace11498d25c4a3d9f13dfdd +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-apps/attr/attr-2.4.47-r2.ebuild b/sys-apps/attr/attr-2.4.47-r2.ebuild --- a/sys-apps/attr/attr-2.4.47-r2.ebuild false +++ b/sys-apps/attr/attr-2.4.47-r2.ebuild 3d320ab8db25d84f70cb14c6e226848e2c2dbb85889b563c48b8a86eb3212b5ca86914294cadfb93c678f8d5d958a0dfc51f9e95fd72da45ba20af4f45a7747c @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +inherit eutils libtool toolchain-funcs multilib-minimal + +DESCRIPTION="Extended attributes tools" +HOMEPAGE="https://savannah.nongnu.org/projects/attr" +SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm ia64 ~mips ppc sh sparc x86" +IUSE="nls static-libs" + +DEPEND="nls? ( sys-devel/gettext ) + sys-devel/autoconf" +RDEPEND="" + +src_prepare() { + epatch "${FILESDIR}"/${P}-cdecls.patch + epatch "${FILESDIR}"/${P}-fix-missing-sys_types_h.patch + + sed -i \ + -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ + -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ + include/builddefs.in \ + || die + strip-linguas -u po + elibtoolize #580792 + + multilib_copy_sources # https://savannah.nongnu.org/bugs/index.php?39736 +} + +multilib_src_configure() { + unset PLATFORM #184564 + export OPTIMIZER=${CFLAGS} + export DEBUG=-DNDEBUG + + econf \ + $(use_enable nls gettext) \ + --enable-shared $(use_enable static-libs static) \ + --libexecdir="${EPREFIX}"/usr/$(get_libdir) \ + --bindir="${EPREFIX}"/bin +} + +multilib_src_compile() { + emake $(multilib_is_native_abi || echo TOOL_SUBDIRS=) +} + +multilib_src_install() { + emake \ + $(multilib_is_native_abi || echo TOOL_SUBDIRS=) \ + DIST_ROOT="${D}" \ + install install-lib install-dev + + if multilib_is_native_abi; then + # we install attr into /bin, so we need the shared lib with it + gen_usr_ldscript -a attr + # the man-pages packages provides the man2 files + # note: man-pages are installed by TOOL_SUBDIRS + rm -r "${ED}"/usr/share/man/man2 "${ED}"/usr/share/man/man5/attr.5 || die + fi +} + +multilib_src_install_all() { + use static-libs || prune_libtool_files --all + einstalldocs +} diff -uNr a/sys-apps/attr/files/attr-2.4.47-cdecls.patch b/sys-apps/attr/files/attr-2.4.47-cdecls.patch --- a/sys-apps/attr/files/attr-2.4.47-cdecls.patch false +++ b/sys-apps/attr/files/attr-2.4.47-cdecls.patch ba7ca504631a2e19f19c693fe8e73e3f51c2ef744fae82aae4de1afc58c91860735ecd94dc66a8e3a5f95cd19a5185908b67e0205e2b09bd68c1588e8f301fa5 @@ -0,0 +1,27 @@ +diff -Naurw attr-2.4.47.orig/include/xattr.h attr-2.4.47/include/xattr.h +--- attr-2.4.47.orig/include/xattr.h 2015-08-22 14:26:31.167584051 +0700 ++++ attr-2.4.47/include/xattr.h 2015-08-22 14:32:25.714261283 +0700 +@@ -31,7 +31,12 @@ + #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ + + +-__BEGIN_DECLS ++#ifdef __cplusplus ++#define __THROW throw() ++extern "C" { ++#else ++#define __THROW ++#endif + + extern int setxattr (const char *__path, const char *__name, + const void *__value, size_t __size, int __flags) __THROW; +@@ -58,6 +63,8 @@ + extern int lremovexattr (const char *__path, const char *__name) __THROW; + extern int fremovexattr (int __filedes, const char *__name) __THROW; + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif /* __XATTR_H__ */ diff -uNr a/sys-apps/attr/files/attr-2.4.47-fix-missing-sys_types_h.patch b/sys-apps/attr/files/attr-2.4.47-fix-missing-sys_types_h.patch --- a/sys-apps/attr/files/attr-2.4.47-fix-missing-sys_types_h.patch false +++ b/sys-apps/attr/files/attr-2.4.47-fix-missing-sys_types_h.patch 3f38c89577221f4adfc15b3e007d6270ebbd2dd5ebc3cab82d046d9c3de9a8fc9ef803c318aba8bdea3544cd271cf44d3d4b911aea8ae330a1932182b55b12b6 @@ -0,0 +1,12 @@ +diff -Naur attr-2.4.47.orig/include/attributes.h attr-2.4.47/include/attributes.h +--- attr-2.4.47.orig/include/attributes.h 2013-05-19 00:53:54.000000000 -0400 ++++ attr-2.4.47/include/attributes.h 2016-05-28 09:34:04.743603033 -0400 +@@ -22,6 +22,8 @@ + extern "C" { + #endif + ++#include <sys/types.h> ++ + /* + * An almost-IRIX-compatible extended attributes API + * (the IRIX attribute "list" operation is missing, added ATTR_SECURE). diff -uNr a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml --- a/sys-apps/attr/metadata.xml false +++ b/sys-apps/attr/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest --- a/sys-apps/baselayout/Manifest false +++ b/sys-apps/baselayout/Manifest 1b390aa55abaa15711df2a6320ec77ab5c6be7cb6bcf87a7809e2588e1679c3f95eb96d0fafafdc431102f8dfd8323ebdbc5f461b2427ceb91d0305111fbf206 @@ -0,0 +1,3 @@ +DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1 +EBUILD baselayout-2.4.1-r2.ebuild 8573 BLAKE2B 1ae0257d233a4ee8a6351cd501bd3516b0c3c3a6e306d3b01fd45db29b4a932214dfe4989d23f397733eefd02c72f58bb726bdcfce975a58a0541f7fe71b4671 SHA512 cdd4f344d072851848c6e512bc3c47f1225d49b2077dbd3af45caf1f4e8d6d9d112a315b034a2237f8cf7bcadd5585cd3fc55489a085bb744130c0d37d2d7662 +MISC metadata.xml 460 BLAKE2B 5c30cc883f9ea3feeae2148cb58741c98e182ca0fff7c28458b3cc20023321395cbeda951426d12ff469105b43689ecaaa5f9c984396b72065c70b8c99843c38 SHA512 60728fd1a2702e79a717ea3e74247ac1e5c80a586a920597d985c87f0d84b30462ef04a36713a0945147d7f2b6c01052c08722c660b02fe82c4bba0407c582b1 diff -uNr a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild --- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild false +++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild a896320baa0e1a72a4976680b0fe04ae768a1001df57fd23bcc36c44c0eb8de62af6ffbd8c6dd8e2bbb844ebc25758cc1a0262dda87097af68760b9ef2d28e6d @@ -0,0 +1,247 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils multilib versionator prefix + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="build kernel_linux" + +pkg_setup() { + multilib_layout +} + +# Create our multilib dirs - the Makefile has no knowledge of this +multilib_layout() { + local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + + [ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" + + # figure out which paths should be symlinks and which should be directories + local dirs syms exp d + for libdir in ${libdirs} ; do + exp=( {,usr/,usr/local/}${libdir} ) + for d in "${exp[@]}" ; do + # most things should be dirs + if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then + [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" + else + [ -h "${d}" ] && syms+=" ${d}" + fi + done + done + if [ -n "${syms}${dirs}" ] ; then + ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" + ewarn "have these paths configured as follows:" + [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" + [ -n "${syms}" ] && ewarn "directories:${syms}" + ewarn "The ebuild will attempt to fix these, but only for trivial conversions." + ewarn "If things fail, you will need to manually create/move the directories." + echo + fi + + # setup symlinks and dirs where we expect them to be; do not migrate + # data ... just fall over in that case. + local prefix + for prefix in "${EROOT}"{,usr/,usr/local/} ; do + if [ "${SYMLINK_LIB}" = yes ] ; then + # we need to make sure "lib" points to the native libdir + if [ -h "${prefix}lib" ] ; then + # it's already a symlink! assume it's pointing to right place ... + continue + elif [ -d "${prefix}lib" ] ; then + # "lib" is a dir, so need to convert to a symlink + ewarn "Converting ${prefix}lib from a dir to a symlink" + rm -f "${prefix}lib"/.keep + if rmdir "${prefix}lib" 2>/dev/null ; then + ln -s ${def_libdir} "${prefix}lib" || die + else + die "non-empty dir found where we needed a symlink: ${prefix}lib" + fi + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a symlink" + mkdir -p "${prefix}" || die + rm -f "${prefix}lib" || die + ln -s ${def_libdir} "${prefix}lib" || die + mkdir -p "${prefix}${def_libdir}" #423571 + fi + else + # we need to make sure "lib" is a dir + if [ -h "${prefix}lib" ] ; then + # "lib" is a symlink, so need to convert to a dir + ewarn "Converting ${prefix}lib from a symlink to a dir" + rm -f "${prefix}lib" || die + if [ -d "${prefix}lib32" ] ; then + ewarn "Migrating ${prefix}lib32 to ${prefix}lib" + mv "${prefix}lib32" "${prefix}lib" || die + else + mkdir -p "${prefix}lib" || die + fi + elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then + # make sure the old "lib" ABI location does not exist; we + # only symlinked the lib dir on systems where we moved it + # to "lib32" ... + case ${CHOST} in + *-gentoo-freebsd*) ;; # We want it the other way on fbsd. + i?86*|x86_64*|powerpc*|sparc*|s390*) + if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then + rm -f "${prefix}lib32"/.keep + if ! rmdir "${prefix}lib32" 2>/dev/null ; then + ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" + die "non-empty dir found where there should be none: ${prefix}lib32" + fi + fi + ;; + esac + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a dir" + mkdir -p "${prefix}lib" || die + fi + fi + done +} + +pkg_preinst() { + # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of + # the baselayout-1.x ebuild copies all the real configs from the user's + # /etc/conf.d into ${D}, it makes them all appear to be the default + # versions. In order to protect them from being unmerged after this + # upgrade, modify their timestamps. + touch "${EROOT}"/etc/conf.d/* 2>/dev/null + + # This is written in src_install (so it's in CONTENTS), but punt all + # pending updates to avoid user having to do etc-update (and make the + # pkg_postinst logic simpler). + rm -f "${EROOT}"/etc/._cfg????_gentoo-release + + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + multilib_layout + if use build ; then + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout || die + fi + rm -f "${ED}"/usr/share/${PN}/Makefile +} + +src_prepare() { + default + if use prefix; then + hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile + hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd + echo PATH=/usr/bin:/bin >> etc/env.d/99host + echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host + fi + + # handle multilib paths. do it here because we want this behavior + # regardless of the C library that you're using. we do explicitly + # list paths which the native ldconfig searches, but this isn't + # problematic as it doesn't change the resulting ld.so.cache or + # take longer to generate. similarly, listing both the native + # path and the symlinked path doesn't change the resulting cache. + local libdir ldpaths + for libdir in $(get_all_libdirs) ; do + ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" + ldpaths+=":${EPREFIX}/usr/local/${libdir}" + done + echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System release ${PV}" > etc/gentoo-release +} + +src_install() { + emake \ + OS=$(usex kernel_FreeBSD BSD Linux) \ + DESTDIR="${ED}" \ + install + dodoc ChangeLog + + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile +} + +pkg_postinst() { + local x + + # We installed some files to /usr/share/baselayout instead of /etc to stop + # (1) overwriting the user's settings + # (2) screwing things up when attempting to merge files + # (3) accidentally packaging up personal files with quickpkg + # If they don't exist then we install them + for x in master.passwd passwd shadow group fstab ; do + [ -e "${EROOT}etc/${x}" ] && continue + [ -e "${EROOT}usr/share/baselayout/${x}" ] || continue + cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc + done + + # Force shadow permissions to not be world-readable #260993 + for x in shadow ; do + [ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}" + done + + # Take care of the etc-update for the user + if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then + mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release + fi + + # whine about users that lack passwords #193541 + if [[ -e "${EROOT}"etc/shadow ]] ; then + local bad_users=$(sed -n '/^[^:]*::/s|^$[^:]*$::.*|\1|p' "${EROOT}"/etc/shadow) + if [[ -n ${bad_users} ]] ; then + echo + ewarn "The following users lack passwords!" + ewarn ${bad_users} + fi + fi + + # baselayout leaves behind a lot of .keep files, so let's clean them up + find "${EROOT}"lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null + find "${EROOT}"lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null + + # whine about users with invalid shells #215698 + if [[ -e "${EROOT}"etc/passwd ]] ; then + local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort) + if [[ -n ${bad_shells} ]] ; then + echo + ewarn "The following users have non-existent shells!" + ewarn "${bad_shells}" + fi + fi + + # https://bugs.gentoo.org/361349 + if use kernel_linux; then + mkdir -p "${EROOT}"run + + local found fstype mountpoint + while read -r _ mountpoint fstype _; do + [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1 + done < "${ROOT}"proc/mounts + [[ -z ${found} ]] && + ewarn "You should reboot now to get /run mounted with tmpfs!" + fi + + for x in ${REPLACING_VERSIONS}; do + if ! version_is_at_least 2.4 ${v}; then + ewarn "After updating ${EROOT}etc/profile, please run" + ewarn "env-update and . /etc/profile" + break + fi + done + + if [[ -e "${EROOT}"etc/env.d/00basic ]]; then + ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout" + ewarn "Please migrate your changes." + fi +} diff -uNr a/sys-apps/baselayout/metadata.xml b/sys-apps/baselayout/metadata.xml --- a/sys-apps/baselayout/metadata.xml false +++ b/sys-apps/baselayout/metadata.xml 801ea47400efa6ca47f268644000e69a05b22cd2437ca78109125647673a4c52912d6a7d964fcb1eee24088a1a66d7acbc6daf47d0697d34acd04b51c5423d5b @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> +</maintainer> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag> +</use> +</pkgmetadata> diff -uNr a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest --- a/sys-apps/busybox/Manifest false +++ b/sys-apps/busybox/Manifest 579e9ad2a22a6b46bb38f5a0ed3f1cae5bc2548933ad8a431f528859996462656b3076d4475577bc1fc3db0fbfc535a7461eba3f607ca5caf7d8b068a351558d @@ -0,0 +1,18 @@ +AUX busybox-1.26.2-bb.patch 2416 BLAKE2B 2e227c11b0fd5558bfdb91a2d8bf3fd73e348e7efff9ecc6820e9ecd92047ffe4e94fe8f2aa864db87a3f081c2e3ff599546563fff83c78fc36a44fafc559de6 SHA512 cb767a613ede504a7b1a87da3270992ffa44d3b6f76eebefceffc8a5a49119a99333c482420efab9d1e5a92a26280376c7e9ec62fcb2193d9172f4e7bc19f50e +AUX ginit.c 3097 BLAKE2B 77a9382dfa5dabc7541fab85fe211760604c757c3f2c5e49556d0ae9e82239833d21eb8954f595ebf814925d3508a5016701344985c6ef15e6f3d23ea675f646 SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c +AUX klogd.confd 218 BLAKE2B e4c814e673dc4fa555bca9cf2065659facbb4878b4a794a56c18366be3077944bf15b1dcf665d83e7ab53a279e23a0cdc1ea8dd01399bb6747247c9bb0d65da3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f +AUX klogd.initd 245 BLAKE2B e8b8045cebfd39a8a088b70142e47442224ddf51d06b7ba7614721eb06bb8662184133d5464c79ece4826e5f338b54b6e2154b67f59c25dc9324fa526e82caf6 SHA512 6c28b5f2db40eeeae14f859f56a5e4f96a034b69639f38da3a437eabd1f74f61240b87eac2f7e5ca9a3377ceb9a37e939ab69b7db6a70c962062e5ae29f7e835 +AUX mdev.initd 869 BLAKE2B 1ad0ce41749e54e16aaea99cb02f1912efe3f29ab94505e692a5c588972ec947bc75791f076db2f7d7b640639ffbef9ca775923cf1e8a6ecdf6bd13e7384dfca SHA512 d7c7074384e8fcc6c8e7e55f94103bc575b101426ed8012a352546e8c741e90dd224869a9308a29e21491021d4372a4fab73c0f0d4453c6a53ea8ae537ca8e7a +AUX mdev/dvbdev 356 BLAKE2B 1819cd2903fc9894183153ed6fca49e992a840a1546ccebbd47698a59085de376a2331f008785eb4a07173f27553e4bd07b6126877019d3dfb0a9c1c5861f526 SHA512 ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a +AUX mdev/ide_links 440 BLAKE2B 245bec553726d745b3e665331591ec2a403b67af87e69cd93398635cd1b86057cee0ca47f9447a291b09fff9032702f73700304fa96d67334e4513a7a6a20910 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec +AUX mdev/usbdev 1624 BLAKE2B 6b3876626a32b598ddf7aa1c53370df614918f95c9817b4e3e3f7a603af29ed9abd6dd9365a94497bed574457207b68ace8d082dbc1079c597afc11723670741 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 +AUX mdev/usbdisk_link 984 BLAKE2B fd05e4223c800b3865adc4963446ee2c13a7df48a366a5c934969cc963db6f9b62a0fddbe82b5dba95672978684d8b90315d959f95516fc7a2729c0b4b34106d SHA512 05bc589f067cf988f97f10def3c05e139ac4f4ebe045bdb4c2f5453f5e672bf61d3dc1636974c5680c8c9cf22498bee9cfa28a8f4a264d9f5b10a72a9da0ca16 +AUX ntpd.confd 186 BLAKE2B c8beac2e21c9aa7bd42e771c40065cfa9251f94d893d02db4567d53f45a3c751ebf7981cd806e3220f6d1a708fc098592b4aef6e688e3a1fe3b94259e23de76e SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 +AUX ntpd.initd 259 BLAKE2B 3a8e41728d613b50721544eafe11f327578817c8ee49d777058508210deefbc2b0927a60489968ed63cdfe040371701f5b6588aecb2acc535c9ea5e173471c96 SHA512 bdae71e811af7165f014bd9a918824ee1b0c68df78f3457296d6be36e85c5e6d813610979f6d6b9af3c9e2fd4c95a451a63900461a948cbe88d7b6e3201cf03a +AUX syslogd.confd 234 BLAKE2B a1601c31dab14e5c2712f49133758479914bcf37e0d9704fe71c6ac26409d7b48fd234b6584b8349cd067c6e914029a67ab4a4e141b95a21a23c7d6ee05eb760 SHA512 01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52 +AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e7594d60bb9adfbbb631eede30f375cf38370606c93d10e8fba05f50e88ede6709ee30b6ae6aec7a7 SHA512 856dd97ed46b08fdd13e497737f1eb192594e33bfc5d395d7ca6eed2e6bc212cf0cf33518b36a6f9a18d6962d462430c7b50c07e9dc08e85606ef68b240b1211 +AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 +AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5 +DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b +EBUILD busybox-1.28.0.ebuild 9293 BLAKE2B 619fd35a6388d82930505fba9b7dbd9788b088ee287274676342f9e36d9f6e283cc56447a278dc0730d2b230a76445a7f4624f9d03c7bae95321fbe9f5695333 SHA512 77c30310b1716c1b7eb1246c134aecdd50cc5516f9b9f83b987c7246f82e06e4fa9e8f168cc5f70750af7125c6b562d7776b48d43d0f636b52cc895a0b0f51d0 +MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 diff -uNr a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild --- a/sys-apps/busybox/busybox-1.28.0.ebuild false +++ b/sys-apps/busybox/busybox-1.28.0.ebuild 3aaae0f9b1423d2350e669efdf07cc194bea540f1b77c3777413565cfc31ff24dddf5b41ab6362a439976ebc8679bc8aac0badf4753d41dedb93458cc1e22471 @@ -0,0 +1,323 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# See `man savedconfig.eclass` for info on how to use USE=savedconfig. + +EAPI="5" +inherit eutils flag-o-matic savedconfig toolchain-funcs multilib + +DESCRIPTION="Utilities for rescue and embedded systems" +HOMEPAGE="https://www.busybox.net/" +if [[ ${PV} == "9999" ]] ; then + MY_P=${P} + EGIT_REPO_URI="https://git.busybox.net/busybox" + inherit git-r3 +else + MY_P=${PN}-${PV/_/-} + SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +fi + +LICENSE="GPL-2" # GPL-2 only +SLOT="0" +IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" +REQUIRED_USE="pam? ( !static )" +RESTRICT="test" + +COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) + pam? ( sys-libs/pam )" +DEPEND="${COMMON_DEPEND} + static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) + >=sys-kernel/linux-headers-2.6.39" +RDEPEND="${COMMON_DEPEND} + mdev? ( !<sys-apps/openrc-0.13 )" + +S=${WORKDIR}/${MY_P} + +busybox_config_option() { + local flag=$1 ; shift + if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then + busybox_config_option $(usex ${flag} y n) "$@" + return + fi + local expr + while [[ $# -gt 0 ]] ; do + case ${flag} in + y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;; + n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;; + *) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;; + esac + sed -i -e "${expr}" .config || die + einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")" + shift + done +} + +busybox_config_enabled() { + local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) + case ${val} in + "") return 1 ;; + y) return 0 ;; + *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; + esac +} + +src_prepare() { + unset KBUILD_OUTPUT #88088 + append-flags -fno-strict-aliasing #310413 + use ppc64 && append-flags -mminimal-toc #130943 + + # patches go here! + epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch +# epatch "${FILESDIR}"/${P}-*.patch + cp "${FILESDIR}"/ginit.c init/ || die + + # flag cleanup + sed -i -r \ + -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ + Makefile.flags || die + #sed -i '/bbsh/s:^//::' include/applets.h + sed -i '/^#error Aborting compilation./d' applets/applets.c || die + use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile + sed -i \ + -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ + -e "/^AR\>/s:=.*:= $(tc-getAR):" \ + -e "/^CC\>/s:=.*:= $(tc-getCC):" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ + Makefile || die + sed -i \ + -e 's:-static-libgcc::' \ + Makefile.flags || die +} + +src_configure() { + # check for a busybox config before making one of our own. + # if one exist lets return and use it. + + restore_config .config + if [ -f .config ]; then + yes "" | emake -j1 -s oldconfig >/dev/null + return 0 + else + ewarn "Could not locate user configfile, so we will save a default one" + fi + + # setup the config file + emake -j1 -s allyesconfig >/dev/null + # nommu forces a bunch of things off which we want on #387555 + busybox_config_option n NOMMU + sed -i '/^#/d' .config + yes "" | emake -j1 -s oldconfig >/dev/null + + # now turn off stuff we really don't want + busybox_config_option n DMALLOC + busybox_config_option n FEATURE_2_4_MODULES #607548 + busybox_config_option n FEATURE_SUID_CONFIG + busybox_config_option n BUILD_AT_ONCE + busybox_config_option n BUILD_LIBBUSYBOX + busybox_config_option n FEATURE_CLEAN_UP + busybox_config_option n MONOTONIC_SYSCALL + busybox_config_option n USE_PORTABLE_CODE + busybox_config_option n WERROR + # triming the BSS size may be dangerous + busybox_config_option n FEATURE_USE_BSS_TAIL + + # These cause trouble with musl. + if use elibc_musl; then + busybox_config_option n FEATURE_UTMP + busybox_config_option n EXTRA_COMPAT + busybox_config_option n FEATURE_VI_REGEX_SEARCH + fi + + # If these are not set and we are using a uclibc/busybox setup + # all calls to system() will fail. + busybox_config_option y ASH + busybox_config_option y SH_IS_ASH + busybox_config_option n HUSH + busybox_config_option n SH_IS_HUSH + + busybox_config_option '"/run"' PID_FILE_PATH + busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH + + # disable ipv6 applets + if ! use ipv6; then + busybox_config_option n FEATURE_IPV6 + busybox_config_option n TRACEROUTE6 + busybox_config_option n PING6 + busybox_config_option n UDHCPC6 + fi + + busybox_config_option pam PAM + busybox_config_option static STATIC + busybox_config_option syslog {K,SYS}LOGD LOGGER + busybox_config_option systemd FEATURE_SYSTEMD + busybox_config_option math FEATURE_AWK_LIBM + + # disable features that uClibc doesn't (yet?) provide. + if use elibc_uclibc; then + busybox_config_option n FEATURE_SYNC_FANCY #567598 + busybox_config_option n NSENTER + fi + + # all the debug options are compiler related, so punt them + busybox_config_option n DEBUG_SANITIZE + busybox_config_option n DEBUG + busybox_config_option y NO_DEBUG_LIB + busybox_config_option n DMALLOC + busybox_config_option n EFENCE + busybox_config_option $(usex debug y n) TFTP_DEBUG + + busybox_config_option selinux SELINUX + + # this opt only controls mounting with <linux-2.6.23 + busybox_config_option n FEATURE_MOUNT_NFS + + # default a bunch of uncommon options to off + local opt + for opt in \ + ADD_SHELL \ + BEEP BOOTCHARTD \ + CRONTAB \ + DC DEVFSD DNSD DPKG{,_DEB} \ + FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ + FEATURE_DEVFS \ + HOSTID HUSH \ + INETD INOTIFYD IPCALC \ + LOCALE_SUPPORT LOGNAME LPD \ + MAKEMIME MKFS_MINIX MSH \ + OD \ + RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ + SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ + TASKSET TCPSVD \ + RPM RPM2CPIO \ + UDPSVD UUDECODE UUENCODE + do + busybox_config_option n ${opt} + done + + emake -j1 oldconfig > /dev/null +} + +src_compile() { + unset KBUILD_OUTPUT #88088 + export SKIP_STRIP=y + + emake V=1 busybox +} + +src_install() { + unset KBUILD_OUTPUT #88088 + save_config .config + + into / + dodir /bin + if use sep-usr ; then + # install /ginit to take care of mounting stuff + exeinto / + newexe busybox_unstripped ginit + dosym /ginit /bin/bb + dosym bb /bin/busybox + else + newbin busybox_unstripped busybox + dosym busybox /bin/bb + fi + if use mdev ; then + dodir /$(get_libdir)/mdev/ + use make-symlinks || dosym /bin/bb /sbin/mdev + cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf + + exeinto /$(get_libdir)/mdev/ + doexe "${FILESDIR}"/mdev/* + + newinitd "${FILESDIR}"/mdev.initd mdev + fi + if use livecd ; then + dosym busybox /bin/vi + fi + + # add busybox daemon's, bug #444718 + if busybox_config_enabled FEATURE_NTPD_SERVER; then + newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" + newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" + fi + if busybox_config_enabled SYSLOGD; then + newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" + newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" + fi + if busybox_config_enabled KLOGD; then + newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" + newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" + fi + if busybox_config_enabled WATCHDOG; then + newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" + newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" + fi + if busybox_config_enabled UDHCPC; then + local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) + exeinto "${path%/*}" + newexe examples/udhcp/simple.script "${path##*/}" + fi + if busybox_config_enabled UDHCPD; then + insinto /etc + doins examples/udhcp/udhcpd.conf + fi + + # bundle up the symlink files for use later + emake DESTDIR="${ED}" install + rm _install/bin/busybox + # for compatibility, provide /usr/bin/env + mkdir -p _install/usr/bin + ln -s /bin/env _install/usr/bin/env + tar cf busybox-links.tar -C _install . || : #;die + insinto /usr/share/${PN} + use make-symlinks && doins busybox-links.tar + + dodoc AUTHORS README TODO + + cd docs + docinto txt + dodoc *.txt + docinto pod + dodoc *.pod + dohtml *.html + + cd ../examples + docinto examples + dodoc inittab depmod.pl *.conf *.script undeb unrpm +} + +pkg_preinst() { + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then + ewarn "setting USE=make-symlinks and emerging to / is very dangerous." + ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." + ewarn "If you are creating a binary only and not merging this is probably ok." + ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." + die "silly options will destroy your system" + fi + + if use make-symlinks ; then + mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die + fi +} + +pkg_postinst() { + savedconfig_pkg_postinst + + if use make-symlinks ; then + cd "${T}" || die + mkdir _install + tar xf busybox-links.tar -C _install || die + cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" + fi + + if use sep-usr ; then + elog "In order to use the sep-usr support, you have to update your" + elog "kernel command line. Add the option:" + elog " init=/ginit" + elog "To launch a different init than /sbin/init, use:" + elog " init=/ginit /sbin/yourinit" + elog "To get a rescue shell, you may boot with:" + elog " init=/ginit bb" + fi +} diff -uNr a/sys-apps/busybox/files/busybox-1.26.2-bb.patch b/sys-apps/busybox/files/busybox-1.26.2-bb.patch --- a/sys-apps/busybox/files/busybox-1.26.2-bb.patch false +++ b/sys-apps/busybox/files/busybox-1.26.2-bb.patch c3455624b2da4caa2a57a25086a958276dfb7281f561a527c9bbe079f62fb857778bfe8125e291ffed026f78ae237cba697b500e05d8b3ee14d6b43d0af70ba1 @@ -0,0 +1,55 @@ +add `bb` and `bbsh` shortcuts as aliases to the main shell so we can install +symlinks in Gentoo at /bin/bb as our recovery shell. + +we also add fallbacks to /bin/busybox and /bin/busybox.static in case /proc +is not yet mounted during early boot. + +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -144,6 +144,8 @@ + //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) + //applet:IF_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) + //applet:IF_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) ++//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) ++//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) + + //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o + //kbuild:lib-$(CONFIG_SH_IS_ASH) += ash.o ash_ptr_hack.o shell_common.o +@@ -7572,6 +7574,8 @@ + } + /* re-exec ourselves with the new arguments */ + execve(bb_busybox_exec_path, argv, envp); ++ execve("/bin/busybox.static", argv, envp); ++ execve("/bin/busybox", argv, envp); + /* If they called chroot or otherwise made the binary no longer + * executable, fall through */ + } +--- a/shell/hush.c ++++ b/shell/hush.c +@@ -221,6 +221,8 @@ + //applet:IF_MSH(APPLET_ODDNAME(msh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) + //applet:IF_SH_IS_HUSH(APPLET_ODDNAME(sh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) + //applet:IF_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) ++//applet:IF_HUSH(APPLET_ODDNAME(bb, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) ++//applet:IF_HUSH(APPLET_ODDNAME(bbsh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) + + //kbuild:lib-$(CONFIG_HUSH) += hush.o match.o shell_common.o + //kbuild:lib-$(CONFIG_SH_IS_HUSH) += hush.o match.o shell_common.o +@@ -6073,6 +6075,8 @@ + if (SPECIAL_JOBSTOP_SIGS != 0) + switch_off_special_sigs(G.special_sig_mask & SPECIAL_JOBSTOP_SIGS); + execve(bb_busybox_exec_path, argv, pp); ++ execve("/bin/busybox.static", argv, pp); ++ execve("/bin/busybox", argv, pp); + /* Fallback. Useful for init=/bin/hush usage etc */ + if (argv[0][0] == '/') + execve(argv[0], argv, pp); +@@ -6931,6 +6931,8 @@ + if (SPECIAL_JOBSTOP_SIGS != 0) + switch_off_special_sigs(G.special_sig_mask & SPECIAL_JOBSTOP_SIGS); + execv(bb_busybox_exec_path, argv); ++ execv("/bin/busybox.static", argv); ++ execv("/bin/busybox", argv); + /* If they called chroot or otherwise made the binary no longer + * executable, fall through */ + } diff -uNr a/sys-apps/busybox/files/ginit.c b/sys-apps/busybox/files/ginit.c --- a/sys-apps/busybox/files/ginit.c false +++ b/sys-apps/busybox/files/ginit.c 178b43d27b436ff287f2d05b6833d5f6d317d4177c5a00ed03f98508e1ab0ee3099aa02e131bb34ed0658fd6706ba46c8b83b59aa79ae3dc3ad581172e1d6375 @@ -0,0 +1,124 @@ +/* + * simple init to bootstrap sep-/usr + * + * Copyright (C) 2012-2013 Mike Frysinger <vapier@gentoo.org> + * + * Licensed under GPLv2 or later + */ + +//applet:IF_GINIT(APPLET(ginit, BB_DIR_SBIN, BB_SUID_DROP)) + +//kbuild:lib-$(CONFIG_GINIT) += ginit.o + +//config:config GINIT +//config: bool "ginit" +//config: default y +//config: select MKDIR +//config: select MDEV +//config: select MOUNT +//config: select MOUNTPOINT +//config: help +//config: sep-/usr bootstrapper + +//usage:#define ginit_trivial_usage NOUSAGE_STR +//usage:#define ginit_full_usage "" + +#include "libbb.h" + +#define eprintf(fmt, args...) printf("%s" fmt, "sep-usr init: ", ## args) + +static void process_args(char **args) +{ + size_t i; + + eprintf("running: "); + for (i = 0; args[i]; ++i) { + /* String needs to be writable, so dupe it */ + args[i] = xstrdup(args[i]); + printf("'%s' ", args[i]); + } + printf("\n"); +} + +int ginit_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE; +int ginit_main(int argc UNUSED_PARAM, char **argv) +{ + FILE *mntlist; + bool ismnted_dev, ismnted_sys, ismnted_usr; + struct mntent *mntent; + + /* + int fd = open("/dev/console", O_RDWR); + if (fd >= 0) { + dup2(fd, 0); + dup2(fd, 1); + dup2(fd, 2); + } + */ + + /* If given an argv[] with an applet name, run it instead. + * Makes recovering simple by doing: init=/ginit bb + */ + if (argv[1] && argv[1][0] != '/') { + eprintf("running user requested applet %s\n", argv[1]); + return spawn_and_wait(argv+1); + } + +#define saw(argv...) \ + ({ \ + static const char *args[] = { argv, NULL }; \ + /* These casts are fine -- see process_args for mem setup */ \ + process_args((void *)args); \ + spawn_and_wait((void *)args); \ + }) + + /* First setup basic /dev */ + if (saw("mountpoint", "-q", "/dev") != 0) { + /* Try /etc/fstab */ + if (saw("mount", "-n", "/dev")) + /* Then devtmpfs */ + if (saw("mount", "-n", "-t", "devtmpfs", "devtmpfs", "/dev")) + /* Finally normal tmpfs */ + saw("mount", "-n", "-t", "tmpfs", "dev", "/dev"); + } else { + eprintf("%s appears to be mounted; skipping its setup\n", "/dev"); + } + + /* If /dev is empty (e.g. tmpfs), run mdev to seed things */ + if (access("/dev/console", F_OK) != 0) { + if (saw("mountpoint", "-q", "/sys") != 0) { + if (saw("mount", "-n", "/sys")) + saw("mount", "-n", "-t", "sysfs", "sysfs", "/sys"); + } else { + eprintf("%s appears to be mounted; skipping its setup\n", "/sys"); + } + + /* Mount /proc as mdev will fork+exec /proc/self/exe */ + if (saw("mountpoint", "-q", "/proc") != 0) { + /* Try /etc/fstab */ + if (saw("mount", "-n", "/proc")) + saw("mount", "-n", "-t", "proc", "proc", "/proc"); + } + + saw("mdev", "-s"); + } + + /* Then seed the stuff we care about */ + saw("mkdir", "-p", "/dev/pts", "/dev/shm"); + + /* Then mount /usr */ + if (saw("mountpoint", "-q", "/usr") != 0) { + saw("mount", "-n", "/usr", "-o", "ro"); + } else { + eprintf("%s appears to be mounted; skipping its setup\n", "/usr"); + } + + /* Now that we're all done, exec the real init */ + if (!argv[1]) { + argv[0] = (void *)"/sbin/init"; + argv[1] = NULL; + } else + ++argv; + process_args(argv); + return execv(argv[0], argv); +} diff -uNr a/sys-apps/busybox/files/klogd.confd b/sys-apps/busybox/files/klogd.confd --- a/sys-apps/busybox/files/klogd.confd false +++ b/sys-apps/busybox/files/klogd.confd f8efd279faaba1631a4c028adcf110a51d421beea22c108b398aec5897fe26b04f9fb1900c7ee59bd0987bf190e7d03240c1fc04cb08373327c77189488d8b51 @@ -0,0 +1,9 @@ +# Config file for /etc/init.d/busybox-sysklogd + +# run "/sbin/klogd --help" to see all possible options. + +# activate if you need remote logging +#rc_need="net" + +# send warnings and above to the console +KLOGD_OPTS="-c 3" diff -uNr a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd --- a/sys-apps/busybox/files/klogd.initd false +++ b/sys-apps/busybox/files/klogd.initd 549ba3c162b91a23757f3a995539e74bccc41633a4a25222555829028ff161b2c583fdc126607514d36f43d56a6a1e673f899e4b3292690613dd69b00d6efb8c @@ -0,0 +1,11 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/bin/busybox klogd" +command_args="${KLOGD_OPTS}" +pidfile="/run/klogd.pid" + +depend() { + need clock hostname +} diff -uNr a/sys-apps/busybox/files/mdev/dvbdev b/sys-apps/busybox/files/mdev/dvbdev --- a/sys-apps/busybox/files/mdev/dvbdev false +++ b/sys-apps/busybox/files/mdev/dvbdev 100702c56eeb8253196ef076e87dfa89a655373f1d749ae1d26ff8160dd93f6324a239b2de15482ff436008772add46b48d2583b02013320ba0cc53e9ad0fa5d @@ -0,0 +1,18 @@ +#!/bin/sh + +# MDEV=dvb0.demux1 -> ADAPTER=dvb0 -> N=0 +ADAPTER=${MDEV%.*} +N=${ADAPTER#dvb} +# MDEV=dvb0.demux1 -> DEVB_DEV=demux1 +DVB_DEV=${MDEV#*.} + +case "$ACTION" in + add|"") + mkdir -p dvb/adapter${N} + mv ${MDEV} dvb/adapter${N}/${DVB_DEV} + ;; + remove) + rm -f dvb/adapter${N}/${DVB_DEV} + rmdir dvb/adapter${N} 2>/dev/null + rmdir dvb/ 2>/dev/null +esac diff -uNr a/sys-apps/busybox/files/mdev/ide_links b/sys-apps/busybox/files/mdev/ide_links --- a/sys-apps/busybox/files/mdev/ide_links false +++ b/sys-apps/busybox/files/mdev/ide_links c567a99b7e7c12cc9edcaaf4eaacaa8d00e09792bc59b5c38d016cd1edf7d205dc02530fe938d8b4fc68bbc96e7f7ab11c7d6d4f65e3a58d42b2bbd70d5c4b50 @@ -0,0 +1,23 @@ +#!/bin/sh + +[ -f /proc/ide/$MDEV/media ] || exit + +media=`cat /proc/ide/$MDEV/media` +for i in $media $media[0-9]* ; do + if [ "`readlink $i 2>/dev/null`" = $MDEV ] ; then + LINK=$i + break + fi +done + +# link exist, remove if necessary and exit +if [ "$LINK" ] ; then + [ "$ACTION" = remove ] && rm $LINK + exit +fi + +# create a link +num=`ls $media[0-9]* 2>/dev/null | wc -l` +ln -sf $MDEV "$media`echo $num`" +[ -e "$media" ] || ln -sf $MDEV "$media" + diff -uNr a/sys-apps/busybox/files/mdev/usbdev b/sys-apps/busybox/files/mdev/usbdev --- a/sys-apps/busybox/files/mdev/usbdev false +++ b/sys-apps/busybox/files/mdev/usbdev 4a9b7f538db915631f7d92b5127eb3784cae7114e0b6bbd89e33c41b12a3adfd23082296f63e7a9d591ed9758ab821201cb7f0966c4cb7e21226a792ff106d2e @@ -0,0 +1,62 @@ +#!/bin/sh + +# script is buggy; until patched just do exit 0 +#exit 0 + +# add zeros to device or bus +add_zeros () { + case "$(echo $1 | wc -L)" in + 1) echo "00$1" ;; + 2) echo "0$1" ;; + *) echo "$1" + esac + exit 0 +} + + +# bus and device dirs in /sys +USB_PATH=$(echo $MDEV | sed -e 's/usbdev$[0-9]$.[0-9]/usb\1/') +USB_PATH=$(find /sys/devices -type d -name "$USB_PATH") +USB_DEV_DIR=$(echo $MDEV | sed -e 's/usbdev$[0-9]$.$[0-9]$/\1-\2/') + +# dir names in /dev +BUS=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev$[0-9]$.[0-9]/\1/')) +USB_DEV=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev[0-9].$[0-9]$/\1/')) + + +# try to load the proper driver for usb devices +case "$ACTION" in + add|"") + # load usb bus driver + for i in $USB_PATH/*/modalias ; do + modprobe `cat $i` 2>/dev/null + done + # load usb device driver if existent + if [ -d $USB_PATH/$USB_DEV_DIR ]; then + for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do + modprobe `cat $i` 2>/dev/null + done + fi + # move usb device file + mkdir -p bus/usb/$BUS + mv $MDEV bus/usb/$BUS/$USB_DEV + ;; + remove) + # unload device driver, if device dir is existent + if [ -d $USB_PATH/$USB_DEV_DIR ]; then + for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do + modprobe -r `cat $i` 2>/dev/null + done + fi + # unload usb bus driver. Does this make sense? + # what happens, if two usb devices are plugged in + # and one is removed? + for i in $USB_PATH/*/modalias ; do + modprobe -r `cat $i` 2>/dev/null + done + # remove device file and possible empty dirs + rm -f bus/usb/$BUS/$USB_DEV + rmdir bus/usb/$BUS/ 2>/dev/null + rmdir bus/usb/ 2>/dev/null + rmdir bus/ 2>/dev/null +esac diff -uNr a/sys-apps/busybox/files/mdev/usbdisk_link b/sys-apps/busybox/files/mdev/usbdisk_link --- a/sys-apps/busybox/files/mdev/usbdisk_link false +++ b/sys-apps/busybox/files/mdev/usbdisk_link fd97dee5f41e6898ca4635845bab4c4125a3d95fddd586c380df7c1d47ef8fd1cd24ccf5d62e0f4f54b009c21da0df55693cc67a153587303d39e8457661b90a @@ -0,0 +1,34 @@ +#!/bin/sh + +# NOTE: since mdev -s only provide $MDEV, don't depend on any hotplug vars. + +current=$(readlink usbdisk) + +if [ "$current" = "$MDEV" ] && [ "$ACTION" = "remove" ]; then + rm -f usbdisk usba1 +fi +[ -n "$current" ] && exit + +if [ -e /sys/block/$MDEV ]; then + SYSDEV=$(readlink -f /sys/block/$MDEV/device) + # if /sys device path contains '/usb[0-9]' then we assume its usb + # also, if it's a usb without partitions we require FAT + if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then + # do not create link if there is not FAT + dd if=/dev/$MDEV bs=512 count=1 2>/dev/null | strings | grep FAT >/dev/null || exit 0 + + ln -sf $MDEV usbdisk + # keep this for compat. people have it in fstab + ln -sf $MDEV usba1 + fi + +elif [ -e /sys/block/*/$MDEV ] ; then + PARENT=$(dirname /sys/block/*/$MDEV) + SYSDEV=$(readlink -f $PARENT/device) + if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then + ln -sf $MDEV usbdisk + # keep this for compat. people have it in fstab + ln -sf $MDEV usba1 + fi +fi + diff -uNr a/sys-apps/busybox/files/mdev.initd b/sys-apps/busybox/files/mdev.initd --- a/sys-apps/busybox/files/mdev.initd false +++ b/sys-apps/busybox/files/mdev.initd ae18d5153dd349e07f2a7f031d1ea7aa4aefc8a38d0278f54620604e1f56f603052bb09fe65efac070c535520cd4620689d4b45985e498c07021bd23fec9e04b @@ -0,0 +1,52 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() +{ + provide dev + need dev-mount sysfs +} + +find_mdev() +{ + if [ -x /sbin/mdev ] ; then + echo "/sbin/mdev" + else + echo "/bin/busybox mdev" + fi +} + +populate_mdev() +{ + ebegin "Populating /dev with existing devices with mdev -s" + $(find_mdev) -s + eend $? + return 0 +} + +seed_dev() +{ + # copy over any persistent things + if [ -d /lib/mdev/devices ] ; then + cp -RPp /lib/mdev/devices/* /dev 2>/dev/null + fi +} + +start() +{ + seed_dev + + # Setup hotplugging (if possible) + if [ -e /proc/sys/kernel/hotplug ] ; then + ebegin "Setting up mdev as hotplug agent" + echo $(find_mdev) > /proc/sys/kernel/hotplug + eend 0 + fi + + if get_bootparam "nocoldplug" ; then + ewarn "Skipping mdev coldplug as requested in kernel cmdline" + else + populate_mdev + fi +} diff -uNr a/sys-apps/busybox/files/ntpd.confd b/sys-apps/busybox/files/ntpd.confd --- a/sys-apps/busybox/files/ntpd.confd false +++ b/sys-apps/busybox/files/ntpd.confd 7c872060dabf8ac9b6051793c09e96a509d74ea9a628b14127487f31a439d3aa14172a9ffefcf5dd0d9e77d0f958c5cf032fa20c4eedc4bc5e3fb85b448d3e31 @@ -0,0 +1,6 @@ +# Config file for /etc/init.d/busybox-ntpd + +# run "/sbin/ntpd --help" to see all possible options. + +# Get time from specified server and run in background +NTPD_OPTS="-N -p pool.ntp.org" diff -uNr a/sys-apps/busybox/files/ntpd.initd b/sys-apps/busybox/files/ntpd.initd --- a/sys-apps/busybox/files/ntpd.initd false +++ b/sys-apps/busybox/files/ntpd.initd 43fd34260d8500014881e48bf6acb3d5c8566b3e9a66077eae1324f083becdaf586746cd9092cd25dcdaa63d17a8ebc54d19e9c85a27303b985e3e0c9cc6b0bc @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/bin/busybox ntpd" +command_args="${NTPD_OPTS}" +pidfile="/run/ntpd.pid" + +depend() { + use net dns logger + after ntp-client +} diff -uNr a/sys-apps/busybox/files/syslogd.confd b/sys-apps/busybox/files/syslogd.confd --- a/sys-apps/busybox/files/syslogd.confd false +++ b/sys-apps/busybox/files/syslogd.confd ec2af5ffd44b90a2f0a8a6a50c6b80187f8c0a2fff0738d1a75aa8a8520b42757ceb89b8242821248599524c65c760c4cf2c18017f45c5b1be33de58f739552f @@ -0,0 +1,9 @@ +# Config file for /etc/init.d/busybox-sysklogd + +# run "/sbin/syslogd --help" to see all possible options. + +# activate if you need remote logging +#rc_need="net" + +# Log to shared mem buffer (use logread to read it) +SYSLOGD_OPTS="-C128" diff -uNr a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd --- a/sys-apps/busybox/files/syslogd.initd false +++ b/sys-apps/busybox/files/syslogd.initd 6c0cc8ced00e3779f9233147d32796732dd1122147711e7b317feb42d9e45174f06eff8667ed0360b0707a5108e1ec9582f6279559f9f1f23552455dbfca3d6e @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/bin/busybox syslogd" +command_args="${SYSLOGD_OPTS}" +pidfile="/run/syslogd.pid" + +depend() { + need clock hostname + provide logger +} diff -uNr a/sys-apps/busybox/files/watchdog.confd b/sys-apps/busybox/files/watchdog.confd --- a/sys-apps/busybox/files/watchdog.confd false +++ b/sys-apps/busybox/files/watchdog.confd 008dddcb9e00ab407d71b20dd72d2337a306a8deeffbe3063e8ea238ab7113380c2d0022eb6bb4148ec775f09da5a23377262104ea384b443bf4495dfca8cc66 @@ -0,0 +1,9 @@ +# Config file for /etc/init.d/busybox-watchdog + +# run "/sbin/watchdog --help" to see all possible options. + +# Periodically write to watchdog device +WATCHDOG_OPTS="/dev/watchdog" + +# optionally set the nice-level +#SSD_NICELEVEL="-20" diff -uNr a/sys-apps/busybox/files/watchdog.initd b/sys-apps/busybox/files/watchdog.initd --- a/sys-apps/busybox/files/watchdog.initd false +++ b/sys-apps/busybox/files/watchdog.initd 2ed36e96c5445dec75bda8f726af7571148166788f4813694ac0f70a4d08f7038b9be56440d39022a8a00a9d5df78d58f8449fabb4eba64db7429f1cee815ab2 @@ -0,0 +1,7 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/bin/busybox watchdog" +command_args="${WATCHDOG_OPTS}" +pidfile="/run/watchdog.pid" diff -uNr a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml --- a/sys-apps/busybox/metadata.xml false +++ b/sys-apps/busybox/metadata.xml b8a31bf1eb038726e6b3991fa55f6eaef38b0344b5303cb6668069ca95b2aff0529eda0df8aa36e15320b7fd1ab47eb31c06320e0f21dee4d258ba8432c82f36 @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> +<email>embedded@gentoo.org</email> +<name>Embedded Gentoo</name> +</maintainer> +<use> +<flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag> +<flag name="math">Enable math support in gawk (requires libm)</flag> +<flag name="mdev">Create the appropriate symlink in /sbin and install mdev.conf and support files</flag> +<flag name="sep-usr">Support a separate /usr without needing an initramfs by booting with init=/ginit</flag> +<flag name="static">Make the system rescue shell (/bin/bb) static so you can recover even when glibc is broken</flag> +<flag name="systemd">Support systemd</flag> +</use> +<upstream> +<remote-id type="cpe">cpe:/a:busybox:busybox</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest --- a/sys-apps/coreutils/Manifest false +++ b/sys-apps/coreutils/Manifest 1cf10401c4d16448f463f2772fdddf1cea2aebd9b2fc5b143cb79a72d3204c1bf8302d810670d2431840c67ddd8d1bb7a2fe8903cb31398de1037dc78f52f8f3 @@ -0,0 +1,5 @@ +DIST coreutils-8.28-man.tar.xz 43832 BLAKE2B 18ea22a89daac64444da8b91c82c62e4c6dfe27e0e9c2d2ec1de4dc9c3ee44fb91f197e3122803a8a18c2619c6daf683e0b3b07c36e0e9b8dd73c2cdf44ba6b7 SHA512 363cf595e0f6fc69eb6a9d1ca258a5f012404cee99887494ab6e40fe2c6de5e49e7cad953aecb394c5612043efe6b407e657811d8251b10e159c97b849dd8b3e +DIST coreutils-8.28-patches-1.1.tar.xz 7336 BLAKE2B 9cd5db3e1d5545da5cb38f919ae5528d8642efb7f7e11994c6603f49b097f0f804cf1553dfce65682f9d725964cd6a3d142916cbc018f707cc617ad8c9b9f471 SHA512 af47aaa614550e5cd82b2386fafd9f90beb0564b8bbedfe92238906e7c6f040fb7468c1929f0951d4f98038b6e1df7da2408204be78219e6a041658507385957 +DIST coreutils-8.28.tar.xz 5252336 BLAKE2B 30e3c05311834b19a941ddaa6a405cb0033b0e3518211dd0d33e9a1aa91c60f4d597fca9419b467ade2b54e3bf81ba5149cebfc93a02fa1e546c1b0f71ee91c9 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1 +EBUILD coreutils-8.28-r1.ebuild 6513 BLAKE2B 7202dde224d53d23d69d07b6f0db38eb52c17bc9cdfbe32e6e223bcf2e5823b81e819794f4088bfbb7ba7e060750a68d5c33156ebb4da010ffa947b25cca0528 SHA512 79fc8c2d6fc9e1c97317a8470166ee7fbf3e03a58ffcfbde3b7fdc172c571299bdd484f91039d79c3d1a0a2b1dc4113c8ec6d40c884fa52f469c8b68713f53ed +MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044 diff -uNr a/sys-apps/coreutils/coreutils-8.28-r1.ebuild b/sys-apps/coreutils/coreutils-8.28-r1.ebuild --- a/sys-apps/coreutils/coreutils-8.28-r1.ebuild false +++ b/sys-apps/coreutils/coreutils-8.28-r1.ebuild 4ee053f48847396c817b0aaaafa033d5fb75110270a757b07a7aa9219593e53650af4c78a2c6ce55422e35bb14bc5ef0a06df265298c66f3d89eb6b467c653a3 @@ -0,0 +1,210 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# To generate the man pages, unpack the upstream tarball and run: +# ./configure --enable-install-program=arch,coreutils,hostname,kill +# make +# cd .. +# tar cf - coreutils-*/man/*.[0-9] | xz > coreutils-<ver>-man.tar.xz + +EAPI="6" + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit eutils flag-o-matic python-any-r1 toolchain-funcs + +PATCH_VER="1.1" +DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" +HOMEPAGE="https://www.gnu.org/software/coreutils/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz + https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCH_VER}.tar.xz + mirror://gentoo/${P}-man.tar.xz + https://dev.gentoo.org/~polynomial-c/dist/${P}-man.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux" +IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr" + +LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) + caps? ( sys-libs/libcap ) + gmp? ( dev-libs/gmp:=[static-libs] ) + xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) + selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + app-arch/xz-utils + test? ( + dev-lang/perl + dev-perl/Expect + !userland_BSD? ( + dev-util/strace + ) + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]') + )" +RDEPEND+=" + hostname? ( !sys-apps/net-tools[hostname] ) + kill? ( + !sys-apps/util-linux[kill] + !sys-process/procps[kill] + ) + !app-misc/realpath + !<sys-apps/util-linux-2.13 + !<sys-apps/sandbox-2.10-r4 + !sys-apps/stat + !net-mail/base64 + !sys-apps/mktemp + !<app-forensics/tct-1.18-r1 + !<net-fs/netatalk-2.0.3-r4" + +pkg_setup() { + if use test ; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + if ! use vanilla ; then + use_if_iuse unicode || rm -f "${WORKDIR}"/patch/000_all_coreutils-i18n.patch + #rm "${WORKDIR}"/patch/001_all_coreutils-gen-progress-bar.patch || die + eapply "${WORKDIR}"/patch/*.patch + fi + + eapply_user + + # Since we've patched many .c files, the make process will try to + # re-build the manpages by running `./bin --help`. When doing a + # cross-compile, we can't do that since 'bin' isn't a native bin. + # Also, it's not like we changed the usage on any of these things, + # so let's just update the timestamps and skip the help2man step. + set -- man/*.x + touch ${@/%x/1} + + # Avoid perl dep for compiled in dircolors default #348642 + if ! has_version dev-lang/perl ; then + touch src/dircolors.h + touch ${@/%x/1} + fi +} + +src_configure() { + local myconf=( + --with-packager="Gentoo" + --with-packager-version="${PVR} (p${PATCH_VER:-0})" + --with-packager-bug-reports="https://bugs.gentoo.org/" + --enable-install-program="arch,$(usev hostname),$(usev kill)" + --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" + --enable-largefile + $(use caps || echo --disable-libcap) + $(use_enable nls) + $(use_enable acl) + $(use_enable multicall single-binary) + $(use_enable xattr) + $(use_with gmp) + ) + if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then + export fu_cv_sys_stat_statfs2_bsize=yes #311569 + export gl_cv_func_realpath_works=yes #416629 + fi + + export gl_cv_func_mknod_works=yes #409919 + use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821 + use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782 + use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ ) + # kill/uptime - procps + # groups/su - shadow + # hostname - net-tools + econf "${myconf[@]}" +} + +src_test() { + # Known to fail with FEATURES=usersandbox (bug #439574): + # - tests/du/long-from-unreadable.sh} (bug #413621) + # - tests/rm/deep-2.sh (bug #413621) + # - tests/dd/no-allocate.sh (bug #629660) + if has usersandbox $FEATURES ; then + ewarn "You are emerging ${P} with 'usersandbox' enabled." \ + "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + fi + + # Non-root tests will fail if the full path isn't + # accessible to non-root users + chmod -R go-w "${WORKDIR}" + chmod a+rx "${WORKDIR}" + + # coreutils tests like to do `mount` and such with temp dirs + # so make sure /etc/mtab is writable #265725 + # make sure /dev/loop* can be mounted #269758 + mkdir -p "${T}"/mount-wrappers + mkwrap() { + local w ww + for w in "$@" ; do + ww="${T}/mount-wrappers/${w}" + cat <<-EOF > "${ww}" + #!${EPREFIX}/bin/sh + exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@" + EOF + chmod a+rx "${ww}" + done + } + mkwrap mount umount + + addwrite /dev/full + #export RUN_EXPENSIVE_TESTS="yes" + #export FETISH_GROUPS="portage wheel" + env PATH="${T}/mount-wrappers:${PATH}" \ + emake -j1 -k check +} + +src_install() { + default + + insinto /etc + newins src/dircolors.hin DIR_COLORS + + if [[ ${USERLAND} == "GNU" ]] ; then + cd "${ED%/}"/usr/bin || die + dodir /bin + # move critical binaries into /bin (required by FHS) + local fhs="cat chgrp chmod chown cp date dd df echo false ln ls + mkdir mknod mv pwd rm rmdir stty sync true uname" + mv ${fhs} ../../bin/ || die "could not move fhs bins" + if use kill; then + mv kill ../../bin/ || die + fi + # move critical binaries into /bin (common scripts) + local com="basename chroot cut dir dirname du env expr head mkfifo + mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" + mv ${com} ../../bin/ || die "could not move common bins" + # create a symlink for uname in /usr/bin/ since autotools require it + local x + for x in ${com} uname ; do + dosym ../../bin/${x} /usr/bin/${x} + done + else + # For now, drop the man pages, collides with the ones of the system. + rm -rf "${ED%/}"/usr/share/man + fi + +} + +pkg_postinst() { + ewarn "Make sure you run 'hash -r' in your active shells." + ewarn "You should also re-source your shell settings for LS_COLORS" + ewarn " changes, such as: source /etc/profile" + + # Help out users using experimental filesystems + if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then + case $(uname -r) in + 2.6.[12][0-9]|2.6.3[0-7]*) + ewarn "You are running a system with a buggy btrfs driver." + ewarn "Please upgrade your kernel to avoid silent corruption." + ewarn "See: https://bugs.gentoo.org/353907" + ;; + esac + fi +} diff -uNr a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml --- a/sys-apps/coreutils/metadata.xml false +++ b/sys-apps/coreutils/metadata.xml b23bcff336d9c3958842971160126199bfc22f92e56eece83b583e675851485dcf1dd557241fee838040be9ca69f52294bf43fc1d9879dfd47fd812df8ff9ec2 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<longdescription>Standard GNU file utilities (chmod, cp, dd, dir, ls, ...), text utilities (sort, tr, head, wc, ...), and shell utilities (whoami, who, ...) +</longdescription> +<use> + <flag name="caps">Add Linux capabilities support in output of file utilities (ls, dir, ...) via <pkg>sys-libs/libcap</pkg></flag> + <flag name="hostname">Build the hostname program</flag> + <flag name="kill">Build the kill program</flag> + <flag name="multicall">Build all tools into a single `coreutils` program akin to busybox to save space</flag> + <flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag> +</use> +<upstream> + <remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest --- a/sys-apps/debianutils/Manifest false +++ b/sys-apps/debianutils/Manifest 323e375a3f52905319354e0c26c5875560f31765bc04d706c973ebd0a12243e4b33348567e5797910a100742ce53a4c072431ce42ae220d305b0812f3f932e48 @@ -0,0 +1,4 @@ +AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4 +DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897 +EBUILD debianutils-4.8.3.ebuild 946 BLAKE2B 91e2ce2423ce3c2314eff13866e6436c221ac87a97fe08daa804f7a3ea798bca0bb8ca8c224d46d8ea6912d6ca827cb3a9986b4b50581d2451291459f79bd1d8 SHA512 a59a6eae24697d99ee40c31ff6fa84e50a45a0df787552d9241b2276af069af982adcb96652f30be25e39bf9bc9fa293400662543a688495e3df1fa693572786 +MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84 diff -uNr a/sys-apps/debianutils/debianutils-4.8.3.ebuild b/sys-apps/debianutils/debianutils-4.8.3.ebuild --- a/sys-apps/debianutils/debianutils-4.8.3.ebuild false +++ b/sys-apps/debianutils/debianutils-4.8.3.ebuild bf229f47249ee242a9623d8fe4d9220bedebc87bd99f6267a4c380da58921e39d0b263cec50cd541000881a12be6895d86462d3e6bd59fe3a9d356301c7b5315 @@ -0,0 +1,41 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit flag-o-matic + +DESCRIPTION="A selection of tools from Debian" +HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html" +SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz" + +LICENSE="BSD GPL-2 SMAIL" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +IUSE="kernel_linux static" + +PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch ) + +S="${WORKDIR}/${PN}" + +src_configure() { + use static && append-ldflags -static + default +} + +src_install() { + into / + dobin tempfile run-parts + if use kernel_linux ; then + dosbin installkernel + fi + + into /usr + dosbin savelog + + doman tempfile.1 run-parts.8 savelog.8 + use kernel_linux && doman installkernel.8 + cd debian || die + dodoc changelog control + keepdir /etc/kernel/postinst.d +} diff -uNr a/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch b/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch --- a/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch false +++ b/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch 0fa64d864781d445c6c1a2bfb546fee265187571004bfe6ea02869541b2065a4f0ea8d2951b960e88cab3846e0cf0fe04f2f2b0bd53b44fed0fc5b49d8725853 @@ -0,0 +1,30 @@ +Allow dots in the names, bug #95173. Patch by Kerin Millar. +Re-sourced for 3.4.2 + +--- a/run-parts.8 ++++ b/run-parts.8 +@@ -25,9 +25,10 @@ + .IR directory . + Other files and directories are silently ignored. + +-If neither the \-\-lsbsysinit option nor the \-\-regex option is given +-then the names must consist entirely of ASCII upper- and lower-case +-letters, ASCII digits, ASCII underscores, and ASCII minus-hyphens. ++If neither the \-\-lsbsysinit option nor the \-\-regex option is given then the ++names must consist entirely of ASCII upper- and lower-case letters, ASCII ++digits, ASCII underscores, and ASCII minus-hyphens. However, the name must not ++begin with a period. + + If the \-\-lsbsysinit option is given, then the names must not end + in .dpkg\-old or .dpkg\-dist or .dpkg\-new or .dpkg\-tmp, and must +--- a/run-parts.c ++++ b/run-parts.c +@@ -501,7 +501,7 @@ + != 0) + pt_regex = &tradre; + +- } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-]+$", ++ } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-][a-zA-Z0-9._-]+$", + REG_EXTENDED | REG_NOSUB)) != 0) + pt_regex = &classicalre; + diff -uNr a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml --- a/sys-apps/debianutils/metadata.xml false +++ b/sys-apps/debianutils/metadata.xml a4b8a4e6fd725b5445a1bf6a0ae374e97a9ddfe04b53b1e8c3210f8fa6f4f79059ceb6b2195f683a6738200f92a1178515c21a671024340e0345fc6355fa4dfa @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name='installkernel'>Install /sbin/installkernel script (for Linux)</flag> + </use> +</pkgmetadata> diff -uNr a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest --- a/sys-apps/diffutils/Manifest false +++ b/sys-apps/diffutils/Manifest 1df0d3944a22c8464a008b6f8d8b9392d9be94a62f28bef62b4102c334c302b00d6094d975f4bdc46bfcbc2566ad7e5b9f102f0865e5935fc3184dea9d6d8111 @@ -0,0 +1,4 @@ +AUX diffutils-3.5-fix_macros.patch 928 BLAKE2B caa78e408cfcdf299277d5f8ee24be3d255571377d7c711bd90cd0ed710016929d7b9a68934d852fc9c9410b73e144259a2cc2264b2751ca444403b9ae37c065 SHA512 ad0cff0aea2ac560b3c0171141b6d1975d2ffb8684a20697464471355cdb161dea5967b72732b4de5ff9375a2ba2f29aae532967abe5311820de817afaf354ba +DIST diffutils-3.5.tar.xz 1360996 BLAKE2B a2348911daff19a73a00985e8528888306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6 SHA512 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b +EBUILD diffutils-3.5.ebuild 1250 BLAKE2B ee2af68ab02655eb85ddc6afa4ed7a7ac8c45d618738f53cf41067440333dba8b2197d101253688081f27e81388af445119fdea9b5185b67fe14071250c05983 SHA512 50a51b0a9bf659004ce150eefcb3b969494fffe87e7f48365a3df0e54b5b960efa228a6ab3e3766aabc63ff3ae39c91eba7da00665a0567f2c0252d0c62ef5b1 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild --- a/sys-apps/diffutils/diffutils-3.5.ebuild false +++ b/sys-apps/diffutils/diffutils-3.5.ebuild 5f3cf9747c0e0a64cf72c2f79f67737f4bf6f94569478711da349cd1ab911b01f31fd84e35936da472d4b0aa2e321d5c6555ee034b51ae70807ab2aa7547d107 @@ -0,0 +1,49 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit flag-o-matic + +DESCRIPTION="Tools to make diffs and compare files" +HOMEPAGE="https://www.gnu.org/software/diffutils/" +SRC_URI="mirror://gnu/diffutils/${P}.tar.xz + mirror://gnu-alpha/diffutils/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls static" + +DEPEND="app-arch/xz-utils + nls? ( sys-devel/gettext )" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +PATCHES=( + "${FILESDIR}/${P}-fix_macros.patch" +) + +src_prepare() { + epatch "${PATCHES[@]}" +} + +src_configure() { + use static && append-ldflags -static + + # Disable automagic dependency over libsigsegv; see bug #312351. + export ac_cv_libsigsegv=no + + local myeconfargs=( + --with-packager="Gentoo" + --with-packager-version="${PVR}" + --with-packager-bug-reports="https://bugs.gentoo.org/" + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} + +src_test() { + # explicitly allow parallel testing + emake check +} diff -uNr a/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch b/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch --- a/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch false +++ b/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch 80718a9d7f19d384f015af1512067b0225805c58a6f9c48d5c378e28fd88157e6027b8701c028dee2a182d063fde10a67615bc2bb1f43bda6beb5655013fae72 @@ -0,0 +1,19 @@ +http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/intprops.h?id=175b4e22f99e00996b72f822f5ae54dca8243d19 + +--- diffutils-3.5/lib/intprops.h ++++ diffutils-3.5/lib/intprops.h +@@ -230,11 +230,11 @@ + (e.g., A and B) have the same type as MIN and MAX. Instead, they assume + that the result (e.g., A + B) has that type. */ + #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL +-# define _GL_ADD_OVERFLOW(a, b, min, max) ++# define _GL_ADD_OVERFLOW(a, b, min, max) \ + __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) +-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) ++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ + __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) +-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) ++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ + __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) + #else + # define _GL_ADD_OVERFLOW(a, b, min, max) \ diff -uNr a/sys-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml --- a/sys-apps/diffutils/metadata.xml false +++ b/sys-apps/diffutils/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-apps/file/Manifest b/sys-apps/file/Manifest --- a/sys-apps/file/Manifest false +++ b/sys-apps/file/Manifest f5ebe0420f09036d62fb4a66e3fdf71e0cf593c4b01d71bfc08bb3aab2ede6a8a0eb245af208c88e3079243e0e7e0f55de7593339d371cdda595988a0eb53c98 @@ -0,0 +1,3 @@ +DIST file-5.32.tar.gz 797025 BLAKE2B d00196a2331b7325acc1b3f52d011faa3864db526f1962e4fcb769a92a715a1ee9874750cdde8f7c5c48541ecedea36c0fbd788a5ee9eb175cfcfc984acec430 SHA512 315343229fa196335389544ee8010e9e80995ef4721938492dedcfb0465dfc45e1feb96f26dfe53cab484fb5d9bac54d2d72917fbfd28a1d998c6ad8c8f9792f +EBUILD file-5.32.ebuild 2899 BLAKE2B 5ec2b6b9e369d603736a4384006fb4c07a8abf23859a9d89e76bb7a0257e852bf290a96e990ce4869ebdc3f36d5033d56a7801470cd847e09cd84aecd9bc3d67 SHA512 7a01b1f616a52d8079fdd33060263922bf1279fe20c64036b365531a1e27513af28a96acafe1dc7919ff602475ff79abfa0b860645c631ae45239bb610905a63 +MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a diff -uNr a/sys-apps/file/file-5.32.ebuild b/sys-apps/file/file-5.32.ebuild --- a/sys-apps/file/file-5.32.ebuild false +++ b/sys-apps/file/file-5.32.ebuild 9c5c9535217657c9d0fc2486085c945982fb0ac299cfbddff829659eac9cf500cb4ee1656eee9be3fb67e4d6f10c22a6144730538cf51fb8f833300148f175c4 @@ -0,0 +1,119 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) +DISTUTILS_OPTIONAL=1 + +inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/glensc/file.git" + inherit autotools git-r3 +else + SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="identify a file's format by scanning binary data for patterns" +HOMEPAGE="https://www.darwinsys.com/file/" + +LICENSE="BSD-2" +SLOT="0" +IUSE="python static-libs zlib" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + python? ( + ${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}] + ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND} + python? ( !dev-python/python-magic )" + +src_prepare() { + default + + [[ ${PV} == "9999" ]] && eautoreconf + elibtoolize + + # don't let python README kill main README #60043 + mv python/README{,.python} || die +} + +multilib_src_configure() { + local myeconfargs=( + --enable-fsect-man5 + $(use_enable static-libs static) + $(use_enable zlib) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +src_configure() { + # when cross-compiling, we need to build up our own file + # because people often don't keep matching host/target + # file versions #362941 + if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then + mkdir -p "${WORKDIR}"/build || die + cd "${WORKDIR}"/build || die + tc-export_build_env BUILD_C{C,XX} + ECONF_SOURCE=${S} \ + ac_cv_header_zlib_h=no \ + ac_cv_lib_z_gzopen=no \ + CHOST=${CBUILD} \ + CFLAGS=${BUILD_CFLAGS} \ + CXXFLAGS=${BUILD_CXXFLAGS} \ + CPPFLAGS=${BUILD_CPPFLAGS} \ + LDFLAGS="${BUILD_LDFLAGS} -static" \ + CC=${BUILD_CC} \ + CXX=${BUILD_CXX} \ + econf --disable-shared + fi + + multilib-minimal_src_configure +} + +multilib_src_compile() { + if multilib_is_native_abi ; then + emake + else + cd src || die + emake magic.h #586444 + emake libmagic.la + fi +} + +src_compile() { + if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then + emake -C "${WORKDIR}"/build/src magic.h #586444 + emake -C "${WORKDIR}"/build/src file + PATH="${WORKDIR}/build/src:${PATH}" + fi + multilib-minimal_src_compile + + if use python ; then + cd python || die + distutils-r1_src_compile + fi +} + +multilib_src_install() { + if multilib_is_native_abi ; then + default + else + emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" + fi +} + +multilib_src_install_all() { + dodoc ChangeLog MAINT README + + if use python ; then + cd python || die + distutils-r1_src_install + fi + prune_libtool_files +} diff -uNr a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml --- a/sys-apps/file/metadata.xml false +++ b/sys-apps/file/metadata.xml 962815e8d915bd888435a16f944743d0d510690de150c484b7289e72aa3458be688970ee41b568c2386ac95e8a2a88da8c69e888ac659b39fa972622f75a0394 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<upstream> + <bugs-to>http://bugs.gw.com/</bugs-to> +</upstream> +</pkgmetadata> diff -uNr a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest --- a/sys-apps/findutils/Manifest false +++ b/sys-apps/findutils/Manifest 1e43b448fb78db71e92f5af1f3ac3eca9b767aac805fed1305c78585954243647b25bdeeccf86db6e75c40345a9f51266835e2ae35764dd6af040f5f0afbb2e9 @@ -0,0 +1,7 @@ +AUX findutils-4.4.2-gnulib-date-x32.patch 1210 BLAKE2B 21c799083621d06e0505b8dba2a166d9136b4dd8b7be8053850d6051008300c601c28301f4932e17188ab24dbfff7c580a92954aab50adcc6ea7ac3b6d525266 SHA512 51bd15305d12a93f2a83faa359d1a2501fd96dea2c8dbed25cafa60c5d7f17b7a86d2d7dd0095dc0a6e0c1e9eaf2775bc6e1ceaadbdf5e2ffbaab6a4a4b9ff60 +AUX findutils-4.4.2-selinux.diff 15603 BLAKE2B 9fac4cb7a522cdce1c13ed4a7b60bba5d1778b0ec4b07e8e8b77461eece3373d516b4711749e531f951b5d95f9bf0594b569dbc54778b7ba305fa3add120608d SHA512 5fb4346b56cab0a470358e75c4c4a57f6709f7a987b1e6887242b9a4f241590adcaba7061d71752a5d2f8ac3598ecc1dffdb92b2bc072f5f31152088b88ed7f9 +AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718acda183bf153cb42bf05bf48c4cb83b95721c0d7e4e2025d58a957fa07ba6fc1406702528b347eb410f627893eacc9ece40aab0cfeab SHA512 2b8024827bea7e0cd4e9f60c52bcef3147e2ba2236d10b2763e510c9e9e7ace8331034db7599f4792802b9dc1619f5086738dcece63b896c0a9ea73ab0068b27 +AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6 +DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4 +EBUILD findutils-4.6.0-r1.ebuild 1905 BLAKE2B e8a6f4faf5a488f83f4b41f03baed7024703fe49d9ca61d0b8864d7bc2757f4a2cae015bf558bcb0d8eee8d0f8a4caf44dfc22b4b469c0278794245b076cfd6f SHA512 11a56e7bc5ec30731a7bd2bbfd9979360a41f87a2f62b1d3316e34ceeec25e8c1fe271c3ea9c27b7123d3c57d234fbbb6af93cd390cb73a216125aaada53c9fb +MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00 diff -uNr a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch b/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch --- a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch false +++ b/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch 0e8f27ecca3242e1f443b4f2187fa8ec080631827734cad20f24d91863fd9c6c08c1516e437d1c48b9b2af5bb61ca26291f8904f16d1873d4e66262a6250d22d @@ -0,0 +1,26 @@ +newer gnulib has rewritten these checks in a way that works for the x32, +and for the targets we care about, these checks won't return false. so +just drop them to make our life simpler. + +https://sites.google.com/site/x32abi/x32-patches + +--- findutils-4.4.2/gnulib/lib/getdate.c.x32 2009-05-10 14:23:57.000000000 -0700 ++++ findutils-4.4.2/gnulib/lib/getdate.c 2011-12-05 11:41:18.130675712 -0800 +@@ -114,7 +114,6 @@ + wraps around, but there's no portable way to check for that at + compile-time. */ + verify (TYPE_IS_INTEGER (time_t)); +-verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX); + + /* An integer value, and the number of digits in its textual + representation. */ +--- findutils-4.4.2/gnulib/lib/mktime.c.x32 2009-05-10 14:25:13.000000000 -0700 ++++ findutils-4.4.2/gnulib/lib/mktime.c 2011-12-05 11:49:38.368589386 -0800 +@@ -166,7 +166,5 @@ ydhms_diff (long int year1, long int yda + { + verify (C99_integer_division, -1 / 2 == 0); +- verify (long_int_year_and_yday_are_wide_enough, +- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); + + /* Compute intervening leap days correctly even if year is negative. + Take care to avoid integer overflow here. */ diff -uNr a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff b/sys-apps/findutils/files/findutils-4.4.2-selinux.diff --- a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff false +++ b/sys-apps/findutils/files/findutils-4.4.2-selinux.diff f579f4e9c13931afdbe0e8abc5a50887863905316b4e28119e679617094e835a281c4c6cdbc3c988adb43b99749fafedc5670c328ff3995224932fd4d66b219a @@ -0,0 +1,464 @@ +diff -purN findutils-4.4.2.orig/find/Makefile.am findutils-4.4.2/find/Makefile.am +--- findutils-4.4.2.orig/find/Makefile.am 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/Makefile.am 2010-04-25 03:58:33.762402367 +0000 +@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = std-options + localedir = $(datadir)/locale + # noinst_PROGRAMS = regexprops + # regexprops_SOURCES = regexprops.c ++DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX + + noinst_LIBRARIES = libfindtools.a + libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c tree.c util.c +@@ -26,7 +27,7 @@ endif + + EXTRA_DIST = defs.h $(man_MANS) + INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\" +-LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ ++LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux + man_MANS = find.1 + SUBDIRS = . testsuite + +diff -purN findutils-4.4.2.orig/find/Makefile.in findutils-4.4.2/find/Makefile.in +--- findutils-4.4.2.orig/find/Makefile.in 2009-05-16 15:28:13.000000000 +0000 ++++ findutils-4.4.2/find/Makefile.in 2010-04-25 03:58:33.762402367 +0000 +@@ -275,7 +275,7 @@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFAULT_ARG_SIZE = @DEFAULT_ARG_SIZE@ +-DEFS = @DEFS@ ++DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX + DEPDIR = @DEPDIR@ + DIRENT_H = @DIRENT_H@ + ECHO_C = @ECHO_C@ +@@ -607,7 +607,7 @@ libfindtools_a_SOURCES = finddata.c fsty + @WITH_FTS_TRUE@oldfind_SOURCES = find.c + @WITH_FTS_FALSE@ftsfind_SOURCES = ftsfind.c + EXTRA_DIST = defs.h $(man_MANS) +-LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ ++LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux + man_MANS = find.1 + SUBDIRS = . testsuite + all: all-recursive +diff -purN findutils-4.4.2.orig/find/defs.h findutils-4.4.2/find/defs.h +--- findutils-4.4.2.orig/find/defs.h 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/defs.h 2010-04-25 03:58:33.762402367 +0000 +@@ -91,6 +91,9 @@ int get_statinfo PARAMS((const char *pat + #define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW) + #define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX) + ++#ifdef WITH_SELINUX ++#include <selinux/selinux.h> ++#endif /*WITH_SELINUX*/ + + struct predicate; + struct options; +@@ -315,6 +318,9 @@ struct predicate + struct samefile_file_id samefileid; /* samefile */ + mode_t type; /* type */ + struct format_val printf_vec; /* printf fprintf fprint ls fls print0 fprint0 print */ ++#ifdef WITH_SELINUX ++ security_context_t scontext; /* scontext */ ++#endif /*WITH_SELINUX*/ + } args; + + /* The next predicate in the user input sequence, +@@ -459,7 +465,9 @@ PREDICATEFUNCTION pred_used; + PREDICATEFUNCTION pred_user; + PREDICATEFUNCTION pred_writable; + PREDICATEFUNCTION pred_xtype; +- ++#ifdef WITH_SELINUX ++PREDICATEFUNCTION pred_scontext; ++#endif /* WITH_SELINUX */ + + + int launch PARAMS((const struct buildcmd_control *ctl, +@@ -605,10 +613,13 @@ struct options + */ + unsigned short optimisation_level; + +- + /* How should we quote filenames in error messages and so forth? + */ + enum quoting_style err_quoting_style; ++ ++#ifdef WITH_SELINUX ++ int (*x_getfilecon)(); ++#endif /* WITH_SELINUX */ + }; + extern struct options options; + +diff -purN findutils-4.4.2.orig/find/find.1 findutils-4.4.2/find/find.1 +--- findutils-4.4.2.orig/find/find.1 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/find.1 2010-04-25 03:58:33.762402367 +0000 +@@ -934,6 +934,10 @@ checks the type of the file that + .B \-type + does not check. + ++.IP "\-context \fIscontext\fR" ++.IP "\--context \fIscontext\fR" ++(SELinux only) File has the security context \fIscontext\fR. ++ + .SS ACTIONS + .IP "\-delete\fR" + Delete files; true if removal succeeded. If the removal failed, an +@@ -1354,6 +1358,8 @@ File's type (like in + U=unknown type (shouldn't happen) + .IP %Y + File's type (like %y), plus follow symlinks: L=loop, N=nonexistent ++.IP %Z ++(SELinux only) file's security context. + .PP + A `%' character followed by any other character is discarded, but the + other character is printed (don't rely on this, as further format +diff -purN findutils-4.4.2.orig/find/find.c findutils-4.4.2/find/find.c +--- findutils-4.4.2.orig/find/find.c 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/find.c 2010-04-25 03:58:33.764899827 +0000 +@@ -1270,7 +1270,7 @@ process_path (char *pathname, char *name + static void + process_dir (char *pathname, char *name, int pathlen, const struct stat *statp, char *parent) + { +- int subdirs_left; /* Number of unexamined subdirs in PATHNAME. */ ++ int subdirs_left=0; /* Number of unexamined subdirs in PATHNAME. */ + boolean subdirs_unreliable; /* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */ + unsigned int idx; /* Which entry are we on? */ + struct stat stat_buf; +diff -purN findutils-4.4.2.orig/find/parser.c findutils-4.4.2/find/parser.c +--- findutils-4.4.2.orig/find/parser.c 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/parser.c 2010-04-25 03:58:33.764899827 +0000 +@@ -53,6 +53,13 @@ + #include <unistd.h> + #include <sys/stat.h> + ++#ifdef WITH_SELINUX ++#include <selinux/selinux.h> ++int optionh_getfilecon(const char *name, security_context_t *p); ++int optionl_getfilecon(const char *name, security_context_t *p); ++int optionp_getfilecon(const char *name, security_context_t *p); ++#endif /*WITH_SELINUX*/ ++ + #if ENABLE_NLS + # include <libintl.h> + # define _(Text) gettext (Text) +@@ -155,6 +162,9 @@ static boolean parse_noignore_race PARAM + static boolean parse_warn PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); + static boolean parse_xtype PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); + static boolean parse_quit PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); ++#ifdef WITH_SELINUX ++static boolean parse_scontext PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); ++#endif /*WITH_SELINUX*/ + + boolean parse_print PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); + +@@ -340,6 +350,8 @@ static struct parser_table const parse_t + {ARG_TEST, "-help", parse_help, NULL}, /* GNU */ + {ARG_TEST, "version", parse_version, NULL}, /* GNU */ + {ARG_TEST, "-version", parse_version, NULL}, /* GNU */ ++ {ARG_TEST, "context", parse_scontext, pred_scontext}, /* SELinux */ ++ {ARG_TEST, "-context", parse_scontext, pred_scontext}, /* SELinux */ + {0, 0, 0, 0} + }; + +@@ -451,10 +463,16 @@ set_follow_state(enum SymlinkOption opt) + case SYMLINK_ALWAYS_DEREF: /* -L */ + options.xstat = optionl_stat; + options.no_leaf_check = true; ++#ifdef WITH_SELINUX ++ options.x_getfilecon = optionl_getfilecon; ++#endif /* WITH_SELINUX */ + break; + + case SYMLINK_NEVER_DEREF: /* -P (default) */ + options.xstat = optionp_stat; ++#ifdef WITH_SELINUX ++ options.x_getfilecon = optionp_getfilecon; ++#endif /* WITH_SELINUX */ + /* Can't turn no_leaf_check off because the user might have specified + * -noleaf anyway + */ +@@ -463,6 +481,9 @@ set_follow_state(enum SymlinkOption opt) + case SYMLINK_DEREF_ARGSONLY: /* -H */ + options.xstat = optionh_stat; + options.no_leaf_check = true; ++#ifdef WITH_SELINUX ++ options.x_getfilecon = optionh_getfilecon; ++#endif /* WITH_SELINUX */ + } + } + options.symlink_handling = opt; +@@ -670,6 +691,94 @@ collect_arg_stat_info(char **argv, int * + + The predicate structure is updated with the new information. */ + ++#ifdef WITH_SELINUX ++ ++static int ++fallback_getfilecon(const char *name, security_context_t *p, int prev_rv) ++{ ++ /* Our original getfilecon() call failed. Perhaps we can't follow a ++ * symbolic link. If that might be the problem, lgetfilecon() the link. ++ * Otherwise, admit defeat. ++ */ ++ switch (errno) ++ { ++ case ENOENT: ++ case ENOTDIR: ++#ifdef DEBUG_STAT ++ fprintf(stderr, "fallback_getfilecon(): getfilecon(%s) failed; falling back on lgetfilecon()\n", name); ++#endif ++ return lgetfilecon(name, p); ++ ++ case EACCES: ++ case EIO: ++ case ELOOP: ++ case ENAMETOOLONG: ++#ifdef EOVERFLOW ++ case EOVERFLOW: /* EOVERFLOW is not #defined on UNICOS. */ ++#endif ++ default: ++ return prev_rv; ++ } ++} ++ ++ ++/* optionh_getfilecon() implements the getfilecon operation when the ++ * -H option is in effect. ++ * ++ * If the item to be examined is a command-line argument, we follow ++ * symbolic links. If the getfilecon() call fails on the command-line ++ * item, we fall back on the properties of the symbolic link. ++ * ++ * If the item to be examined is not a command-line argument, we ++ * examine the link itself. ++ */ ++int ++optionh_getfilecon(const char *name, security_context_t *p) ++{ ++ if (0 == state.curdepth) ++ { ++ /* This file is from the command line; deference the link (if it ++ * is a link). ++ */ ++ int rv = getfilecon(name, p); ++ if (0 == rv) ++ return 0; /* success */ ++ else ++ return fallback_getfilecon(name, p, rv); ++ } ++ else ++ { ++ /* Not a file on the command line; do not derefernce the link. ++ */ ++ return lgetfilecon(name, p); ++ } ++} ++ ++/* optionl_getfilecon() implements the getfilecon operation when the ++ * -L option is in effect. That option makes us examine the thing the ++ * symbolic link points to, not the symbolic link itself. ++ */ ++int ++optionl_getfilecon(const char *name, security_context_t *p) ++{ ++ int rv = getfilecon(name, p); ++ if (0 == rv) ++ return 0; /* normal case. */ ++ else ++ return fallback_getfilecon(name, p, rv); ++} ++ ++/* optionp_getfilecon() implements the stat operation when the -P ++ * option is in effect (this is also the default). That option makes ++ * us examine the symbolic link itself, not the thing it points to. ++ */ ++int ++optionp_getfilecon(const char *name, security_context_t *p) ++{ ++ return lgetfilecon(name, p); ++} ++#endif /* WITH_SELINUX */ ++ + + static boolean + parse_and (const struct parser_table* entry, char **argv, int *arg_ptr) +@@ -1128,6 +1237,10 @@ tests (N can be +N or -N or N): -amin N + -readable -writable -executable\n\ + -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\ + -used N -user NAME -xtype [bcdpfls]\n")); ++#ifdef WITH_SELINUX ++ puts (_("\ ++ -context CONTEXT\n")); ++#endif /*WITH_SELINUX*/ + puts (_("\ + actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\ + -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\ +@@ -2552,6 +2665,29 @@ parse_version (const struct parser_table + exit (0); + } + ++#ifdef WITH_SELINUX ++ ++static boolean ++parse_scontext ( const struct parser_table* entry, char **argv, int *arg_ptr) ++{ ++ struct predicate *our_pred; ++ ++ if ( (argv == NULL) || (argv[*arg_ptr] == NULL) ) ++ return( false ); ++ ++ our_pred = insert_primary(entry); ++ our_pred->need_stat = false; ++#ifdef DEBUG ++ our_pred->p_name = find_pred_name (pred_scontext); ++#endif /*DEBUG*/ ++ our_pred->args.scontext = argv[*arg_ptr];; ++ ++ (*arg_ptr)++; ++ return( true ); ++} ++ ++#endif /*WITH_SELINUX*/ ++ + static boolean + parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) + { +@@ -2803,7 +2939,11 @@ insert_fprintf (struct format_val *vec, + if (*scan2 == '.') + for (scan2++; ISDIGIT (*scan2); scan2++) + /* Do nothing. */ ; ++#ifdef WITH_SELINUX ++ if (strchr ("abcdDfFgGhHiklmMnpPsStuUyYZ", *scan2)) ++#else + if (strchr ("abcdDfFgGhHiklmMnpPsStuUyY", *scan2)) ++#endif + { + segmentp = make_segment (segmentp, format, scan2 - format, + KIND_FORMAT, *scan2, 0, +diff -purN findutils-4.4.2.orig/find/pred.c findutils-4.4.2/find/pred.c +--- findutils-4.4.2.orig/find/pred.c 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/pred.c 2010-04-25 03:58:33.764899827 +0000 +@@ -48,6 +48,14 @@ + #include "error.h" + #include "verify.h" + ++#ifdef WITH_SELINUX ++#include <selinux/selinux.h> ++#endif /*WITH_SELINUX*/ ++ ++#ifndef FNM_CASEFOLD ++#define FNM_CASEFOLD (1<<4) ++#endif /*FNM_CASEFOLD*/ ++ + #if ENABLE_NLS + # include <libintl.h> + # define _(Text) gettext (Text) +@@ -230,6 +238,9 @@ struct pred_assoc pred_table[] = + {pred_user, "user "}, + {pred_writable, "writable "}, + {pred_xtype, "xtype "}, ++#ifdef WITH_SELINUX ++ {pred_scontext, "context"}, ++#endif /*WITH_SELINUX*/ + {0, "none "} + }; + #endif +@@ -1054,6 +1065,26 @@ do_fprintf(struct format_val *dest, + mode_to_filetype(stat_buf->st_mode & S_IFMT)); + } + break; ++#ifdef WITH_SELINUX ++ case 'Z': /* SELinux security context */ ++ { ++ security_context_t scontext; ++ int rv; ++ rv = (*options.x_getfilecon)(state.rel_pathname, &scontext); ++ ++ if ( rv < 0 ) { ++ fprintf(stderr, "getfileconf(%s): %s", ++ pathname, strerror(errno)); ++ fflush(stderr); ++ } ++ else { ++ segment->text[segment->text_len] = 's'; ++ checked_fprintf (dest, segment->text, scontext); ++ freecon(scontext); ++ } ++ } ++ break ; ++#endif /* WITH_SELINUX */ + } + /* end of KIND_FORMAT case */ + break; +@@ -1844,6 +1875,31 @@ pred_xtype (const char *pathname, struct + */ + return (pred_type (pathname, &sbuf, pred_ptr)); + } ++ ++ ++#ifdef WITH_SELINUX ++ ++boolean ++pred_scontext (const char *pathname, struct stat *stat_buf, struct predicate *pred_ptr) ++{ ++ int rv; ++ security_context_t scontext; ++ ++ rv = (* options.x_getfilecon)(state.rel_pathname, &scontext); ++ ++ if ( rv < 0 ) { ++ (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno)); ++ (void) fflush(stderr); ++ return ( false ); ++ } ++ ++ rv = (fnmatch(pred_ptr->args.scontext, scontext,0)==0); ++ freecon(scontext); ++ return rv; ++} ++ ++#endif /*WITH_SELINUX*/ ++ + + /* 1) fork to get a child; parent remembers the child pid + 2) child execs the command requested +diff -purN findutils-4.4.2.orig/find/tree.c findutils-4.4.2/find/tree.c +--- findutils-4.4.2.orig/find/tree.c 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/tree.c 2010-04-25 03:58:33.764899827 +0000 +@@ -1195,6 +1195,10 @@ build_expression_tree(int argc, char *ar + const struct parser_table *entry_close, *entry_print, *entry_open; + int i, oldi; + ++#ifdef WITH_SELINUX ++ int is_selinux_enabled_flag = is_selinux_enabled()>0; ++#endif /* WITH_SELINUX */ ++ + predicates = NULL; + + /* Find where in ARGV the predicates begin by skipping the list of +@@ -1230,6 +1234,16 @@ build_expression_tree(int argc, char *ar + } + + predicate_name = argv[i]; ++ ++#ifdef WITH_SELINUX ++ if (! is_selinux_enabled_flag) { ++ if ((strncmp(predicate_name,"-context",strlen("-context"))==0) || ++ (strncmp(predicate_name,"--context",strlen("--context"))==0)) { ++ error (1, 0,_("Error: invalid predicate %s: the kernel is not selinux-enabled.\n"),predicate_name); ++ } ++ } ++#endif ++ + parse_entry = find_parser (predicate_name); + if (parse_entry == NULL) + { +@@ -1434,6 +1448,9 @@ get_new_pred (const struct parser_table + last_pred->need_stat = true; + last_pred->need_type = true; + last_pred->args.str = NULL; ++#ifdef WITH_SELINUX ++ last_pred->args.scontext = NULL; ++#endif + last_pred->pred_next = NULL; + last_pred->pred_left = NULL; + last_pred->pred_right = NULL; diff -uNr a/sys-apps/findutils/files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch b/sys-apps/findutils/files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch --- a/sys-apps/findutils/files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch false +++ b/sys-apps/findutils/files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 89acf4526c82d957a3ae98ec58d8ea016ec19fab0ceb4cd384da8892cb4cf087d3c82488baf5274f63df3d2a8f97003ad907dfe61b5bcd5ca5583e1875a1be9f @@ -0,0 +1,52 @@ +From 85717b68b03bf85016c5079fbbf0c8aa2b182ba6 Mon Sep 17 00:00:00 2001 +From: Pádraig Brady <P@draigBrady.com> +Date: Mon, 18 Jan 2016 17:29:28 +0000 +Subject: fts: don't unconditionally use leaf optimization for NFS + +NFS st_nlink are not accurate on all implementations, +leading to aborts() if that assumption is made. +See <https://bugzilla.redhat.com/1299169> +* lib/fts.c (leaf_optimization_applies): Remove NFS from +the white list, and document the issue. +--- +(limited to 'lib/fts.c') + +diff --git a/lib/fts.c b/lib/fts.c +index 7e9aca6..2c9df2f 100644 +--- a/gl/lib/fts.c ++++ b/gl/lib/fts.c +@@ -718,22 +718,23 @@ leaf_optimization_applies (int dir_fd) + + switch (fs_buf.f_type) + { +- case S_MAGIC_NFS: +- /* NFS provides usable dirent.d_type but not necessarily for all entries +- of large directories. See <https://bugzilla.redhat.com/1252549>. */ +- return true; +- + /* List here the file system types that lack usable dirent.d_type + info, yet for which the optimization does apply. */ + case S_MAGIC_REISERFS: + case S_MAGIC_XFS: + return true; + ++ /* Explicitly list here any other file system type for which the ++ optimization is not applicable, but need documentation. */ ++ case S_MAGIC_NFS: ++ /* NFS provides usable dirent.d_type but not necessarily for all entries ++ of large directories, so as per <https://bugzilla.redhat.com/1252549> ++ NFS should return true. However st_nlink values are not accurate on ++ all implementations as per <https://bugzilla.redhat.com/1299169>. */ ++ /* fall through */ + case S_MAGIC_PROC: +- /* Explicitly listing this or any other file system type for which +- the optimization is not applicable is not necessary, but we leave +- it here to document the risk. Per http://bugs.debian.org/143111, +- /proc may have bogus stat.st_nlink values. */ ++ /* Per <http://bugs.debian.org/143111> /proc may have ++ bogus stat.st_nlink values. */ + /* fall through */ + default: + return false; +-- +cgit v0.9.0.2 diff -uNr a/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch b/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch --- a/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch false +++ b/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch bc607e8ed4088a373395c35e89b2b3519a3d74f8d70352a5f7f3f7693979264b0915001e0f721bf58a8539c9c29a10d35fd1e26c0ffd6a3ecef5b4978db0cb34 @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/576818 + +From 1f63650823cebf52044df840c81062ccb52163a2 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno <ueno@gnu.org> +Date: Mon, 28 Dec 2015 06:27:42 +0900 +Subject: [PATCH] maint: fix operator precedence in mbrtowc test + +This is a fix for test breakage introduced by commit 45228d96; the +equality expression must be parenthesized when negated with '!', +otherwise we always get: + + test-mbrtowc.c:49: assertion 'ret == (size_t)(-2)' failed + +* m4/mbrtowc.m4 (gl_MBRTOWC_EMPTY_INPUT): Negate the entire expression. +* m4/mbrlen.m4 (gl_MBRLEN_EMPTY_INPUT): Likewise. +--- + m4/mbrlen.m4 | 2 +- + m4/mbrtowc.m4 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/configure ++++ b/configure +@@ -569,7 +569,7 @@ changequote([,])dnl + int + main (void) + { +- return ! mbrtowc (&wc, "", 0, &mbs) == (size_t) -2; ++ return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2; + } + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : +-- +2.6.2 + diff -uNr a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild --- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild false +++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild ccc017e95496354d5f9240fcd2a134c3588d909fa24464c9752f6657ca6b1b58498b9548c04dcb66cfa1a13c95340ea9726c439732df92fccf4214a75da72bec @@ -0,0 +1,62 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit eutils flag-o-matic toolchain-funcs python-any-r1 + +DESCRIPTION="GNU utilities for finding files" +HOMEPAGE="https://www.gnu.org/software/findutils/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls selinux static test" + +RDEPEND="selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + test? ( ${PYTHON_DEPS} ) + nls? ( sys-devel/gettext )" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + # Don't build or install locate because it conflicts with slocate, + # which is a secure version of locate. See bug 18729 + sed -i '/^SUBDIRS/s/locate//' Makefile.in + + # Newer C libraries omit this include from sys/types.h. + # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html + sed -i \ + '/include.*config.h/a#ifdef MAJOR_IN_SYSMACROS\n#include <sys/sysmacros.h>\n#endif\n' \ + gl/lib/mountlist.c || die + + epatch "${FILESDIR}"/${P}-gnulib-mb.patch #576818 + epatch "${FILESDIR}"/${P}-gnulib-S_MAGIC_NFS.patch #580032 +} + +src_configure() { + use static && append-ldflags -static + + program_prefix=$(usex userland_GNU '' g) + econf \ + --with-packager="Gentoo" \ + --with-packager-version="${PVR}" \ + --with-packager-bug-reports="https://bugs.gentoo.org/" \ + --program-prefix=${program_prefix} \ + $(use_enable nls) \ + $(use_with selinux) \ + --libexecdir='$(libdir)'/find +} + +src_compile() { + # We don't build locate, but the docs want a file in there. + emake -C locate dblocation.texi + default +} diff -uNr a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml --- a/sys-apps/findutils/metadata.xml false +++ b/sys-apps/findutils/metadata.xml d8dab99e7d2b3b98a58103f7a662ce9a83d699537f3e128478fe089ca81bc6633cda6933d95d0b4f7660592d15586a8d6b11b175e01f8bc17e93bbeb2008b41a @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<upstream> + <remote-id type="cpe">cpe:/a:gnu:findutils</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest --- a/sys-apps/gawk/Manifest false +++ b/sys-apps/gawk/Manifest e2b7433bf8515ec5b6d7e4cb3d93459e123418c69f54089d53d52d668520a7e9fd0e5dbcbc0a4f64d24cc3ae442c3c65fb8ab5d7d67d1c9fc077381bbc9ac455 @@ -0,0 +1,6 @@ +AUX filefuncs/Makefile 1112 BLAKE2B 2aac64b80953a3253730209b9496164cfa2d3e9d18c90547cc7290329e2639ba4499a7d9c9a87b79c05f31a8cea3ace1663de8adaaef5d75d6b25ab8017951a0 SHA512 9bf5acfca439e6589247db3b4b16985765e748bcb66577e7038247830f92137929f139f6ab72ecb9e2b3b03f9406c8ecf7ca349329979ee8d70fbf44b4feb2b8 +AUX filefuncs/filefuncs.c 10875 BLAKE2B 7da403cea52ba69b3822aa892ad8faa12fd59d64d434f35048e34a38273f57fac73a42d74d88e68c33feae015ac241395c2f71c3e7e7e99b526814d9347d8c73 SHA512 48da0dce39759a8d57097b286dcee2ebf1e1799b694a4a7926716df727eb294a7912117c405e1b63a1722fa3a2427cb2139d92fac723ffd8d2e697632719f974 +AUX gawk-4.1.3-bsd_configure_readline.patch 1899 BLAKE2B a7c8ce8aa8fb25ce3adc74fb195bf8c9dbd7b83084f4f901c61758f5a51969510aa3ae8c9f2668266d798d43563f6fcb7e8659ae9f7cf7514f86de2f5443fed6 SHA512 ed3b6c4efe5bcb53bca6eeb50df0e3871eca266dd3d6ea4369f42dce31b771ed0a4f0aac03b09124706539d18c8d1dfe549e43d2ef4cf80a45353e14238ddaec +DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a5451293418bc15e575a8ed1d97c0a975e084bf46ffd1c27dc70e48de492cd2e007773622ef14886b9269ee1 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097 +EBUILD gawk-4.1.4.ebuild 2090 BLAKE2B 157b0b2d6eed94587109451db8aeae9b809f16e2adff1735d9111ff486ccacdeb0f0add59cb23f58ef80e72fbd746bdf80ee029bffd1ccba5219f6609b124d00 SHA512 59ba5329f4334688408e6afd9fcc0556f87e46bc5f860ae140197c7b0a2a62dfc6236199a9588c1ee57f4ab946ee924bbba804abbfd0125f8acf4dbecaeb9589 +MISC metadata.xml 465 BLAKE2B 4ae9d07b535014b76695db5d04b7a8b984c045dd78e90c8e7b0b3215a3021e5b190bfd89ca3f0dd5d9d8f1b55340ac57e40e02509e0d65288032458a0a247096 SHA512 517baceec7b9ea9311d1a946df59da35e6a5619344426ecdca6ff56e0da876ae1e6f793417e5d563da0f4528c535026deedf451eb6da8c7140db69709342a3cc diff -uNr a/sys-apps/gawk/files/filefuncs/Makefile b/sys-apps/gawk/files/filefuncs/Makefile --- a/sys-apps/gawk/files/filefuncs/Makefile false +++ b/sys-apps/gawk/files/filefuncs/Makefile e30108d1219843d9d44f4a5b3f0fd4d5717c02f2e266e707ce081483940fac34e9202c2522a5d4bbf11af03c2713115a8897d7e9fb3e166e1a8988d54401d1c0 @@ -0,0 +1,56 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Author: Martin Schlemmer <azarah@gentoo.org> + +CC ?= gcc +LD = $(CC) + +MAJORVER = 0 +MINORVER = 0.1 + +AWKINCDIR = /usr/include/awk +DESTDIR = + +TARGET = filefuncs +TARGET_LIB = $(TARGET).so.$(MAJORVER).$(MINORVER) + +LIBDIR = lib + +# Gentoo specific cruft, you like it dont ya idiot +ifdef D +DESTDIR = $(D) +endif +ifdef S +AWKINCDIR = $(S) +endif + +DOIT = yes +ifeq ($(USERLAND),Darwin) +DOIT = no +endif + +ifeq ($(DOIT),yes) + +all: $(TARGET_LIB) + +$(TARGET).o: $(TARGET).c + $(CC) $(CFLAGS) $(CPPFLAGS) -shared -Wall -DHAVE_CONFIG_H -c -O2 -fPIC -I$(AWKINCDIR) $^ + +$(TARGET_LIB): $(TARGET).o + $(LD) $(LDFLAGS) -o $@ -shared -Wl,-soname -Wl,$(TARGET).so.$(MAJORVER) $^ + +install: $(TARGET_LIB) + install -m 0755 -d $(DESTDIR)/$(LIBDIR)/rcscripts + install -m 0755 $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts + ln -s $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET).so.$(MAJORVER) + ln -s $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET).so + +clean: + rm -f $(TARGET) + rm -f *.o *~ core + +else + +all install clean: + +endif diff -uNr a/sys-apps/gawk/files/filefuncs/filefuncs.c b/sys-apps/gawk/files/filefuncs/filefuncs.c --- a/sys-apps/gawk/files/filefuncs/filefuncs.c false +++ b/sys-apps/gawk/files/filefuncs/filefuncs.c 7a4819b2e59f79ff40e3c2a60a7e5afd5830ab5a69783762633f88f29f52013a309ab360b60c04091986fbb3715518a93231882aba6469ddee5b5dfaed45a674 @@ -0,0 +1,484 @@ +/* + * filefuncs.c - Builtin functions that provide initial minimal iterface + * to the file system. + * + * Arnold Robbins, update for 3.1, Mon Nov 23 12:53:39 EST 1998 + */ + +/* + * Copyright (C) 2001 the Free Software Foundation, Inc. + * + * This file is part of GAWK, the GNU implementation of the + * AWK Programming Language. + * + * GAWK is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GAWK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +/* + * Copyright 1999-2004 Gentoo Foundation + * Distributed under the terms of the GNU General Public License v2 + * Author: Martin Schlemmer <azarah@gentoo.org>, Nov 2002 + * + * Extended with: do_symlink() + * do_unlink() + * do_mkdir() + * do_rmdir() + * + * for use in the Gentoo rcscripts + * + */ + +#include "awk.h" + +#include <unistd.h> + +/* do_chdir --- provide dynamically loaded chdir() builtin for gawk */ + +static NODE * +do_chdir(tree) +NODE *tree; +{ + NODE *newdir; + int ret = -1; + + if (do_lint && tree->param_cnt > 1) + lintwarn("chdir: called with too many arguments"); + + newdir = get_argument(tree, 0); + if (newdir != NULL) { + (void) force_string(newdir); + ret = chdir(newdir->stptr); + if (ret < 0) + update_ERRNO(); + + free_temp(newdir); + } else if (do_lint) + lintwarn("chdir: called with no arguments"); + + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* do_symlink --- provide dynamically loaded symlink() builtin for gawk */ + +static NODE * +do_symlink(tree) +NODE *tree; +{ + NODE *oldpath, *newpath; + int ret = -1; + + if (do_lint && tree->param_cnt > 2) + lintwarn("symlink: called with too many arguments"); + + oldpath = get_argument(tree, 0); + newpath = get_argument(tree, 1); + if ((oldpath != NULL) && (newpath)) { + (void) force_string(oldpath); + (void) force_string(newpath); + ret = symlink(oldpath->stptr, newpath->stptr); + if (ret < 0) + update_ERRNO(); + + free_temp(oldpath); + free_temp(newpath); + } else if (do_lint) + lintwarn("symlink: called with not enough arguments"); + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* do_unlink --- provide dynamically loaded unlink() builtin for gawk */ + +static NODE * +do_unlink(tree) +NODE *tree; +{ + NODE *pathname; + int ret = -1; + + if (do_lint && tree->param_cnt > 1) + lintwarn("unlink: called with too many arguments"); + + pathname = get_argument(tree, 0); + if (pathname != NULL) { + (void) force_string(pathname); + ret = unlink(pathname->stptr); + if (ret < 0) + update_ERRNO(); + + free_temp(pathname); + } else if (do_lint) + lintwarn("unlink: called with no arguments"); + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* do_mkdir --- provide dynamically loaded mkdir() builtin for gawk */ + +static NODE * +do_mkdir(tree) +NODE *tree; +{ + NODE *pathname, *mode; + int ret = -1; + + if (do_lint && tree->param_cnt > 2) + lintwarn("mkdir: called with too many arguments"); + + pathname = get_argument(tree, 0); + mode = get_argument(tree, 1); + if ((pathname != NULL) && (mode != NULL)) { + (void) force_string(pathname); + (void) force_number(mode); + ret = mkdir(pathname->stptr, mode->numbr); + if (ret < 0) + update_ERRNO(); + + free_temp(pathname); + free_temp(mode); + } else if (do_lint) + lintwarn("mkdir: called with not enough arguments"); + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* do_rmdir --- provide dynamically loaded rmdir() builtin for gawk */ + +static NODE * +do_rmdir(tree) +NODE *tree; +{ + NODE *pathname; + int ret = -1; + + if (do_lint && tree->param_cnt > 1) + lintwarn("rmdir: called with too many arguments"); + + pathname = get_argument(tree, 0); + if (pathname != NULL) { + (void) force_string(pathname); + ret = rmdir(pathname->stptr); + if (ret < 0) + update_ERRNO(); + + free_temp(pathname); + } else if (do_lint) + lintwarn("rmdir: called with no arguments"); + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* format_mode --- turn a stat mode field into something readable */ + +static char * +format_mode(fmode) +unsigned long fmode; +{ + static char outbuf[12]; + int i; + + strcpy(outbuf, "----------"); + /* first, get the file type */ + i = 0; + switch (fmode & S_IFMT) { +#ifdef S_IFSOCK + case S_IFSOCK: + outbuf[i] = 's'; + break; +#endif +#ifdef S_IFLNK + case S_IFLNK: + outbuf[i] = 'l'; + break; +#endif + case S_IFREG: + outbuf[i] = '-'; /* redundant */ + break; + case S_IFBLK: + outbuf[i] = 'b'; + break; + case S_IFDIR: + outbuf[i] = 'd'; + break; +#ifdef S_IFDOOR /* Solaris weirdness */ + case S_IFDOOR: + outbuf[i] = 'D'; + break; +#endif /* S_IFDOOR */ + case S_IFCHR: + outbuf[i] = 'c'; + break; +#ifdef S_IFIFO + case S_IFIFO: + outbuf[i] = 'p'; + break; +#endif + } + + i++; + if ((fmode & S_IRUSR) != 0) + outbuf[i] = 'r'; + i++; + if ((fmode & S_IWUSR) != 0) + outbuf[i] = 'w'; + i++; + if ((fmode & S_IXUSR) != 0) + outbuf[i] = 'x'; + i++; + + if ((fmode & S_IRGRP) != 0) + outbuf[i] = 'r'; + i++; + if ((fmode & S_IWGRP) != 0) + outbuf[i] = 'w'; + i++; + if ((fmode & S_IXGRP) != 0) + outbuf[i] = 'x'; + i++; + + if ((fmode & S_IROTH) != 0) + outbuf[i] = 'r'; + i++; + if ((fmode & S_IWOTH) != 0) + outbuf[i] = 'w'; + i++; + if ((fmode & S_IXOTH) != 0) + outbuf[i] = 'x'; + i++; + + outbuf[i] = '\0'; + + if ((fmode & S_ISUID) != 0) { + if (outbuf[3] == 'x') + outbuf[3] = 's'; + else + outbuf[3] = 'S'; + } + + /* setgid without execute == locking */ + if ((fmode & S_ISGID) != 0) { + if (outbuf[6] == 'x') + outbuf[6] = 's'; + else + outbuf[6] = 'l'; + } + + if ((fmode & S_ISVTX) != 0) { + if (outbuf[9] == 'x') + outbuf[9] = 't'; + else + outbuf[9] = 'T'; + } + + return outbuf; +} + +/* do_stat --- provide a stat() function for gawk */ + +static NODE * +do_stat(tree) +NODE *tree; +{ + NODE *file, *array; + struct stat sbuf; + int ret; + NODE **aptr; + char *pmode; /* printable mode */ + char *type = "unknown"; + + /* check arg count */ + if (tree->param_cnt != 2) + fatal( + "stat: called with incorrect number of arguments (%d), should be 2", + tree->param_cnt); + + /* directory is first arg, array to hold results is second */ + file = get_argument(tree, 0); + array = get_argument(tree, 1); + + /* empty out the array */ + assoc_clear(array); + + /* lstat the file, if error, set ERRNO and return */ + (void) force_string(file); + ret = lstat(file->stptr, & sbuf); + if (ret < 0) { + update_ERRNO(); + + set_value(tmp_number((AWKNUM) ret)); + + free_temp(file); + return tmp_number((AWKNUM) 0); + } + + /* fill in the array */ + aptr = assoc_lookup(array, tmp_string("name", 4), FALSE); + *aptr = dupnode(file); + + aptr = assoc_lookup(array, tmp_string("dev", 3), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_dev); + + aptr = assoc_lookup(array, tmp_string("ino", 3), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_ino); + + aptr = assoc_lookup(array, tmp_string("mode", 4), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_mode); + + aptr = assoc_lookup(array, tmp_string("nlink", 5), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_nlink); + + aptr = assoc_lookup(array, tmp_string("uid", 3), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_uid); + + aptr = assoc_lookup(array, tmp_string("gid", 3), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_gid); + + aptr = assoc_lookup(array, tmp_string("size", 4), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_size); + + aptr = assoc_lookup(array, tmp_string("blocks", 6), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_blocks); + + aptr = assoc_lookup(array, tmp_string("atime", 5), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_atime); + + aptr = assoc_lookup(array, tmp_string("mtime", 5), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_mtime); + + aptr = assoc_lookup(array, tmp_string("ctime", 5), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_ctime); + + /* for block and character devices, add rdev, major and minor numbers */ + if (S_ISBLK(sbuf.st_mode) || S_ISCHR(sbuf.st_mode)) { + aptr = assoc_lookup(array, tmp_string("rdev", 4), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_rdev); + + aptr = assoc_lookup(array, tmp_string("major", 5), FALSE); + *aptr = make_number((AWKNUM) major(sbuf.st_rdev)); + + aptr = assoc_lookup(array, tmp_string("minor", 5), FALSE); + *aptr = make_number((AWKNUM) minor(sbuf.st_rdev)); + } + +#ifdef HAVE_ST_BLKSIZE + aptr = assoc_lookup(array, tmp_string("blksize", 7), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_blksize); +#endif /* HAVE_ST_BLKSIZE */ + + aptr = assoc_lookup(array, tmp_string("pmode", 5), FALSE); + pmode = format_mode(sbuf.st_mode); + *aptr = make_string(pmode, strlen(pmode)); + + /* for symbolic links, add a linkval field */ + if (S_ISLNK(sbuf.st_mode)) { + char buf[BUFSIZ*2]; + int linksize; + + linksize = readlink(file->stptr, buf, sizeof buf); + /* should make this smarter */ + if (linksize == sizeof(buf)) + fatal("size of symbolic link too big"); + buf[linksize] = '\0'; + + aptr = assoc_lookup(array, tmp_string("linkval", 7), FALSE); + *aptr = make_string(buf, linksize); + } + + /* add a type field */ + switch (sbuf.st_mode & S_IFMT) { +#ifdef S_IFSOCK + case S_IFSOCK: + type = "socket"; + break; +#endif +#ifdef S_IFLNK + case S_IFLNK: + type = "symlink"; + break; +#endif + case S_IFREG: + type = "file"; + break; + case S_IFBLK: + type = "blockdev"; + break; + case S_IFDIR: + type = "directory"; + break; +#ifdef S_IFDOOR + case S_IFDOOR: + type = "door"; + break; +#endif + case S_IFCHR: + type = "chardev"; + break; +#ifdef S_IFIFO + case S_IFIFO: + type = "fifo"; + break; +#endif + } + + aptr = assoc_lookup(array, tmp_string("type", 4), FALSE); + *aptr = make_string(type, strlen(type)); + + free_temp(file); + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* dlload --- load new builtins in this library */ + +NODE * +dlload(tree, dl) +NODE *tree; +void *dl; +{ + make_builtin("chdir", do_chdir, 1); + make_builtin("symlink", do_symlink, 2); + make_builtin("unlink", do_unlink, 1); + make_builtin("mkdir", do_mkdir, 2); + make_builtin("rmdir", do_rmdir, 1); + make_builtin("stat", do_stat, 2); + + return tmp_number((AWKNUM) 0); +} + diff -uNr a/sys-apps/gawk/files/gawk-4.1.3-bsd_configure_readline.patch b/sys-apps/gawk/files/gawk-4.1.3-bsd_configure_readline.patch --- a/sys-apps/gawk/files/gawk-4.1.3-bsd_configure_readline.patch false +++ b/sys-apps/gawk/files/gawk-4.1.3-bsd_configure_readline.patch 8765d61b6734a963dd0715941fd6896c0b448866494a9817c09e9998b9b7a742e463b46d1c8929c215ea5d245d54560b971f4613610fee01dc045252dfcc9693 @@ -0,0 +1,63 @@ +http://git.savannah.gnu.org/cgit/gawk.git/commit/?id=ac0ef52fe407b89c7968b927c7b2b513cc13963a + +--- gawk-4.1.3/configure 2015-05-19 15:38:35.000000000 +0200 ++++ gawk-4.1.3/configure 2015-05-19 15:38:35.000000000 +0200 +@@ -10825,7 +10825,46 @@ + + if test $_found_readline = yes ; then + case $host_os in +- *bsd* ) _combo="$_combo -ltermcap" ++ *bsd* ) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 ++$as_echo_n "checking for tgetent in -ltermcap... " >&6; } ++if ${ac_cv_lib_termcap_tgetent+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltermcap $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char tgetent (); ++int ++main () ++{ ++return tgetent (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_termcap_tgetent=yes ++else ++ ac_cv_lib_termcap_tgetent=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 ++$as_echo "$ac_cv_lib_termcap_tgetent" >&6; } ++if test "x$ac_cv_lib_termcap_tgetent" = xyes; then : ++ _combo="$_combo -ltermcap" ++fi ++ + ;; + esac + +--- gawk-4.1.3/m4/readline.m4 2015-04-05 12:19:19.000000000 +0200 ++++ gawk-4.1.3/m4/readline.m4 2015-04-05 12:19:19.000000000 +0200 +@@ -92,7 +92,7 @@ + + if test $_found_readline = yes ; then + case $host_os in +- *bsd* ) _combo="$_combo -ltermcap" ++ *bsd* ) AC_CHECK_LIB(termcap, tgetent, _combo="$_combo -ltermcap") + ;; + esac + AC_DEFINE(HAVE_LIBREADLINE,1, diff -uNr a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild --- a/sys-apps/gawk/gawk-4.1.4.ebuild false +++ b/sys-apps/gawk/gawk-4.1.4.ebuild 082dca31943da4e1c30bc8612038a37271337e3a15c16bbd6f887a0b4c747b40926ab67b15d9a76ae9caf3011e3eab24e74081d19c0a7da66503a68d12bef4e1 @@ -0,0 +1,75 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils toolchain-funcs multilib + +DESCRIPTION="GNU awk pattern-matching language" +HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html" +SRC_URI="mirror://gnu/gawk/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="mpfr nls readline" + +RDEPEND="mpfr? ( dev-libs/mpfr:0= ) + readline? ( sys-libs/readline:0= )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_prepare() { + # use symlinks rather than hardlinks, and disable version links + sed -i \ + -e '/^LN =/s:=.*:= $(LN_S):' \ + -e '/install-exec-hook:/s|$|\nfoo:|' \ + Makefile.in doc/Makefile.in || die + sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327 + # fix standards conflict on Solaris + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i \ + -e '/\<_XOPEN_SOURCE\>/s/$/600/' \ + extension/inplace.c || die + fi +} + +src_configure() { + export ac_cv_libsigsegv=no + econf \ + --libexec='$(libdir)/misc' \ + $(use_with mpfr) \ + $(use_enable nls) \ + $(use_with readline) +} + +src_install() { + rm -rf README_d # automatic dodocs barfs + default + + # Install headers + insinto /usr/include/awk + doins *.h || die + rm "${ED}"/usr/include/awk/config.h || die +} + +pkg_postinst() { + # symlink creation here as the links do not belong to gawk, but to any awk + if has_version app-admin/eselect \ + && has_version app-eselect/eselect-awk ; then + eselect awk update ifunset + else + local l + for l in "${EROOT}"usr/share/man/man1/gawk.1* "${EROOT}"usr/bin/gawk; do + [[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}" + done + [[ ! -e ${EROOT}bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT}bin/awk" + fi +} + +pkg_postrm() { + if has_version app-admin/eselect \ + && has_version app-eselect/eselect-awk ; then + eselect awk update ifunset + fi +} diff -uNr a/sys-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml --- a/sys-apps/gawk/metadata.xml false +++ b/sys-apps/gawk/metadata.xml a716921dd62eb506e4c87da9ec4188ae6a762a3de16bd59849220a0b39d7422c025e9b14ad4e507f5f123f8045010da8b90a973fa80a0676e3f08df9b849cb6e @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="forced-sandbox">Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)</flag> + <flag name="mpfr">use mpfr for high precision arithmetic (-M / --bignum)</flag> +</use> +</pkgmetadata> diff -uNr a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest --- a/sys-apps/gentoo-functions/Manifest false +++ b/sys-apps/gentoo-functions/Manifest 6670209565bd61b1e22dc070a8a74c10338ae9a43cbcafd2242078d85a49f9749396ff1c1324986ed8e5856810ad46325cbe7bd9a1ff68f14c0334d6a345c6e3 @@ -0,0 +1,3 @@ +DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705 +EBUILD gentoo-functions-0.12.ebuild 846 BLAKE2B 6f8138c350334a38c8e9ecc3421d2fe6af90fe4a687fb6e3ee9bc42d699376f92dcb1a8bfd80527946e970aae87902e80610c262f5f5d72f6f3dd2fdad29b2f9 SHA512 632abc3875fb537fcef9702685a07a2f9a55e540b3fb506f7168f2427e77c69d8fdc553090dc9060f8b63f32a46d7f05a39db922e773164e7d541b93f7351166 +MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2 diff -uNr a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild --- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild false +++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild 3c76cc7e577a03fd60a5232cb96232c691c9c3e99bc1a2111c6a8fe7ca357542025e7488e2de77990f3cd5faee7ea4e3d3db4f6ff527416d01d4b52b436c1c5c @@ -0,0 +1,30 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gentoo/${PN}.git" +else + SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +fi + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="base functions required by all Gentoo systems" +HOMEPAGE="https://www.gentoo.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +src_prepare() { + tc-export CC + append-lfs-flags +} + +src_install() { + emake install DESTDIR="${ED}" +} diff -uNr a/sys-apps/gentoo-functions/metadata.xml b/sys-apps/gentoo-functions/metadata.xml --- a/sys-apps/gentoo-functions/metadata.xml false +++ b/sys-apps/gentoo-functions/metadata.xml 4788c1d949de0109e0636c0a0ba8bb65ff7c5853825637ce101af8c349dbf030264b6e89d38ce62e42942a6c6864e8b445a8a5545d057992211ad2a224636090 @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> + <email>williamh@gentoo.org</email> +</maintainer> +<maintainer type="person"> + <email>blueness@gentoo.org</email> +</maintainer> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<longdescription lang="en"> + This package contains base shell functions which are required by + all Gentoo systems. +</longdescription> +<upstream> + <remote-id type="github">gentoo/gentoo-functions</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest --- a/sys-apps/grep/Manifest false +++ b/sys-apps/grep/Manifest a69757bc2f729b738f427506c89bb3788157902f08e0602320d28ad8ce61a06e9848cabb8050ed9a54920a5e78525086cc366a3ebe593901dc27dcf5be77332a @@ -0,0 +1,4 @@ +AUX grep-2.27-splice.patch 2056 BLAKE2B bcaa98b6c7b009194def6d0b3bba81bfcad6fab6eb72a4a071d04efd4564ea0f8bc601c93d5f9afde3c5ef740736bea8f4da15fcdce93a36ab810f70855c46f5 SHA512 cc3da88a206af1550ed00d8d08f8619853d72b0f4e5066ea56c402104b23c5e46ef7e984b3f879fe33b32392506133622c0ca086394f03247c4274956af52473 +DIST grep-3.0.tar.xz 1375156 BLAKE2B 19f5441ed3fe5bb16d9d8327e76f0beb7eb837b727f6da99844dc9c74eb4def9eab857059c527e651758fa224a6f4079ec5939806645806f2db341ed0cb727e4 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58 +EBUILD grep-3.0.ebuild 1358 BLAKE2B d3dd5e78bf8763f54b30e1447b61248673d0da1151458c6bcd0bfd4dcd4784e45aac6adb71b2cb26cab95762e0c7ec5d54c0ea85ea01df174bc2e0367ba3499e SHA512 3778bc0473f795069196d67b7b806f368994396454d0255c9d37a68b33e35e1b8415c8760373819aa59c12ab2533faf30fb27dad032da40007781ac05fe8cb09 +MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f diff -uNr a/sys-apps/grep/files/grep-2.27-splice.patch b/sys-apps/grep/files/grep-2.27-splice.patch --- a/sys-apps/grep/files/grep-2.27-splice.patch false +++ b/sys-apps/grep/files/grep-2.27-splice.patch da6582ac634653e1d5bcf3fb47fb81aff066878f2963aeb06aca2ba3835cad2efc5f818017c791e32af8a87edea52797ea2257d0fffa9ab87c3da3ad86e96754 @@ -0,0 +1,60 @@ +http://lists.gnu.org/archive/html/bug-grep/2016-12/msg00036.html + +From 7ad47abbcb070946000771a829b51224720b8cef Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Tue, 27 Dec 2016 11:16:32 -0800 +Subject: [PATCH] grep: fix bug with '... | grep pat >> /dev/null' +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Benno Fünfstück (Bug#25283). +* NEWS: Document this. +* src/grep.c (drain_input) [SPLICE_F_MOVE]: +Don't assume /dev/null is always acceptable output to splice. +* tests/grep-dev-null-out: Test for the bug. +--- + NEWS | 7 ++++--- + src/grep.c | 14 +++++++++----- + tests/grep-dev-null-out | 2 ++ + 3 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/src/grep.c b/src/grep.c +index f28f3c287609..aebab2060308 100644 +--- a/src/grep.c ++++ b/src/grep.c +@@ -1728,11 +1728,15 @@ drain_input (int fd, struct stat const *st) + { + #ifdef SPLICE_F_MOVE + /* Should be faster, since it need not copy data to user space. */ +- while ((nbytes = splice (fd, NULL, STDOUT_FILENO, NULL, +- INITIAL_BUFSIZE, SPLICE_F_MOVE))) +- if (nbytes < 0) +- return false; +- return true; ++ nbytes = splice (fd, NULL, STDOUT_FILENO, NULL, ++ INITIAL_BUFSIZE, SPLICE_F_MOVE); ++ if (0 <= nbytes || errno != EINVAL) ++ { ++ while (0 < nbytes) ++ nbytes = splice (fd, NULL, STDOUT_FILENO, NULL, ++ INITIAL_BUFSIZE, SPLICE_F_MOVE); ++ return nbytes == 0; ++ } + #endif + } + while ((nbytes = safe_read (fd, buffer, bufalloc))) +diff --git a/tests/grep-dev-null-out b/tests/grep-dev-null-out +index 13a4843957a6..c8128d5cc6a4 100755 +--- a/tests/grep-dev-null-out ++++ b/tests/grep-dev-null-out +@@ -8,4 +8,6 @@ require_timeout_ + ${AWK-awk} 'BEGIN {while (1) print "x"}' </dev/null | + returns_ 124 timeout 1 grep x >/dev/null || fail=1 + ++echo abc | grep b >>/dev/null || fail=1 ++ + Exit $fail +-- +2.11.0 + diff -uNr a/sys-apps/grep/grep-3.0.ebuild b/sys-apps/grep/grep-3.0.ebuild --- a/sys-apps/grep/grep-3.0.ebuild false +++ b/sys-apps/grep/grep-3.0.ebuild e28eeb8e20c4344f3dbd0f24aba368718dce8e67aa530581f89bc3ff94ecb79a1669d3c63ae3f3074f8ea2b38ce3f1f2694cbcfe7d4e5ed730ffbd99e265a3ac @@ -0,0 +1,45 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="https://www.gnu.org/software/grep/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + mirror://gentoo/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls pcre static" + +LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + nls? ( virtual/libintl ) + virtual/libiconv" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + static? ( ${LIB_DEPEND} )" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + sed -i \ + -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ + src/egrep.sh || die #523898 +} + +src_configure() { + use static && append-ldflags -static + # Always use pkg-config to get lib info for pcre. + export ac_cv_search_pcre_compile=$( + usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' + ) + econf \ + --bindir="${EPREFIX}"/bin \ + $(use_enable nls) \ + $(use_enable pcre perl-regexp) +} diff -uNr a/sys-apps/grep/metadata.xml b/sys-apps/grep/metadata.xml --- a/sys-apps/grep/metadata.xml false +++ b/sys-apps/grep/metadata.xml 4367bbbab6a4a9c81eeab07b86d26359e7000759442ed6691dfa88ef9ac80ebb0c3180963141944a7ad9ef795e4440490ae3519a0163cad5c310c040d565d12b @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<upstream> + <remote-id type="cpe">cpe:/a:gnu:grep</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest --- a/sys-apps/groff/Manifest false +++ b/sys-apps/groff/Manifest cdc0fdf6e853db91b624855a16bf53a005eed8092bafae0cce5fce89ba73d767491c4d11abb8408f548ea8110501966af05e3821b8d7d490f9a5682584b217eb @@ -0,0 +1,7 @@ +AUX groff-1.19.2-man-unicode-dashes.patch 574 BLAKE2B 2a38cb251ea6da0932c7279bb23e8e261cbf80db8ddff59c6e672e13b2e89578de703464f22f06ea52adceb565069931d30f4bbef7106577f70f8ce9769ba2f0 SHA512 17c8d757b93052ceb8342e062965d680ba17aec117d9a0eaf8636bb192a71040e9955bdc0cbb1f55db49a7a43c7ad93da0c8933ad012b8d36c956ac1c4079436 +AUX groff-1.22.2-parallel-mom.patch 3903 BLAKE2B ae706b988d0236f32d981239749aeaf27fd0353173e54566f481492dd93c583d75123a26132fdad54fa09ca2ed035ae28df4eb6cd3e9bccd8d8f348a6cbcd28f SHA512 314fe3d619dc7dd373f1d9ea75d4d8cb365fc7278a958a3dec09e95ba3bf75180edb5f4ec3d43b4791b0252b733f9916e6189794b098b09171f45eb65bee713f +AUX groff-1.22.3-parallel-mom.patch 378 BLAKE2B 46d38a599ec073bddd24a31562960ed86c764679090c72ffe64024944c03d7c556313397c3244adf1d15dc79b75a900a5f627276e28435bff4dea5788b1a9d18 SHA512 29330641fcdcc052cc1760dd69c523f2cfaf4264110b7471ac3dfc00e12a371fa69f3a6902221a575da3b89fb7acc5b161234c95e5a4c4d105bf46d7ffd5d038 +DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 8064ff973c9507536c4e6edb6146c33c6c3a994598f0bb925bd23307a5ed407af9fe744990735d640ea69def4a6aed69ee87b7abbacca401c0059cf63e6eb147 SHA512 883d15dd2f1420a067d35737c45431f33f05bbe3c7e7edab0e119416117b5d096972d71452eae94bfd3df23aa7d6595fc6e65208bd4fba86815162bdf9af8bef +DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80 +EBUILD groff-1.22.2.ebuild 2828 BLAKE2B cfdd8875e9b270ce3b38bbf4d707d34757c6d7b529041c85c7758b559936c0e3080062cca3a8d3461a8ade109f2d2cc81b735de5a6711010c5574d304cbda935 SHA512 6a28fdd8b6cdf9aeb5054631916a667aead8e1102cbee07322bb36bd8a1deb393818ba16418fd30819ea3d4ff573351b726f347a71283023995dee5bd50fc05b +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch b/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch --- a/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch false +++ b/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch df2bfb4312245bcdd6bcebf0440cd515e03bde02ad688f2c63cd048dc906008af7be1f30485a3af13b8d2e8341b9ff51ace3b793ae34da03813831658c91d07f @@ -0,0 +1,24 @@ +format dashes as dashes so as to not confuse people + +http://bugs.gentoo.org/16108 +http://bugs.gentoo.org/17580 +http://bugs.gentoo.org/121502 + +--- tmac/man.local ++++ tmac/man.local +@@ -1,2 +1,6 @@ + .\" This file is loaded after an-old.tmac. + .\" Put any local modifications to an-old.tmac here. ++.if '\*[.T]'utf8' \{\ ++. char \- \N'45' ++. char - \N'45' ++.\} +--- tmac/mdoc.local ++++ tmac/mdoc.local +@@ -1,2 +1,6 @@ + .\" This file is loaded after doc.tmac. + .\" Put any local modifications to doc.tmac here. ++.if '\*[.T]'utf8' \{\ ++. char \- \N'45' ++. char - \N'45' ++.\} diff -uNr a/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch b/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch --- a/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch false +++ b/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch feff5d29af470a1b56bc4b8d9d8d33f480c07480019e7efae11d2d6d73bb59d1616ba7e807bc3482756067ea494acfecb4a9df98899c97b4a247627758be95c6 @@ -0,0 +1,96 @@ +From 9f3af719383ab525c86ee0f514e268ef8494330a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Fri, 6 Dec 2013 20:40:10 -0500 +Subject: [PATCH] fix parallel build w/gropdf and mom examples + +The contrib/mom/examples/ directory uses the helper script from +src/devices/gropdf/. Currently though, parallel builds might fail +like so: + +... +make[2]: Entering directory `.../groff-1.22.2/contrib/mom' +GROFF_COMMAND_PREFIX= GROFF_BIN_PATH="`echo .../groff-1.22.2/src/roff/groff .../groff-1.22.2/src/roff/troff .../groff-1.22.2/src/devices/grops .../groff-1.22.2/src/devices/gropdf | sed -e 's| *|:|g'`" PDFMOM_BIN_PATH=".../groff-1.22.2/src/devices/gropdf" .../groff-1.22.2/src/devices/gropdf/pdfmom -F.../groff-1.22.2/font -F.../groff-1.22.2/font -M.../groff-1.22.2/tmac -M.../groff-1.22.2/tmac -M. examples/letter.mom >examples/letter.pdf +GROFF_COMMAND_PREFIX= GROFF_BIN_PATH="`echo .../groff-1.22.2/src/roff/groff .../groff-1.22.2/src/roff/troff .../groff-1.22.2/src/devices/grops .../groff-1.22.2/src/devices/gropdf | sed -e 's| *|:|g'`" PDFMOM_BIN_PATH=".../groff-1.22.2/src/devices/gropdf" .../groff-1.22.2/src/devices/gropdf/pdfmom -F.../groff-1.22.2/font -F.../groff-1.22.2/font -M.../groff-1.22.2/tmac -M.../groff-1.22.2/tmac -M. examples/mom-pdf.mom >examples/mom-pdf.pdf +/bin/sh: .../groff-1.22.2/src/devices/gropdf/pdfmom: No such file or directory +make[2]: *** [examples/letter.pdf] Error 127 +/bin/sh: .../groff-1.22.2/src/devices/gropdf/pdfmom: No such file or directory +make[2]: *** [examples/mom-pdf.pdf] Error 127 +make[2]: Leaving directory `.../groff-1.22.2/contrib/mom' +make[1]: *** [contrib/mom] Error 2 +... +make[2]: Entering directory `.../groff-1.22.2/src/devices/gropdf' +sed -f .../groff-1.22.2/arch/misc/shdeps.sed \ + -e "s|@VERSION@|1.22.2|" \ + -e "s|@PERLPATH@|/usr/bin/perl|" ./pdfmom.pl >pdfmom + +The top level makefile tries to account for this in general with OTHERDIRS, +but looks like src/devices/gropdf/ was added to this variable (which holds +contrib/mom/ too) because gropdf installs a shell script, and the other +prog vars require it to be a dir of things to compile. + +Declare a new prog var for holding shell scripts. + +URL: http://crbug.com/324116 +URL: https://bugs.gentoo.org/487276 +Signed-off-by: Mike Frysinger <vapier@gentoo.org> + +2013-12-06 Mike Frysinger <vapier@gentoo.org> + + * Makefile.in (SHPROGDIRS): Declare. + (PROGDIRS): Add $(SHPROGDIRS). + (OTHERDIRS): Delete src/devices/gropdf. + ($(SHPROGDIRS):): Add to existing rule. + ($(OTHERDIRS):): Depend on $(SHPROGDIRS). +--- + Makefile.in | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index a794de7..8e478af 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -602,12 +602,15 @@ CCPROGDIRS=\ + src/utils/addftinfo + CPROGDIRS=\ + src/utils/pfbtops ++SHPROGDIRS=\ ++ src/devices/gropdf + PROGDEPDIRS=\ + arch/misc + PROGDIRS=\ + $(PROGDEPDIRS) \ + $(CCPROGDIRS) \ + $(CPROGDIRS) \ ++ $(SHPROGDIRS) \ + $(XPROGDIRS) + DEVDIRS=\ + font/devps \ +@@ -637,7 +640,6 @@ OTHERDIRS=\ + contrib/glilypond \ + contrib/hdtbl \ + contrib/pdfmark \ +- src/devices/gropdf \ + font/devpdf \ + contrib/mom \ + contrib/gdiffmk +@@ -778,7 +780,7 @@ $(CCPROGDIRS): FORCE $(LIBDIRS) + -f $(top_srcdir)/Makefile.ccpg \ + -f Makefile.dep $(do) + +-$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) ++$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(SHPROGDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) + @$(ENVSETUP); \ + if test $(srcdir) = .; then \ + srcdir=.; \ +@@ -809,7 +811,7 @@ $(GNULIBDIRS): FORCE + $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \ + esac + +-$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) ++$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(SHPROGDIRS) + + $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE + @$(ENVSETUP); \ +-- +1.8.4.3 + diff -uNr a/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch b/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch --- a/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch false +++ b/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch 1a9af2b0ec67892f3f035c52e38088677652cee994f039d7f2b4addd2269601850e808369203f7a98631508d92c4dffd4b9cbdc3f47bac7cf79e694008370389 @@ -0,0 +1,11 @@ +--- groff-1.22.3/Makefile.in ++++ groff-1.22.3/Makefile.in +@@ -864,7 +864,7 @@ + -f $(top_srcdir)/Makefile.ccpg \ + -f Makefile.dep $(do) + +-$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE \ ++$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(SHPROGDIRS): FORCE \ + $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) + @$(ENVSETUP); \ + if test $(srcdir) = .; then \ diff -uNr a/sys-apps/groff/groff-1.22.2.ebuild b/sys-apps/groff/groff-1.22.2.ebuild --- a/sys-apps/groff/groff-1.22.2.ebuild false +++ b/sys-apps/groff/groff-1.22.2.ebuild 6530f4471710355d28647248e4ee2926fd143ba7e14544fceb8f523a583dcb15536ca92222e4dbf993f77c36ed4b74d0404ea46181bfc266ac1aba95a1beceb6 @@ -0,0 +1,95 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +inherit autotools eutils toolchain-funcs + +DESCRIPTION="Text formatter used for man pages" +HOMEPAGE="https://www.gnu.org/software/groff/groff.html" +SRC_URI="mirror://gnu/groff/${P}.tar.gz + l10n_ja? ( https://dev.gentoo.org/~naota/patch/${PN}-1.22.1-japanese.patch.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples X l10n_ja" + +RDEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXmu + x11-libs/libXaw + x11-libs/libSM + x11-libs/libICE + )" +DEPEND="${RDEPEND} + dev-lang/perl + l10n_ja? ( virtual/yacc )" + +DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION TODO VERSION ) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502 + epatch "${FILESDIR}"/${PN}-1.22.2-parallel-mom.patch #487276 + + # Make sure we can cross-compile this puppy + if tc-is-cross-compiler ; then + sed -i \ + -e '/^GROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/groff:' \ + -e '/^TROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/troff:' \ + -e '/^GROFF_BIN_PATH=/s:=.*:=:' \ + -e '/^GROFF_BIN_DIR=/s:=.*:=:' \ + contrib/*/Makefile.sub \ + doc/Makefile.in \ + doc/Makefile.sub || die "cross-compile sed failed" + fi + + local pfx=$(usex prefix ' Prefix' '') + cat <<-EOF >> tmac/mdoc.local + .ds volume-operating-system Gentoo${pfx} + .ds operating-system Gentoo${pfx}/${KERNEL} + .ds default-operating-system Gentoo${pfx}/${KERNEL} + EOF + + if use l10n_ja ; then + epatch "${WORKDIR}"/${PN}-1.22.1-japanese.patch #255292 #350534 #450796 + eautoconf + eautoheader + fi + + # make sure we don't get a crappy `g' nameprefix on UNIX systems with real + # troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy) + sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die +} + +src_configure() { + econf \ + --with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_with X x) \ + $(usex l10n_ja '--enable-japanese' '') +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + + # The following links are required for man #123674 + dosym eqn /usr/bin/geqn + dosym tbl /usr/bin/gtbl + + if ! use examples ; then + # The pdf files might not be generated if ghostscript is unavailable. #602020 + local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf" + if [[ -e ${pdf} ]] ; then + # Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732 + mv "${pdf}" "${ED}"/usr/share/doc/${PF}/pdf/ || die + fi + rm -rf "${ED}"/usr/share/doc/${PF}/examples + fi +} diff -uNr a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml --- a/sys-apps/groff/metadata.xml false +++ b/sys-apps/groff/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest --- a/sys-apps/help2man/Manifest false +++ b/sys-apps/help2man/Manifest 4ebd6fba58a43aef011bef01cebf0297bdc561712517a764ea6c280956c58ed37a398f64dc4767db0bfccd1e9ca8985ce7d5b4f410ea72c1fcc708de862cd846 @@ -0,0 +1,4 @@ +AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b +DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd +EBUILD help2man-1.47.4.ebuild 1083 BLAKE2B 7523e2059116c743bdee30f6fc6a5698f6d899e0c35215b0029195658084ffffc92db6afd02c4b5b3275c1d8d26a899c0afeac5bd8abc16bf1810ba3ed45130b SHA512 964a18c1fae41a4c6f45cca17f8109b0497c5334cb06dc88d5aabccf7337d66c8a53142473cac9b5efbc8d9bb5a9518b665b01f663e96fa7d6a3599ff16f7a65 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-apps/help2man/files/help2man-1.46.1-linguas.patch b/sys-apps/help2man/files/help2man-1.46.1-linguas.patch --- a/sys-apps/help2man/files/help2man-1.46.1-linguas.patch false +++ b/sys-apps/help2man/files/help2man-1.46.1-linguas.patch bdacc1a2d1cee1c094fd58a1cd9f6d94cb5839362d421007f9f2f7426e03bd9c49025f0dfac80d2423bdc48c3d94b9c21f7249c8e982368b950c26d3a62032b8 @@ -0,0 +1,67 @@ +respect user LINGUAS + +--- help2man-1.46.1/Makefile.in ++++ help2man-1.46.1/Makefile.in +@@ -27,8 +27,15 @@ + export VPATH = .:$(srcdir) + + DESTDIR = +-LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po))) +-LINGUAS_TEXI = $(basename $(notdir $(wildcard $(srcdir)/po-texi/*.po))) ++ALL_LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po))) ++ALL_LINGUAS_TEXI = $(basename $(notdir $(wildcard $(srcdir)/po-texi/*.po))) ++ifeq ($(LINGUAS),) ++INSTALL_LINGUAS = $(ALL_LINGUAS) ++INSTALL_LINGUAS_TEXI = $(ALL_LINGUAS_TEXI) ++else ++INSTALL_LINGUAS = $(filter $(LINGUAS),$(ALL_LINGUAS)) ++INSTALL_LINGUAS_TEXI = $(filter $(LINGUAS),$(ALL_LINGUAS_TEXI)) ++endif + + CC = @CC@ + PERL = @PERL@ +@@ -80,7 +87,7 @@ + + install_l10n: install_dirs msg_l10n man_l10n info_l10n + set -e; \ +- for lang in $(LINGUAS); \ ++ for lang in $(INSTALL_LINGUAS); \ + do \ + $(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ + $(INSTALL_DATA) $$($(FIND_VPATH) po/$$lang.gmo) \ +@@ -89,7 +96,7 @@ + $(INSTALL_DATA) $$($(FIND_VPATH) $(target).$$lang.1) \ + $(DESTDIR)$(mandir)/$$lang/man1/$(target).1; \ + done; \ +- for lang in $(LINGUAS_TEXI); \ ++ for lang in $(INSTALL_LINGUAS_TEXI); \ + do \ + $(INSTALL_DATA) $$($(FIND_VPATH) $(target)-$$lang.info) \ + $(DESTDIR)$(infodir)/$(target)-$$lang.info; \ +@@ -151,7 +158,7 @@ + $(MAKE) $(target) $(target).h2m + ./$(target) --include=$(target).h2m --output=$@ ./$(target) + +-msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(LINGUAS))) ++msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(ALL_LINGUAS))) + po/%.gmo: $(srcdir)/po/%.po + test -d po || mkdir po + $(MSGFMT) -o $@ $? +@@ -161,7 +168,7 @@ + $(MKINSTALLDIRS) localetmp/$$lang/LC_MESSAGES && \ + $(INSTALL_DATA) po/$$lang.gmo localetmp/$$lang/LC_MESSAGES/$(target).mo + +-man_l10n: $(addprefix $(target).,$(addsuffix .1,$(LINGUAS))) ++man_l10n: $(addprefix $(target).,$(addsuffix .1,$(ALL_LINGUAS))) + $(target).%.1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL \ + $(srcdir)/po/%.po + lang=$(patsubst $(target).%.1,%,$@); \ +@@ -184,7 +191,7 @@ + $(target).info: $(srcdir)/$(target).texi + $(MAKEINFO) $? -o $@ + +-info_l10n: $(addprefix $(target)-,$(addsuffix .info,$(LINGUAS_TEXI))) ++info_l10n: $(addprefix $(target)-,$(addsuffix .info,$(ALL_LINGUAS_TEXI))) + $(target)-%.info: $(target)-%.texi + $(MAKEINFO) $? -o $@.tmp + $(FIXUP_TEXI_TRANS) -o $@ $@.tmp diff -uNr a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild --- a/sys-apps/help2man/help2man-1.47.4.ebuild false +++ b/sys-apps/help2man/help2man-1.47.4.ebuild 5561ea9d48b923d4a81a9ae5273a1f661d097602b6b55034e624c47614bf3959c0b587cdf707e86a547f088ddf47e039de2861a1832244c00a8abb4e8ee81f41 @@ -0,0 +1,40 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils + +DESCRIPTION="GNU utility to convert program --help output to a man page" +HOMEPAGE="https://www.gnu.org/software/help2man/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls" + +RDEPEND="dev-lang/perl + nls? ( dev-perl/Locale-gettext )" +DEPEND=${RDEPEND} + +DOCS="debian/changelog NEWS README THANKS" #385753 + +PATCHES=( + "${FILESDIR}"/${PN}-1.46.1-linguas.patch +) + +src_prepare() { + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i \ + -e 's/-shared/-bundle/' \ + Makefile.in || die + fi + epatch "${PATCHES[@]}" +} + +src_configure() { + # Disable gettext requirement as the release includes the gmo files #555018 + econf \ + ac_cv_path_MSGFMT=$(type -P false) \ + $(use_enable nls) +} diff -uNr a/sys-apps/help2man/metadata.xml b/sys-apps/help2man/metadata.xml --- a/sys-apps/help2man/metadata.xml false +++ b/sys-apps/help2man/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest --- a/sys-apps/hwids/Manifest false +++ b/sys-apps/hwids/Manifest 102246fb8b7660e8827a3158f268f0d7f6beca76cf320a15bcdcbdfc5b59fe54ad210a21d4e3697c2f2ecc8789d6b9c7e345deb87939fb2c810e9d1fc8beaea5 @@ -0,0 +1,3 @@ +DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a +EBUILD hwids-20171003.ebuild 1706 BLAKE2B 9e5ca6bef971a2b88fd85470abfc24742b809a225640ca777990780a2fbc598ac26125d4b3ad51e7b02fecf668b3d648bc9d02d68f3818a7bcc438c7e1c83227 SHA512 ff3c5693b5d81a0d486d269b14c54e9489ae9e959f5c57d9268d2fb2b17723bc764b41ec62660eb7483efd91e8a28fa47a56bb67cdac4fd09ec3e947ead0b5a0 +MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c diff -uNr a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild --- a/sys-apps/hwids/hwids-20171003.ebuild false +++ b/sys-apps/hwids/hwids-20171003.ebuild 3a6e42022dc60a485180f36913bfadbcbed4a62799a612175c6d8be65688060d7476bbc283eb0256425216a80dd10d73d347a6521c1ddb564aadbea97a1f8ef5 @@ -0,0 +1,89 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit udev + +DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" +HOMEPAGE="https://github.com/gentoo/hwids" +if [[ ${PV} == "99999999" ]]; then + PYTHON_COMPAT=( python3_6 ) + inherit git-r3 python-any-r1 + EGIT_REPO_URI="${HOMEPAGE}.git" +else + SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +fi + +LICENSE="|| ( GPL-2 BSD ) public-domain" +SLOT="0" +IUSE="+net +pci +udev +usb" + +DEPEND="" +RDEPEND=" + udev? ( virtual/udev ) + !<sys-apps/pciutils-3.1.9-r2 + !<sys-apps/usbutils-005-r1 +" + +if [[ ${PV} == 99999999 ]]; then + DEPEND+=" + net-misc/curl + udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') ) + " + python_check_deps() { + if use udev; then + has_version --host-root "dev-python/pyparsing[${PYTHON_USEDEP}]" + fi + } +else + S=${WORKDIR}/hwids-${P} +fi + +pkg_setup() { + : +} + +src_unpack() { + if [[ ${PV} == 99999999 ]]; then + git-r3_src_unpack + cd "${S}" || die + emake fetch + else + default + fi +} + +src_prepare() { + default + sed -i -e '/udevadm hwdb/d' Makefile || die +} + +_emake() { + emake \ + NET=$(usex net) \ + PCI=$(usex pci) \ + UDEV=$(usex udev) \ + USB=$(usex usb) \ + "$@" +} + +src_compile() { + [[ ${PV} == 99999999 ]] && use udev && python_setup + _emake +} + +src_install() { + _emake install \ + DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ + MISCDIR="${EPREFIX}/usr/share/misc" \ + HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \ + DESTDIR="${D}" +} + +pkg_postinst() { + if use udev; then + udevadm hwdb --update --root="${ROOT%/}" + fi +} diff -uNr a/sys-apps/hwids/metadata.xml b/sys-apps/hwids/metadata.xml --- a/sys-apps/hwids/metadata.xml false +++ b/sys-apps/hwids/metadata.xml b053d27b269cb20de923e11d4b34fbe758ae888980913c65ae44f5434049bcb78eb214f47ee55131777b9f803a86570df7e9254352c59760f6bc059f634155a2 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<maintainer type="person"> + <email>floppym@gentoo.org</email> +</maintainer> +<use> + <flag name="net">Install the oui.txt and iab.txt databases</flag> + <flag name="pci">Install the pci.ids database</flag> + <flag name="usb">Install the usb.ids database</flag> + <flag name="udev">Install hwdb.d rules for udev</flag> +</use> +<upstream> + <remote-id type="github">gentoo/hwids</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest --- a/sys-apps/iproute2/Manifest false +++ b/sys-apps/iproute2/Manifest ee26943d67311bcbb9c850efc9884f0584135d5749b23f760e6ad7e51228740305e0f18c032bdf6e43b5209d60140a0acba092919f575494a60ea83b2f0d025d @@ -0,0 +1,13 @@ +AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 +AUX iproute2-4.11.0-no-ipv6.patch 1360 BLAKE2B 43881c76622159e6ae7f7499eddfc251b0cf1e0a8fa077d3099c509706b056c51685c3dff66e3381a2ca0839dd32d1534a310dff4acf329836ddd1bec6eb8241 SHA512 8e548f19079eea1d3a5a91bb657bba961c9e9206147e0e0aea1aaf04d74b46e2687c906b78561d939f53f4a33ecb9e08ad8237f401068076df5842c78bc3b577 +AUX iproute2-4.14.0-musl.patch 6957 BLAKE2B 29fed12a0e9bb921cd0f9c3fa16eff21abdef82d3c6bf2897452ea679ebfbbe6b5aba563c2594419464b1eec4121f2d56f21b7169c08a435a4f8adb0a45b3f85 SHA512 9cf0e267c41173a2e9becdd2a5e329c39211dab415c20cad8fb60a4fff0e859eef445bd55ee0e5b33fa93aff6967c709a63fad66dc3b896a916a224a2937eabc +AUX iproute2-4.14.1-configure-nomagic.patch 7334 BLAKE2B d1a79a653cdaa5907bc93a4283aa1576ec31d3d31a13898c7d923365c1f5068c5a76e52b33bfe2b9a190c273e35fb2125788bbd56ea03b4c01965c029660464b SHA512 0d09bc0a11ec32483a10db7e42a1620087f75063ce8bc24fed30f490eed2ee01d19bd092fb6cd392735c0c9434b13f70d562a469ed3d8a3b51b7fb25ceaf5af6 +AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e16717b8a1c51b6b76a774b6ce03126b7664fc5beb47e4f38672910e822b19aadd5c369d00553b2e6b6c30c012e03ad37b023cac4f7 SHA512 cdde7bb5a0cb49471472a8412758023529976dcafefc6a759ce758fba1b0420c046ca6faf084df81ac11e7153ac820909b1b9ec41c04f643208b9db456cfda28 +AUX iproute2-4.14.1-posix-shell.patch 1841 BLAKE2B ba1ab797c264dc74180b85f842810af120462df3e15523f132b67968f7be0ae68086d9c01f33cc70fb7680ce2229c76960fe7a232ce6bd1069903976c7143349 SHA512 bb4c3c75c25ec551fe006ae15a0e3bc31c1f49861083894d6d51320be52dbac60634951332135b888faf9363857b53695f3cc418029445a4578b5e9233aec4f3 +AUX iproute2-4.15.0-musl.patch 8725 BLAKE2B 14d0ade91e97cf890d0e11a20db8ee03bcc688346851e80983c4b13bf1d1e258c9db5fdf4c8e513d4e6dcbd608a3a63f4b6ff01447fba14afc1e40cf78eeb506 SHA512 674685aeba679e751cd570b321e4568e6ebec53b03d7772175f33fb4f094e981a65a4353566c0d2b6c6c274414deee9ccef00aba23b36aadc1d0eefab8c95ac0 +AUX iproute2-4.16.0-configure-nomagic.patch 5104 BLAKE2B 49c1cb559afe12eccae26f4547bcbcf8a030ee37d1ef287c178f55f01472e3b5f04d14f25834c99d3df25fae06246086197bd11446f1f50970aecc261b595f08 SHA512 b46d7ec009f924cae2d32c16e0f45c49ddb68af70dfa5d1fc0806c2ede85c744261fd1157d8ac4b1b1455604de456e2f68075b838b42265c3bfa88c021752de1 +AUX iproute2-4.16.0-keep-family.patch 833 BLAKE2B d9ee15781df4af10997238306c53cda9cde478f61c85dc1d1ad4238ea27c53fff3737bc474a354e1db22a8524f1209e920c0c9b8589a483733f78f34e38bb6bb SHA512 0bc11d6b0b7ed0a89693c73e948f42a1a8ad471e58c557a70d55c33acad53d4e6cf7dd07f92f840e73da757b094131c9ada29543d15e4f8dd0590d59a3616088 +AUX iproute2-4.17.0-musl.patch 9788 BLAKE2B f192b3ec3daa62a5329883a7fa417b8e395bbcba08b34c5c7abc9fc9846db73da14a9fce7ba154fafc730fec78adf6bce36f3958c7c5e1b9af429bf6007a9298 SHA512 2c525180f72a807c727a305b3579da24d70507889a93db74ba6ba4053ce79cae96af776a93b36c50ed41a5a9e40d2d88d34447ad273060fcaa92f91583445a6a +DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c +EBUILD iproute2-4.14.1-r2.ebuild 4084 BLAKE2B 111a65018b29928e5d0833f1602026eac2d1d4b4f077d7a5d51e4ce994c07affde85f2a55b1d1e425409e59eadcfa1d4bc7c2d13a5858964d26973f46be6053c SHA512 65c454be94782440e81c00f55d7e0c749594058b3584fdd835044b2aa451372716e634e5c4ce1b5baf3d47a17c5cf3fad3efefc5c74c1ae461d97ae779d01997 +MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97 diff -uNr a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch b/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch --- a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch false +++ b/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch 42d417d5f75091d95a312398d3088256ea94297eae090b0d0780fdce7f449774dc8fbc2632b6898849e28720e7c27b37450bde48a5a8f8bcb109de9b068f5f6f @@ -0,0 +1,48 @@ +http://bugs.gentoo.org/291907 + +This patch was merged from two patches extracted from this thread: +http://markmail.org/thread/qkd76gpdgefpjlfn + +tc_stab.c: small fixes to commandline help + + +tc_core.c: +As kernel part of things relies on cell align which is always set to -1, +I also added it to userspace computation stage. This way if someone +specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't +end with tsize supporting mtu 4096 suddenly, New default mtu is also set +to 2048 (disregarding weirdness of setting mtu to such values). + + +Unless I missed something, this is harmless and feels cleaner, but if it's +not allowed, documentation will have to be changed back to 2047 + extra +explanation as well. + +--- iproute2/tc/tc_core.c ++++ iproute2/tc/tc_core.c +@@ -155,12 +155,12 @@ + } + + if (s->mtu == 0) +- s->mtu = 2047; ++ s->mtu = 2048; + if (s->tsize == 0) + s->tsize = 512; + + s->cell_log = 0; +- while ((s->mtu >> s->cell_log) > s->tsize - 1) ++ while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1) + s->cell_log++; + + *stab = malloc(s->tsize * sizeof(__u16)); +--- iproute2/tc/tc_stab.c ++++ iproute2/tc/tc_stab.c +@@ -32,7 +32,7 @@ + fprintf(stderr, + "Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ] \n" + " [ overhead BYTES ] [ linklayer TYPE ] ...\n" +- " mtu : max packet size we create rate map for {2047}\n" ++ " mtu : max packet size we create size table for {2048}\n" + " tsize : how many slots should size table have {512}\n" + " mpu : minimum packet size used in rate computations\n" + " overhead : per-packet size overhead used in rate computations\n" diff -uNr a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch --- a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch false +++ b/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch b65ebde3b8b0a29955d6bfdc69d6a6e7a6af1754f0cff4df132cf36e4794a281fdeb7da35a49b42f3da6c9f46e1f22890c4120d83aceba12b6a55e5270a3b8c2 @@ -0,0 +1,37 @@ +--- iproute2-4.11.0/ip/ipmonitor.c ++++ iproute2-4.11.0/ip/ipmonitor.c +@@ -114,7 +114,6 @@ + } + if (n->nlmsg_type == RTM_NEWPREFIX) { + print_headers(fp, "[PREFIX]", ctrl); +- print_prefix(who, n, arg); + return 0; + } + if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) { +--- iproute2-4.11.0/ip/iptunnel.c ++++ iproute2-4.11.0/ip/iptunnel.c +@@ -589,13 +589,6 @@ + break; + case AF_INET: + break; +- /* +- * This is silly enough but we have no easy way to make it +- * protocol-independent because of unarranged structure between +- * IPv4 and IPv6. +- */ +- case AF_INET6: +- return do_ip6tunnel(argc, argv); + default: + fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family); + exit(-1); +--- iproute2-4.11.0/ip/Makefile ++++ iproute2-4.11.0/ip/Makefile +@@ -1,6 +1,6 @@ + IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ +- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ +- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \ ++ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ ++ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \ + ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \ + iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o \ + iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \ diff -uNr a/sys-apps/iproute2/files/iproute2-4.14.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.14.0-musl.patch --- a/sys-apps/iproute2/files/iproute2-4.14.0-musl.patch false +++ b/sys-apps/iproute2/files/iproute2-4.14.0-musl.patch 4503ad578a7dec89ae786e6be01c889641c1acc5946ebe288133d5710c2955fe1458c424dc214383b8a366b4f63d9b9da299fc27c28a2e019131993ccfdd37a8 @@ -0,0 +1,214 @@ +--- iproute2-4.14.0.orig/include/uapi/linux/if_ether.h ++++ iproute2-4.14.0/include/uapi/linux/if_ether.h +@@ -22,6 +22,7 @@ + #define _LINUX_IF_ETHER_H + + #include <linux/types.h> ++#include <linux/libc-compat.h> + + /* + * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble +@@ -142,11 +143,13 @@ + * This is an Ethernet frame header. + */ + ++#if __UAPI_DEF_ETHHDR + struct ethhdr { + unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ + unsigned char h_source[ETH_ALEN]; /* source ether addr */ + __be16 h_proto; /* packet type ID field */ + } __attribute__((packed)); ++#endif + + + #endif /* _LINUX_IF_ETHER_H */ +--- iproute2-4.14.0.orig/include/uapi/linux/if_tunnel.h ++++ iproute2-4.14.0/include/uapi/linux/if_tunnel.h +@@ -2,7 +2,6 @@ + #define _IF_TUNNEL_H_ + + #include <linux/types.h> +-#include <linux/if.h> + #include <linux/ip.h> + #include <linux/in6.h> + #include <asm/byteorder.h> +--- iproute2-4.14.0.orig/include/uapi/linux/ip6_tunnel.h ++++ iproute2-4.14.0/include/uapi/linux/ip6_tunnel.h +@@ -2,7 +2,6 @@ + #define _IP6_TUNNEL_H + + #include <linux/types.h> +-#include <linux/if.h> /* For IFNAMSIZ. */ + #include <linux/in6.h> /* For struct in6_addr. */ + + #define IPV6_TLV_TNL_ENCAP_LIMIT 4 +--- iproute2-4.14.0.orig/include/uapi/linux/kernel.h ++++ iproute2-4.14.0/include/uapi/linux/kernel.h +@@ -1,7 +1,9 @@ + #ifndef _LINUX_KERNEL_H + #define _LINUX_KERNEL_H + ++#ifdef __GLIBC__ + #include <linux/sysinfo.h> ++#endif + + /* + * 'kernel.h' contains some often-used function prototypes etc +--- iproute2-4.14.0.orig/include/uapi/linux/libc-compat.h ++++ iproute2-4.14.0/include/uapi/linux/libc-compat.h +@@ -48,47 +48,57 @@ + #ifndef _LIBC_COMPAT_H + #define _LIBC_COMPAT_H + +-/* We have included glibc headers... */ +-#if defined(__GLIBC__) ++/* We're used from userspace... */ ++#if !defined(__KERNEL__) + +-/* Coordinate with glibc net/if.h header. */ ++/* Coordinate with libc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + + #define __UAPI_DEF_IF_IFCONF 0 + #define __UAPI_DEF_IF_IFMAP 0 + #define __UAPI_DEF_IF_IFNAMSIZ 0 + #define __UAPI_DEF_IF_IFREQ 0 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++#if !defined(__GLIBC__) ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++#else + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ ++#endif /* !defined(__GLIBC__) */ + + #else /* _NET_IF_H */ + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + + #define __UAPI_DEF_IF_IFCONF 1 + #define __UAPI_DEF_IF_IFMAP 1 + #define __UAPI_DEF_IF_IFNAMSIZ 1 + #define __UAPI_DEF_IF_IFREQ 1 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + + #endif /* _NET_IF_H */ + +-/* Coordinate with glibc netinet/in.h header. */ ++/* Coordinate with libc netinet/if_ether.h */ ++#ifdef _NETINET_IF_ETHER_H ++#define __UAPI_DEF_ETHHDR 0 ++#else ++/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */ ++#define __UAPI_DEF_ETHHDR 1 ++#endif /* _NETINET_IF_ETHER_H */ ++ ++/* Coordinate with libc netinet/in.h header. */ + #if defined(_NETINET_IN_H) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + #define __UAPI_DEF_IN_ADDR 0 + #define __UAPI_DEF_IN_IPPROTO 0 +@@ -98,15 +108,7 @@ + #define __UAPI_DEF_IN_CLASS 0 + + #define __UAPI_DEF_IN6_ADDR 0 +-/* The exception is the in6_addr macros which must be defined +- * if the glibc code didn't define them. This guard matches +- * the guard in glibc/inet/netinet/in.h which defines the +- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ +-#if defined(__USE_MISC) || defined (__USE_GNU) + #define __UAPI_DEF_IN6_ADDR_ALT 0 +-#else +-#define __UAPI_DEF_IN6_ADDR_ALT 1 +-#endif + #define __UAPI_DEF_SOCKADDR_IN6 0 + #define __UAPI_DEF_IPV6_MREQ 0 + #define __UAPI_DEF_IPPROTO_V6 0 +@@ -117,7 +119,7 @@ + #else + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + #define __UAPI_DEF_IN_ADDR 1 + #define __UAPI_DEF_IN_IPPROTO 1 +@@ -127,7 +129,7 @@ + #define __UAPI_DEF_IN_CLASS 1 + + #define __UAPI_DEF_IN6_ADDR 1 +-/* We unconditionally define the in6_addr macros and glibc must ++/* We unconditionally define the in6_addr macros and libc must + * coordinate. */ + #define __UAPI_DEF_IN6_ADDR_ALT 1 + #define __UAPI_DEF_SOCKADDR_IN6 1 +@@ -168,18 +170,20 @@ + /* If we did not see any headers from any supported C libraries, + * or we are being included in the kernel, then define everything + * that we need. */ +-#else /* !defined(__GLIBC__) */ ++#else /* defined(__KERNEL__) */ + + /* Definitions for if.h */ + #define __UAPI_DEF_IF_IFCONF 1 + #define __UAPI_DEF_IF_IFMAP 1 + #define __UAPI_DEF_IF_IFNAMSIZ 1 + #define __UAPI_DEF_IF_IFREQ 1 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + ++/* Definitions for if/ether.h */ ++#define __UAPI_DEF_ETHHDR 1 ++ + /* Definitions for in.h */ + #define __UAPI_DEF_IN_ADDR 1 + #define __UAPI_DEF_IN_IPPROTO 1 +@@ -208,6 +212,6 @@ + /* Definitions for xattr.h */ + #define __UAPI_DEF_XATTR 1 + +-#endif /* __GLIBC__ */ ++#endif /* defined(__KERNEL__) */ + + #endif /* _LIBC_COMPAT_H */ +--- iproute2-4.14.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h ++++ iproute2-4.14.0/include/uapi/linux/netfilter_ipv4/ip_tables.h +@@ -17,7 +17,6 @@ + + #include <linux/types.h> + +-#include <linux/if.h> + #include <linux/netfilter_ipv4.h> + + #include <linux/netfilter/x_tables.h> +--- iproute2-4.14.0.orig/tc/f_flower.c ++++ iproute2-4.14.0/tc/f_flower.c +@@ -15,7 +15,7 @@ + #include <syslog.h> + #include <string.h> + #include <net/if.h> +-#include <linux/if_arp.h> ++#include <net/if_arp.h> + #include <linux/if_ether.h> + #include <linux/ip.h> + #include <linux/tc_act/tc_vlan.h> diff -uNr a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch --- a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch false +++ b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch 162214a9e8ab2a7b5caed6dd68258a844e3d208e423d24158a8d9533b355f8b2edd9c9775e3a3bbfd4caa42c6fc1ed40dc057392d42cf38c1c801b4df120ee93 @@ -0,0 +1,196 @@ +The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets +a variable as well as modifying CFLAGS & LDLIBS. + +If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks +are still in place. + +Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they +are only passed when correctly needed. + +Prior Gentoo testcase for reproduction: +USE=minimal ebuild ... compile. +- Linking with libelf & libmnl based only on presence. +- Links based on libselinux based only on presence. + +Closes: https://bugs.gentoo.org/643722 +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/bridge/Makefile iproute2-4.14.1/bridge/Makefile +--- iproute2-4.14.1.orig/bridge/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/bridge/Makefile 2018-01-07 14:24:23.350726423 -0800 +@@ -1,6 +1,7 @@ + BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o + + include ../config.mk ++include ../config.include + + all: bridge + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/config.include iproute2-4.14.1/config.include +--- iproute2-4.14.1.orig/config.include 1969-12-31 16:00:00.000000000 -0800 ++++ iproute2-4.14.1/config.include 2018-01-07 14:25:34.406126921 -0800 +@@ -0,0 +1,22 @@ ++# We can only modify CFLAGS/LDLIBS after all the config options are known. ++ifeq ($(IP_CONFIG_SETNS),y) ++ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) ++endif ++ifeq ($(HAVE_ELF),y) ++ CFLAGS += $(HAVE_ELF_CFLAGS) ++ LDLIBS += $(HAVE_ELF_LDLIBS) ++endif ++ifeq ($(HAVE_SELINUX),y) ++ CFLAGS += $(HAVE_SELINUX_CFLAGS) ++ LDLIBS += $(HAVE_SELINUX_LDLIBS) ++endif ++ifeq ($(HAVE_MNL),y) ++ CFLAGS += $(HAVE_MNL_CFLAGS) ++ LDLIBS += $(HAVE_MNL_LDLIBS) ++endif ++ ++# Rules can only be declared after all variables in them are known. ++%.o: %.c ++ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< ++ ++# vim: ft=make: +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/configure iproute2-4.14.1/configure +--- iproute2-4.14.1.orig/configure 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/configure 2018-01-07 14:25:49.242419367 -0800 +@@ -223,7 +223,7 @@ + then + echo "IP_CONFIG_SETNS:=y" >>$CONFIG + echo "yes" +- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG ++ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG + else + echo "no" + fi +@@ -268,8 +268,8 @@ + echo "HAVE_ELF:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG +- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG ++ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG ++ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG + else + echo "no" + fi +@@ -283,8 +283,8 @@ + echo "HAVE_SELINUX:=y" >>$CONFIG + echo "yes" + +- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG +- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG ++ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG ++ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG + else + echo "no" + fi +@@ -297,8 +297,8 @@ + echo "HAVE_MNL:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG +- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG ++ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG ++ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG + else + echo "no" + fi +@@ -425,7 +425,3 @@ + echo -n "docs:" + check_docs + echo +- +-echo >> $CONFIG +-echo "%.o: %.c" >> $CONFIG +-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/devlink/Makefile iproute2-4.14.1/devlink/Makefile +--- iproute2-4.14.1.orig/devlink/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/devlink/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -1,4 +1,5 @@ + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_MNL),y) + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/genl/Makefile iproute2-4.14.1/genl/Makefile +--- iproute2-4.14.1.orig/genl/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/genl/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -1,6 +1,7 @@ + GENLOBJ=genl.o + + include ../config.mk ++include ../config.include + SHARED_LIBS ?= y + + CFLAGS += -fno-strict-aliasing +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/ip/Makefile iproute2-4.14.1/ip/Makefile +--- iproute2-4.14.1.orig/ip/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/ip/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -14,6 +14,7 @@ + RTMONOBJ=rtmon.o + + include ../config.mk ++include ../config.include + + ALLOBJ=$(IPOBJ) $(RTMONOBJ) + SCRIPTS=ifcfg rtpr routel routef +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/lib/Makefile iproute2-4.14.1/lib/Makefile +--- iproute2-4.14.1.orig/lib/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/lib/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -1,4 +1,5 @@ + include ../config.mk ++include ../config.include + + CFLAGS += -fPIC + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/misc/Makefile iproute2-4.14.1/misc/Makefile +--- iproute2-4.14.1.orig/misc/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/misc/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -4,6 +4,7 @@ + TARGETS=ss nstat ifstat rtacct lnstat + + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_BERKELEY_DB),y) + TARGETS += arpd +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/netem/Makefile iproute2-4.14.1/netem/Makefile +--- iproute2-4.14.1.orig/netem/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/netem/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -1,4 +1,5 @@ + include ../config.mk ++include ../config.include + + DISTGEN = maketable normal pareto paretonormal + DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/rdma/Makefile iproute2-4.14.1/rdma/Makefile +--- iproute2-4.14.1.orig/rdma/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/rdma/Makefile 2018-01-07 14:24:23.352726462 -0800 +@@ -1,4 +1,5 @@ + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_MNL),y) + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tc/Makefile iproute2-4.14.1/tc/Makefile +--- iproute2-4.14.1.orig/tc/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/tc/Makefile 2018-01-07 14:24:23.352726462 -0800 +@@ -3,6 +3,7 @@ + emp_ematch.yacc.o emp_ematch.lex.o + + include ../config.mk ++include ../config.include + + SHARED_LIBS ?= y + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tipc/Makefile iproute2-4.14.1/tipc/Makefile +--- iproute2-4.14.1.orig/tipc/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/tipc/Makefile 2018-01-07 14:24:23.352726462 -0800 +@@ -1,4 +1,5 @@ + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_MNL),y) + diff -uNr a/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch b/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch --- a/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch false +++ b/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch 4f33f12c1f99fe0032e7448df1caf4239d4ed55f2d2a7edee6993d3f1621576fcfa6c54e40f993e02eb679703a187989a19fe49b6fe2652024579a0f982ee660 @@ -0,0 +1,222 @@ +From 3572e01a090a298e2f4c4f796bad6639b652e031 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik <mprivozn@redhat.com> +Date: Fri, 8 Dec 2017 11:18:07 +0100 +Subject: tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() + +Not all callers want parse_action_control*() to advance the +arguments. For instance act_parse_police() does the argument +advancing itself. + +Fixes: e67aba559581 ("tc: actions: add helpers to parse and print control actions") +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + tc/m_bpf.c | 1 + + tc/m_connmark.c | 1 + + tc/m_csum.c | 1 + + tc/m_gact.c | 10 +++++----- + tc/m_ife.c | 1 + + tc/m_mirred.c | 4 +++- + tc/m_nat.c | 1 + + tc/m_pedit.c | 1 + + tc/m_sample.c | 1 + + tc/m_skbedit.c | 1 + + tc/m_skbmod.c | 1 + + tc/m_tunnel_key.c | 1 + + tc/m_vlan.c | 1 + + tc/tc_util.c | 1 - + 14 files changed, 19 insertions(+), 7 deletions(-) + +diff --git a/tc/m_bpf.c b/tc/m_bpf.c +index 1c1f71c..576f69c 100644 +--- a/tc/m_bpf.c ++++ b/tc/m_bpf.c +@@ -129,6 +129,7 @@ opt_bpf: + + parse_action_control_dflt(&argc, &argv, &parm.action, + false, TC_ACT_PIPE); ++ NEXT_ARG_FWD(); + + if (argc) { + if (matches(*argv, "index") == 0) { +diff --git a/tc/m_connmark.c b/tc/m_connmark.c +index 37d7185..47c7a8c 100644 +--- a/tc/m_connmark.c ++++ b/tc/m_connmark.c +@@ -82,6 +82,7 @@ parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + } + + parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_PIPE); ++ NEXT_ARG_FWD(); + + if (argc) { + if (matches(*argv, "index") == 0) { +diff --git a/tc/m_csum.c b/tc/m_csum.c +index 7b15673..e1352c0 100644 +--- a/tc/m_csum.c ++++ b/tc/m_csum.c +@@ -124,6 +124,7 @@ parse_csum(struct action_util *a, int *argc_p, + } + + parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK); ++ NEXT_ARG_FWD(); + + if (argc) { + if (matches(*argv, "index") == 0) { +diff --git a/tc/m_gact.c b/tc/m_gact.c +index e7d91da..b30b042 100644 +--- a/tc/m_gact.c ++++ b/tc/m_gact.c +@@ -87,14 +87,13 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, + if (argc < 0) + return -1; + +- +- if (matches(*argv, "gact") == 0) { +- argc--; +- argv++; +- } else if (parse_action_control(&argc, &argv, &p.action, false) == -1) { ++ if (matches(*argv, "gact") != 0 && ++ parse_action_control(&argc, &argv, &p.action, false) == -1) { + usage(); /* does not return */ + } + ++ NEXT_ARG_FWD(); ++ + #ifdef CONFIG_GACT_PROB + if (argc > 0) { + if (matches(*argv, "random") == 0) { +@@ -114,6 +113,7 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, + if (parse_action_control(&argc, &argv, + &pp.paction, false) == -1) + usage(); ++ NEXT_ARG_FWD(); + if (get_u16(&pp.pval, *argv, 10)) { + fprintf(stderr, + "Illegal probability val 0x%x\n", +diff --git a/tc/m_ife.c b/tc/m_ife.c +index 205efc9..4647f6a 100644 +--- a/tc/m_ife.c ++++ b/tc/m_ife.c +@@ -159,6 +159,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p, + + parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_mirred.c b/tc/m_mirred.c +index 3870d3a..aa7ce6d 100644 +--- a/tc/m_mirred.c ++++ b/tc/m_mirred.c +@@ -202,8 +202,10 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p, + } + + +- if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) ++ if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) { + parse_action_control(&argc, &argv, &p.action, false); ++ NEXT_ARG_FWD(); ++ } + + if (argc) { + if (iok && matches(*argv, "index") == 0) { +diff --git a/tc/m_nat.c b/tc/m_nat.c +index 1e4ff51..f5de4d4 100644 +--- a/tc/m_nat.c ++++ b/tc/m_nat.c +@@ -116,6 +116,7 @@ parse_nat(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struct + + parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_pedit.c b/tc/m_pedit.c +index 26549ee..dc57f14 100644 +--- a/tc/m_pedit.c ++++ b/tc/m_pedit.c +@@ -672,6 +672,7 @@ int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + + parse_action_control_dflt(&argc, &argv, &sel.sel.action, false, TC_ACT_OK); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_sample.c b/tc/m_sample.c +index ff5ee6b..31774c0 100644 +--- a/tc/m_sample.c ++++ b/tc/m_sample.c +@@ -100,6 +100,7 @@ static int parse_sample(struct action_util *a, int *argc_p, char ***argv_p, + + parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c +index aa374fc..c41a7bb 100644 +--- a/tc/m_skbedit.c ++++ b/tc/m_skbedit.c +@@ -123,6 +123,7 @@ parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + parse_action_control_dflt(&argc, &argv, &sel.action, + false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c +index 561b73f..bc268df 100644 +--- a/tc/m_skbmod.c ++++ b/tc/m_skbmod.c +@@ -124,6 +124,7 @@ static int parse_skbmod(struct action_util *a, int *argc_p, char ***argv_p, + + parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c +index 1cdd035..2dc9187 100644 +--- a/tc/m_tunnel_key.c ++++ b/tc/m_tunnel_key.c +@@ -175,6 +175,7 @@ static int parse_tunnel_key(struct action_util *a, int *argc_p, char ***argv_p, + parse_action_control_dflt(&argc, &argv, &parm.action, + false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_vlan.c b/tc/m_vlan.c +index 161759f..edae0d1 100644 +--- a/tc/m_vlan.c ++++ b/tc/m_vlan.c +@@ -131,6 +131,7 @@ static int parse_vlan(struct action_util *a, int *argc_p, char ***argv_p, + parse_action_control_dflt(&argc, &argv, &parm.action, + false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/tc_util.c b/tc/tc_util.c +index 1887905..ee9a70a 100644 +--- a/tc/tc_util.c ++++ b/tc/tc_util.c +@@ -586,7 +586,6 @@ static int __parse_action_control(int *argc_p, char ***argv_p, int *result_p, + } + result |= jump_cnt; + } +- NEXT_ARG_FWD(); + *argc_p = argc; + *argv_p = argv; + *result_p = result; +-- +cgit v1.1 + diff -uNr a/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch b/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch --- a/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch false +++ b/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch 21f8a0037bfa217bf9f1f5aae0df8df67dcd6d9124397782d298a4e2930b77280f2c529e151acf769961a4f7129c8b52bcb0b6cc2193d03cdad1a33591f56189 @@ -0,0 +1,65 @@ +https://marc.info/?l=linux-netdev&m=151554000532498&w=2 + +From aec69bbc285e5498add5384b6018564355594233 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@chromium.org> +Date: Tue, 9 Jan 2018 18:16:53 -0500 +Subject: [PATCH iproute2] ifcfg/rtpr: convert to POSIX shell + +These files are already mostly written in POSIX shell, so convert their +shebangs to /bin/sh and tweak the few bashisms in here. + +URL: https://crbug.com/756559 +Reported-by: Pat Erley <perley@chromium.org> +Signed-off-by: Mike Frysinger <vapier@chromium.org> +--- + ip/ifcfg | 12 ++++++------ + ip/rtpr | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/ip/ifcfg b/ip/ifcfg +index 851b9215ab63..5b34decd4480 100644 +--- a/ip/ifcfg ++++ b/ip/ifcfg +@@ -1,3 +1,3 @@ +-#! /bin/bash ++#! /bin/sh + + CheckForwarding () { +@@ -7,7 +7,7 @@ CheckForwarding () { + fwd=0 + if [ -d $sbase ]; then + for dir in $sbase/*/forwarding; do +- fwd=$[$fwd + `cat $dir`] ++ fwd=$(( fwd + $(cat "$dir") )) + done + else + fwd=2 +@@ -128,12 +128,12 @@ fi + arping -q -A -c 1 -I $dev $ipaddr + noarp=$? + ( sleep 2 ; +- arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null & ++ arping -q -U -c 1 -I $dev $ipaddr ) >/dev/null 2>&1 </dev/null & + +-ip route add unreachable 224.0.0.0/24 >& /dev/null +-ip route add unreachable 255.255.255.255 >& /dev/null ++ip route add unreachable 224.0.0.0/24 >/dev/null 2>&1 ++ip route add unreachable 255.255.255.255 >/dev/null 2>&1 + if [ "`ip link ls $dev | grep -c MULTICAST`" -ge 1 ]; then +- ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null ++ ip route add 224.0.0.0/4 dev $dev scope global >/dev/null 2>&1 + fi + + if [ $fwd -eq 0 ]; then +diff --git a/ip/rtpr b/ip/rtpr +index 192a476f817e..7e48674bcf53 100644 +--- a/ip/rtpr ++++ b/ip/rtpr +@@ -1,3 +1,3 @@ +-#! /bin/bash ++#! /bin/sh + + exec tr "[\\\\]" "[ +-- +2.15.1 + diff -uNr a/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch --- a/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch false +++ b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch 6e39b5bcce18c2c9b5a2bee98e52e683007d05c3c009daf2b8855b86c848c3c06dc25796586385bdb84cd4e1832601fb7769552f5ff419dcc820683dd4b8c2ab @@ -0,0 +1,234 @@ +diff -Naur iproute2-4.15.0.orig/include/uapi/linux/if_tunnel.h iproute2-4.15.0/include/uapi/linux/if_tunnel.h +--- iproute2-4.15.0.orig/include/uapi/linux/if_tunnel.h 2018-01-30 12:22:46.392424243 -0800 ++++ iproute2-4.15.0/include/uapi/linux/if_tunnel.h 2018-01-30 12:23:57.131422976 -0800 +@@ -3,7 +3,6 @@ + #define _IF_TUNNEL_H_ + + #include <linux/types.h> +-#include <linux/if.h> + #include <linux/ip.h> + #include <linux/in6.h> + #include <asm/byteorder.h> +diff -Naur iproute2-4.15.0.orig/include/uapi/linux/ip6_tunnel.h iproute2-4.15.0/include/uapi/linux/ip6_tunnel.h +--- iproute2-4.15.0.orig/include/uapi/linux/ip6_tunnel.h 2018-01-30 12:22:46.393424243 -0800 ++++ iproute2-4.15.0/include/uapi/linux/ip6_tunnel.h 2018-01-30 12:24:05.957422818 -0800 +@@ -3,7 +3,6 @@ + #define _IP6_TUNNEL_H + + #include <linux/types.h> +-#include <linux/if.h> /* For IFNAMSIZ. */ + #include <linux/in6.h> /* For struct in6_addr. */ + + #define IPV6_TLV_TNL_ENCAP_LIMIT 4 +diff -Naur iproute2-4.15.0.orig/include/uapi/linux/kernel.h iproute2-4.15.0/include/uapi/linux/kernel.h +--- iproute2-4.15.0.orig/include/uapi/linux/kernel.h 2018-01-30 12:22:46.393424243 -0800 ++++ iproute2-4.15.0/include/uapi/linux/kernel.h 2018-01-30 12:24:21.576422539 -0800 +@@ -2,7 +2,9 @@ + #ifndef _LINUX_KERNEL_H + #define _LINUX_KERNEL_H + ++#ifdef __GLIBC__ + #include <linux/sysinfo.h> ++#endif + + /* + * 'kernel.h' contains some often-used function prototypes etc +diff -Naur iproute2-4.15.0.orig/include/uapi/linux/libc-compat.h iproute2-4.15.0/include/uapi/linux/libc-compat.h +--- iproute2-4.15.0.orig/include/uapi/linux/libc-compat.h 2018-01-30 12:22:46.393424243 -0800 ++++ iproute2-4.15.0/include/uapi/linux/libc-compat.h 2018-01-30 12:33:58.575412206 -0800 +@@ -49,47 +49,57 @@ + #ifndef _LIBC_COMPAT_H + #define _LIBC_COMPAT_H + +-/* We have included glibc headers... */ +-#if defined(__GLIBC__) ++/* We're used from userspace... */ ++#if !defined(__KERNEL__) + +-/* Coordinate with glibc net/if.h header. */ ++/* Coordinate with libc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + + #define __UAPI_DEF_IF_IFCONF 0 + #define __UAPI_DEF_IF_IFMAP 0 + #define __UAPI_DEF_IF_IFNAMSIZ 0 + #define __UAPI_DEF_IF_IFREQ 0 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 ++#if !defined(__GLIBC__) ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++#else + /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ ++#endif /* !defined(__GLIBC__) */ + + #else /* _NET_IF_H */ + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + + #define __UAPI_DEF_IF_IFCONF 1 + #define __UAPI_DEF_IF_IFMAP 1 + #define __UAPI_DEF_IF_IFNAMSIZ 1 + #define __UAPI_DEF_IF_IFREQ 1 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 + /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + + #endif /* _NET_IF_H */ + +-/* Coordinate with glibc netinet/in.h header. */ ++/* Coordinate with libc netinet/if_ether.h */ ++#ifdef _NETINET_IF_ETHER_H ++#define __UAPI_DEF_ETHHDR 0 ++#else ++/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */ ++#define __UAPI_DEF_ETHHDR 1 ++#endif /* _NETINET_IF_ETHER_H */ ++ ++/* Coordinate with libc netinet/in.h header. */ + #if defined(_NETINET_IN_H) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + #define __UAPI_DEF_IN_ADDR 0 + #define __UAPI_DEF_IN_IPPROTO 0 +@@ -99,15 +109,7 @@ + #define __UAPI_DEF_IN_CLASS 0 + + #define __UAPI_DEF_IN6_ADDR 0 +-/* The exception is the in6_addr macros which must be defined +- * if the glibc code didn't define them. This guard matches +- * the guard in glibc/inet/netinet/in.h which defines the +- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ +-#if defined(__USE_MISC) || defined (__USE_GNU) + #define __UAPI_DEF_IN6_ADDR_ALT 0 +-#else +-#define __UAPI_DEF_IN6_ADDR_ALT 1 +-#endif + #define __UAPI_DEF_SOCKADDR_IN6 0 + #define __UAPI_DEF_IPV6_MREQ 0 + #define __UAPI_DEF_IPPROTO_V6 0 +@@ -118,7 +120,7 @@ + #else + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + #define __UAPI_DEF_IN_ADDR 1 + #define __UAPI_DEF_IN_IPPROTO 1 +@@ -170,7 +172,7 @@ + * or we are being included in the kernel, then define everything + * that we need. Check for previous __UAPI_* definitions to give + * unsupported C libraries a way to opt out of any kernel definition. */ +-#else /* !defined(__GLIBC__) */ ++#else /* defined(__KERNEL__) */ + + /* Definitions for if.h */ + #ifndef __UAPI_DEF_IF_IFCONF +@@ -185,7 +187,6 @@ + #ifndef __UAPI_DEF_IF_IFREQ + #define __UAPI_DEF_IF_IFREQ 1 + #endif +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 + #endif +@@ -262,7 +263,7 @@ + #define __UAPI_DEF_XATTR 1 + #endif + +-#endif /* __GLIBC__ */ ++#endif /* defined(__KERNEL__) */ + + /* Definitions for if_ether.h */ + /* allow libcs like musl to deactivate this, glibc does not implement this. */ +diff -Naur iproute2-4.15.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h iproute2-4.15.0/include/uapi/linux/netfilter_ipv4/ip_tables.h +--- iproute2-4.15.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h 2018-01-30 12:22:46.394424243 -0800 ++++ iproute2-4.15.0/include/uapi/linux/netfilter_ipv4/ip_tables.h 2018-01-30 12:34:19.157411837 -0800 +@@ -18,7 +18,6 @@ + + #include <linux/types.h> + +-#include <linux/if.h> + #include <linux/netfilter_ipv4.h> + + #include <linux/netfilter/x_tables.h> +diff -Naur iproute2-4.15.0.orig/tc/f_flower.c iproute2-4.15.0/tc/f_flower.c +--- iproute2-4.15.0.orig/tc/f_flower.c 2018-01-30 12:22:46.367424244 -0800 ++++ iproute2-4.15.0/tc/f_flower.c 2018-01-30 12:34:36.182411532 -0800 +@@ -14,7 +14,7 @@ + #include <unistd.h> + #include <string.h> + #include <net/if.h> +-#include <linux/if_arp.h> ++#include <net/if_arp.h> + #include <linux/if_ether.h> + #include <linux/ip.h> + #include <linux/tc_act/tc_vlan.h> +diff -Naur iproute2-4.15.0.orig/tc/m_mirred.c iproute2-4.15.0/tc/m_mirred.c +--- iproute2-4.15.0.orig/tc/m_mirred.c 2018-01-30 12:22:46.377424243 -0800 ++++ iproute2-4.15.0/tc/m_mirred.c 2018-01-30 12:57:12.620387241 -0800 +@@ -17,6 +17,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/socket.h> ++#include <net/if.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <string.h> +diff -Naur iproute2-4.15.0.orig/tc/tc_class.c iproute2-4.15.0/tc/tc_class.c +--- iproute2-4.15.0.orig/tc/tc_class.c 2018-01-30 12:22:46.369424244 -0800 ++++ iproute2-4.15.0/tc/tc_class.c 2018-01-30 12:54:53.420389734 -0800 +@@ -15,6 +15,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/socket.h> ++#include <net/if.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <string.h> +diff -Naur iproute2-4.15.0.orig/tc/tc_filter.c iproute2-4.15.0/tc/tc_filter.c +--- iproute2-4.15.0.orig/tc/tc_filter.c 2018-01-30 12:22:46.368424244 -0800 ++++ iproute2-4.15.0/tc/tc_filter.c 2018-01-30 12:56:02.186388502 -0800 +@@ -15,6 +15,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/socket.h> ++#include <net/if.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <string.h> +diff -Naur iproute2-4.15.0.orig/tc/tc_qdisc.c iproute2-4.15.0/tc/tc_qdisc.c +--- iproute2-4.15.0.orig/tc/tc_qdisc.c 2018-01-30 12:22:46.368424244 -0800 ++++ iproute2-4.15.0/tc/tc_qdisc.c 2018-01-30 12:53:37.801391088 -0800 +@@ -15,6 +15,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/socket.h> ++#include <net/if.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <string.h> +diff -Naur iproute2-4.15.0.orig/tc/tc_util.h iproute2-4.15.0/tc/tc_util.h +--- iproute2-4.15.0.orig/tc/tc_util.h 2018-01-30 12:22:46.367424244 -0800 ++++ iproute2-4.15.0/tc/tc_util.h 2018-01-30 12:51:24.463393476 -0800 +@@ -4,7 +4,6 @@ + + #define MAX_MSG 16384 + #include <limits.h> +-#include <linux/if.h> + + #include <linux/pkt_sched.h> + #include <linux/pkt_cls.h> diff -uNr a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch --- a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch false +++ b/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch e695cbe42b2519674d99130daae7295638d51107324469435bd43c42c3921f4cb35a835f0aa5fcd9bc5bd6e74e2b31e0ea018d3fb94ea9452d99ab9721c8250b @@ -0,0 +1,191 @@ +The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets +a variable as well as modifying CFLAGS & LDLIBS. + +If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks +are still in place. + +Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they +are only passed when correctly needed. + +Prior Gentoo testcase for reproduction: +USE=minimal ebuild ... compile. +- Linking with libelf & libmnl based only on presence. +- Links based on libselinux based only on presence. + +Closes: https://bugs.gentoo.org/643722 +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org> + +--- iproute2-4.16.0/bridge/Makefile ++++ iproute2-4.16.0/bridge/Makefile +@@ -2,6 +2,7 @@ + BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o + + include ../config.mk ++include ../config.include + + all: bridge + +--- iproute2-4.16.0/config.include ++++ iproute2-4.16.0/config.include +@@ -0,0 +1,22 @@ ++# We can only modify CFLAGS/LDLIBS after all the config options are known. ++ifeq ($(IP_CONFIG_SETNS),y) ++ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) ++endif ++ifeq ($(HAVE_ELF),y) ++ CFLAGS += $(HAVE_ELF_CFLAGS) ++ LDLIBS += $(HAVE_ELF_LDLIBS) ++endif ++ifeq ($(HAVE_SELINUX),y) ++ CFLAGS += $(HAVE_SELINUX_CFLAGS) ++ LDLIBS += $(HAVE_SELINUX_LDLIBS) ++endif ++ifeq ($(HAVE_MNL),y) ++ CFLAGS += $(HAVE_MNL_CFLAGS) ++ LDLIBS += $(HAVE_MNL_LDLIBS) ++endif ++ ++# Rules can only be declared after all variables in them are known. ++%.o: %.c ++ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< ++ ++# vim: ft=make: +--- iproute2-4.16.0/configure ++++ iproute2-4.16.0/configure +@@ -212,7 +212,7 @@ + then + echo "IP_CONFIG_SETNS:=y" >>$CONFIG + echo "yes" +- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG ++ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG + else + echo "no" + fi +@@ -257,8 +257,8 @@ + echo "HAVE_ELF:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG +- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG ++ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG ++ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG + else + echo "no" + fi +@@ -272,8 +272,8 @@ + echo "HAVE_SELINUX:=y" >>$CONFIG + echo "yes" + +- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG +- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG ++ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG ++ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG + else + echo "no" + fi +@@ -286,8 +286,8 @@ + echo "HAVE_MNL:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG +- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG ++ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG ++ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG + else + echo "no" + fi +@@ -426,7 +426,3 @@ + + echo -n "libcap support: " + check_cap +- +-echo >> $CONFIG +-echo "%.o: %.c" >> $CONFIG +-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG +--- iproute2-4.16.0/devlink/Makefile ++++ iproute2-4.16.0/devlink/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + +--- iproute2-4.16.0/genl/Makefile ++++ iproute2-4.16.0/genl/Makefile +@@ -2,6 +2,7 @@ + GENLOBJ=genl.o + + include ../config.mk ++include ../config.include + SHARED_LIBS ?= y + + CFLAGS += -fno-strict-aliasing +--- iproute2-4.16.0/ip/Makefile ++++ iproute2-4.16.0/ip/Makefile +@@ -15,6 +15,7 @@ + RTMONOBJ=rtmon.o + + include ../config.mk ++include ../config.include + + ALLOBJ=$(IPOBJ) $(RTMONOBJ) + SCRIPTS=ifcfg rtpr routel routef +--- iproute2-4.16.0/lib/Makefile ++++ iproute2-4.16.0/lib/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + CFLAGS += -fPIC + +--- iproute2-4.16.0/misc/Makefile ++++ iproute2-4.16.0/misc/Makefile +@@ -5,6 +5,7 @@ + TARGETS=ss nstat ifstat rtacct lnstat + + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_BERKELEY_DB),y) + TARGETS += arpd +--- iproute2-4.16.0/netem/Makefile ++++ iproute2-4.16.0/netem/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + DISTGEN = maketable normal pareto paretonormal + DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist +--- iproute2-4.16.0/rdma/Makefile ++++ iproute2-4.16.0/rdma/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + +--- iproute2-4.16.0/tc/Makefile ++++ iproute2-4.16.0/tc/Makefile +@@ -4,6 +4,7 @@ + emp_ematch.yacc.o emp_ematch.lex.o + + include ../config.mk ++include ../config.include + + SHARED_LIBS ?= y + +--- iproute2-4.16.0/tipc/Makefile ++++ iproute2-4.16.0/tipc/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + include ../config.mk ++include ../config.include + + TARGETS := + diff -uNr a/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch b/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch --- a/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch false +++ b/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch 75407f5bba08d689789938d38f888a2cbfeff4417ea617c8cec5650130e020c8374e7a2d37c2cdcca38cb4324f2529c5894907dd503fb51e9beb01fee8abe143 @@ -0,0 +1,25 @@ +Bug: https://bugs.gentoo.org/652986 + +https://marc.info/?l=linux-netdev&m=152363743818340&w=2 + +--- a/lib/utils.c ++++ b/lib/utils.c +@@ -568,7 +568,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family) + if (strcmp(name, "default") == 0) { + if ((family == AF_DECnet) || (family == AF_MPLS)) + return -1; +- addr->family = (family != AF_UNSPEC) ? family : AF_INET; ++ addr->family = family; + addr->bytelen = af_byte_len(addr->family); + addr->bitlen = -2; + addr->flags |= PREFIXLEN_SPECIFIED; +@@ -579,7 +579,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family) + strcmp(name, "any") == 0) { + if ((family == AF_DECnet) || (family == AF_MPLS)) + return -1; +- addr->family = AF_UNSPEC; ++ addr->family = family; + addr->bytelen = 0; + addr->bitlen = -2; + return 0; +-- diff -uNr a/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch --- a/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch false +++ b/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch c4fc1906e7c55a62a6a226c87ad111bd481d6db674964e177ff8e49189c667ac4e8752eb84c1b740812b56b0a7539bd7f8c0338c89ddac6697e992aa5f823fc5 @@ -0,0 +1,268 @@ +diff -Naur iproute2-4.17.0.orig/include/uapi/linux/if_tunnel.h iproute2-4.17.0/include/uapi/linux/if_tunnel.h +--- iproute2-4.17.0.orig/include/uapi/linux/if_tunnel.h 2018-06-11 10:31:44.723159108 -0700 ++++ iproute2-4.17.0/include/uapi/linux/if_tunnel.h 2018-06-11 10:32:17.676158518 -0700 +@@ -3,7 +3,6 @@ + #define _IF_TUNNEL_H_ + + #include <linux/types.h> +-#include <linux/if.h> + #include <linux/ip.h> + #include <linux/in6.h> + #include <asm/byteorder.h> +diff -Naur iproute2-4.17.0.orig/include/uapi/linux/ip6_tunnel.h iproute2-4.17.0/include/uapi/linux/ip6_tunnel.h +--- iproute2-4.17.0.orig/include/uapi/linux/ip6_tunnel.h 2018-06-11 10:31:44.722159108 -0700 ++++ iproute2-4.17.0/include/uapi/linux/ip6_tunnel.h 2018-06-11 10:32:24.676158393 -0700 +@@ -3,7 +3,6 @@ + #define _IP6_TUNNEL_H + + #include <linux/types.h> +-#include <linux/if.h> /* For IFNAMSIZ. */ + #include <linux/in6.h> /* For struct in6_addr. */ + + #define IPV6_TLV_TNL_ENCAP_LIMIT 4 +diff -Naur iproute2-4.17.0.orig/include/uapi/linux/kernel.h iproute2-4.17.0/include/uapi/linux/kernel.h +--- iproute2-4.17.0.orig/include/uapi/linux/kernel.h 2018-06-11 10:31:44.722159108 -0700 ++++ iproute2-4.17.0/include/uapi/linux/kernel.h 2018-06-11 10:32:41.676158088 -0700 +@@ -2,7 +2,9 @@ + #ifndef _LINUX_KERNEL_H + #define _LINUX_KERNEL_H + ++#ifdef __GLIBC__ + #include <linux/sysinfo.h> ++#endif + + /* + * 'kernel.h' contains some often-used function prototypes etc +diff -Naur iproute2-4.17.0.orig/include/uapi/linux/libc-compat.h iproute2-4.17.0/include/uapi/linux/libc-compat.h +--- iproute2-4.17.0.orig/include/uapi/linux/libc-compat.h 2018-06-11 10:31:44.721159108 -0700 ++++ iproute2-4.17.0/include/uapi/linux/libc-compat.h 2018-06-11 10:37:37.376152793 -0700 +@@ -49,47 +49,57 @@ + #ifndef _LIBC_COMPAT_H + #define _LIBC_COMPAT_H + +-/* We have included glibc headers... */ +-#if defined(__GLIBC__) ++/* We're used from userspace... */ ++#if !defined(__KERNEL__) + +-/* Coordinate with glibc net/if.h header. */ ++/* Coordinate with libc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + + #define __UAPI_DEF_IF_IFCONF 0 + #define __UAPI_DEF_IF_IFMAP 0 + #define __UAPI_DEF_IF_IFNAMSIZ 0 + #define __UAPI_DEF_IF_IFREQ 0 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 ++#if !defined(__GLIBC__) ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++#else + /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ ++#endif /* !defined(__GLIBC__) */ + + #else /* _NET_IF_H */ + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + + #define __UAPI_DEF_IF_IFCONF 1 + #define __UAPI_DEF_IF_IFMAP 1 + #define __UAPI_DEF_IF_IFNAMSIZ 1 + #define __UAPI_DEF_IF_IFREQ 1 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 + /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + + #endif /* _NET_IF_H */ + +-/* Coordinate with glibc netinet/in.h header. */ ++/* Coordinate with libc netinet/if_ether.h */ ++#ifdef _NETINET_IF_ETHER_H ++#define __UAPI_DEF_ETHHDR 0 ++#else ++/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */ ++#define __UAPI_DEF_ETHHDR 1 ++#endif /* _NETINET_IF_ETHER_H */ ++ ++/* Coordinate with libc netinet/in.h header. */ + #if defined(_NETINET_IN_H) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + #define __UAPI_DEF_IN_ADDR 0 + #define __UAPI_DEF_IN_IPPROTO 0 +@@ -99,15 +109,7 @@ + #define __UAPI_DEF_IN_CLASS 0 + + #define __UAPI_DEF_IN6_ADDR 0 +-/* The exception is the in6_addr macros which must be defined +- * if the glibc code didn't define them. This guard matches +- * the guard in glibc/inet/netinet/in.h which defines the +- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ +-#if defined(__USE_MISC) || defined (__USE_GNU) + #define __UAPI_DEF_IN6_ADDR_ALT 0 +-#else +-#define __UAPI_DEF_IN6_ADDR_ALT 1 +-#endif + #define __UAPI_DEF_SOCKADDR_IN6 0 + #define __UAPI_DEF_IPV6_MREQ 0 + #define __UAPI_DEF_IPPROTO_V6 0 +@@ -118,7 +120,7 @@ + #else + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + #define __UAPI_DEF_IN_ADDR 1 + #define __UAPI_DEF_IN_IPPROTO 1 +@@ -128,7 +130,7 @@ + #define __UAPI_DEF_IN_CLASS 1 + + #define __UAPI_DEF_IN6_ADDR 1 +-/* We unconditionally define the in6_addr macros and glibc must ++/* We unconditionally define the in6_addr macros and libc must + * coordinate. */ + #define __UAPI_DEF_IN6_ADDR_ALT 1 + #define __UAPI_DEF_SOCKADDR_IN6 1 +@@ -170,7 +172,7 @@ + * or we are being included in the kernel, then define everything + * that we need. Check for previous __UAPI_* definitions to give + * unsupported C libraries a way to opt out of any kernel definition. */ +-#else /* !defined(__GLIBC__) */ ++#else /* defined(__KERNEL__) */ + + /* Definitions for if.h */ + #ifndef __UAPI_DEF_IF_IFCONF +@@ -185,7 +187,6 @@ + #ifndef __UAPI_DEF_IF_IFREQ + #define __UAPI_DEF_IF_IFREQ 1 + #endif +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 + #endif +@@ -194,6 +195,11 @@ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + #endif + ++/* Definitions for netinet/if_ether.h */ ++#ifndef __UAPI_DEF_ETHHDR ++#define __UAPI_DEF_ETHHDR 1 ++#endif ++ + /* Definitions for in.h */ + #ifndef __UAPI_DEF_IN_ADDR + #define __UAPI_DEF_IN_ADDR 1 +@@ -262,6 +268,6 @@ + #define __UAPI_DEF_XATTR 1 + #endif + +-#endif /* __GLIBC__ */ ++#endif /* defined(__KERNEL__) */ + + #endif /* _LIBC_COMPAT_H */ +diff -Naur iproute2-4.17.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h iproute2-4.17.0/include/uapi/linux/netfilter_ipv4/ip_tables.h +--- iproute2-4.17.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h 2018-06-11 10:31:44.722159108 -0700 ++++ iproute2-4.17.0/include/uapi/linux/netfilter_ipv4/ip_tables.h 2018-06-11 10:38:07.727152249 -0700 +@@ -18,7 +18,6 @@ + + #include <linux/types.h> + +-#include <linux/if.h> + #include <linux/netfilter_ipv4.h> + + #include <linux/netfilter/x_tables.h> +diff -Naur iproute2-4.17.0.orig/rdma/include/uapi/rdma/rdma_user_cm.h iproute2-4.17.0/rdma/include/uapi/rdma/rdma_user_cm.h +--- iproute2-4.17.0.orig/rdma/include/uapi/rdma/rdma_user_cm.h 2018-06-11 10:31:44.742159108 -0700 ++++ iproute2-4.17.0/rdma/include/uapi/rdma/rdma_user_cm.h 2018-06-11 10:44:48.746145068 -0700 +@@ -34,9 +34,9 @@ + #ifndef RDMA_USER_CM_H + #define RDMA_USER_CM_H + ++#include <netinet/in.h> + #include <linux/types.h> + #include <linux/socket.h> +-#include <linux/in6.h> + #include <rdma/ib_user_verbs.h> + #include <rdma/ib_user_sa.h> + +diff -Naur iproute2-4.17.0.orig/tc/f_flower.c iproute2-4.17.0/tc/f_flower.c +--- iproute2-4.17.0.orig/tc/f_flower.c 2018-06-11 10:31:44.746159108 -0700 ++++ iproute2-4.17.0/tc/f_flower.c 2018-06-11 10:38:29.389151861 -0700 +@@ -14,7 +14,7 @@ + #include <unistd.h> + #include <string.h> + #include <net/if.h> +-#include <linux/if_arp.h> ++#include <net/if_arp.h> + #include <linux/if_ether.h> + #include <linux/ip.h> + #include <linux/tc_act/tc_vlan.h> +diff -Naur iproute2-4.17.0.orig/tc/m_mirred.c iproute2-4.17.0/tc/m_mirred.c +--- iproute2-4.17.0.orig/tc/m_mirred.c 2018-06-11 10:31:44.745159108 -0700 ++++ iproute2-4.17.0/tc/m_mirred.c 2018-06-11 10:38:41.545151644 -0700 +@@ -17,6 +17,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/socket.h> ++#include <net/if.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <string.h> +diff -Naur iproute2-4.17.0.orig/tc/tc_class.c iproute2-4.17.0/tc/tc_class.c +--- iproute2-4.17.0.orig/tc/tc_class.c 2018-06-11 10:31:44.743159108 -0700 ++++ iproute2-4.17.0/tc/tc_class.c 2018-06-11 10:38:53.705151426 -0700 +@@ -15,6 +15,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/socket.h> ++#include <net/if.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <string.h> +diff -Naur iproute2-4.17.0.orig/tc/tc_filter.c iproute2-4.17.0/tc/tc_filter.c +--- iproute2-4.17.0.orig/tc/tc_filter.c 2018-06-11 10:31:44.743159108 -0700 ++++ iproute2-4.17.0/tc/tc_filter.c 2018-06-11 10:39:04.147151239 -0700 +@@ -15,6 +15,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/socket.h> ++#include <net/if.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <string.h> +diff -Naur iproute2-4.17.0.orig/tc/tc_qdisc.c iproute2-4.17.0/tc/tc_qdisc.c +--- iproute2-4.17.0.orig/tc/tc_qdisc.c 2018-06-11 10:31:44.743159108 -0700 ++++ iproute2-4.17.0/tc/tc_qdisc.c 2018-06-11 10:39:17.997150991 -0700 +@@ -15,6 +15,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/socket.h> ++#include <net/if.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <string.h> +diff -Naur iproute2-4.17.0.orig/tc/tc_util.h iproute2-4.17.0/tc/tc_util.h +--- iproute2-4.17.0.orig/tc/tc_util.h 2018-06-11 10:31:44.743159108 -0700 ++++ iproute2-4.17.0/tc/tc_util.h 2018-06-11 10:39:25.558150855 -0700 +@@ -4,7 +4,6 @@ + + #define MAX_MSG 16384 + #include <limits.h> +-#include <linux/if.h> + + #include <linux/pkt_sched.h> + #include <linux/pkt_cls.h> diff -uNr a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild --- a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild false +++ b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild a6c2e188dd804fcbf6659ba526dc1d981fa245ab483cdf5e92a4e6ea51db70b5ec84e4a8e0d91d59add890c22914c4f8e0c7ef449c29fd607c945de9d2956b5c @@ -0,0 +1,147 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs flag-o-matic multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-r3 +else + SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" + KEYWORDS="amd64 arm ~mips ppc x86" +fi + +DESCRIPTION="kernel routing and traffic control utilities" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" + +LICENSE="GPL-2" +SLOT="0" +IUSE="atm berkdb +iptables ipv6 minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl virtual/libelf ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + berkdb? ( sys-libs/db:= ) + atm? ( net-dialup/linux-atm ) + selinux? ( sys-libs/libselinux ) +" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +DEPEND=" + ${RDEPEND} + app-arch/xz-utils + iptables? ( virtual/pkgconfig ) + >=sys-devel/bison-2.4 + sys-devel/flex + >=sys-kernel/linux-headers-3.16 + elibc_glibc? ( >=sys-libs/glibc-2.7 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + "${FILESDIR}"/${P}-fix-tc-actions.patch + "${FILESDIR}"/${PN}-4.14.0-musl.patch +) + +src_prepare() { + if ! use ipv6 ; then + PATCHES+=( + "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 + ) + fi + + default + + sed -i \ + -e '/^CC :\?=/d' \ + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ + -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^WFLAGS/s:-Werror::" \ + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ + Makefile || die + + # Use /run instead of /var/run. + sed -i \ + -e 's:/var/run:/run:g' \ + include/namespace.h \ + man/man8/ip-netns.8 || die + + # build against system headers + rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die + + use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile +} + +src_configure() { + tc-export AR CC PKG_CONFIG + + # This sure is ugly. Should probably move into toolchain-funcs at some point. + local setns + pushd "${T}" >/dev/null + printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n + echo 'int main(){return 0;}' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile + popd >/dev/null + + # run "configure" script first which will create "config.mk"... + default + + # ...now switch on/off requested features via USE flags + cat <<-EOF >> config.mk + TC_CONFIG_ATM := $(usex atm y n) + TC_CONFIG_XT := $(usex iptables y n) + TC_CONFIG_NO_XT := $(usex iptables n y) + # We've locked in recent enough kernel headers #549948 + TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex minimal n y) + HAVE_SELINUX := $(usex selinux y n) + IP_CONFIG_SETNS := ${setns} + # Use correct iptables dir, #144265 #293709 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + EOF +} + +src_install() { + if use minimal ; then + into / + dosbin tc/tc + dobin ip/ip + return 0 + fi + + emake \ + DESTDIR="${D}" \ + LIBDIR="${EPREFIX%/}"/$(get_libdir) \ + SBINDIR="${EPREFIX%/}"/sbin \ + CONFDIR="${EPREFIX%/}"/etc/iproute2 \ + DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX%/}"/usr/share/man \ + ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ + install + + dodir /bin + mv "${ED%/}"/{s,}bin/ip || die #330115 + + dolib.a lib/libnetlink.a + insinto /usr/include + doins include/libnetlink.h + # This local header pulls in a lot of linux headers it + # doesn't directly need. Delete this header that requires + # linux-headers-3.8 until that goes stable. #467716 + sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die + + if use berkdb ; then + dodir /var/lib/arpd + # bug 47482, arpd doesn't need to be in /sbin + dodir /usr/bin + mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die + fi +} diff -uNr a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml --- a/sys-apps/iproute2/metadata.xml false +++ b/sys-apps/iproute2/metadata.xml a76ea2fa6d8fc1a8d4469f74f594083056e3c77e7df851797bf424076c23af7a2ee5d080a3063a332d7645e010837ce7dda43bde2f7db6ced48ddce149be6108 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="berkdb">build programs that use berkdb (just arpd)</flag> + <flag name="elf">support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend)</flag> + <flag name="iptables">include support for iptables filtering</flag> + <flag name="minimal">only install ip and tc programs, without eBPF support</flag> +</use> +</pkgmetadata> diff -uNr a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest --- a/sys-apps/kbd/Manifest false +++ b/sys-apps/kbd/Manifest 6bed2ec86f1dc17a859a94dc45d6f5118deb6deed4abb4773ea5cc773ca2c526098d0ed971b8491c38db38279485d999502c73b6880a92c26fd69a264c515bd2 @@ -0,0 +1,3 @@ +DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f +EBUILD kbd-2.0.4.ebuild 1342 BLAKE2B c003f42111f3ee52aff6589e00ebbaef2f4bc165a0b835fe327e442411e38d9cd977ce9f346b5be51c494b547834433f6f17367f6bbe29f9b53907bcc4ebfa54 SHA512 2e9a027bb6a35be73b81e8000f632496356e7045794ab730a3daa0a77113d5e494a5c25621c79b650e74b24f5e67cd8984d8371990c09310642e519073dde658 +MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641 diff -uNr a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild --- a/sys-apps/kbd/kbd-2.0.4.ebuild false +++ b/sys-apps/kbd/kbd-2.0.4.ebuild 664df7c1e272ca445893f2e13d55ff929786d96181de5553ff6b57ccf7f21a9697110a3baa0524e7f0417ac6af8761682392e9f389b7bd05bff65afb0de6baa9 @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +SCM="" +if [[ ${PV} == "9999" ]] ; then + SCM="autotools git-r3" + EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git" + EGIT_BRANCH="master" +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +fi + +inherit eutils ${SCM} + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="http://kbd-project.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls pam test" + +RDEPEND="pam? ( virtual/pam ) + app-arch/gzip" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-libs/check )" + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-r3_src_unpack + else + default + fi + + # Rename conflicting keymaps to have unique names, bug #293228 + cd "${S}"/data/keymaps/i386 || die + mv dvorak/no.map dvorak/no-dvorak.map || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die +} + +src_prepare() { + if [[ ${PV} == "9999" ]] ; then + eautoreconf + fi +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable pam vlock) \ + $(use_enable test tests) +} + +src_install() { + default + dohtml docs/doc/*.html +} diff -uNr a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml --- a/sys-apps/kbd/metadata.xml false +++ b/sys-apps/kbd/metadata.xml 69a62671f8e477d17928434da9a675beef87d39d0d582944ff07dec52013132178665df60b083756e41b4d68d4223e883b116026e93324dc118ffc3fa51334a8 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<upstream> + <remote-id type="freshmeat">kbd</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest --- a/sys-apps/kmod/Manifest false +++ b/sys-apps/kmod/Manifest 82d6cf0f4178f17b133f8bac6541bfffef22d2078a048e3c4b4c388177361aa5e8cefad0283b638a7758933c351e65854933a38ef40d7d1945c09e9375d39b05 @@ -0,0 +1,4 @@ +AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63 +DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb2462315c0e5dc955b58f02ffd0504a77859b7030c3619f1b5f6a7fa3fb25ec99d90ac67f0167b1eb889 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779 +EBUILD kmod-24.ebuild 4909 BLAKE2B 7148a75e9c5137abd85cb4ac7eb9eddfa7f8ff7ef7f417256c84c4e33372b5a351822670a4c9dc6bc81832590bd337819c06ef7a0e2ec3bc0c5f55c1f4a8ffa4 SHA512 2a59d5e8e24025a785e47ab9c12fa1b9709c315dd69fedfbdbcb36c833d373c4b97e96dacd06ba45d0981da13d29cb08bdbb5cea5e5f2abdbc70e90928a44f08 +MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94 diff -uNr a/sys-apps/kmod/files/kmod-static-nodes-r1 b/sys-apps/kmod/files/kmod-static-nodes-r1 --- a/sys-apps/kmod/files/kmod-static-nodes-r1 false +++ b/sys-apps/kmod/files/kmod-static-nodes-r1 eac7177b9e9d28158d7b3963f0e60cc78226660a57232f35ef71939c5f626ef7baca53ba9b3b0311d0851e82d221c6b471011243aff360fa9da6c40ae222f02d @@ -0,0 +1,18 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Create list of required static device nodes for the current kernel" + +depend() { + after dev-mount + before tmpfiles.dev dev + keyword -lxc -systemd-nspawn +} + +start() { + ebegin "Creating list of required static device nodes for the current kernel" + checkpath -q -d /run/tmpfiles.d + kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf + eend $? +} diff -uNr a/sys-apps/kmod/kmod-24.ebuild b/sys-apps/kmod/kmod-24.ebuild --- a/sys-apps/kmod/kmod-24.ebuild false +++ b/sys-apps/kmod/kmod-24.ebuild c881285d254907aba85fb319afa7d1c7cdb0757ab0054831ae7dfd2233c5da4be17846658738a15e994ae5d900d098a4faac8f20a0c6a1a6f0c243b8a37a9c94 @@ -0,0 +1,189 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit bash-completion-r1 eutils multilib python-r1 + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" + inherit autotools git-r3 +else + SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" + inherit libtool +fi + +DESCRIPTION="library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc lzma python static-libs +tools zlib" + +# Upstream does not support running the test suite with custom configure flags. +# I was also told that the test suite is intended for kmod developers. +# So we have to restrict it. +# See bug #408915. +RESTRICT="test" + +# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +RDEPEND="!sys-apps/module-init-tools + !sys-apps/modutils + !<sys-apps/openrc-0.13.8 + !<sys-apps/systemd-216-r3 + lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) + python? ( ${PYTHON_DEPS} ) + zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 +DEPEND="${RDEPEND} + doc? ( dev-util/gtk-doc ) + lzma? ( virtual/pkgconfig ) + python? ( + dev-python/cython[${PYTHON_USEDEP}] + virtual/pkgconfig + ) + zlib? ( virtual/pkgconfig )" +if [[ ${PV} == 9999* ]]; then + DEPEND="${DEPEND} + dev-libs/libxslt" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS="NEWS README TODO" + +src_prepare() { + if [ ! -e configure ]; then + if use doc; then + gtkdocize --copy --docdir libkmod/docs || die + else + touch libkmod/docs/gtk-doc.make + fi + eautoreconf + else + elibtoolize + fi + + # Restore possibility of running --enable-static wrt #472608 + sed -i \ + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ + configure || die +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --with-rootlibdir="${EPREFIX}/$(get_libdir)" + --enable-shared + $(use_enable static-libs static) + $(use_enable tools) + $(use_enable debug) + $(use_enable doc gtk-doc) + $(use_with lzma xz) + $(use_with zlib) + --with-bashcompletiondir="$(get_bashcompdir)" + ) + + local ECONF_SOURCE="${S}" + + kmod_configure() { + mkdir -p "${BUILD_DIR}" || die + run_in_build_dir econf "${myeconfargs[@]}" "$@" + } + + BUILD_DIR="${WORKDIR}/build" + kmod_configure --disable-python + + if use python; then + python_foreach_impl kmod_configure --enable-python + fi +} + +src_compile() { + emake -C "${BUILD_DIR}" + + if use python; then + local native_builddir=${BUILD_DIR} + + python_compile() { + emake -C "${BUILD_DIR}" -f Makefile -f - python \ + VPATH="${native_builddir}:${S}" \ + native_builddir="${native_builddir}" \ + libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ + <<< 'python: $(pkgpyexec_LTLIBRARIES)' + } + + python_foreach_impl python_compile + fi +} + +src_install() { + emake -C "${BUILD_DIR}" DESTDIR="${D}" install + einstalldocs + + if use python; then + local native_builddir=${BUILD_DIR} + + python_install() { + emake -C "${BUILD_DIR}" DESTDIR="${D}" \ + VPATH="${native_builddir}:${S}" \ + install-pkgpyexecLTLIBRARIES \ + install-dist_pkgpyexecPYTHON + } + + python_foreach_impl python_install + fi + + prune_libtool_files --modules + + if use tools; then + local bincmd sbincmd + for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do + dosym ../bin/kmod /sbin/${sbincmd} + done + + # These are also usable as normal user + for bincmd in lsmod modinfo; do + dosym kmod /bin/${bincmd} + done + fi + + cat <<-EOF > "${T}"/usb-load-ehci-first.conf + softdep uhci_hcd pre: ehci_hcd + softdep ohci_hcd pre: ehci_hcd + EOF + + insinto /lib/modprobe.d + doins "${T}"/usb-load-ehci-first.conf #260139 + + newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes +} + +pkg_postinst() { + if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then + ewarn "Removing old conflicting static-nodes init script from the boot runlevel" + rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes + fi + + # Add kmod to the runlevel automatically if this is the first install of this package. + if [[ -z ${REPLACING_VERSIONS} ]]; then + if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then + mkdir -p "${EROOT%/}"/etc/runlevels/sysinit + fi + if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then + ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes + fi + fi + + if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then + if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + ewarn + ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" + ewarn "kernel modules to have required static nodes!" + ewarn "Run this command:" + ewarn "\trc-update add kmod-static-nodes sysinit" + fi + fi +} diff -uNr a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml --- a/sys-apps/kmod/metadata.xml false +++ b/sys-apps/kmod/metadata.xml e2d87a94b1ca6d5481b8c47357214252c90f8c08c573707bc94df20bece542d53dd7e0410b0d3c5a483f46a62c3264a4fbefe98bf28b2f06204dea810e306d57 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>udev-bugs@gentoo.org</email> +</maintainer> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="lzma">Enable support for XZ compressed modules</flag> + <flag name="tools">Install module loading/unloading tools.</flag> + <flag name="zlib">Enable support for gzipped modules</flag> +</use> +</pkgmetadata> diff -uNr a/sys-apps/less/Manifest b/sys-apps/less/Manifest --- a/sys-apps/less/Manifest false +++ b/sys-apps/less/Manifest 3cb07023df626b47fcdf1fc31a459fa6dd5c35d8ad08b52593664ebe9471fb15779e1a6a806a57df68134e5e2e98e0e26bf0a289588f20bcbcd72fde2e7987e6 @@ -0,0 +1,6 @@ +AUX README.Gentoo 823 BLAKE2B d4920f827b4c0c210715f4f05c1365c3388b01ca41e8e08add41f6784c89e9f26296ca2b71d0bcc22f58a773c602dac4bd9a7361bd6173501db4ceb24a9a3926 SHA512 fe18f4f5bac70f31ca833cb25d4f1aecde03c3993495ab964cc67f0e52737e3d04aa2263eff26ded279121cc346ef77738743943b5b092c9586c5622ee3a6c92 +AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 +AUX lesspipe.sh 7797 BLAKE2B 1f66e2ef843e24de958dab1577f6f69f63b260369b9b625c1fd823a8f5a00a110df3492d299b04a66b003528549991c0b87e1ee80835a0383667991b6a8bba50 SHA512 d7bbae07e8ddcae2981549f958daffc3750f3a343da37cd5e43df86b4dcab35c3121d7fa7b76d61dd457c972a888bcce1c85d01fa1e685aadf169d5541bb0d8b +DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c556c69837f2018ef95efeea35acadcb9946bdde0272848d1bd8537c847e89591d980ceb2eda5a4c5963c4 SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a +EBUILD less-529.ebuild 1379 BLAKE2B 2a2ccc09e83b054b26d30defcdab7e38cdead7c0518b479e98507faa66388828ceecba7c212e5bd6128289379a61c9fafbead43cf9e34a37d20e6c8bfbec2a79 SHA512 9d88c15907f68e4a8b96febcb2282d0909933cd5a1b19b46917de7108c4e95453973b31532c7b1883ec7bc2ee779fb7cfbf57d36b5682ed86d5673fecd7f8a23 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-apps/less/files/README.Gentoo b/sys-apps/less/files/README.Gentoo --- a/sys-apps/less/files/README.Gentoo false +++ b/sys-apps/less/files/README.Gentoo df8a459abad98e1617fa626b628b767b71f502d99da19bb46619b58a81557a1e2224eec9da687fbd604ae2cbbb4f8922e010ba183ff416f3c251fab792881c08 @@ -0,0 +1,22 @@ +This version of less comes with some Gentoo enhancements: + - default lesspipe.sh script to "view" files + - colorization support + +To see what file types are supported, just read the /usr/bin/lesspipe.sh +script (it's just a plain text bash script). + +Colorization support is disabled by default. To enable it, export the +LESSCOLOR variable to "yes": + $ export LESSCOLOR=yes + +We also provide a colorization script, 'code2color', that is used by +default. If you wish to use another script, simply export the LESSCOLORIZER +variable to name of the script: + $ export LESSCOLORIZER=some-other-script + +If you want to use the code2color script and the default color schemes are +not acceptable, you can develop your own schemes and save them in one of +the following places: + /etc/code2color + ~/.code2color + CODE2COLOR_CONFIG env var diff -uNr a/sys-apps/less/files/less.envd b/sys-apps/less/files/less.envd --- a/sys-apps/less/files/less.envd false +++ b/sys-apps/less/files/less.envd 21ea8de9b926bae7fd9d697a67aaf30df1b881015351f968a14fb90682a000ecf99208c5521eb8e6e1c81fa56a173b1c18225dd7ae4bff0ffb2119f962e8238d @@ -0,0 +1,2 @@ +LESSOPEN="|lesspipe %s" +LESS="-R -M --shift 5" diff -uNr a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh --- a/sys-apps/less/files/lesspipe.sh false +++ b/sys-apps/less/files/lesspipe.sh b7313bbb9a9f2097dbb774e4d6a5492257c4c565c8ff5817c6634b230fb21f50b78a6ee4faa02f527c651be73556632fba8cf6e6d06cf5a2709a318c966a4fe1 @@ -0,0 +1,281 @@ +#!/bin/bash +# +# Preprocessor for 'less'. Used when this environment variable is set: +# LESSOPEN="|lesspipe %s" + +# TODO: handle compressed files better + +[[ -n ${LESSDEBUG} ]] && set -x + +trap 'exit 0' PIPE + +guesscompress() { + case "$1" in + *.gz|*.z) echo "gunzip -c" ;; + *.bz2|*.bz) echo "bunzip2 -c" ;; + *.lz) echo "lzip -dc" ;; + *.lzma) echo "unlzma -c" ;; + *.lzo) echo "lzop -dc" ;; + *.xz) echo "xzdec" ;; + *) echo "cat" ;; + esac +} + +lesspipe_file() { + local out=$(file -L -- "$1") + local suffix + case ${out} in + *" 7-zip archive"*) suffix="7z";; + *" ar archive"*) suffix="a";; + *" CAB-Installer"*) suffix="cab";; + *" cpio archive"*) suffix="cpio";; + *" ELF "*) suffix="elf";; + *" LHa"*archive*) suffix="lha";; + *" troff "*) suffix="man";; + *" script text"*) suffix="sh";; + *" shared object"*) suffix="so";; + *" tar archive"*) suffix="tar";; + *" Zip archive"*) suffix="zip";; + *": data") hexdump -C -- "$1"; return 0;; + *) return 1;; + esac + lesspipe "$1" ".${suffix}" + return 0 +} + +lesspipe() { + local match=$2 + [[ -z ${match} ]] && match=$1 + + local DECOMPRESSOR=$(guesscompress "${match}") + + # User filters + if [[ -x ~/.lessfilter ]] ; then + ~/.lessfilter "$1" && exit 0 + fi + + local ignore + for ignore in ${LESSIGNORE} ; do + [[ ${match} == *.${ignore} ]] && exit 0 + done + + # Handle non-regular file types. + if [[ -d $1 ]] ; then + ls -alF -- "$1" + return + elif [[ ! -f $1 ]] ; then + stat "$1" + return + fi + + case "${match}" in + + ### Doc files ### + *.[0-9n]|*.man|\ + *.[0-9n].bz2|*.man.bz2|\ + *.[0-9n].gz|*.man.gz|\ + *.[0-9n].lzma|*.man.lzma|\ + *.[0-9n].xz|*.man.xz|\ + *.[0-9][a-z].gz|*.[0-9][a-z].gz) + local out=$(${DECOMPRESSOR} -- "$1" | file -) + case ${out} in + *troff*) + # Need to make sure we pass path to man or it will try + # to locate "$1" in the man search paths + if [[ $1 == /* ]] ; then + man -- "$1" + else + man -- "./$1" + fi + ;; + *text*) + ${DECOMPRESSOR} -- "$1" + ;; + *) + # We could have matched a library (libc.so.6), so let + # `file` figure out what the hell this thing is + lesspipe_file "$1" + ;; + esac + ;; + *.dvi) dvi2tty "$1" ;; + *.ps) ps2ascii "$1" || pstotext "$1" ;; + *.pdf) pdftotext "$1" - || ps2ascii "$1" || pstotext "$1" ;; + *.doc) antiword "$1" || catdoc "$1" ;; + *.rtf) unrtf --nopict --text "$1" ;; + *.conf|*.txt|*.log) ;; # force less to work on these directly #150256 + + ### URLs ### + ftp://*|http://*|*.htm|*.html) + for b in links2 links lynx ; do + ${b} -dump "$1" && exit 0 + done + html2text -style pretty "$1" + ;; + + ### Tar files ### + *.tar|\ + *.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|\ + *.tar.lz|*.tar.tlz|\ + *.tar.lzma|*.tar.xz) + ${DECOMPRESSOR} -- "$1" | tar tvvf -;; + *.tbz2|*.tbz|*.tgz|*.tlz|*.txz) + lesspipe "$1" "$1".tar.${1##*.t} ;; + + ### Misc archives ### + *.bz2|\ + *.gz|*.z|\ + *.lz|\ + *.lzma|*.xz) ${DECOMPRESSOR} -- "$1" ;; + *.rpm) rpm -qpivl --changelog -- "$1" || rpm2tar -O "$1" | tar tvvf -;; + *.cpi|*.cpio) cpio -itv < "$1" ;; + *.ace) unace l "$1" ;; + *.arc) arc v "$1" ;; + *.arj) unarj l -- "$1" ;; + *.cab) cabextract -l -- "$1" ;; + *.lha|*.lzh) lha v "$1" ;; + *.zoo) zoo -list "$1" || unzoo -l "$1" ;; + *.7z|*.exe) 7z l -- "$1" || 7za l -- "$1" || 7zr l -- "$1" ;; + *.a) ar tv "$1" ;; + *.elf) readelf -a -W -- "$1" ;; + *.so) readelf -h -d -s -W -- "$1" ;; + *.mo|*.gmo) msgunfmt -- "$1" ;; + + *.rar|.r[0-9][0-9]) unrar l -- "$1" ;; + + *.jar|*.war|*.ear|*.xpi|*.zip) + unzip -v "$1" || miniunzip -l "$1" || miniunz -l "$1" || zipinfo -v "$1" + ;; + + *.deb|*.udeb) + if type -P dpkg > /dev/null ; then + dpkg --info "$1" + dpkg --contents "$1" + else + ar tv "$1" + ar p "$1" data.tar.gz | tar tzvvf - + fi + ;; + + ### Filesystems ### + *.squashfs) unsquashfs -s "$1" && unsquashfs -ll "$1" ;; + + ### Media ### + *.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp) + identify -verbose -- "$1" || file -L -- "$1" + ;; + *.asf|*.avi|*.flv|*.mkv|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv) + midentify "$1" || file -L -- "$1" + ;; + *.mp3) mp3info "$1" || id3info "$1" ;; + *.ogg) ogginfo "$1" ;; + *.flac) metaflac --list "$1" ;; + *.torrent) torrentinfo "$1" || torrentinfo-console "$1" || ctorrent -x "$1" ;; + *.bin|*.cue|*.raw) + # not all .bin/.raw files are cd images #285507 + # fall back to lesspipe_file if .cue doesn't exist, or if + # cd-info failed to parse things sanely + [[ -e ${1%.*}.cue ]] \ + && cd-info --no-header --no-device-info "$1" \ + || lesspipe_file "$1" + ;; + *.iso) + iso_info=$(isoinfo -d -i "$1") + echo "${iso_info}" + # Joliet output overrides Rock Ridge, so prefer the better Rock + case ${iso_info} in + *$'\n'"Rock Ridge"*) iso_opts="-R";; + *$'\n'"Joliet"*) iso_opts="-J";; + *) iso_opts="";; + esac + isoinfo -l ${iso_opts} -i "$1" + ;; + + ### Encryption stuff ### + *.crl) openssl crl -hash -text -noout -in "$1" ;; + *.csr) openssl req -text -noout -in "$1" ;; + *.crt|*.pem) openssl x509 -hash -text -noout -in "$1" ;; + +# May not be such a good idea :) +# ### Device nodes ### +# /dev/[hs]d[a-z]*) +# fdisk -l "${1:0:8}" +# [[ $1 == *hd* ]] && hdparm -I "${1:0:8}" +# ;; + + ### Everything else ### + *) + case $(( recur++ )) in + # Maybe we didn't match due to case issues ... + 0) lesspipe "$1" "$(echo $1 | LC_ALL=C tr '[:upper:]' '[:lower:]')" ;; + + # Maybe we didn't match because the file is named weird ... + 1) lesspipe_file "$1" ;; + esac + + # So no matches from above ... finally fall back to an external + # coloring package. No matching here so we don't have to worry + # about keeping in sync with random packages. Any coloring tool + # you use should not output errors about unsupported files to + # stdout. If it does, it's your problem. + + # Allow people to flip color off if they dont want it + case ${LESSCOLOR} in + always) LESSCOLOR=2;; + [yY][eE][sS]|[yY]|1|true) LESSCOLOR=1;; + [nN][oO]|[nN]|0|false) LESSCOLOR=0;; + *) LESSCOLOR=0;; # default to no color #188835 + esac + if [[ ${LESSCOLOR} != "0" ]] && [[ -n ${LESSCOLORIZER=code2color} ]] ; then + # 2: Only colorize if user forces it ... + # 1: ... or we know less will handle raw codes -- this will + # not detect -seiRM, so set LESSCOLORIZER yourself + if [[ ${LESSCOLOR} == "2" ]] || [[ " ${LESS} " == *" -"[rR]" "* ]] ; then + LESSQUIET=true ${LESSCOLORIZER} "$1" + fi + fi + + # Nothing left to do but let less deal + exit 0 + ;; + esac +} + +if [[ -z $1 ]] ; then + echo "Usage: lesspipe <file>" +elif [[ $1 == "-V" || $1 == "--version" ]] ; then + cat <<-EOF + lesspipe (git) + Copyright 2001-2016 Gentoo Foundation + Mike Frysinger <vapier@gentoo.org> + (with plenty of ideas stolen from other projects/distros) + + EOF + less -V +elif [[ $1 == "-h" || $1 == "--help" ]] ; then + cat <<-EOF + lesspipe: preprocess files before sending them to less + + Usage: lesspipe <file> + + lesspipe specific settings: + LESSCOLOR env - toggle colorizing of output (no/yes/always; default: no) + LESSCOLORIZER env - program used to colorize output (default: code2color) + LESSIGNORE - list of extensions to ignore (don't do anything fancy) + + You can create per-user filters as well by creating the executable file: + ~/.lessfilter + One argument is passed to it: the file to display. The script should exit 0 + to indicate it handled the file, or non-zero to tell lesspipe to handle it. + + To use lesspipe, simply add to your environment: + export LESSOPEN="|lesspipe %s" + + Run 'less --help' or 'man less' for more info. + EOF +else + recur=0 + [[ -n ${LESSDEBUG} ]] \ + && lesspipe "$1" \ + || lesspipe "$1" 2> /dev/null +fi diff -uNr a/sys-apps/less/less-529.ebuild b/sys-apps/less/less-529.ebuild --- a/sys-apps/less/less-529.ebuild false +++ b/sys-apps/less/less-529.ebuild af1cc9f0e09ce9bcf9e89a69fd43ccf584a016bf573a76e4faf0b78aea2a794ffbdb6160afc8c3e5de87b83460d32d38efa01e0328e8a4538646dc2c74bd8f62 @@ -0,0 +1,42 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Excellent text file viewer" +HOMEPAGE="http://www.greenwoodsoftware.com/less/" +SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" + +LICENSE="|| ( GPL-3 BSD-2 )" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="pcre unicode" + +DEPEND=">=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2:0= + pcre? ( dev-libs/libpcre )" +RDEPEND="${DEPEND}" + +src_configure() { + export ac_cv_lib_ncursesw_initscr=$(usex unicode) + export ac_cv_lib_ncurses_initscr=$(usex !unicode) + econf \ + --with-regex=$(usex pcre pcre posix) \ + --with-editor="${EPREFIX}"/usr/libexec/editor +} + +src_install() { + default + + newbin "${FILESDIR}"/lesspipe.sh lesspipe + newenvd "${FILESDIR}"/less.envd 70less +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-483-r1" ; then + elog "The lesspipe.sh symlink has been dropped. If you are still setting" + elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." + elog "Colorization support has been dropped. If you want that, check out" + elog "the new app-text/lesspipe package." + fi +} diff -uNr a/sys-apps/less/metadata.xml b/sys-apps/less/metadata.xml --- a/sys-apps/less/metadata.xml false +++ b/sys-apps/less/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest --- a/sys-apps/man-db/Manifest false +++ b/sys-apps/man-db/Manifest 91e8e115ae166c2a227bb6ffac9f4cab5441feb6c086a606447cb3c5f34aedd747ab065f1c948045f000882af2e5c6aa21e2b4dfcb25d3b72a410989459f9fd8 @@ -0,0 +1,4 @@ +AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331 +DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301 +EBUILD man-db-2.7.6.1-r2.ebuild 3173 BLAKE2B 7fc7db98ce8e00ddd57564cfd72129b3b42e1505e3d0cf0ebe875b8793febd33024245e61f4db184955cdd4d60ed7862af9639874859e317a17996483627240b SHA512 0a51e238d3b399eb8fffbb01f229c614aad6c84691ca9b309c982a2e832a332f01d963f6d3e1da850dc667d6248acd04f564418838692bce98af70cc9d6aabf9 +MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79 diff -uNr a/sys-apps/man-db/files/man-db.cron b/sys-apps/man-db/files/man-db.cron --- a/sys-apps/man-db/files/man-db.cron false +++ b/sys-apps/man-db/files/man-db.cron 913b0f1d663a58948c7640f53986a554596f3201c6062941fc75b149b9ad6553cadeb3362cdc4b1cfbaf4425164e3ec447a2fb74c51d946cf773678323d6ca77 @@ -0,0 +1,11 @@ +#!/bin/sh + +# Use same perms/settings as the ebuild. +cachedir="/var/cache/man" +if [ ! -d "${cachedir}" ]; then + mkdir -p "${cachedir}" + chown man:man "${cachedir}" + chmod 0755 "${cachedir}" +fi + +exec nice mandb --quiet diff -uNr a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild --- a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild false +++ b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild 06e769cbeff5099d8dfc19898308c68179f2bf27d8b46d45feb59318a1dea90887a189d21dff40051e7dc701e99466fcf59e2444d41df1da6f57131010834077 @@ -0,0 +1,110 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils user versionator + +DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" +HOMEPAGE="http://www.nongnu.org/man-db/" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib" + +CDEPEND=">=dev-libs/libpipeline-1.4.0 + berkdb? ( sys-libs/db:= ) + gdbm? ( sys-libs/gdbm:= ) + !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) + sys-apps/groff + zlib? ( sys-libs/zlib ) + !sys-apps/man" +DEPEND="${CDEPEND} + app-arch/xz-utils + virtual/pkgconfig + nls? ( + >=app-text/po4a-0.45 + sys-devel/gettext + )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-mandb ) +" +PDEPEND="manpager? ( app-text/manpager )" + +pkg_setup() { + # Create user now as Makefile in src_install does setuid/chown + enewgroup man 15 + enewuser man 13 -1 /usr/share/man man + + if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150 + ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings" + fi +} + +src_configure() { + export ac_cv_lib_z_gzopen=$(usex zlib) + local myeconfargs=( + --docdir='$(datarootdir)'/doc/${PF} + --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d + --enable-setuid + --enable-cache-owner=man + --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" + $(use_enable nls) + $(use_enable static-libs static) + --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) + ) + econf "${myeconfargs[@]}" + + # Disable color output from groff so that the manpager can add it. #184604 + sed -i \ + -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ + src/man_db.conf || die +} + +src_install() { + default + dodoc docs/{HACKING,TODO} + prune_libtool_files + + exeinto /etc/cron.daily + newexe "${FILESDIR}"/man-db.cron man-db #289884 +} + +pkg_preinst() { + local cachedir="${EROOT}var/cache/man" + # If the system was already exploited, and the attacker is hiding in the + # cachedir of the old man-db, let's wipe them out. + # see bug #602588 comment 18 + local _replacing_version= + local _setgid_vuln=0 + for _replacing_version in ${REPLACING_VERSIONS}; do + if version_is_at_least '2.7.6.1-r2' "${_replacing_version}"; then + debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!" + else + _setgid_vuln=1 + debug-print "Applying cleanup for security bug #602588" + fi + done + [[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}" + + # Fall back to recreating the cachedir + if [[ ! -d ${cachedir} ]] ; then + mkdir -p "${cachedir}" || die + chown man:man "${cachedir}" || die + fi + + # Update the whatis cache + if [[ -f ${cachedir}/whatis ]] ; then + einfo "Cleaning ${cachedir} from sys-apps/man" + find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete + fi +} + +pkg_postinst() { + if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then + einfo "Rebuilding man-db from scratch with new database format!" + mandb --quiet --create + fi +} diff -uNr a/sys-apps/man-db/metadata.xml b/sys-apps/man-db/metadata.xml --- a/sys-apps/man-db/metadata.xml false +++ b/sys-apps/man-db/metadata.xml b19780bf217663456105adb2161dc24e84b868bece67fee0fb7bfd883282ec0a96a1a93bdb9e4f70142a1257892c960c725ab8af7a244f00f043d1420dd17057 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="manpager">Enable manpager wrapper for colorizing output</flag> +</use> +</pkgmetadata> diff -uNr a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest --- a/sys-apps/net-tools/Manifest false +++ b/sys-apps/net-tools/Manifest aa938c1c64b7c119139b58de555da318201afd293cefc31ac0ef01a230d657a66f85df3e58f72c23c7135dd3e05f150438bf2965627aebb2117714978f67b6b7 @@ -0,0 +1,5 @@ +AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 947 BLAKE2B 261e56b52b0f0da17d16b494831fca1a3c698773f4edec91bda1cbeb55cda1130835bcd8f6964866ef7ff9479b28d453e634c6c42654338ad933e1567e39ee15 SHA512 a334bdac0dd86d94c1db9b841db3742df72d0d69d45f618b867839b0d2c99ade47b74e98f423e574af053de7a8478f04b77282ba04f437b5a9e271ea77878c50 +AUX net-tools-fix-headers.patch 462 BLAKE2B 870b3f13b9c4977c567e1f6c1b95ec63dc147d688d304ca4c029d85895b9ba768fa9052bcad32a199d6ec2e37f83220df7cf2126dcb585391bd3d87224671329 SHA512 e4bf76c0f3988445d2d7bb49c8ae2aaf24d066b1060806e38c5d2764dbbe5141de58dc0d58fe34894bcde987b758178dfcff5334fcc2dabc8ec019753e931f16 +DIST net-tools-1.60_p20161110235919.tar.xz 227552 BLAKE2B 0dba75b7b7345be047bd8618811c6ea43f96f0d7c8a2c67cd03138b8f31dc47a641c7ff1e93fb1ad295423f9b82e3d222178c7c97233d4e3698355fed729f723 SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 +EBUILD net-tools-1.60_p20161110235919.ebuild 2541 BLAKE2B 0da3392fc80d2a4110f8b18b4c629a2a209703cb21cf800f5c5f034613a34d72f8ae8ce92e0b3f231111af0a661bbe5b01d05d1c8b6df5fa91cef780b0459566 SHA512 ebd50e72a61cb8e20486469fd621b2eddb4f369d1f0a1d4ea6a946488376e4444af77d6f19a5debbe7b36c454f47e7042351786c7588aa7eb99f483e9aebbebb +MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037 diff -uNr a/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch b/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch --- a/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch false +++ b/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 0d7089acc0d7c901209aa6dbd067a62615899d607c8f2bdddb7cad910bca7bc106388b95c4e78ca679197f890cedb1b1ace387748165f2af164ed41542aec9ab @@ -0,0 +1,32 @@ +From ea3935bd7c0f36c86c40e5785326698fa3336c6a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 14 Nov 2016 22:48:42 -0500 +Subject: [PATCH] iptunnel: fix building w/older linux headers + +While linux-4.8+ headers work, older ones are missing includes. +Dropping netinet/ip.h uncovered that mess, so add linux/ip.h. + +URL: https://bugs.gentoo.org/599542 +Reported-by: Conrad Kostecki <ck@bl4ckb0x.de> +--- + iptunnel.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/iptunnel.c b/iptunnel.c +index 247ae10..d6e47e6 100644 +--- a/iptunnel.c ++++ b/iptunnel.c +@@ -29,6 +29,11 @@ + #include <arpa/inet.h> + #include <net/if_arp.h> ++/* We only care about linux/if_tunnel.h. Unfortunately, older Linux headers ++ * (pre linux-4.8) did not include all the proper headers leading to missing ++ * structs and types. ++ */ + #include <linux/types.h> ++#include <linux/ip.h> + #include <linux/if_tunnel.h> + + #include "config.h" +-- +2.9.0 diff -uNr a/sys-apps/net-tools/files/net-tools-fix-headers.patch b/sys-apps/net-tools/files/net-tools-fix-headers.patch --- a/sys-apps/net-tools/files/net-tools-fix-headers.patch false +++ b/sys-apps/net-tools/files/net-tools-fix-headers.patch 5c4f9f87b6336dbb88d008b1c6b9944c8b73473dbe98b6558208f2deda5c9ba6baff4037c049b3e66ba10c3d0d9b5bf827df3d4d76bd3ec2b9bc342e98925295 @@ -0,0 +1,11 @@ +diff -Naur net-tools-1.60_p20161110235919.orig/iptunnel.c net-tools-1.60_p20161110235919/iptunnel.c +--- net-tools-1.60_p20161110235919.orig/iptunnel.c 2016-11-11 17:19:27.312541677 -0800 ++++ net-tools-1.60_p20161110235919/iptunnel.c 2016-11-11 17:21:46.730922004 -0800 +@@ -27,7 +27,6 @@ + #include <sys/ioctl.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-#include <net/if.h> + #include <net/if_arp.h> + #include <linux/types.h> + #include <linux/if_tunnel.h> diff -uNr a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml --- a/sys-apps/net-tools/metadata.xml false +++ b/sys-apps/net-tools/metadata.xml 684f7c9de8dbbd2c2faa43a1e7c71eec3f791f185973dc1096f766f1e9a409304725eff2508c00772f0768cad3f6b47697fdf9f06ea46c4543ba852ca03e6978 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="arp">build the arp and rarp tools (for manipulating the ARP cache)</flag> + <flag name="hostname">build the hostname and dnsdomainname tools</flag> + <flag name="plipconfig">build the plipconfig tool (for working with old PLIP hardware)</flag> + <flag name="slattach">build the slattach tool (for working with old serial ports)</flag> +</use> +<upstream> + <remote-id type="sourceforge">net-tools</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild --- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild false +++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild 3ef309045437fc878928652817a4085ebf79b94f5eff84f02f176d2482a2e82c2155936ada7952ae99238b7ba9d9e5c6594a7bc4f6ded78c908a9f818472dd66 @@ -0,0 +1,96 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code" + EGIT_PROJECT="${PN}" + inherit git-2 +else + SRC_URI="mirror://gentoo/${P}.tar.xz" + KEYWORDS="amd64 arm ~mips ppc x86" +fi + +DESCRIPTION="Standard Linux networking tools" +HOMEPAGE="http://net-tools.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static" +REQUIRED_USE="nis? ( hostname )" + +RDEPEND="selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND} + selinux? ( virtual/pkgconfig ) + app-arch/xz-utils" +if [[ ${PV} == "9999" ]]; then + DEPEND+=" nls? ( sys-devel/gettext )" +fi +RDEPEND+=" + hostname? ( !sys-apps/coreutils[hostname] ) + !<sys-apps/openrc-0.9.9.3" + +maint_pkg_create() { + cd /usr/local/src/net-tools + #git-update + local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S) + local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60} + local p="${PN}-${pv}" + git archive --prefix="${p}/" master | tar xf - -C "${T}" + pushd "${T}" >/dev/null + emake -C "${p}/po" dist + sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die + tar cf - ${p}/ | xz > ${p}.tar.xz + popd >/dev/null + + du -b "${T}"/*.tar.xz +} + +pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; } + +set_opt() { + local opt=$1 ans + shift + ans=$("$@" && echo y || echo n) + einfo "Setting option ${opt} to ${ans}" + sed -i \ + -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \ + config.in || die +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-fix-headers.patch + epatch "${FILESDIR}/${P}-fix-building-w-older-linux-headers.patch" +} + +src_configure() { + # Clear out env vars from the user. #599602 + unset BASEDIR BINDIR SBINDIR + + set_opt I18N use nls + set_opt HAVE_AFINET6 use ipv6 + set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6' + set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5' + set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6' + set_opt HAVE_SELINUX use selinux + set_opt HAVE_ARP_TOOLS use arp + set_opt HAVE_HOSTNAME_TOOLS use hostname + set_opt HAVE_HOSTNAME_SYMLINKS use nis + set_opt HAVE_PLIP_TOOLS use plipconfig + set_opt HAVE_SERIAL_TOOLS use slattach + if use static ; then + append-flags -static + append-ldflags -static + fi + tc-export AR CC + yes "" | ./configure.sh config.in || die +} + +src_install() { + # We need to use emake by hand to pass ED. #567300 + emake DESTDIR="${ED}" install + dodoc README THANKS TODO +} diff -uNr a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest --- a/sys-apps/openrc/Manifest false +++ b/sys-apps/openrc/Manifest db4067ce1657d74146abff159d9f7e33441f95344160b73a566f824f488f9fa8ed039abd89af7e321377ce6e9231c780dd4658df75758d7a3e4ba579e3a7dac9 @@ -0,0 +1,6 @@ +AUX openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch 761 BLAKE2B 78fcfe2e48a6b13a2c65837fd185f90f5db423b3bbadc12fd1ad07139b354ad3a79c03d95f8fe29270960df1fe477d95ed818874a84d79da436e9ad674d0f6ae SHA512 3ece21313c9c3465a0d5ac2d9358824f80165a1edb193ec0e237b38aefe5ac25d1c7a8c992134c78e7416ea6294711a2a0e86d369e8456b85a59eaa402e34a10 +AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec +AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb +DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be +EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15 +MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb diff -uNr a/sys-apps/openrc/files/openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch b/sys-apps/openrc/files/openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch --- a/sys-apps/openrc/files/openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch false +++ b/sys-apps/openrc/files/openrc-0.35.5-Add-_POSIX_C_SOURCE-definition-to-Linux-build.patch 2058ed4088f8f24fc545d20837c9b11ad0a011fc7a3bceb95ab30aefd2fd5f86aed4a1ed3c868925877b40954684888fde96bbef86ae5b1ce17ad0b0a849bf89 @@ -0,0 +1,29 @@ +From f4e2142089487b7f5c99da949d7bf8d038724df7 Mon Sep 17 00:00:00 2001 +From: William Hubbs <w.d.hubbs@gmail.com> +Date: Tue, 1 May 2018 13:28:57 -0500 +Subject: [PATCH] Add _POSIX_C_SOURCE definition to Linux build + +We need this to allow builds on uclibc-ng based systems. + +X-Gentoo-Bug: 650908 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=650908 +--- + mk/os-Linux.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk +index 2479ff5b..9e8a1485 100644 +--- a/mk/os-Linux.mk ++++ b/mk/os-Linux.mk +@@ -11,7 +11,7 @@ + SFX= .Linux.in + PKG_PREFIX?= /usr + +-CPPFLAGS+= -D_DEFAULT_SOURCE ++CPPFLAGS+= -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L + LIBDL= -Wl,-Bdynamic -ldl + + ifeq (${MKSELINUX},yes) +-- +2.16.1 + diff -uNr a/sys-apps/openrc/files/openrc.logrotate b/sys-apps/openrc/files/openrc.logrotate --- a/sys-apps/openrc/files/openrc.logrotate false +++ b/sys-apps/openrc/files/openrc.logrotate 147b36e48bf717c3ef87353ebaf6efeb9e554edb0eaa7ee37062b1f1265d7137c58fd18883ec663eb0f0365c646692266440ddb1e064c05909dd439d115e984d @@ -0,0 +1,4 @@ +/var/log/rc.log { + missingok + notifempty +} diff -uNr a/sys-apps/openrc/files/start-stop-daemon.pam b/sys-apps/openrc/files/start-stop-daemon.pam --- a/sys-apps/openrc/files/start-stop-daemon.pam false +++ b/sys-apps/openrc/files/start-stop-daemon.pam 02a6923fbf148adf9252f2f266c8530e90bba264fa676b4fe69bdf3c4a848a2b4c82b7bd0bd8c06d67e0498c2e3783608f9edee2d7c9c011f3cc2ee9073f2d22 @@ -0,0 +1,2 @@ +account required pam_permit.so +session include system-services diff -uNr a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml --- a/sys-apps/openrc/metadata.xml false +++ b/sys-apps/openrc/metadata.xml 9fae488a4db1cb294197e389702368370bbd22e7d24a33d1c2a634e31cba3efba89e4a6f0417c5d865a5897987ef2ab9304a0dc287e2acbba584fc26a88f51a4 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>openrc@gentoo.org</email> + <name>Gentoo OpenRC Project</name> + </maintainer> + <use> + <flag name="netifrc">enable Gentoo's network stack (net.* scripts)</flag> + <flag name="newnet">enable the new network stack (experimental)</flag> + </use> + <upstream> + <remote-id type="github">openrc/openrc</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/sys-apps/openrc/openrc-0.34.11.ebuild b/sys-apps/openrc/openrc-0.34.11.ebuild --- a/sys-apps/openrc/openrc-0.34.11.ebuild false +++ b/sys-apps/openrc/openrc-0.34.11.ebuild ed036d56568055c65b46b6ba694cac9a0cabe78e7ff5ab97dd25550e5da4f9854d7db4ed0ce6292190d40be3a75662ff0cb9eacc4fa3e0adda21087aa772caa1 @@ -0,0 +1,329 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic pam toolchain-funcs + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="https://github.com/openrc/openrc/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs + unicode kernel_linux kernel_FreeBSD" + +COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) + ncurses? ( sys-libs/ncurses:0= ) + pam? ( + sys-auth/pambase + virtual/pam + ) + audit? ( sys-process/audit ) + kernel_linux? ( + sys-process/psmisc + !<sys-process/procps-3.3.9-r2 + ) + selinux? ( + sys-apps/policycoreutils + >=sys-libs/libselinux-2.6 + ) + !<sys-apps/baselayout-2.1-r1 + !<sys-fs/udev-init-scripts-27" +DEPEND="${COMMON_DEPEND} + virtual/os-headers + ncurses? ( virtual/pkgconfig )" +RDEPEND="${COMMON_DEPEND} + !prefix? ( + kernel_linux? ( + >=sys-apps/sysvinit-2.86-r6[selinux?] + virtual/tmpfiles + ) + kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) + ) + selinux? ( + >=sec-policy/selinux-base-policy-2.20170204-r4 + >=sec-policy/selinux-openrc-2.20170204-r4 + ) +" + +PDEPEND="netifrc? ( net-misc/netifrc )" + +src_prepare() { + default + + sed -i 's:0444:0644:' mk/sys.mk || die + + if [[ ${PV} == "9999" ]] ; then + local ver="git-${EGIT_VERSION:0:6}" + sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die + fi +} + +src_compile() { + unset LIBDIR #266688 + + MAKE_ARGS="${MAKE_ARGS} + LIBNAME=$(get_libdir) + LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc + MKNET=$(usex newnet) + MKSELINUX=$(usex selinux) + MKAUDIT=$(usex audit) + MKPAM=$(usev pam) + MKSTATICLIBS=$(usex static-libs)" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Gentoo ${brand}" + use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" + export DEBUG=$(usev debug) + export MKTERMCAP=$(usev ncurses) + + tc-export CC AR RANLIB + emake ${MAKE_ARGS} +} + +# set_config <file> <option name> <yes value> <no value> test +# a value of "#" will just comment out the option +set_config() { + local file="${ED}/$1" var=$2 val com + eval "${@:5}" && val=$3 || val=$4 + [[ ${val} == "#" ]] && com="#" && val='\2' + sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" +} + +set_config_yes_no() { + set_config "$1" "$2" YES NO "${@:3}" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install + + # move the shared libs back to /usr so ldscript can install + # more of a minimal set of files + # disabled for now due to #270646 + #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die + #gen_usr_ldscript -a einfo rc + gen_usr_ldscript libeinfo.so + gen_usr_ldscript librc.so + + if ! use kernel_linux; then + keepdir /$(get_libdir)/rc/init.d + fi + keepdir /$(get_libdir)/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die + rm -rf "${ED}"/etc/runlevels + + # Setup unicode defaults for silly unicode users + set_config_yes_no /etc/rc.conf unicode use unicode + + # Cater to the norm + set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' + + # On HPPA, do not run consolefont by default (bug #222889) + if use hppa; then + rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont + fi + + # Support for logfile rotation + insinto /etc/logrotate.d + newins "${FILESDIR}"/openrc.logrotate openrc + + # install gentoo pam.d files + newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon + newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon + + # install documentation + dodoc ChangeLog *.md + if use newnet; then + dodoc README.newnet + fi +} + +add_boot_init() { + local initd=$1 + local runlevel=${2:-boot} + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ + || return + [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return + + # if runlevels dont exist just yet, then create it but still flag + # to pkg_postinst that it needs real setup #277323 + if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then + mkdir -p "${EROOT}"etc/runlevels/${runlevel} + touch "${EROOT}"etc/runlevels/.add_boot_init.created + fi + + elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" + ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${EROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local f LIBDIR=$(get_libdir) + + # avoid default thrashing in conf.d files when possible #295406 + if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then + ( + unset hostname HOSTNAME + source "${EROOT}"etc/conf.d/hostname + : ${hostname:=${HOSTNAME}} + [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" + ) + fi + + # set default interactive shell to sulogin if it exists + set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin + + # termencoding was added in 0.2.1 and needed in boot + has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding + + # swapfiles was added in 0.9.9 and needed in boot (february 2012) + has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles + + if ! has_version ">=sys-apps/openrc-0.11"; then + add_boot_init sysfs sysinit + fi + + if ! has_version ">=sys-apps/openrc-0.11.3" ; then + migrate_udev_mount_script + add_boot_init tmpfiles.setup boot + fi + + # these were added in 0.12. + if ! has_version ">=sys-apps/openrc-0.12"; then + add_boot_init loopback + add_boot_init tmpfiles.dev sysinit + + # ensure existing /etc/conf.d/net is not removed + # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier + # this needs to stay in openrc ebuilds for a long time. :( + # Added in 0.12. + if [[ -f "${EROOT}"etc/conf.d/net ]]; then + einfo "Modifying conf.d/net to keep it from being removed" + cat <<-EOF >>"${EROOT}"etc/conf.d/net + +# The network scripts are now part of net-misc/netifrc +# In order to avoid sys-apps/${P} from removing this file, this comment was +# added; you can safely remove this comment. Please see +# /usr/share/doc/netifrc*/README* for more information. +EOF + fi + fi + has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt + + if ! has_version ">=sys-apps/openrc-0.18.3"; then + add_boot_init mtab + if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then + ewarn "${EROOT}etc/mtab will be replaced with a" + ewarn "symbolic link to /proc/self/mounts on the next" + ewarn "reboot." + ewarn "Change the setting in ${EROOT}etc/conf.d/mtab" + ewarn "if you do not want this to happen." + fi + fi +} + +# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. +migrate_udev_mount_script() { + if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ + ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then + add_boot_init udev-mount sysinit + fi + return 0 +} + +pkg_postinst() { + local LIBDIR=$(get_libdir) + + # Make our runlevels if they don't exist + if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc + rm -f "${EROOT}"etc/runlevels/.add_boot_init.created + else + if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then + mkdir -p "${EROOT}"etc/runlevels/sysinit + cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ + "${EROOT}"etc/runlevels/sysinit + fi + if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then + mkdir -p "${EROOT}"etc/runlevels/shutdown + cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ + "${EROOT}"etc/runlevels/shutdown + fi + if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then + cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \ + "${EROOT}"etc/runlevels + fi + fi + + if use hppa; then + elog "Setting the console font does not work on all HPPA consoles." + elog "You can still enable it by running:" + elog "# rc-update add consolefont boot" + fi + + # Handle the conf.d/local.{start,stop} -> local.d transition + if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then + elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" + elog "files to ${EROOT}etc/local.d" + mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start + mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop + chmod +x "${EROOT}"etc/local.d/*{start,stop} + fi + + if use kernel_linux && [[ "${EROOT}" = "/" ]]; then + if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then + ewarn "The dependency data could not be migrated to /run/openrc." + ewarn "This means you need to reboot your system." + fi + fi + + # update the dependency tree after touching all files #224171 + [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if ! use newnet && ! use netifrc; then + ewarn "You have emerged OpenRc without network support. This" + ewarn "means you need to SET UP a network manager such as" + ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd," + ewarn "net-misc/NetworkManager, or net-vpn/badvpn." + ewarn "Or, you have the option of emerging openrc with the newnet" + ewarn "use flag and configuring /etc/conf.d/network and" + ewarn "/etc/conf.d/staticroute if you only use static interfaces." + ewarn + fi + + if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then + ewarn "Please add the network service to your boot runlevel" + ewarn "as soon as possible. Not doing so could leave you with a system" + ewarn "without networking." + ewarn + fi +} diff -uNr a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest --- a/sys-apps/opentmpfiles/Manifest false +++ b/sys-apps/opentmpfiles/Manifest 141cb8712326a6d8ef9c30380170d92de0caa27994779889f46a04d6cad6be6224022cf7672877c13189b6fbed77995211e5b17212a5841061a310ff84599676 @@ -0,0 +1,3 @@ +DIST opentmpfiles-0.1.3.tar.gz 5691 BLAKE2B 56d79f0279a46ed3b4e13f94a7f2c7d494df245a17b8533c48cff357c21db56485bd076e375f3b4e2c9a140a65e8ab472a8a1030bbee0853463f734c316f71e8 SHA512 fd0b10ebfeb621466edadede50ec6e8f415861ab3b14b833c75bd71f7296e9c091e59144d39e1f9efd342b6d97776cade5a692c941085e33e9651fd885da7121 +EBUILD opentmpfiles-0.1.3.ebuild 1139 BLAKE2B c74faed4e847c8fb39276bd184bbfd413d544596ffd4ef74205deca3cd5aa66a3341bf72c5bfe30558b343b7092d42be5ae69a3f90e012af448d10f740d15beb SHA512 be34016b152901f48cc91dca89fcd37aa90c0b22b9496d5dee23a0c9ed1c3c6d2354290a753adf871151f2fabc3f9c0a8f8f3f5f86901cf34123353604afaf04 +MISC metadata.xml 445 BLAKE2B 7ef4133faa6be767de26139d7f9348e892363b327fda9103b24410e09043b9a27c4a155037ef72754b2200b0b799f01adb478d6519abe41d551742084dfdb75b SHA512 eef375fdacdf78b008c8205a8b1e86eb5715f6a18999df0b71ae81e02a366e052346222d7bbcb05857b2d1c882791972f143881d62ad8a9ca264f73911d10e33 diff -uNr a/sys-apps/opentmpfiles/metadata.xml b/sys-apps/opentmpfiles/metadata.xml --- a/sys-apps/opentmpfiles/metadata.xml false +++ b/sys-apps/opentmpfiles/metadata.xml 9c00f2b56798bdadbfe6a20af58e87b1dac1b0e8563c622a331ba91cdaa8ca288cdb9c93d8cc096b3be858cdc6a9c5d8796f2f0b87432bfe96d565de598beb21 @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer type="project"> + <email>openrc@gentoo.org</email> + <name>Gentoo OpenRC Team</name> + </maintainer> + <upstream> + <remote-id type="github">openrc/opentmpfiles</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild --- a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild false +++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild 55e1515d3141eec14a0dd6e64aa13b8d5b66026cd8057b68583982ce972efbcdb123e68ebeee6bfc851aae8274fbe155dc1e4a4e18a61f72280e11523b11f234 @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/openrc/${PN}" +else + SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz -> + ${P}.tar.gz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +fi + +DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files" +HOMEPAGE="https://github.com/openrc/opentmpfiles" + +LICENSE="BSD-2" +SLOT="0" +IUSE="selinux" + +RDEPEND="!<sys-apps/openrc-0.23 + selinux? ( sec-policy/selinux-base-policy )" + +src_install() { + default + cd openrc + for f in opentmpfiles-dev opentmpfiles-setup; do + newconfd ${f}.confd ${f} + newinitd ${f}.initd ${f} + done +} + +add_service() { + local initd=$1 + local runlevel=$2 + + elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" + ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} +} + +pkg_postinst() { + if [[ -z $REPLACING_VERSIONS ]]; then + add_service opentmpfiles-dev sysinit + add_service opentmpfiles-setup boot + fi +} diff -uNr a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest --- a/sys-apps/portage/Manifest false +++ b/sys-apps/portage/Manifest 3008c4d215dc04d94c16acf1aadcee82281bea54a212a92d1818cc17aac1a1366a66d8c762a166efaa7ed76a489f2d2dbda65eb236e54503b04e760c4a04662e @@ -0,0 +1,5 @@ +AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 +AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c +DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec +EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea +MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59 diff -uNr a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE --- a/sys-apps/portage/files/README.RESCUE false +++ b/sys-apps/portage/files/README.RESCUE 6060c4fad6babf09b9afe5334773be2c3c0505a9cd7dc885b3a4c7473505f26204115c977058d171ed3c7659700b0d4a9ac0ff0697e3dfb34279131e36dd4e25 @@ -0,0 +1,2 @@ +Please see http://www.gentoo.org/proj/en/portage/doc/manually-fixing-portage.xml +for a recovery guide for a broken portage installation. diff -uNr a/sys-apps/portage/files/portage-ccache.conf b/sys-apps/portage/files/portage-ccache.conf --- a/sys-apps/portage/files/portage-ccache.conf false +++ b/sys-apps/portage/files/portage-ccache.conf 998fb62f4a51f26783205b2d6f7fc50647cb39890af52822f1296cfcde014138751a34ed74f737ff215dfe5086890d844d98f8aea8c28a34d9a0bcd50ac2cd0f @@ -0,0 +1,2 @@ +# Prevent ccache files from being cleaned +x /var/tmp/ccache diff -uNr a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml --- a/sys-apps/portage/metadata.xml false +++ b/sys-apps/portage/metadata.xml 295bd1a5a08069c2b69be8536a35fee88cac5e9f1ea269b896df0df3355c46d48f65a7057abb9c44001fa25377a9c46a3af74845cbd7ca62a6de3ec950d80c01 @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <upstream> + <bugs-to>mailto:dev-portage@gentoo.org</bugs-to> + <changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog> + <doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc> + </upstream> + <maintainer type="project"> + <email>dev-portage@gentoo.org</email> + </maintainer> + <use> + <flag name="epydoc">Build html API documentation with epydoc.</flag> + <flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag> + <flag name="ipc">Use inter-process communication between portage and + running ebuilds. + </flag> + <flag name="native-extensions"> + Compiles native "C" extensions (speedups, instead of using python + backup code). Currently includes libc-locales. + This should only be temporarily disabled for some bootstrapping + operations. Cross-compilation is not supported. + </flag> + <flag name="rsync-verify"> + Enable full-tree cryptographic verification of Gentoo repository + rsync checkouts using <pkg>app-portage/gemato</pkg>. + </flag> + <flag name="xattr">Preserve extended attributes (filesystem-stored metadata) + when installing files. Usually only required for hardened systems. + </flag> + </use> +</pkgmetadata> diff -uNr a/sys-apps/portage/portage-2.3.24-r1.ebuild b/sys-apps/portage/portage-2.3.24-r1.ebuild --- a/sys-apps/portage/portage-2.3.24-r1.ebuild false +++ b/sys-apps/portage/portage-2.3.24-r1.ebuild fae5414907b3a49e05f36999b88e92db84ad1ff4851f973e15eabec844a5774cfa28376a96697ccab2d31c4565a8dafef9f8006e062a39887fc84437020916cd @@ -0,0 +1,284 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( + pypy + python3_4 python3_5 python3_6 + python2_7 +) +PYTHON_REQ_USE='bzip2(+),threads(+)' + +inherit distutils-r1 systemd + +DESCRIPTION="Portage is the package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +LICENSE="GPL-2" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd" +SLOT="0" +IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr" + +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" +# Require sandbox-2.2 for bug #288863. +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's +# quite slow, so it's not considered in the dependencies as an alternative to +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so +# for now, don't pull in xattr deps for other kernels. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ + python{2_7,3_4,3_5} pypy) + rsync-verify? ( + >=app-portage/gemato-10 + app-crypt/gentoo-keys + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ + python2_7 pypy) + ) ) + !<app-admin/logrotate-3.8.0" +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + userland_GNU? ( >=sys-apps/coreutils-6.4 ) + )" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# NOTE: FEATURES=installsources requires debugedit and rsync + +REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" + +SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" + +prefix_src_archives() { + local x y + for x in ${@}; do + for y in ${SRC_ARCHIVES}; do + echo ${y}/${x} + done + done +} + +TARBALL_PV=${PV} +SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 + $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" + +pkg_setup() { + use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) +} + +python_prepare_all() { + distutils-r1_python_prepare_all + + if use gentoo-dev; then + einfo "Disabling --dynamic-deps by default for gentoo-dev..." + sed -e 's:$"--dynamic-deps", $$"y"$:\1"n":' \ + -i pym/_emerge/create_depgraph_params.py || \ + die "failed to patch create_depgraph_params.py" + + einfo "Enabling additional FEATURES for gentoo-dev..." + echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ + >> cnf/make.globals || die + fi + + if use native-extensions; then + printf "[build_ext]\nportage-ext-modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i pym/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + sed -e "s|^$SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"$$/usr/bin/sandbox\"$|\\1${EPREFIX}\\2|" \ + -e "s|^$FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"$$/usr/bin/fakeroot\"$|\\1${EPREFIX}\\2|" \ + -e "s|^$BASH_BINARY[[:space:]]*=[[:space:]]*\"$$/bin/bash\"$|\\1${EPREFIX}\\2|" \ + -e "s|^$MOVE_BINARY[[:space:]]*=[[:space:]]*\"$$/bin/mv\"$|\\1${EPREFIX}\\2|" \ + -e "s|^$PRELINK_BINARY[[:space:]]*=[[:space:]]*\"$$/usr/sbin/prelink\"$|\\1${EPREFIX}\\2|" \ + -e "s|^$EPREFIX[[:space:]]*=[[:space:]]*\"$.*|\\1${EPREFIX}\"|" \ + -i pym/portage/const.py || \ + die "Failed to patch portage.const.EPREFIX" + + einfo "Prefixing shebangs ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f -print0) + + einfo "Adjusting make.globals ..." + sed -e "s|$/usr/portage$|${EPREFIX}\\1|" \ + -e "s|^$PORTAGE_TMPDIR=\"$$/var/tmp\"$|\\1${EPREFIX}\\2|" \ + -i cnf/make.globals || die "sed failed" + + einfo "Adjusting repos.conf ..." + sed -e "s|^$location = $$/usr/portage$|\\1${EPREFIX}\\2|" \ + -e "s|^$sync-openpgp-key-path = $$.*$|\\1${EPREFIX}\\2|" \ + -i cnf/repos.conf || die "sed failed" + if use prefix-guest ; then + sed -e "s|^$main-repo = $.*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^$sync-uri = $.*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use epydoc && targets+=( epydoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use epydoc && targets+=( + install_epydoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + # comment out sanity test until it is fixed to work + # with the new PORTAGE_PYM_PATH + #if [[ $ROOT == / ]] ; then + ## Run some minimal tests as a sanity check. + #local test_runner=$(find "${ED}" -name runTests) + #if [[ -n $test_runner && -x $test_runner ]] ; then + #einfo "Running preinst sanity tests..." + #"$test_runner" || die "preinst sanity tests failed" + #fi + #fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} + fi + + if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ + has_version "<${CATEGORY}/${PN}-2.3.3"; then + SYNC_DEPTH_UPGRADE=true + else + SYNC_DEPTH_UPGRADE=false + fi +} + +pkg_postinst() { + if ${SYNC_DEPTH_UPGRADE}; then + ewarn "Please note that this release no longer respects sync-depth for" + ewarn "git repositories. There have been too many problems and" + ewarn "performance issues. See bugs 552814, 559008" + fi + einfo "" + einfo "This release of portage NO LONGER contains the repoman code base." + einfo "Repoman has its own ebuild and release package." + einfo "For repoman functionality please emerge app-portage/repoman" + einfo "Please report any bugs you may encounter." + einfo "" +} diff -uNr a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest --- a/sys-apps/sandbox/Manifest false +++ b/sys-apps/sandbox/Manifest 9ad08e019948551257eb21264f48ad6b59a3b7bef59de0d1f226572bcfa4fe9517ac87823967640b90e384cf8f09e329c492a8f1caadda6e72ec404a0e998467 @@ -0,0 +1,6 @@ +AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a +AUX sandbox-2.10-fix-visibility-musl.patch 573 BLAKE2B 0ce78d4d3b0e21c506e7dd497a7c20d19c8623e64227a9abe3708ee80886169c0995d293a5ec254ffecd566bc24ac5a5092271cb76dc0323f301dace1b585436 SHA512 a740e0b1a68c0609dc3080e88ab8ab87885fe05f5e0864d10ed76e8e7000f7879cb206342c38d4097c691a7c85d1936e98802b206084eb2af9f78bd43158d759 +AUX sandbox-2.11-musl.patch 1851 BLAKE2B 562428f4c2ec25f53b2a22e83ee1dfda60f56b46ab3841ae80b57f89996d2cb2c266042a3fc78bdd57c97c35f6b79d16fe16aa28d397044b4c961f67d0cc5683 SHA512 2800191fbf312d9b8858ef29975355ae51a4aff05ccc7c425f5168fe2db24562e4cf164e8ee35ecc77e0777be9d37cc52d66fdd4bf3eaeb0fc4c68c240a0cb61 +DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf +EBUILD sandbox-2.13.ebuild 2003 BLAKE2B df34256f560684c3d90259d5761999b232137dc9e9323ca2e159b34718fac888499c27bc4c4de9a8c8c2c8032afcca81299639159418c1c2b730de0deb032778 SHA512 b8bbf5e4bb3052222c01ed2d410d3ff1fc053c1ae10aeff130a7e4938ec98289cadb0b7eb7b6ce0599f8473df8aa44b012460c97a23614391547064e115a02f2 +MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9 diff -uNr a/sys-apps/sandbox/files/09sandbox b/sys-apps/sandbox/files/09sandbox --- a/sys-apps/sandbox/files/09sandbox false +++ b/sys-apps/sandbox/files/09sandbox 3d1eec16c0cca42391a64b1fb9853b29e5311bea17714d0b5c65d609d25d479bfb301787e4f6100d687aa87d82c541f1deaab05ea20c8550fa8fe8d5b76a345f @@ -0,0 +1 @@ +CONFIG_PROTECT_MASK="/etc/sandbox.d" diff -uNr a/sys-apps/sandbox/files/sandbox-2.10-fix-visibility-musl.patch b/sys-apps/sandbox/files/sandbox-2.10-fix-visibility-musl.patch --- a/sys-apps/sandbox/files/sandbox-2.10-fix-visibility-musl.patch false +++ b/sys-apps/sandbox/files/sandbox-2.10-fix-visibility-musl.patch 110f7c8240107ff42871ad62ce344b7d9ebb22afa29b70d1b196f11a4e1f3efe4edf57dc6addbcee3ec2b904777a5ecadf854abad59554d9022a110675342c92 @@ -0,0 +1,12 @@ +diff -Naur sandbox-2.10.orig/scripts/gen_symbol_version_map.awk sandbox-2.10/scripts/gen_symbol_version_map.awk +--- sandbox-2.10.orig/scripts/gen_symbol_version_map.awk 2009-08-26 01:59:48.000000000 -0400 ++++ sandbox-2.10/scripts/gen_symbol_version_map.awk 2016-01-22 23:32:41.602858004 -0500 +@@ -14,7 +14,7 @@ + + # Only check FUNCtion symbols which are not LOCAL, or + # do not have DEFAULT visibility +- if ($4 != "FUNC" || $5 == "LOCAL" || $6 != "DEFAULT") ++ if ($4 != "FUNC" || $5 == "LOCAL" || ($6 != "DEFAULT" && $6 != "PROTECTED")) + next; + + for (x in SYMBOLS) { diff -uNr a/sys-apps/sandbox/files/sandbox-2.11-musl.patch b/sys-apps/sandbox/files/sandbox-2.11-musl.patch --- a/sys-apps/sandbox/files/sandbox-2.11-musl.patch false +++ b/sys-apps/sandbox/files/sandbox-2.11-musl.patch cfec3b89d80883c89796707bfc1c6c42ef72143e4ad3081e5a416d4510412d39212ef30a7b1a5ac1717f5ca886742496bb2f9a4208c60f310cfbe32ab5507c32 @@ -0,0 +1,48 @@ +diff -Naur sandbox-2.11.orig/headers.h sandbox-2.11/headers.h +--- sandbox-2.11.orig/headers.h 2015-09-26 23:20:27.000000000 -0700 ++++ sandbox-2.11/headers.h 2016-03-29 10:35:14.716185990 -0700 +@@ -151,9 +151,11 @@ + #ifdef HAVE_ASM_PTRACE_H + # include <asm/ptrace.h> + #endif ++/* + #ifdef HAVE_LINUX_PTRACE_H + # include <linux/ptrace.h> + #endif ++*/ + #undef FU_ia64_fpreg + #undef FU_pt_all_user_regs + +diff -Naur sandbox-2.11.orig/libsandbox/trace.c sandbox-2.11/libsandbox/trace.c +--- sandbox-2.11.orig/libsandbox/trace.c 2016-03-29 03:01:35.000000000 -0700 ++++ sandbox-2.11/libsandbox/trace.c 2016-03-29 10:32:19.581906031 -0700 +@@ -10,7 +10,7 @@ + #include "sb_nr.h" + + static long do_peekdata(long offset); +-static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data); ++static long _do_ptrace(int request, const char *srequest, void *addr, void *data); + #define do_ptrace(request, addr, data) _do_ptrace(request, #request, addr, data) + #define _trace_possible(data) true + +@@ -44,7 +44,7 @@ + _exit(status); + } + +-static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data) ++static long _do_ptrace(int request, const char *srequest, void *addr, void *data) + { + long ret; + try_again: +diff -Naur sandbox-2.11.orig/scripts/gen_symbol_header.awk sandbox-2.11/scripts/gen_symbol_header.awk +--- sandbox-2.11.orig/scripts/gen_symbol_header.awk 2009-08-25 22:59:48.000000000 -0700 ++++ sandbox-2.11/scripts/gen_symbol_header.awk 2016-03-29 10:33:37.236471898 -0700 +@@ -161,7 +161,7 @@ + else + printf("symbol_version(%s, %s, %s);\n", + sym_real_name, sym_index, symbol_array[2]); +- } else { ++ } else if (!(sym_index ~ 64)) { + # For non-versioned libc's we use strong aliases + printf("strong_alias(%s, %s);\n", sym_real_name, + sym_index); diff -uNr a/sys-apps/sandbox/metadata.xml b/sys-apps/sandbox/metadata.xml --- a/sys-apps/sandbox/metadata.xml false +++ b/sys-apps/sandbox/metadata.xml e6c985f8cb3459da77d28b96c9b335a6baaabf61db0f4d07c8d20adf0500aff875eee2e0aeb97c4d5d392e688d9266b5265bccff7a8b718f3fb5328c7c81e37e @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>sandbox@gentoo.org</email> + <name>Sandbox Maintainers</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild --- a/sys-apps/sandbox/sandbox-2.13.ebuild false +++ b/sys-apps/sandbox/sandbox-2.13.ebuild f26a0aea7a76239c005887d9200097712afa3cb62134df73f4790be69fcb838ac95e99e7c0d6b41dd6bd9f0ec2de55152d69ef59f87066698572ef58cb15541f @@ -0,0 +1,82 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils + +DESCRIPTION="sandbox'd LD_PRELOAD hack" +HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" +SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ~mips ppc x86" +IUSE="" + +DEPEND="app-arch/xz-utils + >=app-misc/pax-utils-0.1.19" #265376 +RDEPEND="" + +has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" + +sandbox_death_notice() { + ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" + ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" +} + +src_prepare() { + eapply "${FILESDIR}"/${PN}-2.11-musl.patch + eapply "${FILESDIR}"/${PN}-2.10-fix-visibility-musl.patch + eapply_user +} + +multilib_src_configure() { + filter-lfs-flags #90228 + + local myconf=() + host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092 + + ECONF_SOURCE="${S}" \ + econf "${myconf[@]}" +} + +multilib_src_test() { + # Default sandbox build will run with --jobs set to # cpus. + emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" +} + +multilib_src_install_all() { + doenvd "${FILESDIR}"/09sandbox + + keepdir /var/log/sandbox + fowners root:portage /var/log/sandbox + fperms 0770 /var/log/sandbox + + dodoc AUTHORS ChangeLog* NEWS README +} + +pkg_preinst() { + chown root:portage "${ED}"/var/log/sandbox + chmod 0770 "${ED}"/var/log/sandbox + + local v + for v in ${REPLACING_VERSIONS}; do + if [[ ${v} == 1.* ]] ; then + local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') + if [[ -n ${old} ]] ; then + elog "Removing old sandbox libraries for you:" + find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete + fi + fi + done +} + +pkg_postinst() { + local v + for v in ${REPLACING_VERSIONS}; do + if [[ ${v} == 1.* ]] ; then + chmod 0755 "${EROOT}"/etc/sandbox.d #265376 + fi + done +} diff -uNr a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest --- a/sys-apps/sed/Manifest false +++ b/sys-apps/sed/Manifest 3fbf15cb2e28fcae2c87ba2332fa393876ce1d4427e49ec329091f367e51bb71e271df72569d7306b18d3b6d8af765cc95d82f7007673abe982872c97f98e46e @@ -0,0 +1,7 @@ +AUX sed-4.1.5-alloca.patch 413 BLAKE2B ace3926149e5190bb800a1e1871d70613fee6ef5ef6fee2fca27f5f572adfab36864f4032a9a8c86d77f21672050ed77ca3665ee96a43329a81128d3512956c0 SHA512 dccdad774cbf1eb71744b9d1a49ce45e6c6197ffed66448b6de9302dc88d46246b52a6cbed95a5b86511f19a735a710af177003732d54ca01baa84ef21734d29 +AUX sed-4.3-dfa-segv-1.patch 6180 BLAKE2B ff482286d08ca2aa87553a959884159bf8d958e7713e8da2f51d7ff2209a967ed4da45702f9149094e948412cdc9fa7f95e15cb92ac707a13b0374dd7ab9dc34 SHA512 467a36bc863ee2bed90b8e87f0023b67615c606dea4376bc8da72356f13871a51f82e73965f1f17975d76b7768dfe20ad2d4b7373a2c208257981d8235b61e7b +AUX sed-4.3-dfa-segv-2.patch 3797 BLAKE2B 1880183179c88e8898579abdbe493112bf5aad1c4350997726582c5e36ad73f22cf4eb630d1cb6b25c96219c7e35c8a21bd8f58a2b3b3fe6799e19097a66ec4c SHA512 d346f71e4899d5bde9127f86428a8ab1ee149aee28247e6e04ff940eb9ee90392f81d3d61b525cef5f1c3e871ee4295b4168edcd00d802edfc3f8a2725a39072 +AUX sed-4.3-dfa-segv-3.patch 5334 BLAKE2B 44cd0e56f46e0ed458ff6e157f28bf2e0f7c5af32541dc609f28831dfe3c3442fe9240863c500f39267bd9be2d492966591b8a32bb6bf858fdeafdb9baab4032 SHA512 270a4917addf899d03b32fe544816d2132063ca113229cd1b5b72dacd1ebb6f087fea5cc362ceda3237966074cf542883f12e3f1d2da4b045a7f158f50017ccb +DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573 +EBUILD sed-4.2.2.ebuild 1680 BLAKE2B 5091750a04cdaa6b5c340cfe27c74a3b620d21b3be451755104d93774f73060d92a70c367ce4107407dbfc3a4edb8fefbcbeef3876e3bc9707e481f5b20cb3eb SHA512 331c709e673cd26b2c3b5a48094ce5e2cb4d486b5eca2ac6733fc8e39fd525342be2494384922da920075f94fe2ab81a625795ea094769ab71548acb93089d99 +MISC metadata.xml 599 BLAKE2B 1e3e9343805c40b2f8ba3be494c1280395ce8edfb85d93b53e136269c774312b5b27d63cd628eb1ca57faa2c1a3849a7b361c9fa68850f47d70d618995b57667 SHA512 6aa22a76f9ec43142548e347dcea74b4c0b02bf0f8ccaff581265ba4b97fc16fca5d01bc3884e27523d138eec3b809bae6b379c7c0d38b344db2f7175e5565d5 diff -uNr a/sys-apps/sed/files/sed-4.1.5-alloca.patch b/sys-apps/sed/files/sed-4.1.5-alloca.patch --- a/sys-apps/sed/files/sed-4.1.5-alloca.patch false +++ b/sys-apps/sed/files/sed-4.1.5-alloca.patch d18a9c64fef4fe290cef865da2446c48532b43c9bd7d166622fa8c6a66912008f2ea23c059718dbff49af149ed43cc01daf75c942c716176e6939c8122493798 @@ -0,0 +1,14 @@ +fix building on BSD systems which often do not have alloca.h + +--- sed-4.1.5/lib/regex_internal.h ++++ sed-4.1.5/lib/regex_internal.h +@@ -410,7 +410,9 @@ static unsigned int re_string_context_at + #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx)) + #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx)) + ++#ifdef HAVE_ALLOCA_H + #include <alloca.h> ++#endif + + #ifndef _LIBC + # if HAVE_ALLOCA diff -uNr a/sys-apps/sed/files/sed-4.3-dfa-segv-1.patch b/sys-apps/sed/files/sed-4.3-dfa-segv-1.patch --- a/sys-apps/sed/files/sed-4.3-dfa-segv-1.patch false +++ b/sys-apps/sed/files/sed-4.3-dfa-segv-1.patch 04d8537f29160623767199f49c29640c673fbbf4a83c7832a8239aed097023481805dce38397f5235285e891504e45c0c140f2bb7b6d495919d1c52ce4c0b8e0 @@ -0,0 +1,175 @@ +fix from upstream gnulib (fudged to apply to sed-4.3) + +From 823b5cb589366f7c8742503af980803afad0978f Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Sun, 8 Jan 2017 12:44:29 -0800 +Subject: [PATCH] dfa: fix reallocation bug when matching newlines + +Problem reported for sed by S. Gilles (Bug#25390). +* lib/dfa.c (realloc_trans_if_necessary): Move earlier. +(dfastate): Reallocate before moving any newline transition ... +(build_state): ... instead of reallocating here, where it is too late. +--- + ChangeLog | 8 +++++ + lib/dfa.c | 114 ++++++++++++++++++++++++++++++-------------------------------- + 2 files changed, 63 insertions(+), 59 deletions(-) + +diff --git a/lib/dfa.c b/lib/dfa.c +index 8276db160a4b..141888a978fa 100644 +--- a/lib/dfa.c ++++ b/lib/dfa.c +@@ -2574,6 +2574,40 @@ dfaanalyze (struct dfa *d, bool searchflag) + free (merged.elems); + } + ++/* Make sure D's state arrays are large enough to hold NEW_STATE. */ ++static void ++realloc_trans_if_necessary (struct dfa *d, state_num new_state) ++{ ++ state_num oldalloc = d->tralloc; ++ if (oldalloc <= new_state) ++ { ++ state_num **realtrans = d->trans ? d->trans - 2 : NULL; ++ ptrdiff_t newalloc1 = realtrans ? d->tralloc + 2 : 0; ++ realtrans = xpalloc (realtrans, &newalloc1, new_state - oldalloc + 1, ++ -1, sizeof *realtrans); ++ realtrans[0] = realtrans[1] = NULL; ++ d->trans = realtrans + 2; ++ ptrdiff_t newalloc = d->tralloc = newalloc1 - 2; ++ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails); ++ d->success = xnrealloc (d->success, newalloc, sizeof *d->success); ++ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines); ++ if (d->localeinfo.multibyte) ++ { ++ realtrans = d->mb_trans ? d->mb_trans - 2 : NULL; ++ realtrans = xnrealloc (realtrans, newalloc1, sizeof *realtrans); ++ if (oldalloc == 0) ++ realtrans[0] = realtrans[1] = NULL; ++ d->mb_trans = realtrans + 2; ++ } ++ for (; oldalloc < newalloc; oldalloc++) ++ { ++ d->trans[oldalloc] = NULL; ++ d->fails[oldalloc] = NULL; ++ if (d->localeinfo.multibyte) ++ d->mb_trans[oldalloc] = NULL; ++ } ++ } ++} + + /* Return the transition out of state s of d for the input character uc, + updating the slots in trans accordingly. +@@ -2810,20 +2844,25 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) + } + + /* Set the transitions for each character in the label. */ ++ state_num maxstate = -1; + for (i = 0; i < NOTCHAR; i++) + if (tstbit (i, label)) +- switch (d->syntax.sbit[i]) +- { +- case CTX_NEWLINE: +- trans[i] = state_newline; +- break; +- case CTX_LETTER: +- trans[i] = state_letter; +- break; +- default: +- trans[i] = state; +- break; +- } ++ { ++ switch (d->syntax.sbit[i]) ++ { ++ case CTX_NEWLINE: ++ trans[i] = state_newline; ++ break; ++ case CTX_LETTER: ++ trans[i] = state_letter; ++ break; ++ default: ++ trans[i] = state; ++ break; ++ } ++ if (maxstate < trans[i]) ++ maxstate = trans[i]; ++ } + + #ifdef DEBUG + fprintf (stderr, "trans table %td", s); +@@ -2840,6 +2879,9 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) + free (follows.elems); + free (tmp.elems); + ++ /* Reallocate now, to reallocate any newline transition properly. */ ++ realloc_trans_if_necessary (d, maxstate); ++ + /* Keep the newline transition in a special place so we can use it as + a sentinel. */ + if (tstbit (d->syntax.eolbyte, label)) +@@ -2851,42 +2893,6 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) + return trans[uc]; + } + +-/* Make sure D's state arrays are large enough to hold NEW_STATE. */ +-static void +-realloc_trans_if_necessary (struct dfa *d, state_num new_state) +-{ +- state_num oldalloc = d->tralloc; +- if (oldalloc <= new_state) +- { +- state_num **realtrans = d->trans ? d->trans - 2 : NULL; +- ptrdiff_t newalloc, newalloc1; +- newalloc1 = realtrans ? d->tralloc + 2 : 0; +- realtrans = xpalloc (realtrans, &newalloc1, new_state - oldalloc + 1, +- -1, sizeof *realtrans); +- realtrans[0] = realtrans[1] = NULL; +- d->trans = realtrans + 2; +- d->tralloc = newalloc = newalloc1 - 2; +- d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails); +- d->success = xnrealloc (d->success, newalloc, sizeof *d->success); +- d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines); +- if (d->localeinfo.multibyte) +- { +- realtrans = d->mb_trans ? d->mb_trans - 2 : NULL; +- realtrans = xnrealloc (realtrans, newalloc1, sizeof *realtrans); +- if (oldalloc == 0) +- realtrans[0] = realtrans[1] = NULL; +- d->mb_trans = realtrans + 2; +- } +- for (; oldalloc < newalloc; oldalloc++) +- { +- d->trans[oldalloc] = NULL; +- d->fails[oldalloc] = NULL; +- if (d->localeinfo.multibyte) +- d->mb_trans[oldalloc] = NULL; +- } +- } +-} +- + /* Calculate the transition table for a new state derived from state s + for a compiled dfa d after input character uc, and return the new + state number. */ +@@ -2932,18 +2939,7 @@ build_state (state_num s, struct dfa *d, unsigned char uc) + if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d)) + d->success[s] |= CTX_NONE; + +- s = dfastate (s, d, uc, trans); +- +- /* Now go through the new transition table, and make sure that the trans +- and fail arrays are allocated large enough to hold a pointer for the +- largest state mentioned in the table. */ +- state_num maxstate = -1; +- for (int i = 0; i < NOTCHAR; i++) +- if (maxstate < trans[i]) +- maxstate = trans[i]; +- realloc_trans_if_necessary (d, maxstate); +- +- return s; ++ return dfastate (s, d, uc, trans); + } + + /* Multibyte character handling sub-routines for dfaexec. */ +-- +2.11.0 + diff -uNr a/sys-apps/sed/files/sed-4.3-dfa-segv-2.patch b/sys-apps/sed/files/sed-4.3-dfa-segv-2.patch --- a/sys-apps/sed/files/sed-4.3-dfa-segv-2.patch false +++ b/sys-apps/sed/files/sed-4.3-dfa-segv-2.patch ebf59d5deef45c186387fdccc6b0485fb6d991064f8fd0872213d003be1f8ca8d2d95f7032df9df9a285ed241a6286e637818f40b7777e3e60b58bed5a1c394f @@ -0,0 +1,112 @@ +fix from upstream gnulib (fudged to apply to sed-4.3) + +From aff55692da81f702ccbc461ad4f896b23c398638 Mon Sep 17 00:00:00 2001 +From: Norihiro Tanaka <noritnk@kcn.ne.jp> +Date: Mon, 9 Jan 2017 07:46:13 +0900 +Subject: [PATCH] dfa: simplify transition table allocation + +* src/dfa.c (realloc_trans_if_necessary): Remove second argument. +Its value is derived from other variable. Update callers. +(dfastate): Remove calculation of max number of state. +--- + lib/dfa.c | 44 ++++++++++++++++++++------------------------ + 1 file changed, 20 insertions(+), 24 deletions(-) + +diff --git a/lib/dfa.c b/lib/dfa.c +index 141888a978fa..bda4602b1094 100644 +--- a/lib/dfa.c ++++ b/lib/dfa.c +@@ -2576,14 +2576,14 @@ dfaanalyze (struct dfa *d, bool searchflag) + + /* Make sure D's state arrays are large enough to hold NEW_STATE. */ + static void +-realloc_trans_if_necessary (struct dfa *d, state_num new_state) ++realloc_trans_if_necessary (struct dfa *d) + { + state_num oldalloc = d->tralloc; +- if (oldalloc <= new_state) ++ if (oldalloc < d->sindex) + { + state_num **realtrans = d->trans ? d->trans - 2 : NULL; + ptrdiff_t newalloc1 = realtrans ? d->tralloc + 2 : 0; +- realtrans = xpalloc (realtrans, &newalloc1, new_state - oldalloc + 1, ++ realtrans = xpalloc (realtrans, &newalloc1, d->sindex - oldalloc, + -1, sizeof *realtrans); + realtrans[0] = realtrans[1] = NULL; + d->trans = realtrans + 2; +@@ -2825,6 +2825,9 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) + state_letter = state_index (d, &follows, CTX_LETTER); + else + state_letter = state; ++ ++ /* Reallocate now, to reallocate any newline transition properly. */ ++ realloc_trans_if_necessary (d); + } + + /* If we are a searching matcher, the default transition is to a state +@@ -2847,22 +2850,18 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) + state_num maxstate = -1; + for (i = 0; i < NOTCHAR; i++) + if (tstbit (i, label)) +- { +- switch (d->syntax.sbit[i]) +- { +- case CTX_NEWLINE: +- trans[i] = state_newline; +- break; +- case CTX_LETTER: +- trans[i] = state_letter; +- break; +- default: +- trans[i] = state; +- break; +- } +- if (maxstate < trans[i]) +- maxstate = trans[i]; +- } ++ switch (d->syntax.sbit[i]) ++ { ++ case CTX_NEWLINE: ++ trans[i] = state_newline; ++ break; ++ case CTX_LETTER: ++ trans[i] = state_letter; ++ break; ++ default: ++ trans[i] = state; ++ break; ++ } + + #ifdef DEBUG + fprintf (stderr, "trans table %td", s); +@@ -2879,9 +2878,6 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) + free (follows.elems); + free (tmp.elems); + +- /* Reallocate now, to reallocate any newline transition properly. */ +- realloc_trans_if_necessary (d, maxstate); +- + /* Keep the newline transition in a special place so we can use it as + a sentinel. */ + if (tstbit (d->syntax.eolbyte, label)) +@@ -3042,7 +3038,7 @@ transit_state (struct dfa *d, state_num s, unsigned char const **pp, + + separate_contexts = state_separate_contexts (&d->mb_follows); + s2 = state_index (d, &d->mb_follows, separate_contexts ^ CTX_ANY); +- realloc_trans_if_necessary (d, s2); ++ realloc_trans_if_necessary (d); + + d->mb_trans[s][d->states[s1].mb_trindex] = s2; + +@@ -3137,7 +3133,7 @@ dfaexec_main (struct dfa *d, char const *begin, char *end, bool allow_nl, + } + + if (!d->tralloc) +- realloc_trans_if_necessary (d, 0); ++ realloc_trans_if_necessary (d); + + s = s1 = 0; + p = mbp = (unsigned char const *) begin; +-- +2.11.0 + diff -uNr a/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch b/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch --- a/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch false +++ b/sys-apps/sed/files/sed-4.3-dfa-segv-3.patch d681a7e7b1063fe128fcd7e89f1412582a66735677bd5630a3e10b9991fe981533b13242e1fe07ec57df4ea5deb19b5dd6a6bcd78b44b26e5ab979ac71a21bfe @@ -0,0 +1,146 @@ +fix from upstream gnulib (fudged to apply to sed-4.3) + +From 7c345c68cdf62737ccc4a9d0ba2cd921fae850fa Mon Sep 17 00:00:00 2001 +From: Norihiro Tanaka <noritnk@kcn.ne.jp> +Date: Mon, 9 Jan 2017 08:21:21 +0900 +Subject: [PATCH] dfa: melt down dfastate into build_state + +* src/dfa.c (dfastate): Remove it. +(build_state): Insert content of dfastate() to bottom. +--- + lib/dfa.c | 97 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 45 insertions(+), 52 deletions(-) + +diff --git a/lib/dfa.c b/lib/dfa.c +index bda4602b1094..6896ed320a7b 100644 +--- a/lib/dfa.c ++++ b/lib/dfa.c +@@ -2609,8 +2609,10 @@ realloc_trans_if_necessary (struct dfa *d) + } + } + +-/* Return the transition out of state s of d for the input character uc, +- updating the slots in trans accordingly. ++/* ++ Calculate the transition table for a new state derived from state s ++ for a compiled dfa d after input character uc, and return the new ++ state number. + + Do not worry about all possible input characters; calculate just the group + of positions that match uc. Label it with the set of characters that +@@ -2639,8 +2641,9 @@ realloc_trans_if_necessary (struct dfa *d) + If after comparing with every group there are characters remaining in C, + create a new group labeled with the characters of C and insert this + position in that group. */ ++ + static state_num +-dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) ++build_state (state_num s, struct dfa *d, unsigned char uc) + { + leaf_set group; /* Positions that match the input char. */ + charclass label; /* The group's label. */ +@@ -2652,6 +2655,45 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) + fprintf (stderr, "build state %td\n", s); + #endif + ++ /* A pointer to the new transition table, and the table itself. */ ++ state_num **ptrans = (ACCEPTING (s, *d) ? d->fails : d->trans) + s; ++ state_num *trans = *ptrans; ++ ++ if (!trans) ++ { ++ /* MAX_TRCOUNT is an arbitrary upper limit on the number of ++ transition tables that can exist at once, other than for ++ initial states. Often-used transition tables are quickly ++ rebuilt, whereas rarely-used ones are cleared away. */ ++ if (MAX_TRCOUNT <= d->trcount) ++ { ++ for (state_num i = d->min_trcount; i < d->tralloc; i++) ++ { ++ free (d->trans[i]); ++ free (d->fails[i]); ++ d->trans[i] = d->fails[i] = NULL; ++ } ++ d->trcount = 0; ++ } ++ ++ d->trcount++; ++ *ptrans = trans = xmalloc (NOTCHAR * sizeof *trans); ++ ++ /* Fill transition table with a default value which means that the ++ transited state has not been calculated yet. */ ++ for (int i = 0; i < NOTCHAR; i++) ++ trans[i] = -2; ++ } ++ ++ /* Set up the success bits for this state. */ ++ d->success[s] = 0; ++ if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NEWLINE, s, *d)) ++ d->success[s] |= CTX_NEWLINE; ++ if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_LETTER, s, *d)) ++ d->success[s] |= CTX_LETTER; ++ if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d)) ++ d->success[s] |= CTX_NONE; ++ + group.elems = xnmalloc (d->nleaves, sizeof *group.elems); + group.nelem = 0; + +@@ -2889,55 +2931,6 @@ dfastate (state_num s, struct dfa *d, unsigned char uc, state_num trans[]) + return trans[uc]; + } + +-/* Calculate the transition table for a new state derived from state s +- for a compiled dfa d after input character uc, and return the new +- state number. */ +- +-static state_num +-build_state (state_num s, struct dfa *d, unsigned char uc) +-{ +- /* A pointer to the new transition table, and the table itself. */ +- state_num **ptrans = (ACCEPTING (s, *d) ? d->fails : d->trans) + s; +- state_num *trans = *ptrans; +- +- if (!trans) +- { +- /* MAX_TRCOUNT is an arbitrary upper limit on the number of +- transition tables that can exist at once, other than for +- initial states. Often-used transition tables are quickly +- rebuilt, whereas rarely-used ones are cleared away. */ +- if (MAX_TRCOUNT <= d->trcount) +- { +- for (state_num i = d->min_trcount; i < d->tralloc; i++) +- { +- free (d->trans[i]); +- free (d->fails[i]); +- d->trans[i] = d->fails[i] = NULL; +- } +- d->trcount = 0; +- } +- +- d->trcount++; +- *ptrans = trans = xmalloc (NOTCHAR * sizeof *trans); +- +- /* Fill transition table with a default value which means that the +- transited state has not been calculated yet. */ +- for (int i = 0; i < NOTCHAR; i++) +- trans[i] = -2; +- } +- +- /* Set up the success bits for this state. */ +- d->success[s] = 0; +- if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NEWLINE, s, *d)) +- d->success[s] |= CTX_NEWLINE; +- if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_LETTER, s, *d)) +- d->success[s] |= CTX_LETTER; +- if (ACCEPTS_IN_CONTEXT (d->states[s].context, CTX_NONE, s, *d)) +- d->success[s] |= CTX_NONE; +- +- return dfastate (s, d, uc, trans); +-} +- + /* Multibyte character handling sub-routines for dfaexec. */ + + /* Consume a single byte and transit state from 's' to '*next_state'. +-- +2.11.0 + diff -uNr a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml --- a/sys-apps/sed/metadata.xml false +++ b/sys-apps/sed/metadata.xml 29184f552d5dc3a17be34c3fb674ea1ceb02cd66d4199776295dcedf9ccf0f8fb1de06c8e2fe6112592bf17a5ffe54ac101873ded051c73bc767cfb80abd6fd2 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<upstream> + <remote-id type="sourceforge">sed</remote-id> +</upstream> +<use> + <flag name="forced-sandbox"> + Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands). + Note: This may break many configure scripts, so it should be avoided on dev systems + (and generally used on binpkg/final systems only). + </flag> +</use> +</pkgmetadata> diff -uNr a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild --- a/sys-apps/sed/sed-4.2.2.ebuild false +++ b/sys-apps/sed/sed-4.2.2.ebuild 99db48111682967bc212af86a1b1820919c9f0937e8fadcac3345ffaa7263d868d07407b72a35cf898f60f8a3cc9f943d0b89a41e87bff211bf8acae6cd88aee @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Super-useful stream editor" +HOMEPAGE="http://sed.sourceforge.net/" +SRC_URI="mirror://gnu/sed/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="acl nls selinux static" + +RDEPEND="acl? ( virtual/acl ) + nls? ( virtual/libintl ) + selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_bootstrap_sed() { + # make sure system-sed works #40786 + if ! type -p sed > /dev/null ; then + mkdir -p "${T}/bootstrap" + printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die + chmod a+rx "${T}/bootstrap/sed" + PATH="${T}/bootstrap:${PATH}" + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-4.1.5-alloca.patch + + # don't use sed before bootstrap if we have to recover a broken host sed + src_bootstrap_sed + # this has to be after the bootstrap portion + sed -i \ + -e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \ + doc/Makefile.in || die "sed html doc" +} + +src_configure() { + local myconf=() + if use userland_GNU; then + myconf+=( --exec-prefix="${EPREFIX}" ) + else + myconf+=( --program-prefix=g ) + fi + + # Should be able to drop this hack in next release. #333887 + tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes + export ac_cv_search_setfilecon=$(usex selinux -lselinux) + export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux) + use static && append-ldflags -static + econf \ + $(use_enable acl) \ + $(use_enable nls) \ + "${myconf[@]}" +} diff -uNr a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest --- a/sys-apps/shadow/Manifest false +++ b/sys-apps/shadow/Manifest 2b5b87346f9ad4596c665078aa80ddbb32e0dc01d540f10f2c544807bb6c9cf537c05345f5b2952bdb3770e89399136081d2711dcab927e8628836c1425e0ff5 @@ -0,0 +1,7 @@ +AUX default/useradd 96 BLAKE2B 64b694bdff7f901e19ac21695e3b2eebeb5a03683be5a01e33f96a4e7f94d1059a3ea3703fd4f7167778c8aebb0605640edfd60c46bc48242fae8b37f7182303 SHA512 87b01ac88c2065392fa988871489d8403ef93341b4cfbadb4504f39a2a3396ddef756efc6378868d00627a58a1feb9612eb52a8135558a211a09c6a9ccf3404f +AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d35c9908ca400bd57dcb234fb7691aa2a5a7646a379553aa6dee0dd96ee569aa492d7f20774e991a90f8602 SHA512 31611a08d97cd2c129f18d451a555ff6c781f91603c77fc0c66ff406b5fa4a97db19ae4ce104816a6324529d10e131de0d5329646bdab2abc8dc3ee5b82b057f +AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3 +AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d +DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714 +EBUILD shadow-4.6.ebuild 5349 BLAKE2B 06f7ef54c7e2f34a679364b51c0447ad9b4c221225e3d47489132da7ddf3b0c2d9483f0ae2a338f83242fc9969d57b5ce56a5ddc562b5ef481b7ae64c4b9d582 SHA512 2d6b2f974c4540ddc0ef987416636e3ce8e52feac028eaa29a6d86570c1b16d2b50c8613a7dff27a4132a0a3f2b554ae7cb000aed333e99b7883a3a10d26d479 +MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469 diff -uNr a/sys-apps/shadow/files/default/useradd b/sys-apps/shadow/files/default/useradd --- a/sys-apps/shadow/files/default/useradd false +++ b/sys-apps/shadow/files/default/useradd ba07b1709840c15c9991b1ac81e70bc31acaee5e55020c7b55f2a8d3c45c75e2539b4ff0e5fff36c938dc4cb959f632b8ea4e5dffb8ca129c9d09186ca5cbe96 @@ -0,0 +1,7 @@ +# useradd defaults file +GROUP=100 +HOME=/home +INACTIVE=-1 +EXPIRE= +SHELL=/bin/bash +SKEL=/etc/skel diff -uNr a/sys-apps/shadow/files/pam.d-include/passwd b/sys-apps/shadow/files/pam.d-include/passwd --- a/sys-apps/shadow/files/pam.d-include/passwd false +++ b/sys-apps/shadow/files/pam.d-include/passwd 3ccbfe35379d15ae3b289835d16feb9814f79901c04788e2bd2b0d112f9e9aae69f5de10af5f4352d4c3cf2821c81086f9f6192b09b4b3e6a8e3937e19295e14 @@ -0,0 +1,8 @@ +#%PAM-1.0 + +auth sufficient pam_rootok.so +auth include system-auth + +account include system-auth + +password include system-auth diff -uNr a/sys-apps/shadow/files/pam.d-include/shadow b/sys-apps/shadow/files/pam.d-include/shadow --- a/sys-apps/shadow/files/pam.d-include/shadow false +++ b/sys-apps/shadow/files/pam.d-include/shadow 76858d178e7b3011d528b699564b4c5a2efc5ba59205b2fa74dc6dca82bb48c0b0e86f09e9fb5014905960b842585667bb3fa60e23883a371ae5854a9c71ad13 @@ -0,0 +1,8 @@ +#%PAM-1.0 + +auth sufficient pam_rootok.so +auth required pam_permit.so + +account include system-auth + +password required pam_permit.so diff -uNr a/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch --- a/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch false +++ b/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch 492925131bfe67e6cec11560b41f42808c3c17130ebc40dc1f7f6a8304b9d6c88a84c352c7ef9f3e34352059f9e4c29b250f432339c85d16de32b09ec25c7a39 @@ -0,0 +1,10 @@ +--- shadow-4.1.3/libmisc/chkname.c ++++ shadow-4.1.3/libmisc/chkname.c +@@ -66,6 +66,7 @@ + ( ('0' <= *name) && ('9' >= *name) ) || + ('_' == *name) || + ('-' == *name) || ++ ('.' == *name) || + ( ('$' == *name) && ('\0' == *(name + 1)) ) + )) { + return false; diff -uNr a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml --- a/sys-apps/shadow/metadata.xml false +++ b/sys-apps/shadow/metadata.xml e2de9b7562de7dc329e35ef18defd501db828553bc3a7183ac685bb86a86ba0e315efb12a20e1ef03bc675a85b8c9da770b6066f884da44d596e420e5f67e673 @@ -0,0 +1,17 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <maintainer type="project"> + <email>pam-bugs@gentoo.org</email> + <name>Pluggable Authentication Method maintenance</name> + </maintainer> +  + <upstream> + <remote-id type="cpe">cpe:/a:debian:shadow</remote-id> + <remote-id type="github">shadow-maint/shadow</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild --- a/sys-apps/shadow/shadow-4.6.ebuild false +++ b/sys-apps/shadow/shadow-4.6.ebuild ae0b1f4897f83550516dd574cb7f0363d2c37ff0fd3852a1467f0ca9380b974d80af7de4a53d74f49415860a5f9cf636e91327cc568d80cf3a924ea9770622ef @@ -0,0 +1,211 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit libtool pam multilib + +DESCRIPTION="Utilities to deal with user accounts" +HOMEPAGE="https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/" +SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.gz" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +IUSE="acl audit +cracklib nls pam selinux skey xattr" +# Taken from the man/Makefile.am file. +LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW ) + +RDEPEND="acl? ( sys-apps/acl:0= ) + audit? ( >=sys-process/audit-2.6:0= ) + cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) + pam? ( virtual/pam:0= ) + skey? ( sys-auth/skey:0= ) + selinux? ( + >=sys-libs/libselinux-1.28:0= + sys-libs/libsemanage:0= + ) + nls? ( virtual/libintl ) + xattr? ( sys-apps/attr:0= )" +DEPEND="${RDEPEND} + app-arch/xz-utils + nls? ( sys-devel/gettext )" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20150213 )" + +PATCHES=( + "${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch" +) + +src_prepare() { + default + #eautoreconf + elibtoolize +} + +src_configure() { + local myeconfargs=( + --without-group-name-max-length + --without-tcb + --enable-shared=no + --enable-static=yes + $(use_with acl) + $(use_with audit) + $(use_with cracklib libcrack) + $(use_with pam libpam) + $(use_with skey) + $(use_with selinux) + $(use_enable nls) + $(use_with elibc_glibc nscd) + $(use_with xattr attr) + ) + econf "${myeconfargs[@]}" + + has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052 + + if use nls ; then + local l langs="po" # These are the pot files. + for l in ${LANGS[*]} ; do + has ${l} ${LINGUAS-${l}} && langs+=" ${l}" + done + sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die + fi +} + +set_login_opt() { + local comment="" opt=$1 val=$2 + if [[ -z ${val} ]]; then + comment="#" + sed -i \ + -e "/^${opt}\>/s:^:#:" \ + "${ED%/}"/etc/login.defs || die + else + sed -i -r \ + -e "/^#?${opt}\>/s:.*:${opt} ${val}:" \ + "${ED%/}"/etc/login.defs + fi + local res=$(grep "^${comment}${opt}\>" "${ED%/}"/etc/login.defs) + einfo "${res:-Unable to find ${opt} in /etc/login.defs}" +} + +src_install() { + emake DESTDIR="${D}" suidperms=4711 install + + # Remove libshadow and libmisc; see bug 37725 and the following + # comment from shadow's README.linux: + # Currently, libshadow.a is for internal use only, so if you see + # -lshadow in a Makefile of some other package, it is safe to + # remove it. + rm -f "${ED%/}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} + + insinto /etc + if ! use pam ; then + insopts -m0600 + doins etc/login.access etc/limits + fi + + # needed for 'useradd -D' + insinto /etc/default + insopts -m0600 + doins "${FILESDIR}"/default/useradd + + # move passwd to / to help recover broke systems #64441 + mv "${ED%/}"/usr/bin/passwd "${ED%/}"/bin/ || die + dosym ../../bin/passwd /usr/bin/passwd + + cd "${S}" || die + insinto /etc + insopts -m0644 + newins etc/login.defs login.defs + + set_login_opt CREATE_HOME yes + if ! use pam ; then + set_login_opt MAIL_CHECK_ENAB no + set_login_opt SU_WHEEL_ONLY yes + set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict + set_login_opt LOGIN_RETRIES 3 + set_login_opt ENCRYPT_METHOD SHA512 + set_login_opt CONSOLE + else + dopamd "${FILESDIR}"/pam.d-include/shadow + + for x in chpasswd chgpasswd newusers; do + newpamd "${FILESDIR}"/pam.d-include/passwd ${x} + done + + for x in chage chsh chfn \ + user{add,del,mod} group{add,del,mod} ; do + newpamd "${FILESDIR}"/pam.d-include/shadow ${x} + done + + # comment out login.defs options that pam hates + local opt sed_args=() + for opt in \ + CHFN_AUTH \ + CONSOLE \ + CRACKLIB_DICTPATH \ + ENV_HZ \ + ENVIRON_FILE \ + FAILLOG_ENAB \ + FTMP_FILE \ + LASTLOG_ENAB \ + MAIL_CHECK_ENAB \ + MOTD_FILE \ + NOLOGINS_FILE \ + OBSCURE_CHECKS_ENAB \ + PASS_ALWAYS_WARN \ + PASS_CHANGE_TRIES \ + PASS_MIN_LEN \ + PORTTIME_CHECKS_ENAB \ + QUOTAS_ENAB \ + SU_WHEEL_ONLY + do + set_login_opt ${opt} + sed_args+=( -e "/^#${opt}\>/b pamnote" ) + done + sed -i "${sed_args[@]}" \ + -e 'b exit' \ + -e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \ + -e ': exit' \ + "${ED%/}"/etc/login.defs || die + + # remove manpages that pam will install for us + # and/or don't apply when using pam + find "${ED%/}"/usr/share/man \ + '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ + -delete + + # Remove pam.d files provided by pambase. + rm "${ED%/}"/etc/pam.d/{login,passwd,su} || die + fi + + # Remove manpages that are handled by other packages + find "${ED%/}"/usr/share/man \ + '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ + -delete + + cd "${S}" || die + dodoc ChangeLog NEWS TODO + newdoc README README.download + cd doc || die + dodoc HOWTO README* WISHLIST *.txt +} + +pkg_preinst() { + rm -f "${EROOT}"/etc/pam.d/system-auth.new \ + "${EROOT}/etc/login.defs.new" +} + +pkg_postinst() { + # Enable shadow groups. + if [ ! -f "${EROOT}"/etc/gshadow ] ; then + if grpck -r -R "${EROOT}" 2>/dev/null ; then + grpconv -R "${EROOT}" + else + ewarn "Running 'grpck' returned errors. Please run it by hand, and then" + ewarn "run 'grpconv' afterwards!" + fi + fi + + einfo "The 'adduser' symlink to 'useradd' has been dropped." +} diff -uNr a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest --- a/sys-apps/sysvinit/Manifest false +++ b/sys-apps/sysvinit/Manifest 7df7608d59331a7ba057ade872a661d00caad12eaa98d15996d0f96b23f4877fd7dfceb23633a33c1cfda8f9e70a8d63e3b70e0eaedcddb97bac31a37c495a10 @@ -0,0 +1,11 @@ +AUX inittab-2.88 1928 BLAKE2B abf5b94c6021f8d46543e9028e89359e4c6aff2ebed7f6dd20b3529a73a7885d0c1acf9417bda1e5ca7fcd191a3020419631b15c6da3992567bddd61949bcf0b SHA512 71476e1e07e288796887c7cfdf359523403816adb939c5c364b4fafef3dabd3e7eefb354bc09343606af4804a10247b5f345b404a5490fcdae8937287a84a990 +AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee +AUX sysvinit-2.86-shutdown-single.patch 1229 BLAKE2B fc95e0a3db23300776bc61890f491449f0b078f3814d73b1fae278a3e28f8b3b567056f71ecfbd917e74aec1594cfdb7b15e6808a09ccda594ec8e1a683d5957 SHA512 b1fa6225cdb0d5ed6d2d3128a9ad29dc76f14845c3fe57aa2edf234af456ae49f700b25ed4170a6337f662be224bd6ddfd424331483b0c482fd33cd045ddc575 +AUX sysvinit-2.88-makefile.patch 1546 BLAKE2B 4634bc8e62bf8a38778f0fd186a0a380159ae52cdfc089af9b9bacdf4a9db5d5d5f8093c68d2340852f2f080193eeec5f878e4aac3f019a5740850691ee36a87 SHA512 8cc6d2b3fe43d9040aa9f54b2ac448c3dbe986de629638052ddc294b2589ed283b51cc25d9b73e8dac5c5183a5c0675799fa425cf44523636c3ad1a943f1e4a5 +AUX sysvinit-2.88-selinux.patch 1041 BLAKE2B e5c6f981cbc73dc78ffc6593faf1c96c7629e4977e504637648236fc4810d04c64274ff00f5533ab88a82cded686308ffc73d5ff406d7c9c401a5b29a2863c3b SHA512 46eeb3ab2dd25f314b9f60b2dc8a7da2aa2aafb978953a730ccc36456d240e317930e86df69ce2592cf45978f3307dfc2522b24ae1158e64ff17dfa6ed84dcb8 +AUX sysvinit-2.88-shutdown-h.patch 1626 BLAKE2B ba9aba1854f040c31862c5a1a0c9d1ea3186ced2415f9e0fe457a34fa4eec9d56d024467d7524133da858dc313b079ae5d3b1c926b8247804414fb4f23cbffcf SHA512 244ed7c2242f52674153ccfebb92c7a9bdc68a25f98aacbbf107ddfce11b195483e90150619fbeae3167136fcb54b878f8eb77e2dfe225d9f2eeb2c182e5e2fe +AUX sysvinit-2.88-sysmacros.patch 224 BLAKE2B c25c63e72ac15b4e5a518acd55ed792227596ca399c6704a05bd4e5137b74f256dc4146500021ef0613284d4565a8d75f6da183bfad5d3d739e4b12395e61a65 SHA512 217fc75d34a19caebcdc56967f7cc9664d46d1523fc09b17369d10d61389dd7b93b8863ec292427603ed55aa68e86d5a81839f1da480b7654d78a4b01d83df43 +AUX sysvinit-2.88-ttydefaults.patch 266 BLAKE2B 037f77b059dbd593b9f8eb683a0be57c73c62ba421895386932b5c072457e30ee145977c6eb145ebfb0097ebeb483c002bf346e751629398c5e5cb48504bf2ff SHA512 d27c0f0ae4d2c6ddb9622c76571c0a4260b2c537ec7fcbc3c56b4e461f43238e5c9f8072f2db582bf5e625320e963e840aac247c83ec2438c3454d7cdc1b3198 +DIST sysvinit-2.88dsf.tar.bz2 105551 BLAKE2B 2378a7ab96d059fc781b8b7dd130f4c6311a83527e80e6d40b0970140f0f6c0b081eec502b0c9e461fe5ac02cc064437c2bef2237b20209c8c5f8535a45e50d1 SHA512 0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf +EBUILD sysvinit-2.88-r9.ebuild 3470 BLAKE2B 6963eb9b677c53c0b7fe67c6dd3d9cf4b0ee89f8670abc6e9d8481b2d0dab41c7428b6293f00f039d286eac0c223ebe4d250bfda27fb82beca8812b188de232d SHA512 3beb173dc4b830874f20e16f9d079abba86c2813f81719d091c174aed9591a803fb92d5fa2d20884f8aebb755b6735fa6183613271a576cd93f51c17a072b0f5 +MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f diff -uNr a/sys-apps/sysvinit/files/inittab-2.88 b/sys-apps/sysvinit/files/inittab-2.88 --- a/sys-apps/sysvinit/files/inittab-2.88 false +++ b/sys-apps/sysvinit/files/inittab-2.88 c5c017b9b1fa38c4f5ff9ff2fac16764c5efd59d1df4b9cc6bad0575d3ff194751cff7fdb1d13051d5913393a2a3177b4ec92a0ceab11e7b8768bc7106129b88 @@ -0,0 +1,59 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +# the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, <miquels@cistron.nl> +# Modified by: Patrick J. Volkerding, <volkerdi@ftp.cdrom.com> +# Modified by: Daniel Robbins, <drobbins@gentoo.org> +# Modified by: Martin Schlemmer, <azarah@gentoo.org> +# Modified by: Mike Frysinger, <vapier@gentoo.org> +# Modified by: Robin H. Johnson, <robbat2@gentoo.org> +# Modified by: William Hubbs, <williamh@gentoo.org> +# + +# Default runlevel. +id:3:initdefault: + +# System initialization, mount local filesystems, etc. +si::sysinit:/sbin/openrc sysinit + +# Further system initialization, brings up the boot runlevel. +rc::bootwait:/sbin/openrc boot + +l0:0:wait:/sbin/openrc shutdown +l0s:0:wait:/sbin/halt -dhnp +l1:1:wait:/sbin/openrc single +l2:2:wait:/sbin/openrc nonetwork +l3:3:wait:/sbin/openrc default +l4:4:wait:/sbin/openrc default +l5:5:wait:/sbin/openrc default +l6:6:wait:/sbin/openrc reboot +l6r:6:wait:/sbin/reboot -dkn +#z6:6:respawn:/sbin/sulogin + +# new-style single-user +su0:S:wait:/sbin/openrc single +su1:S:wait:/sbin/sulogin + +# TERMINALS +#x1:12345:respawn:/sbin/agetty 38400 console linux +c1:12345:respawn:/sbin/agetty 38400 tty1 linux +c2:2345:respawn:/sbin/agetty 38400 tty2 linux +c3:2345:respawn:/sbin/agetty 38400 tty3 linux +c4:2345:respawn:/sbin/agetty 38400 tty4 linux +c5:2345:respawn:/sbin/agetty 38400 tty5 linux +c6:2345:respawn:/sbin/agetty 38400 tty6 linux + +# SERIAL CONSOLES +#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100 + +# What to do at the "Three Finger Salute". +ca:12345:ctrlaltdel:/sbin/shutdown -r now + +# Used by /etc/init.d/xdm to control DM startup. +# Read the comments in /etc/init.d/xdm for more +# info. Do NOT remove, as this will start nothing +# extra at boot if /etc/init.d/xdm is not added +# to the "default" runlevel. +x:a:once:/etc/X11/startDM.sh diff -uNr a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch b/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch --- a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch false +++ b/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch 955b536fbc85d9f6ecbd85da52ccdbb712d613ce8c6f644f614ffe9af6aa0779ca04487e4fdde0cd79873020758d0e9a3c982bbdc267592480c6393d69230698 @@ -0,0 +1,142 @@ +halt: add a -k kexec flag + +--- a/man/halt.8 ++++ b/man/halt.8 +@@ -40,6 +40,7 @@ halt, reboot, poweroff \- stop the system. + .RB [ \-d ] + .RB [ \-f ] + .RB [ \-i ] ++.RB [ \-k ] + .br + .B /sbin/poweroff + .RB [ \-n ] +@@ -83,6 +84,8 @@ Put all hard drives on the system in stand-by mode just before halt or power-off + .IP \fB\-p\fP + When halting the system, switch off the power. This is the default when halt is + called as \fBpoweroff\fP. ++.IP \fB\-k\fP ++Try to reboot using \fBkexec\fP, if kernel supports it. + .\"}}} + .\"{{{ Diagnostics + .SH DIAGNOSTICS +--- a/src/halt.c ++++ b/src/halt.c +@@ -8,7 +8,7 @@ + * execute an "shutdown -r". This is for compatibility with + * sysvinit 2.4. + * +- * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] ++ * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] [-k] + * -n: don't sync before halting the system + * -w: only write a wtmp reboot record and exit. + * -d: don't write a wtmp record. +@@ -16,6 +16,7 @@ + * -h: put harddisks in standby mode + * -i: shut down all network interfaces. + * -p: power down the system (if possible, otherwise halt). ++ * -k: reboot the system using kexec. + * + * Reboot and halt are both this program. Reboot + * is just a link to halt. Invoking the program +@@ -74,8 +75,10 @@ extern void write_wtmp(char *user, char *id, int pid, int type, char *line); + */ + void usage(void) + { +- fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s\n", +- progname, strcmp(progname, "halt") ? "" : " [-p]"); ++ fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s%s\n", ++ progname, ++ strcmp(progname, "halt") ? "" : " [-p]", ++ strcmp(progname, "reboot") ? "" : " [-k]"); + fprintf(stderr, "\t-n: don't sync before halting the system\n"); + fprintf(stderr, "\t-w: only write a wtmp reboot record and exit.\n"); + fprintf(stderr, "\t-d: don't write a wtmp record.\n"); +@@ -84,6 +87,8 @@ void usage(void) + fprintf(stderr, "\t-i: shut down all network interfaces.\n"); + if (!strcmp(progname, "halt")) + fprintf(stderr, "\t-p: power down the system (if possible, otherwise halt).\n"); ++ if (!strcmp(progname, "reboot")) ++ fprintf(stderr, "\t-k: reboot the system using kexec.\n"); + exit(1); + } + +@@ -182,6 +187,7 @@ int main(int argc, char **argv) + int do_ifdown = 0; + int do_hddown = 0; + int do_poweroff = 0; ++ int do_kexec = 0; + int c; + char *tm = NULL; + +@@ -201,7 +207,7 @@ int main(int argc, char **argv) + /* + * Get flags + */ +- while((c = getopt(argc, argv, ":ihdfnpwt:")) != EOF) { ++ while((c = getopt(argc, argv, ":ihdfnpwkt:")) != EOF) { + switch(c) { + case 'n': + do_sync = 0; +@@ -225,6 +231,9 @@ int main(int argc, char **argv) + case 'p': + do_poweroff = 1; + break; ++ case 'k': ++ do_kexec = 1; ++ break; + case 't': + tm = optarg; + break; +@@ -242,10 +251,24 @@ int main(int argc, char **argv) + (void)chdir("/"); + + if (!do_hard && !do_nothing) { ++ c = get_runlevel(); ++ ++ /* ++ * We can't reboot using kexec through this path. ++ */ ++ if (c != '6' && do_reboot && do_kexec) { ++ fprintf(stderr, "ERROR: using -k at this" ++ " runlevel requires also -f\n" ++ " (You probably want instead to reboot" ++ " normally and let your reboot\n" ++ " script, usually /etc/init.d/reboot," ++ " specify -k)\n"); ++ exit(1); ++ } ++ + /* + * See if we are in runlevel 0 or 6. + */ +- c = get_runlevel(); + if (c != '0' && c != '6') + do_shutdown(do_reboot ? "-r" : "-h", tm); + } +@@ -277,6 +300,15 @@ int main(int argc, char **argv) + if (do_nothing) exit(0); + + if (do_reboot) { ++ /* ++ * kexec or reboot ++ */ ++ if (do_kexec) ++ init_reboot(BMAGIC_KEXEC); ++ ++ /* ++ * Fall through if failed ++ */ + init_reboot(BMAGIC_REBOOT); + } else { + /* +--- a/src/reboot.h ++++ b/src/reboot.h +@@ -47,5 +47,8 @@ + # define BMAGIC_POWEROFF BMAGIC_HALT + #endif + ++/* for kexec support */ ++#define BMAGIC_KEXEC 0x45584543 ++ + #define init_reboot(magic) reboot(magic) + diff -uNr a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch --- a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch false +++ b/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch f118e13439268bfc5227454ab005ec95e0e711944072f677bcbb770d348f428b0f4771284968e30c7ede327ef08bd6bb3fb7eeb39f5b460916a7a71de9b59047 @@ -0,0 +1,36 @@ +This patch makes shutdown use the Single User runlevel by default so +the gettys are shutdown too. + +Roy Marples <uberlord@gentoo.org> + +--- a/man/shutdown.8 ++++ b/man/shutdown.8 +@@ -44,7 +44,7 @@ mail and news processing programs a chance to exit cleanly, etc. + \fBshutdown\fP does its job by signalling the \fBinit\fP process, + asking it to change the runlevel. + Runlevel \fB0\fP is used to halt the system, runlevel \fB6\fP is used +-to reboot the system, and runlevel \fB1\fP is used to put to system into ++to reboot the system, and runlevel \fBS\fP is used to put to system into + a state where administrative tasks can be performed; this is the default + if neither the \fI-h\fP or \fI-r\fP flag is given to \fBshutdown\fP. + To see which actions are taken on halt or reboot see the appropriate +--- a/src/shutdown.c ++++ b/src/shutdown.c +@@ -506,7 +506,7 @@ int main(int argc, char **argv) + usage(); + exit(1); + } +- strcpy(down_level, "1"); ++ strcpy(down_level, "S"); + halttype = NULL; + + /* Process the options. */ +@@ -685,6 +685,8 @@ int main(int argc, char **argv) + strcpy(newstate, "for reboot"); + break; + case '1': ++ case 'S': ++ case 's': + strcpy(newstate, "to maintenance mode"); + break; + default: diff -uNr a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch b/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch --- a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch false +++ b/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch f2d613c747fa7428178ad15dc2ecd77c20a3c857a7e25ec10db140c3bb8425157c887dad8eb685629330d8f89d00b141e2ab5cb0a571c7a1926fd322bd8e0378 @@ -0,0 +1,60 @@ +https://savannah.nongnu.org/bugs/index.php?29758 + +From 2b7d90f04cdd0e343f413c5c7672615926c02706 Mon Sep 17 00:00:00 2001 +From: wfink <wfink@456724a4-4300-0410-8514-c89748c515a2> +Date: Tue, 4 May 2010 07:50:12 +0000 +Subject: [PATCH] Fix sysvinit bug #29758 + +git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@87 456724a4-4300-0410-8514-c89748c515a2 + +diff --git a/src/Makefile b/src/Makefile +index e2b8028..19675c5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -92,9 +92,9 @@ all: $(BIN) $(SBIN) $(USRBIN) + init: LDLIBS += $(INITLIBS) $(STATIC) + init: init.o init_utmp.o + +-halt: halt.o ifdown.o hddown.o utmp.o reboot.h ++halt: halt.o ifdown.o hddown.o utmp.o + +-last: last.o oldutmp.h ++last: last.o + + mesg: mesg.o + +@@ -109,7 +109,7 @@ sulogin: sulogin.o + + wall: dowall.o wall.o + +-shutdown: dowall.o shutdown.o utmp.o reboot.h ++shutdown: dowall.o shutdown.o utmp.o + + bootlogd: LDLIBS += -lutil + bootlogd: bootlogd.o +@@ -118,14 +118,22 @@ sulogin.o: CPPFLAGS += $(SELINUX_DEF) + sulogin.o: sulogin.c + + init.o: CPPFLAGS += $(SELINUX_DEF) +-init.o: init.c init.h set.h reboot.h initreq.h ++init.o: init.c init.h initreq.h paths.h reboot.h set.h + +-utmp.o: utmp.c init.h ++utmp.o: + + init_utmp.o: CPPFLAGS += -DINIT_MAIN +-init_utmp.o: utmp.c init.h ++init_utmp.o: utmp.c init.h initreq.h paths.h + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + ++utmpdump.o: utmpdump.c oldutmp.h ++ ++shutdown.o: shutdown.c paths.h reboot.h initreq.h init.h ++ ++halt.o: halt.c reboot.h ++ ++last.o: last.c oldutmp.h ++ + cleanobjs: + rm -f *.o *.bak + diff -uNr a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch b/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch --- a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch false +++ b/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch 2bd77a6126bb42c60e18eea7290d2eea81a912a56e476de198d40831da181127c209d3606becce6c0367ae2dbe426d83d2bd7cba256d2bbc8fcca2484166c522 @@ -0,0 +1,38 @@ +http://svn.savannah.nongnu.org/viewvc?view=rev&root=sysvinit&revision=90 +https://bugs.gentoo.org/326697 + +--- sysvinit/trunk/src/init.c 2010/05/07 15:16:26 89 ++++ sysvinit/trunk/src/init.c 2010/05/17 09:44:34 90 +@@ -54,10 +54,6 @@ + + #ifdef WITH_SELINUX + # include <selinux/selinux.h> +-# include <sys/mount.h> +-# ifndef MNT_DETACH /* present in glibc 2.10, missing in 2.7 */ +-# define MNT_DETACH 2 +-# endif + #endif + + #ifdef __i386__ +@@ -2872,11 +2868,9 @@ + + #ifdef WITH_SELINUX + if (getenv("SELINUX_INIT") == NULL) { +- const int rc = mount("proc", "/proc", "proc", 0, 0); +- if (is_selinux_enabled() > 0) { +- putenv("SELINUX_INIT=YES"); +- if (rc == 0) umount2("/proc", MNT_DETACH); ++ if (is_selinux_enabled() != 1) { + if (selinux_init_load_policy(&enforce) == 0) { ++ putenv("SELINUX_INIT=YES"); + execv(myname, argv); + } else { + if (enforce > 0) { +@@ -2887,7 +2881,6 @@ + } + } + } +- if (rc == 0) umount2("/proc", MNT_DETACH); + } + #endif + /* Start booting. */ diff -uNr a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch --- a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch false +++ b/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch f2b95ded63f64b49829f0d40a8aee0303c0da8aa53ccea7ee7b08e34a5a289e2cf8cfd08a03821b043ee3e311dca1db4de9f5ed471d3959b573fc52c65f721f3 @@ -0,0 +1,65 @@ +other inits have moved to not requiring the -h flag when used with -H/-P. +modify sysvinit to be the same since it really doesn't matter. + +https://bugs.gentoo.org/449354 + +patch by Doug Goldstein + +--- sysvinit-2.88dsf/man/shutdown.8 ++++ sysvinit-2.88dsf/man/shutdown.8 +@@ -66,16 +66,15 @@ + .\"}}} + .\"{{{ -h + .IP \fB\-h\fP +-Halt or power off after shutdown. ++Equivalent to -P, unless -H is specified. + .\"}}} + .\"{{{ -P + .IP \fB\-P\fP +-Halt action is to turn off the power. ++Action is to power-off the machine. + .\"}}} + .\"{{{ -H + .IP \fB\-H\fP +-Modifier to the -h flag. Halt action is to halt or drop into boot +-monitor on systems that support it. Must be used with the -h flag. ++Action is to halt the machine. + .\"}}} + .\"{{{ -f + .IP \fB\-f\fP +--- sysvinit-2.88dsf/src/shutdown.c ++++ sysvinit-2.88dsf/src/shutdown.c +@@ -514,9 +514,11 @@ + switch(c) { + case 'H': + halttype = "HALT"; ++ down_level[0] = '0'; + break; + case 'P': + halttype = "POWERDOWN"; ++ down_level[0] = '0'; + break; + case 'a': /* Access control. */ + useacl = 1; +@@ -532,6 +534,8 @@ + break; + case 'h': /* Halt after shutdown */ + down_level[0] = '0'; ++ if (!halttype) ++ halttype = "POWERDOWN"; + break; + case 'f': /* Don't perform fsck after next boot */ + fastboot = 1; +@@ -565,12 +569,6 @@ + } + } + +- if (NULL != halttype && down_level[0] != '0') { +- fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n"); +- usage(); +- exit(1); +- } +- + /* Do we need to use the shutdown.allow file ? */ + if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) { + diff -uNr a/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch b/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch --- a/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch false +++ b/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch 4471942781d0d572f317060dc2cf8643c9d6e3b560b6b194a57dd44fc3d87308b3d2b41bdf19665151bc0af237d5d2df558d312e621ce78b24cfb09bcaf5d791 @@ -0,0 +1,12 @@ +Newer C libraries omit this include from sys/types.h. + +--- a/src/bootlogd.c ++++ b/src/bootlogd.c +@@ -32,6 +32,7 @@ + * + */ + ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/time.h> + #include <sys/stat.h> diff -uNr a/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch b/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch --- a/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch false +++ b/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch 95a77a3e2f5c3ba1a5f1dc57a7257a14090813b9b55c47e7af0933b5c8371b47871206f3c620855994985f2796da5ef1bb1ff3e7a2eb7d00c3c883cf5ee01f93 @@ -0,0 +1,10 @@ +--- sysvinit/trunk/src/init.c 2014/01/26 16:40:03 134 ++++ sysvinit/trunk/src/init.c 2014/01/26 22:00:42 135 +@@ -49,6 +49,7 @@ + #include <utmp.h> + #include <ctype.h> + #include <stdarg.h> ++#include <sys/ttydefaults.h> + #include <sys/syslog.h> + #include <sys/time.h> + diff -uNr a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml --- a/sys-apps/sysvinit/metadata.xml false +++ b/sys-apps/sysvinit/metadata.xml 0b7e18c13f1ea757aa4964fc4b12de55e1c4541aae69b98123f77aa9619e67a29a7dfaa667944dd37c4240baca9cece0dca6dd270fa332955d67a94929341ae0 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> +</maintainer> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild --- a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild false +++ b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild e7f064052b444aeaef3e267ec928519353522bb77c1a370879a8843c5786f55235a29de687598c4a32285eb3dd1f17fee039d3698f6502d0352660e25ebd4b36 @@ -0,0 +1,122 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils toolchain-funcs flag-o-matic + +DESCRIPTION="/sbin/init - parent of all processes" +HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" +SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +IUSE="selinux ibm static kernel_FreeBSD" + +CDEPEND=" + selinux? ( + >=sys-libs/libselinux-1.28 + )" +DEPEND="${CDEPEND} + virtual/os-headers" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-shutdown ) + !<sys-apps/openrc-0.13 +" + +S=${WORKDIR}/${P}dsf + +PATCHES=( + "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 + "${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615 + "${FILESDIR}/${P}-makefile.patch" #319197 + "${FILESDIR}/${P}-selinux.patch" #326697 + "${FILESDIR}/${P}-shutdown-h.patch" #449354 + "${FILESDIR}/${PN}-2.88-sysmacros.patch" + "${FILESDIR}/${PN}-2.88-ttydefaults.patch" #551626 +) + +src_prepare() { + epatch "${PATCHES[@]}" + sed -i '/^CPPFLAGS =$/d' src/Makefile || die + + # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux + sed -i -r \ + -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ + -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ + src/Makefile || die + + # pidof has moved to >=procps-3.3.9 + sed -i -r \ + -e '/\/bin\/pidof/d' \ + -e '/^MAN8/s:\<pidof.8\>::g' \ + src/Makefile || die + + # Mung inittab for specific architectures + cd "${WORKDIR}" + cp "${FILESDIR}"/inittab-2.88 inittab || die "cp inittab" + local insert=() + use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) + use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) + use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) + use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) + use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) + if use ibm ; then + insert+=( + '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' + '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' + ) + fi + (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab + if use kernel_FreeBSD ; then + sed -i \ + -e 's/linux/cons25/g' \ + -e 's/ttyS0/cuaa0/g' \ + -e 's/ttyS1/cuaa1/g' \ + inittab #121786 + fi + if use x86 || use amd64 ; then + sed -i \ + -e '/ttyS[01]/s:9600:115200:' \ + inittab + fi + if [[ ${#insert[@]} -gt 0 ]] ; then + printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab + fi +} + +src_compile() { + local myconf + + tc-export CC + append-lfs-flags + export DISTRO= #381311 + use static && append-ldflags -static + use selinux && myconf=WITH_SELINUX=yes + emake -C src ${myconf} || die +} + +src_install() { + emake -C src install ROOT="${D}" + dodoc README doc/* + + insinto /etc + doins "${WORKDIR}"/inittab + + # dead symlink + rm "${D}"/usr/bin/lastb || die +} + +pkg_postinst() { + # Reload init to fix unmounting problems of / on next reboot. + # This is really needed, as without the new version of init cause init + # not to quit properly on reboot, and causes a fsck of / on next reboot. + if [[ ${ROOT} == / ]] ; then + # Do not return an error if this fails + /sbin/telinit U &>/dev/null + fi + + elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" + elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." +} diff -uNr a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest --- a/sys-apps/texinfo/Manifest false +++ b/sys-apps/texinfo/Manifest 31cbc678e79c3ce89ef26008cdc5b3ef8fbac01c098133ba16b8c8c550dc5dfcfba8e011979966ef5c23d06907848a5ea6ffd70602053e92e4c7db5590b191e1 @@ -0,0 +1,3 @@ +DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4 +EBUILD texinfo-6.3.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml --- a/sys-apps/texinfo/metadata.xml false +++ b/sys-apps/texinfo/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-apps/texinfo/texinfo-6.3.ebuild b/sys-apps/texinfo/texinfo-6.3.ebuild --- a/sys-apps/texinfo/texinfo-6.3.ebuild false +++ b/sys-apps/texinfo/texinfo-6.3.ebuild fcc6102ca7c74caba898be3eb9a4218c35196557cdb9f37af89ce101dade8c1879cb9fa72a29a3dc938c354de4bfb59d2a1c9d36577b0293038799fc616670b5 @@ -0,0 +1,40 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Note: if your package uses the texi2dvi utility, it must depend on the +# virtual/texi2dvi package to pull in all the right deps. The tool is not +# usable out-of-the-box because it requires the large tex packages. + +EAPI="5" + +inherit flag-o-matic + +DESCRIPTION="The GNU info program and utilities" +HOMEPAGE="https://www.gnu.org/software/texinfo/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="nls static" + +RDEPEND=" + !=app-text/tetex-2* + >=sys-libs/ncurses-5.2-r2:0= + dev-lang/perl:= + dev-perl/libintl-perl + dev-perl/Unicode-EastAsianWidth + dev-perl/Text-Unidecode + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + app-arch/xz-utils + nls? ( >=sys-devel/gettext-0.19.6 )" + +src_configure() { + use static && append-ldflags -static + econf \ + --with-external-libintl-perl \ + --with-external-Unicode-EastAsianWidth \ + --with-external-Text-Unidecode \ + $(use_enable nls) +} diff -uNr a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest --- a/sys-apps/util-linux/Manifest false +++ b/sys-apps/util-linux/Manifest 360931817ec47eb50c074d04f07b56f7d956c706490eba2a5c886ae2b08d9369bf1bee33ce855628c9ff0e7d5a307ec56d486600c3dfd9b3364b9d0bf271f733 @@ -0,0 +1,7 @@ +AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301 +AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd +AUX util-linux-2.32-add-missing-lintl.patch 1279 BLAKE2B d76fac864c34f38f51fdf422042f3199ddd8eecf7b2eab1b222c6be65605df365477be7e605bd45937ca3be716008227e7157d3da130fc0bf32eeffbefdbd9c1 SHA512 e705a5ec1a686d46226d9fa1e9369cc266c69c314a2a2f2f456cf92235d87b974c1dac72c928892657ea12f71bdaea83afaf95ed2eefd89b36007b371e047eb1 +AUX util-linux-2.32_rc2-umount_completion.patch 1157 BLAKE2B a20c9965747048e236cabbc5902afde093732794d8898c8aac619e9841332566b7fc07a0f7d5841e49bac08f3502986f37eaca8d66f258f22ed9afe5434a00cb SHA512 6f5311ea43495bb0b0da180e77044124c8fbeb3a3791182871afd562a7bfa4799184faf7a43f34845ddf11611412df342826679169f55831f43c2f256fb6c799 +DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d +EBUILD util-linux-2.30.2-r1.ebuild 6505 BLAKE2B c1d22b2567a811b2b4727eca13ed9974eb115f0e1bad9a0cc096b96afdcedeef013480aa7d5832b93c94b1a885be0edfceb3eb80d693b6f09d10a37d0e9113a8 SHA512 d27ea0f42a066dfdc1c5c5bfa5af3fb50e5f7b04b27a692cd810316143c942f3befd18e1d83880e5cf56b3505d0c265b751c570ef947f568fb417bb92e0c6c60 +MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133 diff -uNr a/sys-apps/util-linux/files/runuser-l.pamd b/sys-apps/util-linux/files/runuser-l.pamd --- a/sys-apps/util-linux/files/runuser-l.pamd false +++ b/sys-apps/util-linux/files/runuser-l.pamd 3a498094f50a3e219c5eb88eb581eb101919ac8bed48b1aa032e8da8346b97ca300e323190dfe4fd84a79de96d8c9eb695ea1fa6483827b0ef7ba17e84db9f87 @@ -0,0 +1,5 @@ +auth include system-local-login +account include system-local-login +password include system-local-login +session optional pam_lastlog.so +session include system-local-login diff -uNr a/sys-apps/util-linux/files/runuser.pamd b/sys-apps/util-linux/files/runuser.pamd --- a/sys-apps/util-linux/files/runuser.pamd false +++ b/sys-apps/util-linux/files/runuser.pamd fd1e140d87ccadb39ba183e9fb90bd3b73336a5a1f135aab39e30d2c10c5824dc9e3d7eb405389bb1aed80ec9f88f212d890671a7daa738d6ab46553899b9dd2 @@ -0,0 +1,8 @@ +auth sufficient pam_rootok.so +auth required pam_wheel.so use_uid +auth include system-auth +account include system-auth +password include system-auth +session include system-auth +session required pam_env.so +session optional pam_xauth.so diff -uNr a/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch b/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch --- a/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch false +++ b/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch 3c7d194b94868a96f4e680e7cc469c75aca6e24b9a1adfa5ce578dc0985b71815fe86f4dba42af7014d0d17d899b5ab379f60b5f963da260b737a5b6d2267864 @@ -0,0 +1,38 @@ +From 3188ea9a9292604e537f06f11adddf474fc9e52d Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Mon, 9 Apr 2018 12:11:36 +0200 +Subject: [PATCH] build: Add missing -lintl linkage to lib{smartcols,uuid} + +Addresses: https://github.com/karelzak/util-linux/pull/615 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + libsmartcols/src/Makemodule.am | 2 +- + libuuid/src/Makemodule.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am +index 664aca30b..665b2aa7f 100644 +--- a/libsmartcols/src/Makemodule.am ++++ b/libsmartcols/src/Makemodule.am +@@ -19,7 +19,7 @@ libsmartcols_la_SOURCES= \ + libsmartcols/src/version.c \ + libsmartcols/src/init.c + +-libsmartcols_la_LIBADD = libcommon.la ++libsmartcols_la_LIBADD = $(LDADD) libcommon.la + + libsmartcols_la_CFLAGS = \ + $(AM_CFLAGS) \ +diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am +index 5122622a5..e58fa261c 100644 +--- a/libuuid/src/Makemodule.am ++++ b/libuuid/src/Makemodule.am +@@ -31,7 +31,7 @@ libuuid_la_SOURCES = \ + EXTRA_libuuid_la_DEPENDENCIES = \ + libuuid/src/libuuid.sym + +-libuuid_la_LIBADD = $(SOCKET_LIBS) ++libuuid_la_LIBADD = $(LDADD) $(SOCKET_LIBS) + + libuuid_la_CFLAGS = \ + $(AM_CFLAGS) \ diff -uNr a/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch b/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch --- a/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch false +++ b/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch 328b3386d55cf610928fe1c3edf820503ef9ee092a52a65f841873b2e45842918a79a25efab021e2d3571d6ca78eb590d24b08bc8d195598f6e228ddb7867f18 @@ -0,0 +1,41 @@ +From 75f03badd7ed9f1dd951863d75e756883d3acc55 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Thu, 16 Nov 2017 16:27:32 +0100 +Subject: [PATCH] bash-completion: (umount) use findmnt, escape a space in + paths + + # mount /dev/sdc1 /mnt/test/foo\ bar + # umount <tab> + +has to return "/mnt/test/foo\ bar". + +Changes: + + * don't use mount | awk output, we have findmnt + * force compgen use \n as entries separator + +Addresses: https://github.com/karelzak/util-linux/issues/539 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + bash-completion/umount | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/bash-completion/umount b/bash-completion/umount +index d76cb9fff..98c90d61a 100644 +--- a/bash-completion/umount ++++ b/bash-completion/umount +@@ -40,9 +40,10 @@ _umount_module() + return 0 + ;; + esac +- local DEVS_MPOINTS +- DEVS_MPOINTS="$(mount | awk '{print $1, $3}')" +- COMPREPLY=( $(compgen -W "$DEVS_MPOINTS" -- $cur) ) +- return 0 ++ ++ local oldifs=$IFS ++ IFS=$'\n' ++ COMPREPLY=( $( compgen -W '$(findmnt -lno TARGET | sed "s/$[[:blank:]]$/\\\\\1/g")' -- "$cur" ) ) ++ IFS=$oldifs + } + complete -F _umount_module umount diff -uNr a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml --- a/sys-apps/util-linux/metadata.xml false +++ b/sys-apps/util-linux/metadata.xml af97079e031669ac871a935ac8727fc4ff488fa69184d0a02fcaef92c54dd6bba650733e577eaa342d9ce096a5c273e68427b7f014ffb29915a458228105a239 @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="caps">build setpriv helper (run programs with diff capabilities)</flag> + <flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag> + <flag name="fdformat">build fdformat (floppy disk format)</flag> + <flag name="kill">build the kill program</flag> + <flag name="pam">build runuser helper</flag> + <flag name="suid"> + install mount/umount as setuid so non-root users may mount/umount devices, + and wall/write as setgid so non-root users can notify other users + </flag> + <flag name="tty-helpers">install the mesg/wall/write tools for talking to local users</flag> +</use> +<upstream> + <remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id> + <remote-id type="github">karelzak/util-linux</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild --- a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild false +++ b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild c4f20af656425ea26a10e847717e915ec81807a57ef3108bd13c72f73b238bf07a279d6b85db701ba4a0e8cc55304f7a3f71d7eaa89520e3bcea7492f50d46a8 @@ -0,0 +1,212 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-single-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" + SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" +fi + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/" + +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode" + +# Most lib deps here are related to programs rather than our libs, +# so we rarely need to specify ${MULTILIB_USEDEP}. +RDEPEND="caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + !build? ( systemd? ( sys-apps/systemd ) ) + udev? ( virtual/libudev:= )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) + virtual/os-headers" +RDEPEND+=" + kill? ( + !sys-apps/coreutils[kill] + !sys-process/procps[kill] + ) + !sys-process/schedutils + !sys-apps/setarch + !<sys-apps/sysvinit-2.88-r7 + !<sys-libs/e2fsprogs-libs-1.41.8 + !<sys-fs/e2fsprogs-1.41.8 + !<app-shells/bash-completion-2.3-r2 + !<sys-apps/s390-tools-1.36.1-r1" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-2.32_rc2-umount_completion.patch" #649812 +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Prevent uuidd test failure due to socket path limit. #593304 + sed -i \ + -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ + tests/ts/uuid/uuidd || die "Failed to fix uuidd test" + + if [[ ${PV} == 9999 ]] ; then + po/update-potfiles + eautoreconf + fi + + # Undo bad ncurses handling by upstream. #601530 + sed -i -E \ + -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ + -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ + configure || die + + elibtoolize +} + +lfs_fallocate_test() { + # Make sure we can use fallocate with LFS #300307 + cat <<-EOF > "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include <fcntl.h> + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +multilib_src_configure() { + lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 + + local myeconfargs=( + --disable-chfn-chsh + --disable-login + --disable-nologin + --disable-reset + --disable-su + --docdir='${datarootdir}'/doc/${PF} + --enable-agetty + --enable-bash-completion + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + --enable-line + --enable-partx + --enable-raw + --enable-rename + --enable-schedutils + --with-bashcompletiondir="$(get_bashcompdir)" + --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no") + $(multilib_native_use_enable caps setpriv) + $(multilib_native_use_enable cramfs) + $(multilib_native_use_enable fdformat) + $(multilib_native_use_enable nls) + $(multilib_native_use_enable suid makeinstall-chown) + $(multilib_native_use_enable suid makeinstall-setuid) + $(multilib_native_use_enable tty-helpers mesg) + $(multilib_native_use_enable tty-helpers wall) + $(multilib_native_use_enable tty-helpers write) + $(multilib_native_use_with python) + $(multilib_native_use_with readline) + $(multilib_native_use_with slang) + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') + $(tc-has-tls || echo --disable-tls) + $(use_enable unicode widechar) + $(use_enable kill) + $(use_enable static-libs static) + $(use_with selinux) + $(usex ncurses '' '--without-tinfo') + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + # build libraries only + emake -f Makefile -f - mylibs \ + <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' + fi +} + +multilib_src_test() { + multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" +} + +multilib_src_install() { + if multilib_is_native_abi; then + default + else + emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ + install-pkgconfigDATA install-uuidincHEADERS \ + install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ + install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS + fi + + if multilib_is_native_abi; then + # need the libs in / + gen_usr_ldscript -a blkid mount smartcols uuid + + use python && python_optimize + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + + # e2fsprogs-libs didnt install .la files, and .pc work fine + find "${ED}" -name "*.la" -delete || die + + if use pam; then + newpamd "${FILESDIR}/runuser.pamd" runuser + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l + fi +} + +pkg_postinst() { + if ! use tty-helpers; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} diff -uNr a/sys-apps/which/Manifest b/sys-apps/which/Manifest --- a/sys-apps/which/Manifest false +++ b/sys-apps/which/Manifest 215c3ac73da0f810b783182e1a1847f0038b67e57c2753d7416e4df87d1cc6d520f5d13be8cd923080738bd25248100be4881208949a6bc9ec4257ce91a7a7b6 @@ -0,0 +1,3 @@ +DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61 +EBUILD which-2.21.ebuild 673 BLAKE2B d681f3859e04138afec5d34cd74591217630e65ebd4620345fdd19ebaadfea217be8ced8012cd22b37ba6bd9105be7a8e21b4eef36563d7d59832f88199879d1 SHA512 a15d06bff94a64d770489f66d2683f6d6eeaf08e30c3275b8f4d1a18b40cfeb2aea68be2738ff52e15e4e4084443000fecb5bb78771526df3ed3d83da7a7ead1 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-apps/which/metadata.xml b/sys-apps/which/metadata.xml --- a/sys-apps/which/metadata.xml false +++ b/sys-apps/which/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild --- a/sys-apps/which/which-2.21.ebuild false +++ b/sys-apps/which/which-2.21.ebuild c3f68521f395b280cf3d4e16a51557145952bc4c71828cceadadaf17ddeb37094d578e2704063d89dc15337d005c7d7207575a846afeb8f521d199f4414f37ef @@ -0,0 +1,21 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Prints out location of specified executables that are in your path" +HOMEPAGE="https://carlowood.github.io/which/" +SRC_URI="https://carlowood.github.io/which/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +src_configure() { + append-lfs-flags + tc-export AR + default +} diff -uNr a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest --- a/sys-auth/pambase/Manifest false +++ b/sys-auth/pambase/Manifest b0681172bb73e129213290155fca318bb56616c485d6ab337e0466c06707ba58c034698c0d30a60124befeaaf7c5275b16c724ad29c067ca3e76ae5d261d1714 @@ -0,0 +1,8 @@ +AUX pambase-20120417-lastlog-silent.patch 694 BLAKE2B b66b3115869df00dc7c73078a36b9f33140ab6ad5cba3e013b9e52ee44c9e7954afebad938a848bf274dadd3c9beb4334ca3e6c8923b167a176a85e899efa08f SHA512 3bcef6d9e97cf38df079675ffdffaf233a185bbb09bf79930c81b8b7b802247de0f0bfb9e69d935bce7a7297f544f1c7abc199224e7a536cdfe606f2c0217500 +AUX pambase-20120417-systemd-auth.patch 937 BLAKE2B 3bf50f1b05a04154e30299a3685671287e15cdaebe672e25ad23998670a6f443ca8a040b4a5a83ff5efb39ebf12161da8b65f78defbd24b21037d8c3f84388d9 SHA512 0d78a7dd4851bccf95bb3f92c095c4fc4e7fbbc077c1369797aa230e21763ecb6d087c17bc22c93adeaa695305179d54d838f2e4fe25e9ff16c683fb1edbb2bf +AUX pambase-20120417-systemd.patch 608 BLAKE2B 2eaba084268b4c2844850cc75be62caef64eee20e9971910e7bc1cdabca7ca29b02cd8c33564e26a6218c23867c8527d166889efa1698a7b3730c6987019b7be SHA512 c06d4e35cae11b1156ba32051a4f25a4551857081e9a723f5c0b48758859d7794de94889eb91b19424b49bd4fd5509d34cba943d7a7bbc89f4339a771f29f754 +AUX pambase-20150213-elogind.patch 436 BLAKE2B f8d800b30b1f5f54f40747b256e460dbf10fd629c839088706299ae26bece8e248312dac1153ccb5b5fb25e71bee575d30db0912df0823be988f3cb68bb48e90 SHA512 e5865431fa616335f3732deefec96b11ba5e3f29523182ecbe24bafa80a0fd9b9dc5914b610d7ba485dcf5cd66775d9e668d8ba30f776ce33492b4da75301a1d +AUX pambase-20150213-selinux-note.patch 441 BLAKE2B 8457438ff72becbdf8da61143eacd961ad9a58f876e1560fcf3832af9b3cd995b37a1b4881a9b5bd572e9aff5bb89465d9bba8211e22347af7df22d5d9d8ffb4 SHA512 560afa6b9d2ac657f16ef41abf3f9243480c0d6c57ff725be00a936a92a392c1a5f59f787b1b0ddfe05a81da10cb3c1fc8d24ed9560731bbcae1608a5f155fdb +DIST pambase-20150213.tar.xz 3480 BLAKE2B 7c59774bb8888fd2c4656264f1d8ea8cdd5ffffff4dc5d03091592726c8bd7775ba1573091c8616aa891298a1fe309b19885b5ec21efb45fe38900b7c959aaf5 SHA512 3b49dd3f06a0942fcced95527f62cbc4ff723c48dc896a0b57ecd19736d2892db974c782be3fe24e8e6e17294869a772ae9ee6118af96dfdc7a3a6561dc3f3e5 +EBUILD pambase-20150213-r1.ebuild 2907 BLAKE2B 2bed6e9773bfd859f76b963d167278e773238ff79f98b99bd9ad221daf1cc9c4bd93ba962c8cfe3f76cc3cc5d7cd628326e5e32b69d4dddce24dcd03de3304a1 SHA512 d397c4bca37353cf4dda0c060f84b45a94c5064ff3e5bbfa6dec867d53ad08eb8fc83a28dc17e0ee6ee2145f84d61222dd0797416c029144b35717460f4a6d0a +MISC metadata.xml 4297 BLAKE2B 53d6b14f5e6cf707666441f1bef3c975d43f33387ceb482dd7c41e97b2771466a02efb3db1c881d354bcfff42010e1da47a28579972169e3c7edac33f43f565d SHA512 d717c2916e154630a756f7925794d43d43c5881bc9df53b82b35f86104366902a76f2d9298cf5a8511431084f0103fe91234c5e4172555677bbdc00db0a73a04 diff -uNr a/sys-auth/pambase/files/pambase-20120417-lastlog-silent.patch b/sys-auth/pambase/files/pambase-20120417-lastlog-silent.patch --- a/sys-auth/pambase/files/pambase-20120417-lastlog-silent.patch false +++ b/sys-auth/pambase/files/pambase-20120417-lastlog-silent.patch 2f23c5536bce5bf285665e262c808caadadcd470db8f2fe1785a36e7c90bcc8369bf5f26f1f5f5c555af176a0e6fcc73f35dcf47e1efcede95e8ac1923289e18 @@ -0,0 +1,20 @@ +--- pambase-20120417/login.in.orig 2012-11-21 14:31:49.031948988 +0100 ++++ pambase-20120417/login.in 2012-11-21 14:32:41.172330601 +0100 +@@ -3,4 +3,6 @@ + + account include system-local-login + password include system-local-login ++ ++session optional pam_lastlog.so DEBUG + session include system-local-login +--- pambase-20120417/system-login.in.orig 2012-11-21 14:31:42.232160039 +0100 ++++ pambase-20120417/system-login.in 2012-11-21 14:35:20.738025880 +0100 +@@ -41,7 +41,7 @@ + session required pam_env.so DEBUG + #endif + #if HAVE_LASTLOG +-session optional pam_lastlog.so DEBUG ++session optional pam_lastlog.so silent DEBUG + #endif + session include system-auth + #if HAVE_CONSOLEKIT diff -uNr a/sys-auth/pambase/files/pambase-20120417-systemd-auth.patch b/sys-auth/pambase/files/pambase-20120417-systemd-auth.patch --- a/sys-auth/pambase/files/pambase-20120417-systemd-auth.patch false +++ b/sys-auth/pambase/files/pambase-20120417-systemd-auth.patch 7c52eabbade94afdab4111345fd72e51e1f86301b539096400d1722f13a5a482497e20d0c99a3d1fb7c8bbe4cb530a906a7339888bfdfbb700c067dcf192bc5a @@ -0,0 +1,26 @@ +diff -u pambase-20120417.old/system-auth.in pambase-20120417/system-auth.in +--- pambase-20120417.old/system-auth.in 2013-10-27 15:58:21.766193297 +0100 ++++ pambase-20120417/system-auth.in 2013-10-27 16:01:10.614555766 +0100 +@@ -35,3 +35,7 @@ + session optional pam_ssh.so + #endif + #include "system-session.inc" ++ ++#if HAVE_SYSTEMD ++-session optional pam_systemd.so ++#endif +Sólo en pambase-20120417: system-auth.in~ +diff -u pambase-20120417.old/system-login.in pambase-20120417/system-login.in +--- pambase-20120417.old/system-login.in 2013-10-27 15:58:21.766193297 +0100 ++++ pambase-20120417/system-login.in 2013-10-27 15:59:42.032316285 +0100 +@@ -47,9 +47,6 @@ + #if HAVE_CONSOLEKIT + -session optional pam_ck_connector.so nox11 + #endif +-#if HAVE_SYSTEMD +--session optional pam_systemd.so +-#endif + #if HAVE_GNOME_KEYRING + session optional pam_gnome_keyring.so auto_start + #endif +Sólo en pambase-20120417: system-login.in~ diff -uNr a/sys-auth/pambase/files/pambase-20120417-systemd.patch b/sys-auth/pambase/files/pambase-20120417-systemd.patch --- a/sys-auth/pambase/files/pambase-20120417-systemd.patch false +++ b/sys-auth/pambase/files/pambase-20120417-systemd.patch e865a383deb4d02da455a5e539f13e37a5f89e50a451b7be0779f7c074025efca888203c5f2157c4a86cbdafcd4d286d362404aef76fc8dc9060b43cbf28d384 @@ -0,0 +1,29 @@ +http://bugs.gentoo.org/372229 + +--- Makefile ++++ Makefile +@@ -28,6 +28,10 @@ + PAMFLAGS += -DHAVE_CONSOLEKIT=1 + endif + ++ifeq "$(SYSTEMD)" "yes" ++PAMFLAGS += -DHAVE_SYSTEMD=1 ++endif ++ + ifeq "$(GNOME_KEYRING)" "yes" + PAMFLAGS += -DHAVE_GNOME_KEYRING=1 + endif +--- system-login.in ++++ system-login.in +@@ -45,7 +45,10 @@ + #endif + session include system-auth + #if HAVE_CONSOLEKIT +-session optional pam_ck_connector.so nox11 ++-session optional pam_ck_connector.so nox11 ++#endif ++#if HAVE_SYSTEMD ++-session optional pam_systemd.so + #endif + #if HAVE_GNOME_KEYRING + session optional pam_gnome_keyring.so auto_start diff -uNr a/sys-auth/pambase/files/pambase-20150213-elogind.patch b/sys-auth/pambase/files/pambase-20150213-elogind.patch --- a/sys-auth/pambase/files/pambase-20150213-elogind.patch false +++ b/sys-auth/pambase/files/pambase-20150213-elogind.patch 2c6892590aeca4f22ddbdbce04a0322995e41debc4f7922c1571d66bc0aacd5dafbe769a37f2588e7bbd21c169096081fb181cbec90ce773b60f322202e0ec21 @@ -0,0 +1,23 @@ +--- a/Makefile ++++ b/Makefile +@@ -32,6 +32,10 @@ + PAMFLAGS += -DHAVE_SYSTEMD=1 + endif + ++ifeq "$(ELOGIND)" "yes" ++PAMFLAGS += -DHAVE_ELOGIND=1 ++endif ++ + ifeq "$(GNOME_KEYRING)" "yes" + PAMFLAGS += -DHAVE_GNOME_KEYRING=1 + endif +--- a/system-auth.in ++++ b/system-auth.in +@@ -39,3 +39,7 @@ + #if HAVE_SYSTEMD + -session optional pam_systemd.so + #endif ++ ++#if HAVE_ELOGIND ++-session optional pam_elogind.so ++#endif diff -uNr a/sys-auth/pambase/files/pambase-20150213-selinux-note.patch b/sys-auth/pambase/files/pambase-20150213-selinux-note.patch --- a/sys-auth/pambase/files/pambase-20150213-selinux-note.patch false +++ b/sys-auth/pambase/files/pambase-20150213-selinux-note.patch fa6fc26cf5590b8154b7893170567ff696f26e24bc487fb565b28fd629ac6c75e9a09f0d797fd1ff4eaaf388dbda01dbf5b4d4a5a38363e4896b7ffa904563ac @@ -0,0 +1,11 @@ +--- a/system-login.in.orig 2015-04-17 16:58:02.247000000 +0200 ++++ b/system-login.in 2015-04-17 16:58:07.684000000 +0200 +@@ -48,7 +48,7 @@ + session optional pam_ck_connector.so nox11 + #endif + #if HAVE_SELINUX +-# Note: modules that run in the user's context must come after this line. ++ # Note: modules that run in the user's context must come after this line. + session required pam_selinux.so multiple open + #endif + #if HAVE_GNOME_KEYRING diff -uNr a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml --- a/sys-auth/pambase/metadata.xml false +++ b/sys-auth/pambase/metadata.xml 3c9749c9d3ecb03761c40730be9616bac7a2709ddd1bd91ec132f131c147891c376ca6cae41a44a53782350e9adeaea30edbb697fc3db58d10511987dc5b9444 @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>pam-bugs@gentoo.org</email> + </maintainer> + <use> + <flag name="cracklib"> + Enable pam_cracklib module on system authentication stack. This + produces warnings when changing password to something easily + crackable. It requires the same USE flag to be enabled on + <pkg>sys-libs/pam</pkg> or system login might be impossible. + </flag> + <flag name="consolekit"> + Enable pam_ck_connector module on local system logins. This + allows for console logins to make use of ConsoleKit + authorization. + </flag> + <flag name="elogind"> + Use pam_elogind module to register user sessions with elogind. + </flag> + <flag name="systemd"> + Use pam_systemd module to register user sessions in the systemd + control group hierarchy. + </flag> + <flag name="gnome-keyring"> + Enable pam_gnome_keyring module on system login stack. This + enables proper Gnome Keyring access to logins, whether they are + done with the login shell, a Desktop Manager or a remote login + systems such as SSH. + </flag> + <flag name="debug"> + Enable debug information logging on syslog(3) for all the + modules supporting this in the system authentication and system + login stacks. + </flag> + <flag name="passwdqc"> + Enable pam_passwdqc module on system auth stack for password + quality validation. This is an alternative to pam_cracklib + producing warnings, rejecting or providing example passwords + when changing your system password. It is used by default by + OpenWall GNU/*/Linux and by FreeBSD. + </flag> + <flag name="mktemp"> + Enable pam_mktemp module on system auth stack for session + handling. This module creates a private temporary directory for + the user, and sets TMP and TMPDIR accordingly. + </flag> + <flag name="pam_ssh"> + Enable pam_ssh module on system auth stack for authentication + and session handling. This module will accept as password the + passphrase of a private SSH key (one of ~/.ssh/id_rsa, + ~/.ssh/id_dsa or ~/.ssh/identity), and will spawn an ssh-agent + instance to cache the open key. + </flag> + <flag name="sha512"> + Switch Linux-PAM's pam_unix module to use sha512 for passwords + hashes rather than MD5. This option requires + <pkg>sys-libs/pam</pkg> version 1.0.1 built against + <pkg>sys-libs/glibc</pkg> version 2.7, if it's built against an + earlier version, it will silently be ignored, and MD5 hashes + will be used. All the passwords changed after this USE flag is + enabled will be saved to the shadow file hashed using SHA512 + function. The password previously saved will be left + untouched. Please note that while SHA512-hashed passwords will + still be recognised if the USE flag is removed, the shadow file + will not be compatible with systems using an earlier glibc + version. + </flag> + <flag name="pam_krb5"> + Enable pam_krb5 module on system auth stack, as an alternative + to pam_unix. If Kerberos authentication succeed, only pam_unix + will be ignore, and all the other modules will proceed as usual, + including Gnome Keyring and other session modules. It requires + <pkg>sys-libs/pam</pkg> as PAM implementation. + </flag> + <flag name="minimal"> + Disables the standard PAM modules that provide extra information + to users on login; this includes pam_tally (and pam_tally2 for + Linux PAM 1.1 and later), pam_lastlog, pam_motd and other + similar modules. This might not be a good idea on a multi-user + system but could reduce slightly the overhead on single-user + non-networked systems. + </flag> + <flag name="nullok"> + Enable the nullok option with the pam_unix module. This allows + people to login with blank passwords. + </flag> + <flag name="securetty"> + Enable pam_securetty module in the login stack. Not generally + relevant anymore as the login stack only refers to local logins + and local terminals imply secure access in the first place. + </flag> + </use> +</pkgmetadata> diff -uNr a/sys-auth/pambase/pambase-20150213-r1.ebuild b/sys-auth/pambase/pambase-20150213-r1.ebuild --- a/sys-auth/pambase/pambase-20150213-r1.ebuild false +++ b/sys-auth/pambase/pambase-20150213-r1.ebuild ba1b879d7ac942e455e9bf41453d5dba79a3bdc86fe1f62315a32d946ad1d28ec3fba94c16c718a256567bcc846730e887ce711bd414f3b776b3c76a4f869b2e @@ -0,0 +1,107 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="PAM base configuration files" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:PAM" +SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 -x86-fbsd ~amd64-linux ~x86-linux" +IUSE="consolekit +cracklib debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd" + +RESTRICT="binchecks" + +MIN_PAM_REQ=1.1.3 + +RDEPEND=" + || ( + >=sys-libs/pam-${MIN_PAM_REQ} + ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) + ) + consolekit? ( sys-auth/consolekit[pam] ) + cracklib? ( sys-libs/pam[cracklib] ) + elogind? ( sys-auth/elogind[pam] ) + gnome-keyring? ( gnome-base/gnome-keyring[pam] ) + mktemp? ( sys-auth/pam_mktemp ) + pam_krb5? ( + || ( >=sys-libs/pam-${MIN_PAM_REQ} sys-auth/openpam ) + sys-auth/pam_krb5 + ) + pam_ssh? ( sys-auth/pam_ssh ) + passwdqc? ( sys-auth/pam_passwdqc ) + selinux? ( sys-libs/pam[selinux] ) + sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} ) + systemd? ( sys-apps/systemd[pam] ) +" +DEPEND=" + app-arch/xz-utils + app-portage/portage-utils +" + +PATCHES=( + "${FILESDIR}"/${P}-selinux-note.patch #540096 + "${FILESDIR}"/${P}-elogind.patch #599498 +) + +pkg_setup() { + local stcnt=0 + + use consolekit && stcnt=$((stcnt+1)) + use elogind && stcnt=$((stcnt+1)) + use systemd && stcnt=$((stcnt+1)) + + if [[ ${stcnt} -gt 1 ]] ; then + ewarn "You are enabling ${stcnt} session trackers at the same time." + ewarn "This is not a recommended setup to have. Please consider enabling" + ewarn "only one of USE=\"consolekit\", USE=\"elogind\" or USE=\"systemd\"." + fi +} + +src_compile() { + local implementation linux_pam_version + if has_version sys-libs/pam; then + implementation=linux-pam + local ver_str=$(qatom $(best_version sys-libs/pam) | cut -d ' ' -f 3) + linux_pam_version=$(printf "0x%02x%02x%02x" ${ver_str//\./ }) + elif has_version sys-auth/openpam; then + implementation=openpam + else + die "PAM implementation not identified" + fi + + use_var() { + local varname=$(echo "$1" | tr '[:lower:]' '[:upper:]') + local usename=${2-$(echo "$1" | tr '[:upper:]' '[:lower:]')} + local varvalue=$(usex ${usename}) + echo "${varname}=${varvalue}" + } + + emake \ + GIT=true \ + $(use_var debug) \ + $(use_var cracklib) \ + $(use_var passwdqc) \ + $(use_var consolekit) \ + $(use_var elogind) \ + $(use_var systemd) \ + $(use_var GNOME_KEYRING gnome-keyring) \ + $(use_var selinux) \ + $(use_var nullok) \ + $(use_var mktemp) \ + $(use_var pam_ssh) \ + $(use_var securetty) \ + $(use_var sha512) \ + $(use_var KRB5 pam_krb5) \ + $(use_var minimal) \ + IMPLEMENTATION=${implementation} \ + LINUX_PAM_VERSION=${linux_pam_version} +} + +src_test() { :; } + +src_install() { + emake GIT=true DESTDIR="${ED}" install +} diff -uNr a/sys-block/parted/Manifest b/sys-block/parted/Manifest --- a/sys-block/parted/Manifest false +++ b/sys-block/parted/Manifest 1197041610061d41919f47a880a365122beeb0219da73d446de2e52a45b70a131d7a7311bd0d894371781ef7e750960172b7540653396cfc50bc82580550e5ab @@ -0,0 +1,8 @@ +AUX parted-3.2-devmapper.patch 1972 BLAKE2B 10ceeec3f6af744dad642a9b1b8e8d30a85793415bac68c87463d459e4b1fb321c1d0e9017aa895334f2a2849c436f617581c5b4f3d1d0dbe5d1a97b9f3a278b SHA512 3baf2090ba86242df1633bb4b50deeb6e0226b0a56ad82466ddd76f028a859e29bd021f1f251047cd2a2a5ea1c77ed0129eca8be2e97ee48c21c1d186c07b8da +AUX parted-3.2-fix-includes.patch 257 BLAKE2B c810c645c90a37ec1cd16157ba4aefc818d40dfe6321d5850ba6d2861c388ce6db57be81637dd2bffa646bf6fbc2a6c648da45154e184c6eb13f4bc16dbccae1 SHA512 55ee63c218d1867c0f2c596e7c3eec5c42af160181456cc551fe3d432eabed0ac2dd3a3955ff0c375f76aeec8071e7f55a32834b87a0d39b8ef30361f671bfdd +AUX parted-3.2-fix-resizing-FAT16.patch 2383 BLAKE2B d680374c1949a1f4f118e67ad5f2b90cbde13475b0749cf580d25dc78b424ecc003a97c4607733b7bde833022c0ba76bdcae0853c8f205fb1fb4c873639ee928 SHA512 31a79f24de58fdbc77b50790372019083375acace66f9a9d3fc93c6ec22988b7198fda13c3790e00518f7a2878de1efb914658f517d275c6ecfd3e507bc4cd15 +AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872 +AUX parted-3.2-sysmacros.patch 804 BLAKE2B 294094fd79a799d577c2db00569f4be218713b71659654603a299f039939a7b3901ab80aab6cf969fd503712da8a7039e8fd7dac007b164a1f3b7ead4c5596ed SHA512 97c141d623bc52387b3726a164c5191c094cef1b2aa000dbd8e505aab418210d27ad07a59e0433faf001bf12ee1e3729838186fc2bae69ed7a66941364e3b468 +DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 +EBUILD parted-3.2-r2.ebuild 1504 BLAKE2B 5b8392aef7ddaa82a107cdd35830486fba0f471e27d26f9da6f34e2f289caa600552082554430ba2c19681d2475880213d2e5f73b2e00052db48a0da7ff2eec7 SHA512 64cc033082e4c884e844d22bfc7e61865d4fb785195e0d14320bc251e2f7f93c8e4cfa0f6fa94c585ded52508b19e3bf97031f9539ac5ac93d90c09f9f6fa4e5 +MISC metadata.xml 754 BLAKE2B 6bf44d26295c82c00691f9ba11e114f43c2674e98b1a0f332280e2753c08aeeb5b5a402c2288e9f0c654d4d91be1ed20810eb4b19cf277b76d326423ee6b19a8 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184 diff -uNr a/sys-block/parted/files/parted-3.2-devmapper.patch b/sys-block/parted/files/parted-3.2-devmapper.patch --- a/sys-block/parted/files/parted-3.2-devmapper.patch false +++ b/sys-block/parted/files/parted-3.2-devmapper.patch a7ebb34ef70b8e91444b08c265705e292e0d99c2ce88843402144fd0356fb63769ab2e6738773696b7110c49061d3f27f45b175bc1b18c4951dfac68b0139dcc @@ -0,0 +1,60 @@ +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -2304,6 +2304,7 @@ + return r < 0 ? NULL : resultp; + } + ++#ifdef ENABLE_DEVICE_MAPPER + static char * + dm_canonical_path (PedDevice const *dev) + { +@@ -2326,12 +2327,22 @@ + err: + return NULL; + } ++#endif /* ENABLE_DEVICE_MAPPER */ + + static char* + _device_get_part_path (PedDevice const *dev, int num) + { +- char *devpath = (dev->type == PED_DEVICE_DM +- ? dm_canonical_path (dev) : dev->path); ++ char *devpath = ++#ifdef ENABLE_DEVICE_MAPPER ++ ( ++ dev->type == PED_DEVICE_DM ++ ? dm_canonical_path (dev) : ++#endif /* ENABLE_DEVICE_MAPPER */ ++ dev->path ++#ifdef ENABLE_DEVICE_MAPPER ++ ) ++#endif /* ENABLE_DEVICE_MAPPER */ ++ ; + size_t path_len = strlen (devpath); + char *result; + /* Check for devfs-style /disc => /partN transformation +@@ -2945,12 +2956,14 @@ + unsigned long long *length); + + ++#ifdef ENABLE_DEVICE_MAPPER + if (disk->dev->type == PED_DEVICE_DM) { + add_partition = _dm_add_partition; + remove_partition = _dm_remove_partition; + resize_partition = _dm_resize_partition; + get_partition_start_and_length = _dm_get_partition_start_and_length; + } else { ++#endif /* ENABLE_DEVICE_MAPPER */ + add_partition = _blkpg_add_partition; + remove_partition = _blkpg_remove_partition; + #ifdef BLKPG_RESIZE_PARTITION +@@ -2959,7 +2972,9 @@ + resize_partition = NULL; + #endif + get_partition_start_and_length = _kernel_get_partition_start_and_length; ++#ifdef ENABLE_DEVICE_MAPPER + } ++#endif /* ENABLE_DEVICE_MAPPER */ + + /* lpn = largest partition number. + * for remove pass, use greater of device or label limit */ diff -uNr a/sys-block/parted/files/parted-3.2-fix-includes.patch b/sys-block/parted/files/parted-3.2-fix-includes.patch --- a/sys-block/parted/files/parted-3.2-fix-includes.patch false +++ b/sys-block/parted/files/parted-3.2-fix-includes.patch d2bdecb1596259f2531b0aace72056e5322d2ba3e3a0d1e964e6c9a4ad705ec8207feef6d5e30be1fe6ca8d6488e62aeed1af60b4f98946385dcec19ff0d57e1 @@ -0,0 +1,10 @@ +--- parted-3.1.orig/libparted/fs/xfs/platform_defs.h ++++ parted-3.1/libparted/fs/xfs/platform_defs.h +@@ -35,6 +35,7 @@ + #define __XFS_PLATFORM_DEFS_H__ + + #include <stdio.h> ++#include <fcntl.h> + #include <stdarg.h> + #include <assert.h> + #include <endian.h> diff -uNr a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch b/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch --- a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch false +++ b/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch e4e6b04f98c78a13b07c01ac95c56d52a984799741b14fa0af07154840c34bdce3a1023487147d86824e80759474cf769ecc957c769f724a075673ca474b65b1 @@ -0,0 +1,64 @@ +From 1e9e770f4bc7f3d80e09ecd1df58575fad064163 Mon Sep 17 00:00:00 2001 +From: Mike Fleetwood <mike.fleetwood@googlemail.com> +Date: Sun, 28 Sep 2014 15:15:48 +0000 +Subject: lib-fs-resize: Prevent crash resizing FAT16 file systems + +Resizing FAT16 file system crashes in libparted/fs/r/fat/resize.c +create_resize_context() because it was dereferencing NULL pointer +fs_info->info_sector to copy the info_sector. + +Only FAT32 file systems have info_sector populated by fat_open() -> +fat_info_sector_read(). FAT12 and FAT16 file systems don't have an +info_sector so pointer fs_info->info_sector remains assigned NULL from +fat_alloc(). When resizing a FAT file system create_resize_context() +was always dereferencing fs_info->info_sector to memory copy the +info_sector, hence it crashed for FAT12 and FAT16. + +Make create_resize_context() only copy the info_sector for FAT32 file +systems. + +Reported by Christian Hesse in +https://bugzilla.gnome.org/show_bug.cgi?id=735669 +--- +diff --git a/NEWS b/NEWS +index 297b0a5..da7db50 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,10 @@ GNU parted NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Bug Fixes ++ ++ libparted-fs-resize: Prevent crash resizing FAT16 file systems. ++ + + * Noteworthy changes in release 3.2 (2014-07-28) [stable] + +diff --git a/libparted/fs/r/fat/resize.c b/libparted/fs/r/fat/resize.c +index 919acf0..bfe60a0 100644 +--- a/libparted/fs/r/fat/resize.c ++++ b/libparted/fs/r/fat/resize.c +@@ -668,11 +668,17 @@ create_resize_context (PedFileSystem* fs, const PedGeometry* new_geom) + + /* preserve boot code, etc. */ + new_fs_info->boot_sector = ped_malloc (new_geom->dev->sector_size); +- new_fs_info->info_sector = ped_malloc (new_geom->dev->sector_size); + memcpy (new_fs_info->boot_sector, fs_info->boot_sector, + new_geom->dev->sector_size); +- memcpy (new_fs_info->info_sector, fs_info->info_sector, +- new_geom->dev->sector_size); ++ new_fs_info->info_sector = NULL; ++ if (fs_info->fat_type == FAT_TYPE_FAT32) ++ { ++ PED_ASSERT (fs_info->info_sector != NULL); ++ new_fs_info->info_sector = ++ ped_malloc (new_geom->dev->sector_size); ++ memcpy (new_fs_info->info_sector, fs_info->info_sector, ++ new_geom->dev->sector_size); ++ } + + new_fs_info->logical_sector_size = fs_info->logical_sector_size; + new_fs_info->sector_count = new_geom->length; +-- +cgit v0.9.0.2 diff -uNr a/sys-block/parted/files/parted-3.2-po4a-mandir.patch b/sys-block/parted/files/parted-3.2-po4a-mandir.patch --- a/sys-block/parted/files/parted-3.2-po4a-mandir.patch false +++ b/sys-block/parted/files/parted-3.2-po4a-mandir.patch b9c5d0f9a9c46ba1b724f071705388a61d502b2fd15730bc2f300c494513ff2c43a06188c9525306dbbd787b46009a163e55e8113381d1accf1d8a43a8e9a799 @@ -0,0 +1,11 @@ +--- a/doc/po4a.mk ++++ b/doc/po4a.mk +@@ -23,7 +23,7 @@ + # threshold is 80%), it won't be distributed, and the build won't fail. + # + +-mandir = $(mandir)/$(lang) ++mandir := $(mandir)/$(lang) + + # Inform automake that we want to install some man pages in section 1, 5 + # and 8. diff -uNr a/sys-block/parted/files/parted-3.2-sysmacros.patch b/sys-block/parted/files/parted-3.2-sysmacros.patch --- a/sys-block/parted/files/parted-3.2-sysmacros.patch false +++ b/sys-block/parted/files/parted-3.2-sysmacros.patch 47b60abc00d49100c3699dc6b8109cf0668f80cb3a533b5da605132712b311fe6e36a5edf86d1e583472e1bba7b11b3f8a721f2a83b1e832536747375f93d1bd @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/580022 + +From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Tue, 21 Jun 2016 15:01:08 -0400 +Subject: [PATCH] include sysmacros.h for major/minor/makedev + +Linux C libs are moving away from including this header implicitly via +sys/types.h, so include it explicitly. +--- + libparted/arch/linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 326b95619d31..e5c168be3c68 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -37,6 +37,7 @@ + #include <dirent.h> + #include <sys/ioctl.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/utsname.h> /* for uname() */ + #include <scsi/scsi.h> +-- +2.8.2 + diff -uNr a/sys-block/parted/metadata.xml b/sys-block/parted/metadata.xml --- a/sys-block/parted/metadata.xml false +++ b/sys-block/parted/metadata.xml ab9b7fccbbb5fc3502ecff39cedefe1abc72b6d6bc0c0f9931295d33f5ac6e064ee45a43c046e53271fa0bcfaf995da622d898b407490adf67eb4f56da9d5d5a @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>livecd@gentoo.org</email> + <name>Gentoo LiveCD Project</name> + </maintainer> + <use> + <flag name="device-mapper"> + Enable device-mapper support from <pkg>sys-fs/lvm2</pkg> in parted + </flag> + <flag name="debug"> + Enable debugging as encouraged by upstream: [The default configuration] + includes --enable-debug (by default), which contains many assertions. + Obviously, these "waste" space, but in the past, they have caught + potentially dangerous bugs before they would have done damage, so we think + it's worth it. Also, it means we get more bug reports ;) + </flag> + </use> +</pkgmetadata> diff -uNr a/sys-block/parted/parted-3.2-r2.ebuild b/sys-block/parted/parted-3.2-r2.ebuild --- a/sys-block/parted/parted-3.2-r2.ebuild false +++ b/sys-block/parted/parted-3.2-r2.ebuild 40a4ee3317422231c7e326d6ce1798477bb3b4d083d221c07e8f896d0bb59f7dad933d7524c61944814ea90e4bc2770bf462dabb4365fd214ea1590af24ec35e @@ -0,0 +1,64 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools eutils flag-o-matic + +DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" +HOMEPAGE="https://www.gnu.org/software/parted" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 arm ~mips ppc x86" +IUSE="+debug device-mapper nls readline selinux static-libs" +RESTRICT="test" + +# specific version for gettext needed +# to fix bug 85999 +RDEPEND=" + >=sys-fs/e2fsprogs-1.27 + device-mapper? ( >=sys-fs/lvm2-2.02.45 ) + readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) + selinux? ( sys-libs/libselinux ) + elibc_uclibc? ( dev-libs/libiconv ) +" +DEPEND=" + ${RDEPEND} + nls? ( >=sys-devel/gettext-0.12.1-r2 ) + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-3.2-devmapper.patch + "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch + "${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch + "${FILESDIR}"/${PN}-3.2-sysmacros.patch + "${FILESDIR}"/${PN}-3.2-fix-includes.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + use elibc_uclibc && append-libs -liconv + econf \ + $(use_enable debug) \ + $(use_enable device-mapper) \ + $(use_enable nls) \ + $(use_enable selinux) \ + $(use_enable static-libs static) \ + $(use_with readline) \ + --disable-rpath \ + --disable-silent-rules +} + +DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) + +src_install() { + default + + prune_libtool_files +} diff -uNr a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest --- a/sys-boot/lilo/Manifest false +++ b/sys-boot/lilo/Manifest f9e7f4135add0738047b985902fe95d5670dd0c00e7c9856ac18254cd178cd72531a34500ff4d2b1b27d8b2e8acca863311b79d830c9d745e17de4645a38fd41 @@ -0,0 +1,8 @@ +AUX lilo-24.1-novga.patch 500 BLAKE2B a5ba2f06791812fd7dcafe0882218e6d3884db228f5866604f903972e6914cfdab8379e18eb18f399174581eb72775fda05f1a61df699d39f60564b9a2e337a6 SHA512 067a741086b6df6b5f728ffde3cac949dd9b59cdc11ac1b022f240b69c4a8ef883f5623cc610becd4648f02ad3a243a0d6a939aa8d8c63d9b0158426e6b6f300 +AUX lilo-24.1-remove-O_ACCMODE.patch 493 BLAKE2B a6e8c15563467cde6f7abba2f694780b7908387d0331ed29a9aa3c861c9bcc3003b84c83a5b0054166133c5b7886f6d7dc42cc606536e4641c53a56889cf1907 SHA512 a053dce3107e860dcce30453ae80cf15c3871655bcbbbb9c19942eb609e6d5973d9b9b97c543fe422c41691450756507ae9bf0143fd13e903b19b2c0a5d922c3 +AUX lilo-24.1-remove__GLIBC__.patch 475 BLAKE2B cf014d949353b5554f159f4e85af7369075d5ced994cfb0c2f67b6e3476bc11b0c4a274266e7bfcd016466fd7ee30cde9e824bdc355837bc4b202833666907df SHA512 5f9556f5e42f20d5a4545599c8cea4df1f4d8e3ff20a51a3b388a9729016c43eefa2b8ff56daa829d53d972ab0393269bbe46d259364102225fd976977c8372b +AUX lilo.conf 1620 BLAKE2B 5371f3b82e8b4b8f887af2b3476d5cf9263fb661f414175c9390f3e45f4161436ca112e16dd1762c78bfe4fc9c0c842c4da89710372a7e0540479fda1239a5e6 SHA512 70f2f57dd9c2598db4c909410055b30ae71dbc0d88618e7f64effdf877d3f7fea6d77421103c06e6ce51fbca943a90f1401460ceab2d8fcdf059aee3cd7e9287 +DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936 +DIST lilo-24.1.tar.gz 773223 BLAKE2B ceaeaf6696b7b15d95cc6c90c6de63ad731f4d0f6d9e42fea4a245219d446cbecdb7d372ef4cb31dce26c7e149723779244f0319939343edf971ac1a19ba5063 SHA512 d1375cac9654fcb3934e7e5e0533e126ff8700a48154eb5019cf62e4b89f14d2ce7a17b6324795d9b60b37ab7656bfb2c9467f6e9d3540095f5c294579e83883 +EBUILD lilo-24.1.ebuild 4257 BLAKE2B d88b0325a431710cf2bf8ebfba6a21effd734879530a652a428ef4ec8250aa0753886812fec65825334846093a37c13c43f2a1913246ab72382b34909b7fc134 SHA512 58a806cd54ca4f2f5439d2c31d0beebf4392db029b691148cad5a8f1ae2b7487618b168ad294c844e0b5ea17e296be791351038aaefb20590ecb90a7c3824989 +MISC metadata.xml 582 BLAKE2B 3eff61a72e8828178013f444fafad385ca14c91d9a9a989646b5b1a9a1485598b537c2bf7f49b6d7301e45f7266e1dc866c0c3fffe74843a0d44ce94fa982825 SHA512 e9c7e5bcd88fab10e756ab7e22a949d1eaa9552cfad60891ca3f47d92fb3487ec74baee67539fabf9db2c15b225ab40050ff5e3ef1d7f858723bf8ae1b80fa04 diff -uNr a/sys-boot/lilo/files/lilo-24.1-novga.patch b/sys-boot/lilo/files/lilo-24.1-novga.patch --- a/sys-boot/lilo/files/lilo-24.1-novga.patch false +++ b/sys-boot/lilo/files/lilo-24.1-novga.patch c1299386966c36254694cde1aa9a20096dd2dd36b1a31d47fe2b250a38705d0a661b1d680fc191e71deb412c5a361005f86a8c921117e0291f0d7ab6b6dac04e @@ -0,0 +1,12 @@ +diff -uNr lilo-24.1.ORIG/make.vars lilo-24.1/make.vars +--- lilo-24.1.ORIG/make.vars 2015-01-22 10:36:54.656904227 +0000 ++++ lilo-24.1/make.vars 2015-01-22 10:37:16.516903935 +0000 +@@ -71,7 +71,7 @@ + + CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ + -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ +- -DMDPRAID -DDEVMAPPER ++ -DMDPRAID -DDEVMAPPER -DNOVGA + + # set the following if you wish LILO.COM to be installed + DOS_DIR=/dosC/boot diff -uNr a/sys-boot/lilo/files/lilo-24.1-remove-O_ACCMODE.patch b/sys-boot/lilo/files/lilo-24.1-remove-O_ACCMODE.patch --- a/sys-boot/lilo/files/lilo-24.1-remove-O_ACCMODE.patch false +++ b/sys-boot/lilo/files/lilo-24.1-remove-O_ACCMODE.patch c2cc7b5aafd2ff6bd85a76772e180abc3cc2b7039456c2ae01e3f7cc449de03bb2bcb2abc1a20e85c445cf6262838227446723bace4411181f624d56f488f2a1 @@ -0,0 +1,17 @@ +diff -Naur lilo-24.1.orig/src/common.h lilo-24.1/src/common.h +--- lilo-24.1.orig/src/common.h 2011-06-22 03:13:27.000000000 -0400 ++++ lilo-24.1/src/common.h 2015-07-22 19:27:06.272990549 -0400 +@@ -23,12 +23,7 @@ + # define PAGE_SIZE 4096U + #endif + +-#ifdef O_ACCMODE +-# define O_NOACCESS O_ACCMODE +-#else +-/* open a file for "no access" */ +-# define O_NOACCESS 3 +-#endif ++#define O_NOACCESS O_RDONLY + + /* special for LILO, bypass the actual open in dev_open( , ,-1) */ + #define O_BYPASS -1 diff -uNr a/sys-boot/lilo/files/lilo-24.1-remove__GLIBC__.patch b/sys-boot/lilo/files/lilo-24.1-remove__GLIBC__.patch --- a/sys-boot/lilo/files/lilo-24.1-remove__GLIBC__.patch false +++ b/sys-boot/lilo/files/lilo-24.1-remove__GLIBC__.patch 49622d1e5c486c749fedea61f4b22532145be97a23d4bc6c79ac095f6c5b37810f2a72f58f5a0376ad3153e40f90c5194846278642a2efdf2b57fe4bc0e6f6ba @@ -0,0 +1,11 @@ +diff -Naur lilo-24.1.orig/src/lilo.c lilo-24.1/src/lilo.c +--- lilo-24.1.orig/src/lilo.c 2014-10-16 20:06:46.000000000 -0400 ++++ lilo-24.1/src/lilo.c 2015-07-18 22:16:32.776066238 -0400 +@@ -182,7 +182,6 @@ + printf("Without"); + #endif + printf(" device-mapper\n"); +- printf("\nglibc version %d.%d\n", __GLIBC__, __GLIBC_MINOR__); + printf("Kernel Headers included from %d.%d.%d\n", + LINUX_VERSION_CODE>>16, + LINUX_VERSION_CODE>>8 & 255, diff -uNr a/sys-boot/lilo/files/lilo.conf b/sys-boot/lilo/files/lilo.conf --- a/sys-boot/lilo/files/lilo.conf false +++ b/sys-boot/lilo/files/lilo.conf 768153079a545f99285863706a50a5eca890940e41bb6277eb6c0c507ad407b8a466dac8da3fc44eca4d3fabdb5dc3f788fe6b0bf47978ca5fe59bcd7cfa9e73 @@ -0,0 +1,73 @@ +# $Id$ +# Author: Ultanium + +# +# Start LILO global section +# + +# Faster, but won't work on all systems: +#compact +# Should work for most systems, and do not have the sector limit: +lba32 +# If lba32 do not work, use linear: +#linear + +# MBR to install LILO to: +boot = /dev/hda +map = /boot/.map + +# If you are having problems booting from a hardware raid-array +# or have a unusual setup, try this: +#disk=/dev/ataraid/disc0/disc bios=0x80 # see this as the first BIOS disk +#disk=/dev/sda bios=0x81 # see this as the second BIOS disk +#disk=/dev/hda bios=0x82 # see this as the third BIOS disk + +# Here you can select the secondary loader to install. A few +# examples is: +# +# boot-text.b +# boot-menu.b +# boot-bmp.b +# +install = /boot/boot-menu.b # Note that for lilo-22.5.5 or later you + # do not need boot-{text,menu,bmp}.b in + # /boot, as they are linked into the lilo + # binary. + +menu-scheme=Wb +prompt +# If you always want to see the prompt with a 15 second timeout: +#timeout=150 +delay = 50 +# Normal VGA console +vga = normal +# VESA console with size 1024x768x16: +#vga = 791 + +# +# End LILO global section +# + +# +# Linux bootable partition config begins +# +image = /boot/bzImage + root = /dev/hda3 + #root = /devices/discs/disc0/part3 + label = Gentoo + read-only # read-only for checking +# +# Linux bootable partition config ends +# + +# +# DOS bootable partition config begins +# +other = /dev/hda1 + #other = /devices/discs/disc0/part1 + label = Windows + table = /dev/hda +# +# DOS bootable partition config ends +# + diff -uNr a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild --- a/sys-boot/lilo/lilo-24.1.ebuild false +++ b/sys-boot/lilo/lilo-24.1.ebuild 02cb181cbc7b85b46fcf7dbb01f932e6dd71808cc807206ec6d063fd99b1c4f4e743dded4fe32fcaaafb1ac9af2934aa9765ba28a185bfb3e536d6c90bac9311 @@ -0,0 +1,182 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs + +DOLILO_V="0.6" +IUSE="static minimal pxeserial device-mapper" + +DESCRIPTION="Standard Linux boot loader" +HOMEPAGE="https://alioth.debian.org/projects/lilo/" + +DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" +SRC_URI=" + http://lilo.alioth.debian.org/ftp/sources/${P}.tar.gz + mirror://gentoo/${DOLILO_TAR} +" + +SLOT="0" +LICENSE="BSD GPL-2" +KEYWORDS="-* amd64 x86" + +DEPEND=">=sys-devel/bin86-0.15.5" +RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )" + +src_prepare() { + # this patch is needed when booting PXE and the device you're using + # emulates vga console via serial console. + # IE.. B.B.o.o.o.o.t.t.i.i.n.n.g.g....l.l.i.i.n.n.u.u.x.x and stair stepping. + use pxeserial && epatch "${FILESDIR}/${P}-novga.patch" + + # Remove reference to __GLIBC__ for musl. + epatch "${FILESDIR}"/${P}-remove__GLIBC__.patch + epatch "${FILESDIR}"/${P}-remove-O_ACCMODE.patch + + # Do not strip and have parallel make + # FIXME: images/Makefile does weird stuff + sed -i Makefile src/Makefile \ + -e '/strip/d;s|^ make| $(MAKE)|g' \ + -e '/images install/d' \ + -e '/images all/d' \ + || die "sed strip failed" +} + +src_configure() { + if ! use device-mapper; then + sed -i make.vars -e 's|-DDEVMAPPER||g' || die + fi +} + +src_compile() { + # lilo needs this. bug #140209 + export LC_ALL=C + + # we explicitly prevent the custom CFLAGS for stability reasons + if use static; then + local target=alles + else + local target=all + fi + + emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die +} + +src_install() { + keepdir /boot + emake DESTDIR="${D}" install || die + + if use !minimal; then + into / + dosbin "${WORKDIR}"/dolilo/dolilo || die + + into /usr + dosbin keytab-lilo.pl || die + + insinto /etc + newins "${FILESDIR}"/lilo.conf lilo.conf.example || die + + newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die + + dodoc CHANGELOG* readme/README.* readme/INCOMPAT README + docinto samples ; dodoc sample/* + fi +} + +# Check whether LILO is installed +# This function is from /usr/sbin/mkboot from debianutils, with copyright: +# +# Debian GNU/Linux +# Copyright 1996-1997 Guy Maor <maor@debian.org> +# +# Modified for Gentoo for use with the lilo ebuild by: +# Martin Schlemmer <azarah@gentoo.org> (16 Mar 2003) +# +lilocheck() { + local bootpart= + local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")" + + echo + ebegin "Checking whether LILO can be safely updated" + + if [ "$(whoami)" != "root" ] + then + eend 1 + eerror "Only root can check for LILO" + return 1 + fi + + if [ -z "${rootpart}" ] + then + eend 1 + eerror "Could not determine root partition" + return 1 + fi + + if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ] + then + eend 1 + eerror "No LILO configuration in place" + return 1 + fi + + bootpart="$(sed -n "s:^boot[ ]*=[ ]*$.*$[ ]*:\1:p" /etc/lilo.conf)" + + if [ -z "${bootpart}" ] + then + # lilo defaults to current root when 'boot=' is not present + bootpart="${rootpart}" + fi + + if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO' + then + eend 1 + eerror "No LILO signature on ${bootpart}" + ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand." + return 1 + fi + + if grep -q "^[[:space:]]*password[[:space:]]*=[[:space:]]*\"\"" /etc/lilo.conf + then + eend 1 + eerror "Interactive password entry configured" + ewarn "Run /sbin/lilo -p by hand." + return 1 + fi + + einfo "LILO on ${bootpart} is safe to update" + eend 0 + return 0 +} + +pkg_postinst() { + if [ ! -e "${ROOT}/boot/boot.b" -a ! -L "${ROOT}/boot/boot.b" ] + then + [ -f "${ROOT}/boot/boot-menu.b" ] && \ + ln -snf boot-menu.b "${ROOT}/boot/boot.b" + fi + + if [ "${ROOT}" = "/" ] && use !minimal; + then + if lilocheck + then + einfo "Running DOLILO to complete the install" + # do not redirect to /dev/null because it may display some input + # prompt + /sbin/dolilo + if [ "$?" -ne 0 ] + then + eerror "You must manually configure and run LILO" + fi + fi + echo + fi + if use !minimal; then + echo + einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that" + einfo "handles mounting and unmounting /boot for you. It can do more, " + einfo "edit /etc/conf.d/dolilo to harness its full potential." + echo + fi +} diff -uNr a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml --- a/sys-boot/lilo/metadata.xml false +++ b/sys-boot/lilo/metadata.xml d68e7ea6c4bb4cb9ad8ea49222e9c04a3c62a0cc16744fb39cc1d22bbdc7f0733923c58b97c9996c25a12d9d5d416bf83e7f6d780f3350ca1d0ccc7865b316b7 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> + <email>chainsaw@gentoo.org</email> +</maintainer> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag> + <flag name="minimal">Do not install the dolilo helper script</flag> + <flag name="pxeserial">Avoid character echo on PXE serial console</flag> +</use> +</pkgmetadata> diff -uNr a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest --- a/sys-devel/autoconf/Manifest false +++ b/sys-devel/autoconf/Manifest 9d268398b359ebad1885273dac41f1e05f84f96454258ab1f3e4f714fbdaef2e52d5832c5d0a53b9b5ed625ef66f55a0e6e0201b3db297a53fdd3fef64a4cc63 @@ -0,0 +1,10 @@ +AUX autoconf-2.13-destdir.patch 604 BLAKE2B 4c3607a31a7e99820b49dea142e9b2445a70508cedf7407f7822f86fb4d1595ced6ab202bf6e42e422f41e44c256e62ee2a617f5ea01d1319c66f811333d5c1e SHA512 c69c7681b028f82735e0187dc9ea0d73906b74e32a6d51754e2c973a559895590fb5a1701d153445b772bcf0536a4688292895242910f20e6d4cf1a02f1a877f +AUX autoconf-2.13-gentoo.patch 799 BLAKE2B e9d403d2e7e6ca2efafcf9b2e7108f8b383b107bc78290242f0ed2662ec8e05c5a178f8014e6317f260695cbaa0e4c6a2cce3221d1990b1fd2a96fa3db5ce611 SHA512 5712ad0d67cb5661c949700d5bc0d8c582b27562229400e7b8b1c0249020d13077af5ef3602adef7135cc8dfe529556d5a23f2ce494e3554322262510c2a9fb7 +AUX autoconf-2.13-test-fixes.patch 547 BLAKE2B aa7509f3098da8e2723f835133e375d63896ea65b3030037d625361fa01a02e7e982920cedcbfdf1679783fd7a6a8f0b8476e583749419fd8d103735c0b98d2d SHA512 085e7525c66e710b42dcb068c8aeda89488d1e926e493bcab74e1a1440f53f67630d6998a2a9eff6dc65cf8f71cad19127d541422b51a2519163b51ba78ae592 +AUX autoconf-2.61-darwin.patch 454 BLAKE2B c98084d8109ead961c446aecd38d150b244a83a62870e6820c10024085c023ebcbc75d2c388e170c3bdbd562e3a2b795271c52c02b3245ccc30195443d82d89b SHA512 7d11430a596cfa8624380fa21cfee4f4684a0144d4a4f93218656cedc0aeba2e7bf85dd52f7cdad3ef2a9aa4d5213c318b6cde8a33c09690ea4dddc7d8057101 +AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71cab644328c850c77214dd15c99c2b1ae2ee040ef3d75d4dbe3301992bdb9ad2f2b48f4a6363b14e9f6765863e57f0047b83f86 SHA512 38506631fdde1f80a3467673e6fb48d4751323462c1657c85e2b5289e1219ef236ed9af3a66906c8851a62c244c1ffed70537a5f1421539429a9aa04e929d727 +AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0 +AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20 +DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b +EBUILD autoconf-2.69-r4.ebuild 1362 BLAKE2B b058dea727115a2624f1706d1ed15d470c6051e98940c0f708a79039909e18227cf60568e94965a9ab9fc662dca1e8bfc1218e5d8c8eca0f13a768ae3e0bc93c SHA512 956cd3a9ad64a329f24a3036e5a1a2fdefc5ba00d44c539a0f3906049276921d773c036e327114bc35d3463f1729ea7360ca1bfbfa707063d938da2c17b6e235 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild --- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild false +++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild 08975f8d7dcd1ca75aea1135ea58d00b5747875091aa93207b5e1a8f07994a17e225048926bbaaaccac684dd47883662627ae6992999289b93feb4f3c33ab3d4 @@ -0,0 +1,42 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git" + inherit git-r3 +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +inherit toolchain-autoconf + +DESCRIPTION="Used to create autoconfiguration files" +HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" + +LICENSE="GPL-3" +SLOT="${PV}" +IUSE="emacs" + +DEPEND=">=sys-devel/m4-1.4.16 + >=dev-lang/perl-5.6" +RDEPEND="${DEPEND} + !~sys-devel/${P}:2.5 + >=sys-devel/autoconf-wrapper-13" +[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3" +PDEPEND="emacs? ( app-emacs/autoconf-mode )" + +src_prepare() { + # usr/bin/libtool is provided by binutils-apple, need gnu libtool + [[ ${CHOST} == *-darwin* ]] && \ + PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch ) + PATCHES+=( + "${FILESDIR}"/${PN}-2.69-perl-5.26.patch + "${FILESDIR}"/${P}-fix-libtool-test.patch + "${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch + ) + toolchain-autoconf_src_prepare +} diff -uNr a/sys-devel/autoconf/files/autoconf-2.13-destdir.patch b/sys-devel/autoconf/files/autoconf-2.13-destdir.patch --- a/sys-devel/autoconf/files/autoconf-2.13-destdir.patch false +++ b/sys-devel/autoconf/files/autoconf-2.13-destdir.patch 59fba48cdbc54f4e1fdb60f7ecbde7843945f9774dd911d3c65ca22a102885c8c51dd7282a99594155748fd72fbfc3ec44c3d05ce2d769dee445cb3f15011539 @@ -0,0 +1,26 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -41,18 +41,18 @@ + + transform=@program_transform_name@ + +-prefix = @prefix@ ++prefix = $(DESTDIR)@prefix@ +-exec_prefix = @exec_prefix@ ++exec_prefix = $(DESTDIR)@exec_prefix@ + + # Directory in which to install scripts. +-bindir = @bindir@ ++bindir = $(DESTDIR)@bindir@ + + # Directory in which to install library files. +-datadir = @datadir@ ++datadir = $(DESTDIR)@datadir@ + acdatadir = $(datadir)/autoconf + + # Directory in which to install documentation info files. +-infodir = @infodir@ ++infodir = $(DESTDIR)@infodir@ + + #### End of system configuration section. #### + diff -uNr a/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch b/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch --- a/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch false +++ b/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch cdcc600ac8e49c720c4392ea2dc3a28d5a82fbb5eec5fc8bb42e80285e6282be594ea0230ebc9b94c99dfac038fec6dd53aa822765edf64c6cf00a85fdf73789 @@ -0,0 +1,36 @@ +--- a/configure ++++ b/configure +@@ -654,12 +654,10 @@ + echo "$ac_t""no" 1>&6 + fi + +-if test "$PERL" != no; then +- SCRIPTS=autoscan +-else +- echo "configure: warning: autoscan will not be built since perl is not found" 1>&2 ++if test "$PERL" = no; then ++ PERL=/usr/bin/perl + fi +- ++SCRIPTS=autoscan + ac_aux_dir= + for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then +--- a/configure.in ++++ b/configure.in +@@ -14,12 +14,10 @@ + AC_PATH_PROG(PERL, perl, no) + AC_SUBST(PERL)dnl + AC_SUBST(SCRIPTS)dnl +-if test "$PERL" != no; then +- SCRIPTS=autoscan +-else +- AC_MSG_WARN(autoscan will not be built since perl is not found) ++if test "$PERL" = no; then ++ PERL=/usr/bin/perl + fi +- ++SCRIPTS=autoscan + AC_PROG_INSTALL + + # Work with the GNU or Cygnus source tree layout. diff -uNr a/sys-devel/autoconf/files/autoconf-2.13-test-fixes.patch b/sys-devel/autoconf/files/autoconf-2.13-test-fixes.patch --- a/sys-devel/autoconf/files/autoconf-2.13-test-fixes.patch false +++ b/sys-devel/autoconf/files/autoconf-2.13-test-fixes.patch f6a9ea6da4ef3dd441d481e2a64afaa594d1bf77de425767fe0e0118ae974a0c4f8cf6f932acc568a5130f76b2769566054b6250ce02bf336bacee51f51b2fb5 @@ -0,0 +1,18 @@ +newer gcc versions don't provide g77, so if it doesn't exist, +don't bother trying to test it (and failing) + +http://bugs.gentoo.org/146592 + +--- autoconf-2.13/testsuite/autoconf.s/syntax.exp ++++ autoconf-2.13/testsuite/autoconf.s/syntax.exp +@@ -5,6 +5,10 @@ + set macros [exec sed -n $script $srcdir/../acspecific.m4] + + foreach mac $macros { ++ if { [string match "*F77*" "$mac"] && [catch {exec which g77} ignore_output] } then { ++ send_user "XFAIL: $mac\n" ++ continue ++ } + send_user "$mac\n" + autoconf_test $mac $mac + } diff -uNr a/sys-devel/autoconf/files/autoconf-2.61-darwin.patch b/sys-devel/autoconf/files/autoconf-2.61-darwin.patch --- a/sys-devel/autoconf/files/autoconf-2.61-darwin.patch false +++ b/sys-devel/autoconf/files/autoconf-2.61-darwin.patch a8c0e9f45824f371ddbbf5964871bc9211279b996fbd9c97ae9d7bfb96dbc7a16fb950e9e72d1393b246fcb2569f3bb94c5865a25730c7ee80eab6a030e1fa54 @@ -0,0 +1,11 @@ +--- a/bin/autoreconf.in ++++ b/bin/autoreconf.in +@@ -110,7 +110,7 @@ + my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; + my $automake = $ENV{'AUTOMAKE'} || 'automake'; + my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; +-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; ++my $libtoolize = $ENV{'LIBTOOLIZE'} || 'glibtoolize'; + my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; + + # --install -- as --add-missing in other tools. diff -uNr a/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch b/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch --- a/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch false +++ b/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch aefb609c4c48ba98bbe957adb127700574e81c1dafc45c3db365b9aca8c7569ab624feced2c8950464f93d747368a6e4209b190e38da7aadfa7d95f41e47dfe8 @@ -0,0 +1,31 @@ +From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001 +From: "Gary V. Vaughan" <gary@gnu.org> +Date: Mon, 3 Nov 2014 07:25:03 +0100 +Subject: tests: avoid spurious test failure with libtool 2.4.3 + +Based on a report by Bruce Dubbs. + +* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the +older `quote'. + +Signed-off-by: Eric Blake <eblake@redhat.com> +--- + tests/foreign.at | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/foreign.at b/tests/foreign.at +index a9dc33c..d4702cd 100644 +--- a/tests/foreign.at ++++ b/tests/foreign.at +@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore]) + # Make sure at-path contains something valid, and let the test suite + # display it when verbose. And fail, skipping would too easily hide + # problems. +-AT_CHECK([sed -n ["s,^.*\`\$/[^']*\$'.*,\\1,p"] stdout], [0], [stdout]) ++AT_CHECK([sed -n ["s,^[^']*[\`']\$/[^']*\$'.*,\\1,p"] stdout], [0], [stdout]) + AT_CHECK([test -f "`sed -n 1p stdout`"]) + + # Older libtoolize installed everything but install-sh... +-- +cgit v1.0-41-gc330 + diff -uNr a/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch --- a/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch false +++ b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch 8b60152329fc8297be2ffe00b8915cc517bda5f9440a7c31db044d26bc6c7fd1e4e05ef731a317ccdb790bf52e2298ea88931f5ed519477d29b1b6ee0e6c6699 @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/625576 + +--- autoconf-2.69/bin/autoheader.in ++++ autoconf-2.69/bin/autoheader.in +@@ -173,6 +173,12 @@ + # Source what the traces are trying to tell us. + verb "$me: running $autoconf to trace from $ARGV[0]"; + my $quoted_tmp = shell_quote ($tmp); ++my $perl_tmp; ++if ( $tmp =~ /^\// ) { ++ $perl_tmp=$tmp; ++} else { ++ $perl_tmp="./".$tmp; ++} + xsystem ("$autoconf" + # If you change this list, update the + # `Autoheader-preselections' section of autom4te.in. +@@ -182,9 +188,9 @@ + . " " . shell_quote ($ARGV[0]) . " >$quoted_tmp/traces.pl"); + + local (%verbatim, %symbol); +-debug "$me: \`do'ing $tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`; +-do "$tmp/traces.pl"; +-warn "couldn't parse $tmp/traces.pl: $@" if $@; ++debug "$me: \`do'ing $perl_tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`; ++do "$perl_tmp/traces.pl"; ++warn "couldn't parse $perl_tmp/traces.pl: $@" if $@; + unless ($config_h) + { + error "error: AC_CONFIG_HEADERS not found in $ARGV[0]"; diff -uNr a/sys-devel/autoconf/files/autoconf-2.69-perl-5.26.patch b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26.patch --- a/sys-devel/autoconf/files/autoconf-2.69-perl-5.26.patch false +++ b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26.patch a43b6a47ec86b926e0552a8f6b455ec8998b78c89e8178c6a2a295a4c61a25068788957a67da72db6ac0a1bdca5367949077dfc774c2199cb8582e61c3aeb88a @@ -0,0 +1,28 @@ +From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Tue, 29 Jan 2013 13:46:48 -0800 +Subject: [PATCH] autoscan: port to perl 5.17 + +* bin/autoscan.in (scan_sh_file): Escape '{'. This avoids a +feature that is deprecated in Perl 5.17. Reported by Ray Lauff in +<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>. +--- + bin/autoscan.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/autoscan.in b/bin/autoscan.in +index 993a750..db1df79 100644 +--- a/bin/autoscan.in ++++ b/bin/autoscan.in +@@ -358,7 +358,7 @@ sub scan_sh_file ($) + { + # Strip out comments and variable references. + s/#.*//; +- s/\${[^\}]*}//g; ++ s/\$\{[^\}]*}//g; + s/@[^@]*@//g; + + # Tokens in the code. +-- +1.9.1 + diff -uNr a/sys-devel/autoconf/metadata.xml b/sys-devel/autoconf/metadata.xml --- a/sys-devel/autoconf/metadata.xml false +++ b/sys-devel/autoconf/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest --- a/sys-devel/autoconf-wrapper/Manifest false +++ b/sys-devel/autoconf-wrapper/Manifest caf0dc646bee2921ace31cd1bf53be90b4860b8e0beeca58db81be0f8e3372cb8b15acfe00517765ffeddc80c3ba0b84d291cc542ad5213432d506491d848628 @@ -0,0 +1,3 @@ +AUX ac-wrapper-13.sh 5055 BLAKE2B 66fd728f347cdb873007e51113225608b3dae87c5979ba512a5e65a3185d8278502cdbaa60675b33643e0f9f459cf3956967f8e07b198d442139abb06a75f597 SHA512 0bbe9a992cff140bd60161404f1d1f6a9da6c79b1e9909000092f5e1159e457edee3fcefcb8fcaf47cedd9a7074505c4a61bc25107277d248150cdde5f11c5b7 +EBUILD autoconf-wrapper-13-r1.ebuild 828 BLAKE2B 911f5b016723361b42b211b71abb455d7033fd14db4e6ea7d1d5948df0b39d2111f166c0710a018d03fbe49cddf86eb5908f17990c510ec6c8cad14c7cccb297 SHA512 58e5e49b48a2ce652cdd1778e0f7b9474d043742de0a826e501e213cc8c7747b5a2a3a931b2ff9cb14cc1eb8ebf4b0160bda2b0696cc87f9525b8cf15b28094f +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild --- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild false +++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild ae7574c7b0c1df0db04abcb3338dd061df95af0a64d2f64b7bb680a659c5c240e1d1871be390f424330d68b2008f8b7af5260176c7d20f1a19c67915d4e3901e @@ -0,0 +1,28 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib + +DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +S="${WORKDIR}" + +src_install() { + exeinto /usr/$(get_libdir)/misc + newexe "${FILESDIR}"/ac-wrapper-${PV}.sh ac-wrapper.sh + + dodir /usr/bin + local x= + for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do + dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} + done +} diff -uNr a/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh --- a/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh false +++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh ed73fafbcd08ace3bcf9bfc74ce2f26f8a6226464db720d6be200c7502baf0607f6fd2d02b05d2bb0fece5a7655d1bcb5cab402909cd6ed6674cef1d7cecc266 @@ -0,0 +1,201 @@ +#!/bin/sh +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Based on the ac-wrapper.pl script provided by MandrakeSoft +# Rewritten in bash by Gregorio Guidi +# +# Executes the correct autoconf version. +# +# - defaults to newest version available (hopefully autoconf-2.60) +# - runs autoconf 2.13 if: +# - envvar WANT_AUTOCONF is set to `2.1' +# -or- +# - `ac{local,include}.m4' or `configure.{in,ac}' have AC_PREREQ(2.1) (not higher) +# -or- +# - `configure' is already present and was generated by autoconf 2.13 + +warn() { printf "ac-wrapper: $*\n" 1>&2; } +err() { warn "$@"; exit 1; } +unset IFS +which() { + local p + IFS=: # we don't use IFS anywhere, so don't bother saving/restoring + for p in ${PATH} ; do + p="${p}/$1" + [ -e "${p}" ] && echo "${p}" && return 0 + done + unset IFS + return 1 +} + +# +# Sanitize argv[0] since it isn't always a full path #385201 +# +argv0=${0##*/} +case ${0} in + ${argv0}) + # find it in PATH + if ! full_argv0=$(which "${argv0}") ; then + err "could not locate ${argv0}; file a bug" + fi + ;; + *) + # re-use full/relative paths + full_argv0=$0 + ;; +esac + +if [ "${argv0}" = "ac-wrapper.sh" ] ; then + err "Don't call this script directly" +fi + +if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${argv0}" = "autom4te" ] ; then + err "Autoconf 2.13 doesn't contain autom4te.\n" \ + " Either unset WANT_AUTOCONF or don't execute anything\n" \ + " that would use autom4te." +fi + +if ! seq 0 0 2>/dev/null 1>&2 ; then #338518 + seq() { + local f l i + case $# in + 1) f=1 i=1 l=$1;; + 2) f=$1 i=1 l=$2;; + 3) f=$1 i=$2 l=$3;; + esac + while :; do + [ $l -lt $f -a $i -gt 0 ] && break + [ $f -lt $l -a $i -lt 0 ] && break + echo $f + : $(( f += i )) + done + return 0 + } +fi + +# +# Set up bindings between actual version and WANT_AUTOCONF; +# Start at last known unstable/stable versions to speed up lookup process. +# +KNOWN_AUTOCONF="2.69:2.5 2.68:2.5" +vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1" + +binary="" +for v in ${vers} ; do + auto_ver=${v%:*} + if [ -z "${binary}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then + binary="${full_argv0}-${auto_ver}" + break + fi +done +if [ -z "${binary}" ] ; then + err "Unable to locate any usuable version of autoconf.\n" \ + "\tI tried these versions: ${vers}\n" \ + "\tWith a base name of '${full_argv0}'." +fi + +# +# Check the WANT_AUTOCONF setting. We accept a whitespace delimited +# list of autoconf versions. +# +if [ -n "${WANT_AUTOCONF}" ] ; then + for v in ${vers} x ; do + if [ "${v}" = "x" ] ; then + warn "warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring." + unset WANT_AUTOCONF + break + fi + + auto_ver=${v%:*} + want_ver=${v#*:} + for wx in ${WANT_AUTOCONF} ; do + if [ -x "${full_argv0}-${wx}" ] ; then + binary="${full_argv0}-${wx}" + v="x" + elif [ "${wx}" = "${want_ver}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then + binary="${full_argv0}-${auto_ver}" + v="x" + fi + done + [ "${v}" = "x" ] && break + done +fi + +# +# autodetect helpers +# +acprereq_version() { + sed -n -r \ + -e '/^\s*(#|dnl)/d' \ + -e '/AC_PREREQ/s:.*AC_PREREQ\s*$\[?\s*([0-9.]+)\s*\]?$:\1:p' \ + "$@" | + LC_ALL=C sort -n -t . | + tail -1 +} + +generated_version() { + local re='^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9.]+).*' + sed -n -r "/${re}/{s:${re}:\3:;p;q}" "$@" +} + +# +# autodetect routine +# +if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then + err "Since configure.ac is present, aclocal always use\n" \ + "\tautoconf 2.59+, which conflicts with your choice and\n" \ + "\tcauses error. You have two options:\n" \ + "\t1. Try execute command again after removing configure.ac\n" \ + "\t2. Don't set WANT_AUTOCONF" +fi + +if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then + # Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE + # is set to an older version, let's do some sanity checks. + case "${WANT_AUTOMAKE}" in + 1.[456]) + acfiles=$(ls aclocal.m4 acinclude.m4 configure.in configure.ac 2>/dev/null) + [ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles}) + + [ -z "${confversion}" ] && [ -r "configure" ] \ + && confversion=$(generated_version configure) + + if [ "${confversion}" = "2.1" ] && [ ! -f "configure.ac" ] ; then + binary="${full_argv0}-2.13" + fi + esac +fi + +if [ -n "${WANT_ACWRAPPER_DEBUG}" ] ; then + if [ -n "${WANT_AUTOCONF}" ] ; then + warn "DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}" + fi + warn "DEBUG: will execute <${binary}>" +fi + +# +# for further consistency +# +if [ -z "${WANT_AUTOCONF}" ] ; then + for v in ${vers} ; do + auto_ver=${v%:*} + want_ver=${v#*:} + if [ "${binary}" = "${full_argv0}-${auto_ver}" ] ; then + export WANT_AUTOCONF="${want_ver}" + break + fi + done +fi + +# +# Now try to run the binary +# +if [ ! -x "${binary}" ] ; then + # this shouldn't happen + err "${binary} is missing or not executable.\n" \ + "\tPlease try emerging the correct version of autoconf." +fi + +exec "${binary}" "$@" +# The shell will error out if `exec` failed. diff -uNr a/sys-devel/autoconf-wrapper/metadata.xml b/sys-devel/autoconf-wrapper/metadata.xml --- a/sys-devel/autoconf-wrapper/metadata.xml false +++ b/sys-devel/autoconf-wrapper/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest --- a/sys-devel/automake/Manifest false +++ b/sys-devel/automake/Manifest 4a851745e7f1a51a79919a692516a54747d3bd3a2e3ead5669a037edbbc80532768e0326495b5e4f2f38cfbbd49111ddb1685e8346af9d64059740683489e7bd @@ -0,0 +1,39 @@ +AUX automake-1.10-ccnoco-ldflags.patch 901 BLAKE2B dee96c3d931011c9f30ab803ce039ebe48bb89a923c614eecfe05eb6b4d39409db0dbb8e9b7bf333a3f8e198fd8750bd4b9234d16d605498cfb08ff93b95af8f SHA512 bc823b9387277c06944faef1abc4277c4f6e8024cf9cdfdfb2b9f333d578cedb6c5071fbf49ee420dbe696e8a8bda4583829e3eca225e9ba7f5d0ca0e2639ca3 +AUX automake-1.10-perl-5.16.patch 3555 BLAKE2B 8128b27ade89b12445b02532d9837ff469e6d0e1be3ebab6969d8d68c3a57a27e25ff89db82ed8abf3eff6d392bbd3b91a0b5b6b0827e7eec1279bc5345dc024 SHA512 050d66f3f1b4aed6482a234b32bbdbe231ddea0c9f4fb2ff97e963095ad69a487fd65986189fd659fbe8d8d011f3f866e92e506e653fd832d2adaf3263ed33fc +AUX automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch 3016 BLAKE2B 8dbc2ae72f8d687e785be6dde22429305cdbbb2b441a05ad268d5a7f019b087e090d7b93cb5ff033d004a8344fc9056172f1a16bd0bfa98501e1c55cf6933c54 SHA512 0f6c6ee15c895b64742113156f9864396daa6d7680897e4795909c78cb300df0d96c63091a39e901c2d62e76852fcbb49a5be747cb4b381c4346b81c0c570149 +AUX automake-1.13-dyn-ithreads.patch 2126 BLAKE2B 13fa89641077b7e9e7052441b84b756d7ddbd1ac3b87857028ccb34feb4528d774400fc411bf4fa54bbed697d8be6bf948d774d474f0638611c52f8d98696951 SHA512 7a3795cb8b14b347a296abd410f3a740401e796a06317e52fa1ef8b0866099f71965f7fb12fd85db2ccc7445f310a4dbff6870d8a63e72c49ed6f8ca9da97277 +AUX automake-1.13-hash-order-workaround.patch 529 BLAKE2B 92706c8c87aa1722de4ee4bbffd815720dfbc3d124776f7118ca57d682bbb9475174357412bb7e9f79c98adeb03651087cb095b52e682aa14447ab012945ca6a SHA512 2899c650664ead4c5fb4fdae79605b665cad52c3ecda0f8192e2ca37dbfdb42eb5937f9a24622e6463d4c003d70186b8a4c1404a47bd387de36d9f0db03e5593 +AUX automake-1.13-perl-escape-curly-bracket-r1.patch 1127 BLAKE2B 18664d2af473845f6ae91ab566651a53cbcf16df598adc3812f6d40f774c2c571c20dada4f23193b2b39ddc36c5fe9fea0449f32231540477fbf2260a7052c51 SHA512 25d94503572f70a5f9ab808057ca1ad7080cba89cf98c2b1664da2dc347f8ada1db6a97138a9b3ee12ffa54a37a34307a9fded4c069e1eb20e490556ad4f46d3 +AUX automake-1.14-gzip-fix.patch 2689 BLAKE2B 589f5261936f1d54f1345dccc284381373bef942d8fc484c3df1394109bb0cf9b425c28cf21f9c798d9dc9b7e095289a3b9547c6fbd3b4b0f1116d106e78d299 SHA512 aa5f25cc036a5b27a7066c9a0daeb862b739cfe6b32e029e1c76ef3a0816629e09d26f08137f07e52be9c6dce616f758e51030eef0109a17de1ec94b33a40d68 +AUX automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch 3015 BLAKE2B a0a7afb76c8cd8a5dce60bcb0a7a59a7957bcfe2b70f541889d5677005f4c9a295cf0459eaf4626314ce75031716028fe0a91db00f416e2aef8d17d8e31009d0 SHA512 34a061b72993290ac9fbf7957da89d0ed0ded70f304db0983ffff557887434dba01f5ca40cfd13dccfc648af7ade9b94d45895bac33dd560d550e3f1b24b6a55 +AUX automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch 3672 BLAKE2B e967579e81e3da85c9a5026a829be9dae93fd7d452c67bf94383787a7e7b46b62ba605112f3aaa5b4ee38d06727320ab8df017fc0b3a957e8fe0ba8e91883d52 SHA512 cfb9a11d82641b4f5b8e43d6a97fc20d012ce9ba6c4ab5fa3bae8c33da980867e3bad35229fbd5f2d811cfd849b275e83ecd0b80d25cff78695f700ebfc92cdc +AUX automake-1.15-perl-escape-curly-bracket.patch 1129 BLAKE2B deb9f842d4d0fd8735e7da0a8344a8c48521097db06cf8c37705046dfdeedc913fcc8fe9c462a7f0dc9089f2548fdfb86a26e19edeb966d3d769a396faca3fae SHA512 d6c2078e7eebd4e5104e7c9d9b5623cab322689b520e28b788a0e6fc52d795ef24e246f72ada9be6aae7d4904e34e4a6f2b6dc94abb3ed70b338d89985ed2164 +AUX automake-1.16-fix-AM_PATH_PYTHON.patch 1694 BLAKE2B d96f3840da73ecaee54751f246ff194c9be15b8fbc7302fd1c2b4cdd3694696762778b6b8f4dc25958741c7cd67c0a73ad2a0cadafed2e87fa4f6ad3ce9fd98a SHA512 2a7d9106ddc51fcae85f720b81d8a6d266b97e48bddcb2f979ef11bb3dacfa277f0a7123adda1b17fc340aada54a06b5b0aff5f49d015ec3645a386ad47d0768 +AUX automake-1.4-CVE-2009-4029.patch 2186 BLAKE2B 6a33684f950b1e932418e2b7d8d6676fc27792e354f3b72502d5149e9ec9db6fb984e5bb168a465ad97e13d0f1d84b6b8acc0ca04ef51612577196f67441cad3 SHA512 cf65172ee59f91869b13292204e9744fb385a2cf13a17dab0e1dba5b1f403da55d1bd73448b00d81f46de2c9e7de1347e7b6868cd6f4b5e97e255a5c206d2d31 +AUX automake-1.4-ansi2knr-stdlib.patch 249 BLAKE2B bbf77d9aba954d03cfdb896c88bf9fb98695951011f885936b9df29c522d5ea5d46ee1441d37c7e367cd2c7429a2f017edbf4645470f55c55a7c50b0a7b2ae50 SHA512 db8d0e71e702e236b1e9d6f2ff949b6981a02da4ec143219ea10327f7c6dd9845f100c62c715b6cda46082dbc2cfb69bd50aea64d5fccc5bbd6fe81351a0012c +AUX automake-1.4-libtoolize.patch 542 BLAKE2B 25dad3cbd948d1a6825ba800756e1a6f67ce0be86d2e33d345eaecd5e7c6a7a6e6aee213eb89cb9ce83ee6abf550c96f2ab2d17f32bddc62b95abd4003d93417 SHA512 1c9ee6d970cc9eb393e959c12518173ac49ec88d07ae52ca026807b52502a52f3f019916503e1fc444ba83bc21a6df74a95abadbc2cf938f79fd63299cd64846 +AUX automake-1.4-nls-nuisances.patch 746 BLAKE2B 91fe9080fd3c8a860398abeb8b95ac724458660eae126d27338cbe11e34f69ff1919dffdcedd5cd9186a47e51759f7df3e810dbf8706fdaa04c41087bf84d31e SHA512 5821637eb9cec970feb4cf1b09dc6efcd5b84cfce804915d31eccf810983e0b837c3fb6c9a4af857f4bb0545244f3d824138ad364c2073fab34d858aa8ff7d8c +AUX automake-1.4-perl-5.11.patch 839 BLAKE2B 6af1a5bbef79cf7938486ebfcf5b46cc3d10817a64344c824258dab187286af34ff64ef9fda7dda679b9d988a8bbc22dfaea1ab28df94cf05d853a5fabc3cd00 SHA512 f604c8334a942c345c4f63a07a18d91123f840a66d9314d99853a3133caf032f8dd6ad65b124f78f89c9494451babb3245a8ed7e771dbc9e479c302938fb62d5 +AUX automake-1.4-perl-dyn-call.patch 738 BLAKE2B 5bd553905fcedfa58cf57db2f188317d31199044670696d21f61087b0c81d9270d8ae7f23e373536c1c6961dc67ee1c3dece6e7b73cdcb4a6a8de4942155c8b0 SHA512 69a1d2ff4265e2cc3935313e95337b3b4c3b52210888ef15c15a83aa35e2b564e04f03bb8c8bca6877913abb2ccc5ea4351eb245b4b6e5f48f19f8010941e24c +AUX automake-1.4-subdirs-89656.patch 944 BLAKE2B 98db6654bc5fdec52c05695d628dad8b2d1d3bb0acf607a8b0b69c13a4c4fbce013818c279c19857d39933fd9b23ddd6574c13f9dd18214409cd91f0b540cee2 SHA512 3aa2d98bf64294f608c081df2c316064ae86d7d7b05b60f79a571049e8d125a91309771edeb460ff8d29bf2536e0fe0542c0c247764338be9af37c0d32686670 +AUX automake-1.5-CVE-2009-4029.patch 2316 BLAKE2B 7c90e68fc679f3431ed17fc456281adb9bae25c0d3652d940ee3299780f580c975012ad4cb90c072bf4f770b895c8ed11a9541f227edabb9cb6c4b7fc88cab26 SHA512 2961ce03774e55623362b041214e8b1ecc98c193ca1b080938b848c3069e25438fd023a41ac73ca6aaf51d537e836fa8bcfbbd3e6e32494ba758ecbcbe2458ee +AUX automake-1.5-perl-5.11.patch 806 BLAKE2B 2391683a15f82728e1992d1ec066d3ce5bd9016e633efb44e1ad4b61792f2730b2f88ddc06f49dce72d1b2031fa33501081fccbb99d9f5c96e6681e657dc7031 SHA512 1eb9314be86d7e775c1bbdc35d86d3f0e8b5ca81e4c170a6fec63dea3895c81c770e101660e4337a942fa2c34aeaa6b8b1e7eaed3d310921c23292dbcd25febe +AUX automake-1.5-slot.patch 1191 BLAKE2B e8cc77cf6b79a0a9017684083f302efc2c333a8cfef1cbde1e10bb09c5b294f63fa15db4fad43e0322772018e0eb8995f9ce06b4c88626727e4667d10dc8f177 SHA512 031b592f62b95a9832a034838f2b0e1b3bc120af9e1582f03f66da3cc4d9bdb0148417da3e7064ace01e028e2c0c9b94fe59da95493dc736a6f75718e2fd0121 +AUX automake-1.5-target_hook.patch 1132 BLAKE2B f4b501e3d5d92c00435de01ab1b44ae89c11df0ebf5a06f79e3c9d80af9adc78f1a22cb79b7ac971ef9b9f142d376f6e61e8039ba0f5698582223927209a8816 SHA512 3d21577b22bd2d6bcdb78259f0b8ebe4783184785868e1b54740269c627045fbe1608e01bd044ad85e848fa5c6eee241b6c0c9626369d839784cbc79892fdaea +AUX automake-1.5-test-fixes.patch 1300 BLAKE2B 87a853e32a34419e48d8a6514f2c404d7e77c6ffcd703d2d493546c6e355b4d431733a7f00be370c7ad2188c6589d1c4b42d885d7cda7f294a66f3e54a717c39 SHA512 5642985801c0786678062f50fbc8090c4994c53b989727e274e4054d37dd9efc0de44b160bb5eae71fbdad289daf406812963d941a68953d1f6314089196f0f4 +AUX automake-1.6.3-test-fixes.patch 723 BLAKE2B 9d54674ae2964702cc1965e8d977ab5e6cad42dde4ae053ada2999e1cc8decdb40d58c108962d87b2d27e9b9e2acaf482fb2e4106e761bcfd2ca5016511645bc SHA512 6f3b97d87412906a812febd813a4303b1dde51454732256e4b483388eb602b471262f79822ad222e738199d9583ae3d91e266197385d9a265306907a696d8b93 +AUX automake-1.7.9-infopage-namechange.patch 592 BLAKE2B 87262591052afd95f5458e45fcc28d4ef493327eae40b6a9160ae7147070ad9c01b93344eac1f84d4163ff26fe3ae65c444a52a91cabf61ff15f1a4aa16f90be SHA512 15770a375b60a39a453c1b0e2bef5eb05d567ae230429fe009531f5d7d059bd182772b9cc06daf2bc7640628ee463b4c4529a74714f329b04078c4174140e2e1 +AUX automake-1.7.9-libtool-2.patch 859 BLAKE2B 3ef296b4cef6e21888c5c704342bbabae4c52b9e0f5b14f938086f2a5f0c695a06dba9856ef802242f30d8c5fcb99b20daaba83a89a727b91d5b37208453c4ff SHA512 1e571d20a0a8d5928c938e3892e5cc5d76abb678f726ee85afb5d29417ccd2167c249a8c252496312277e8dfbf9b0f7c5c6b77cec1e861a02400dddb5d4711b4 +AUX automake-1.7.9-test-fixes.patch 1159 BLAKE2B a805acac10b8895cf97804d44217d20ad6f15bfee7118c4ac9ce7744437a15925b79bf2cfc998edd3f7bc934ba292a76116d93d246983ebbeb5a8fb0980d6dee SHA512 ea4a6ded1a6f605dbcb3cf3da1c6f369c2dd4abf3739185df723ffe52eb88ef93ff1e9b23323c7a94c477301250873dbeea2af2cac1affdfde9d67ce7d38a679 +AUX automake-1.8-perl-5.11.patch 784 BLAKE2B 5bbd4f9b5dd03233a7b06f230cedc5693afdb4a9d5d6a88a36cf7f245c63f40efbe1ccea037238f364ffeefab6fd98b7237883a04734ae915df0a146e27d530d SHA512 ab574c2af5a4b1c734d547611e74057984092b7058e638344f3c2350858a8fd45fcdd5c8a7631d6d54777458d6d6f79f922b0b94c653f3370a386c035ff9eb32 +AUX automake-1.8.2-infopage-namechange.patch 1131 BLAKE2B 535a92ce58929485880b978a914cdda42e3310d40fdc0d59d9c9e1fd4a15008765589561379c19a7e7763bac7837d9fd85ed2d55466be64858b3b5cf42c7ec6b SHA512 cf39407187264c1db540701c9e1164c5204b4cfdec02f93e91298b582b13e0fe77c5d272801df9bb50f2cda5dcd14114386f9f445eda28c51bebc1f61fb828ea +AUX automake-1.8.5-CVE-2009-4029.patch 2256 BLAKE2B c6c0c9624d7bbf5648efabd6ef3a8a1448f018f8e13ae68955285ca6f0ef9e0630e92a133df629f6d5472e33ad3a21d1c7fb18e6a13e4dd77be0b144da936d4c SHA512 e7043688eb420facf38efddc745d57f2adb519bf85eb5a525a99b495b67347a476aab06570f4be1c8585cc07ef4c3d43468c015fbc103a0e34123510c3f84e35 +AUX automake-1.8.5-test-fixes.patch 1068 BLAKE2B 5e72e237ba972be5c35e3630e9c673e0fce07af7aa260eeeb1a8363a0f35c7da7655f2b31d7fc726a2c564b7cbc8afc2124e4883469b8147405afe1760ede340 SHA512 703c40549542dcd55af05201e3c40118ee138398da6dc87ce7b880ee71a7bf15ad1063d8ebcf9807c2849c8a981367d2cc5f9f5b14c060ce36303250ec792685 +AUX automake-1.9.6-aclocal7-test-sleep.patch 1102 BLAKE2B 63a4b56f2c88d290072cd88e1939323845db3b24c0cfbcc28ee6af06846a9bfb92a18fd9de3282b20ce5a1887855ec2f4bac210966f96852f8a7dca964b1ec46 SHA512 9ac24b6ff41b1fe17cf36d10c9b3e7a52b35cf7384ddbb03328a4593da76918707a47717a21257a86fa28c39e6c7648d0309ef7bb71be65744151704919dbb16 +AUX automake-1.9.6-ignore-comments-r1.patch 618 BLAKE2B da53e3798ed97625f2e92e215d4da2d60f94f972d0a7df299f65561ea8f7a62a2f8d6847b7ebeb7de138336eb47b609fed9212edda0d4dc4f8913d46d4a0bb43 SHA512 0ecb4ca8dcb4cc13e5b7b90d59b9f1e5165adb90bbe06a297b89904d3a1de058cde5b448b842f04e1ba6ec642334b159e0c9983b81f5186fb4175227f8996ae5 +AUX automake-1.9.6-include-dir-prefix-r1.patch 1110 BLAKE2B d3e81d86b83eaa6734201ef6ad238243332180352b593713a40544c2a73bd10d4b0162a0a1b2a3572a2cb89490de13871db4bdc2ebfb55b0e8dc88db2d939e3a SHA512 30f251c017de861d4a704b79043bb32b4a1cffc2a7888902218360b730a1103e076950637704d14db684e3f69d11a0c60359ff68d307bb2bd024e27a5751b450 +AUX automake-1.9.6-infopage-namechange-r1.patch 1160 BLAKE2B 01a83d16f7b262d47075f146cc0c1452249b049e06bfd059649184601cf53582a7fcc3b988d5abbf9e2a98c6ded93d0fe7f85f0a706d2233460187c7fc60b158 SHA512 12696d6af2f6f7d8db3ca0b94532c8c9a170462dfbea52e92e127619a1af4ae87e063a47b34f675bc25e7591ce94713f5739a887a22ce4d2977a7d00e90009ed +AUX automake-1.9.6-subst-test.patch 1332 BLAKE2B c7a882b592835a4bf9625435aa508975d7d8945f501dcc273947abca0bb22fe4a0a939777574bf7102b8c4c0c83d49a6e13e7e89a7e8d84a9c45f2427ae9c883 SHA512 f5e8106e96f5976d8f958665b53cdf1088d0620f7d4da3b9f5a73766ddc32c4eff13d39f245a8a01b90567c364949a94bc7ecdcc4b8214b43d2f7f6b1740a891 +DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688 +EBUILD automake-1.15.1-r2.ebuild 3206 BLAKE2B 331eaa9a446627e92a4e3ae26904fa9d70ca64af6514edc269c711f27d628ca399663018045b6132954ab31dcb4bb1e11c841ab5d99b128d18f4dafa4cbc7309 SHA512 42a1acbf22ca591b1989f8e626655927d835518f4e28bed7122e807fb753cffde3bd04f9ddd218037ba8b7e3b93dfe6d655811da8b4a5d8dde7fc611b9e9a987 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild --- a/sys-devel/automake/automake-1.15.1-r2.ebuild false +++ b/sys-devel/automake/automake-1.15.1-r2.ebuild a5c08751d47067ba668b25c27eeb9957d8fc41ddd870a579e6ba77a6dc029c82b82b1218794d73c2ecd0b1796fe4ba80280627061b035b19723701d6fb671c28 @@ -0,0 +1,110 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python2_7 ) + +inherit python-any-r1 versionator + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" + + inherit git-r3 +else + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + if [[ ${PV/_beta} == ${PV} ]]; then + MY_P=${P} + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + else + MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_P="${PN}-${MY_PV}" + + # Alpha/beta releases are not distributed on the usual mirrors. + SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + fi + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +IUSE="test" + +RDEPEND="dev-lang/perl + >=sys-devel/automake-wrapper-10 + >=sys-devel/autoconf-2.69:* + sys-devel/gnuconfig" +DEPEND="${RDEPEND} + sys-apps/help2man + test? ( ${PYTHON_DEPS} )" + +PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch ) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + export WANT_AUTOCONF=2.5 + # Don't try wrapping the autotools this thing runs as it tends + # to be a bit esoteric, and the script does `set -e` itself. + ./bootstrap || die + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die + + # Bug 628912 + if ! has_version sys-apps/texinfo ; then + touch doc/{stamp-vti,version.texi,automake.info} || die + fi +} + +# slot the info pages. do this w/out munging the source so we don't have +# to depend on texinfo to regen things. #464146 (among others) +slot_info_pages() { + pushd "${ED%/}"/usr/share/info >/dev/null || die + rm -f dir || die + + # Rewrite all the references to other pages. + # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. + # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. + local p pages=( *.info ) args=() + for p in "${pages[@]/%.info}" ; do + args+=( + -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" + -e "s:(${p}):(${p}-${SLOT}):g" + ) + done + sed -i "${args[@]}" * || die + + # Rewrite all the file references, and rename them in the process. + local f d + for f in * ; do + d=${f/.info/-${SLOT}.info} + mv "${f}" "${d}" || die + sed -i -e "s:${f}:${d}:g" * || die + done + + popd >/dev/null || die +} + +src_install() { + default + + slot_info_pages + rm "${ED%/}"/usr/share/aclocal/README || die + rmdir "${ED%/}"/usr/share/aclocal || die + rm \ + "${ED%/}"/usr/bin/{aclocal,automake} \ + "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + done +} diff -uNr a/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch b/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch --- a/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch false +++ b/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch 71ccd577b657d48fb933068926bec9b0f33626934925a97f8b6b6be8a5712591517fd935b2e9fa3fc33626076b1c1fbcf31dd4d2c4b3c4c85068a54a05198b0d @@ -0,0 +1,35 @@ +http://bugs.gentoo.org/203914 + +From 6e86514729c6dccb6213fdde8d93d7061c8108a5 Mon Sep 17 00:00:00 2001 +From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +Date: Mon, 7 Jan 2008 21:53:38 +0100 +Subject: [PATCH] Fix ccnoco.test for uncommon LDFLAGS settings. + +* tests/ccnoco.test (Mycomp): Use a tighter match for -c -o, +to avoid matching for example `LDFLAGS=-Wl,--sort-common'. +* THANKS: Update. +Report and analysis by Carsten Lohrke and Mike Frysinger. +--- + ChangeLog | 7 +++++++ + THANKS | 1 + + tests/ccnoco.test | 6 +++--- + 3 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/tests/ccnoco.test b/tests/ccnoco.test +index 8b37fe8..ca75922 100755 +--- a/tests/ccnoco.test ++++ b/tests/ccnoco.test +@@ -57,8 +57,8 @@ END + cat > Mycomp << 'END' + #!/bin/sh + +-case "$@" in +- *-c*-o* | *-o*-c*) ++case " "$* in ++ *\ -c*\ -o* | *\ -o*\ -c*) + exit 1 + ;; + esac +-- +1.6.3 + diff -uNr a/sys-devel/automake/files/automake-1.10-perl-5.16.patch b/sys-devel/automake/files/automake-1.10-perl-5.16.patch --- a/sys-devel/automake/files/automake-1.10-perl-5.16.patch false +++ b/sys-devel/automake/files/automake-1.10-perl-5.16.patch c19eec74f0a8a2da1fc606ecb9aa9a0ca8a568d318c83a04a2fc23ece44f91f8fe4fba1a02d528d207cfd79f3c289d637bb80f52108a16276dd88285dba7029b @@ -0,0 +1,128 @@ +https://bugs.gentoo.org/424453 + +From 6bf58a59a1f3803e57e3f0378aa9344686707b75 Mon Sep 17 00:00:00 2001 +From: Stefano Lattarini <stefano.lattarini@gmail.com> +Date: Mon, 28 May 2012 13:32:03 +0200 +Subject: [PATCH] aclocal: declare function prototypes, do not use '&' in + function calls + +This change will also fix automake bug#11543 (from a report by Matt +Burgess). + +* aclocal.in: Declare prototypes for almost all functions early, before +any actual function definition (but omit the prototype for the dynamically +generated '&search' function). Add prototypes to any function definition. +Remove '&' from function invocations (i.e., simply use "func(ARGS..)" +instead of "&func(ARGS...)"). +* THANKS, NEWS: Update. + +Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> +--- + NEWS | 4 ++++ + THANKS | 1 + + aclocal.in | 42 ++++++++++++++++++++++++++++++++++-------- + 3 files changed, 39 insertions(+), 8 deletions(-) + +diff --git a/aclocal.in b/aclocal.in +index dfb851b..e8855d5 100644 +--- a/aclocal.in ++++ b/aclocal.in +@@ -152,8 +152,34 @@ my $erase_me; + + ################################################################ + ++# Prototypes for all subroutines. ++ ++sub unlink_tmp (;$); ++sub xmkdir_p ($); ++sub check_acinclude (); ++sub reset_maps (); ++sub install_file ($$); ++sub list_compare (\@\@); ++sub scan_m4_dirs ($@); ++sub scan_m4_files (); ++sub add_macro ($); ++sub scan_configure_dep ($); ++sub add_file ($); ++sub scan_file ($$$); ++sub strip_redundant_includes (%); ++sub trace_used_macros (); ++sub scan_configure (); ++sub write_aclocal ($@); ++sub usage ($); ++sub version (); ++sub handle_acdir_option ($$); ++sub parse_arguments (); ++sub parse_ACLOCAL_PATH (); ++ ++################################################################ ++ + # Erase temporary file ERASE_ME. Handle signals. +-sub unlink_tmp ++sub unlink_tmp (;$) + { + my ($sig) = @_; + +@@ -350,7 +376,7 @@ sub scan_m4_dirs ($@) + next if $file eq 'aclocal.m4'; + + my $fullfile = File::Spec->canonpath ("$m4dir/$file"); +- &scan_file ($type, $fullfile, 'aclocal'); ++ scan_file ($type, $fullfile, 'aclocal'); + } + closedir (DIR); + } +@@ -361,12 +387,12 @@ sub scan_m4_files () + { + # First, scan configure.ac. It may contain macro definitions, + # or may include other files that define macros. +- &scan_file (FT_USER, $configure_ac, 'aclocal'); ++ scan_file (FT_USER, $configure_ac, 'aclocal'); + + # Then, scan acinclude.m4 if it exists. + if (-f 'acinclude.m4') + { +- &scan_file (FT_USER, 'acinclude.m4', 'aclocal'); ++ scan_file (FT_USER, 'acinclude.m4', 'aclocal'); + } + + # Finally, scan all files in our search paths. +@@ -380,7 +406,7 @@ sub scan_m4_files () + my $search = "sub search {\nmy \$found = 0;\n"; + foreach my $key (reverse sort keys %map) + { +- $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { & add_macro ("' . $key ++ $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { add_macro ("' . $key + . '"); $found = 1; }' . "\n"); + } + $search .= "return \$found;\n};\n"; +@@ -403,7 +429,7 @@ sub add_macro ($) + + verb "saw macro $macro"; + $macro_seen{$macro} = 1; +- &add_file ($map{$macro}); ++ add_file ($map{$macro}); + } + + # scan_configure_dep ($file) +@@ -465,7 +491,7 @@ sub scan_configure_dep ($) + } + + add_macro ($_) foreach (@rlist); +- &scan_configure_dep ($_) foreach @ilist; ++ scan_configure_dep ($_) foreach @ilist; + } + + # add_file ($FILE) +@@ -931,7 +957,7 @@ EOF + } + + # Print version and exit. +-sub version() ++sub version () + { + print <<EOF; + aclocal (GNU $PACKAGE) $VERSION +-- +2.1.3 + diff -uNr a/sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch b/sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch --- a/sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch false +++ b/sys-devel/automake/files/automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch 44e7a9281d75e0b7ac1ce8a809e9c5853056b8f31ccfa4064af53ed25ab22b97e03e5dcfc4030ea8fe7ca6881d56f656f2d373da7eb943fc3f9ecf7025f1a842 @@ -0,0 +1,77 @@ +From: Pavel Raiskup <praiskup@redhat.com> +Date: Sat, 15 Aug 2015 04:40:57 -0400 +Subject: install-sh: avoid (low risk) race in /tmp + +Ensure that nobody can cross privilege boundaries by pre-creating +symlink on '$tmpdir' path. + +Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not +safe because '/tmp' directory is usually world-writeable and +'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by +attacker (at least for shells where $RANDOM is not supported). +So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p. +This step would fail early if somebody wanted catch us. + +Note that systems that implement (and have enabled) +fs.protected_symlinks kernel feature are not affected even without +this commit. + +References: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455 +https://bugzilla.redhat.com/show_bug.cgi?id=1140725 + +* lib/install-sh: Implement safer 'mkdir -p' test by running +'$mkdirprog $mkdir_mode "$tmpdir"' first. +(scriptversion): Bump. + +--- a/lib/install-sh ++++ b/lib/install-sh +@@ -345,34 +345,41 @@ do + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) ++ # $RANDOM is not portable (e.g. dash); use it when possible to ++ # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ +- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + ++ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so ++ # create the $tmpdir first (and fail if unsuccessful) to make sure ++ # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && +- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ $mkdirprog $mkdir_mode "$tmpdir" && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. +- ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ test_tmpdir="$tmpdir/a" ++ ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && +- $mkdirprog -m$different_mode -p -- "$tmpdir" && { +- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi +- rmdir "$tmpdir/d" "$tmpdir" ++ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. +- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; diff -uNr a/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch b/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch --- a/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch false +++ b/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch 1670a3a84f0de8364be1776ef5f87f2e529cf571679a06254ad41fe9721b085f6f254558a402b9dc2fc124dac7d510444bf9482c0cd301ef978530b36a46f934 @@ -0,0 +1,59 @@ +https://bugs.gentoo.org/343439 + +From 182626687f2640609f8eb28ad1b04b078342f2c7 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 12 Jan 2013 00:19:40 -0500 +Subject: [PATCH] ithreads: use runtime (not configure time) detection of perl + threads + +I can't imagine the runtime checks being a big runtime penalty, so there +shouldn't be a need to do the checks at configure check and hardcode the +result in the generated automake. + +With the current system, it means if you change your perl config (build +perl w/threads, build automake, build perl w/out threads), or deploy a +compiled automake package on a different system (build had threads, but +deployed system does not), you get errors when trying to run automake. + +So take the logic from configure.ac and move it to the one place where +PERL_THREADS is used (lib/Automake/Config.in) and do the version/config +checking at runtime. + +* bootstrap.sh (PERL_THREADS): Delete assignment and use in sed. +* configure.ac (am_cv_prog_PERL_ithreads, PERL_THREADS): Delete all code +related to these two variables. +* lib/Automake/Config.in (perl_threads): Initialize to 0, and only set to +1 if the perl version is at least 5.007_002, and useithreads is in Config. + +Copyright-paperwork-exempt: yes +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> +--- + bootstrap.sh | 2 -- + configure.ac | 26 -------------------------- + lib/Automake/Config.in | 9 ++++++++- + 3 files changed, 8 insertions(+), 29 deletions(-) + +diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in +index fe6ef9d..885e74e 100644 +--- a/lib/Automake/Config.in ++++ b/lib/Automake/Config.in +@@ -33,7 +33,14 @@ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; + our $VERSION = '@VERSION@'; + our $RELEASE_YEAR = '@RELEASE_YEAR@'; + our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; +-our $perl_threads = @PERL_THREADS@; ++ ++our $perl_threads = 0; ++# We need at least this version for CLONE support. ++if (eval { require 5.007_002; }) ++ { ++ use Config; ++ $perl_threads = $Config{useithreads}; ++ } + + 1; + +-- +1.8.0.2 + diff -uNr a/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch b/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch --- a/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch false +++ b/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch 7bd8f49b687585a83359b73421367236ea500cb897fb57028115ac3e305999342613c13558e0c3c9993755415fb0e5b0506ba86b558dbbec90bad260593699b5 @@ -0,0 +1,14 @@ +--- a/t/primary-prefix-invalid-couples.tap ++++ b/t/primary-prefix-invalid-couples.tap +@@ -186,8 +186,10 @@ grep -v 'dir.* not a legitimate directory' stderr && exit 1 + # Check that the same failures are present without the '--add-missing' + # option. + mv stderr stderr.old ++cat stderr.old | sort > a + AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples" ++cat stderr | sort > b + command_ok_ "... and with the same diagnostic of 'automake -a'" \ +- diff stderr.old stderr ++ diff a b + + : diff -uNr a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch b/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch --- a/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch false +++ b/sys-devel/automake/files/automake-1.13-perl-escape-curly-bracket-r1.patch 99fd986cf01f67a83b164a30aa9fd3c72cb034faabbeb35d764d4b100978ca9e2fdaf6048cc706947f08cf96dfb718826a4481ebc2a61605e767151dceb5c6a0 @@ -0,0 +1,37 @@ +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 + +From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <praiskup@redhat.com> +Date: Tue, 7 Jul 2015 10:54:24 +0200 +Subject: [PATCH] bin/automake: escape '{' in regexp pattern + +Based on perlre(1) documentation: +.. in Perl v5.26, literal uses of a curly bracket will be required +to be escaped, say by preceding them with a backslash ("\{" ) or +enclosing them within square brackets ("[{]") .. + +References: +https://bugzilla.redhat.com/1239379 + +* bin/automake.in (substitute_ac_subst_variables): Escape the +occurrence of '{' character. +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index 0c29184..c294ced 100644 +--- a/automake.in ++++ b/automake.in +@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker + sub substitute_ac_subst_variables ($) + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } + +-- +2.1.0 + diff -uNr a/sys-devel/automake/files/automake-1.14-gzip-fix.patch b/sys-devel/automake/files/automake-1.14-gzip-fix.patch --- a/sys-devel/automake/files/automake-1.14-gzip-fix.patch false +++ b/sys-devel/automake/files/automake-1.14-gzip-fix.patch 3ed8c79a7fc9f220ed9c292ed39461b38faeb0fe758646807710dff719ff1652f746a0a5aa009076bd23dc09ed826679585f41775be1b07721e07467432e4dbb @@ -0,0 +1,67 @@ +commit 749468ac63042820bc3da85ece5bed64b0c15d62 +Author: Paul Eggert <eggert at> +Date: Mon Mar 28 19:44:19 2016 -0700 + + automake: port better to future gzip + + * lib/am/distdir.am (dist-gzip, dist-shar, distcheck): + Port better to future versions of gzip, which are planned to + deprecate the GZIP environment variable (Bug#20132). + +diff --git a/lib/am/distdir.am b/lib/am/distdir.am +index d4dd8cc9b..87c6730f5 100644 +--- a/lib/am/distdir.am ++++ b/lib/am/distdir.am +@@ -309,6 +309,16 @@ endif %?TOPDIR_P% + ## We order DIST_TARGETS by expected duration of the compressors, + ## slowest first, for better parallelism in "make dist". Do not + ## reorder DIST_ARCHIVES, users may expect gzip to be first. ++## ++## Traditionally, gzip prepended the contents of the GZIP environment ++## variable to its arguments, and the commands below formerly used ++## this by invoking 'GZIP=$(GZIP_ENV) gzip'. The GZIP environment ++## variable is now considered to be obsolescent, so the commands below ++## now use 'eval GZIP= gzip $(GZIP_ENV)' instead; this should work ++## with both older and newer gzip implementations. The 'eval' is to ++## support makefile assignments like 'GZIP_ENV = "-9 -n"' that quote ++## the GZIP_ENV right-hand side because that was needed with the ++## former invocation pattern. + + if %?TOPDIR_P% + +@@ -316,7 +326,7 @@ if %?TOPDIR_P% + GZIP_ENV = --best + .PHONY: dist-gzip + dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + $(am__post_remove_distdir) + + ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2 +@@ -352,7 +362,7 @@ dist-shar: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + $(am__post_remove_distdir) + + ?ZIP?DIST_ARCHIVES += $(distdir).zip +@@ -412,7 +422,7 @@ endif %?SUBDIRS% + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ ++ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ +@@ -422,7 +432,7 @@ distcheck: dist + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ ++ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac diff -uNr a/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch b/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch --- a/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch false +++ b/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch c6f453727c31b0606f010564f57deaf1969d1e8d7b3b58a136c373986746f4b5835ddcf9938ec599e33fae45d9af786c8cd07525f6598ba3f2b8bb70692a999a @@ -0,0 +1,77 @@ +From: Pavel Raiskup <praiskup@redhat.com> +Date: Sat, 15 Aug 2015 04:40:57 -0400 +Subject: install-sh: avoid (low risk) race in /tmp + +Ensure that nobody can cross privilege boundaries by pre-creating +symlink on '$tmpdir' path. + +Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not +safe because '/tmp' directory is usually world-writeable and +'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by +attacker (at least for shells where $RANDOM is not supported). +So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p. +This step would fail early if somebody wanted catch us. + +Note that systems that implement (and have enabled) +fs.protected_symlinks kernel feature are not affected even without +this commit. + +References: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455 +https://bugzilla.redhat.com/show_bug.cgi?id=1140725 + +* lib/install-sh: Implement safer 'mkdir -p' test by running +'$mkdirprog $mkdir_mode "$tmpdir"' first. +(scriptversion): Bump. + +--- a/lib/install-sh ++++ b/lib/install-sh +@@ -345,34 +345,41 @@ do + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) ++ # $RANDOM is not portable (e.g. dash); use it when possible to ++ # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ +- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + ++ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so ++ # create the $tmpdir first (and fail if unsuccessful) to make sure ++ # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && +- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ $mkdirprog $mkdir_mode "$tmpdir" && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. +- ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ test_tmpdir="$tmpdir/a" ++ ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && +- $mkdirprog -m$different_mode -p -- "$tmpdir" && { +- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi +- rmdir "$tmpdir/d" "$tmpdir" ++ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. +- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; diff -uNr a/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch b/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch --- a/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch false +++ b/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch 4eacdf5e55f17cd42d0573c3ac5f5c3dbc2f280f912b04b4eed67ac1ad312b916c0dd25f5e3991ee720cfd8e3cef3140054b5455d9bae7ecaac4ef4abad38153 @@ -0,0 +1,82 @@ +From: Pavel Raiskup <praiskup@redhat.com> +Date: Sat, 15 Aug 2015 04:40:57 -0400 +Subject: install-sh: avoid (low risk) race in /tmp + +Ensure that nobody can cross privilege boundaries by pre-creating +symlink on '$tmpdir' path. + +Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not +safe because '/tmp' directory is usually world-writeable and +'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by +attacker (at least for shells where $RANDOM is not supported). +So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p. +This step would fail early if somebody wanted catch us. + +Note that systems that implement (and have enabled) +fs.protected_symlinks kernel feature are not affected even without +this commit. + +References: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455 +https://bugzilla.redhat.com/show_bug.cgi?id=1140725 + +* lib/install-sh: Implement safer 'mkdir -p' test by running +'$mkdirprog $mkdir_mode "$tmpdir"' first. +(scriptversion): Bump. +--- + lib/install-sh | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +diff --git a/lib/install-sh b/lib/install-sh +index 0b0fdcb..59990a1 100755 +--- a/lib/install-sh ++++ b/lib/install-sh +@@ -324,34 +324,41 @@ do + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) ++ # $RANDOM is not portable (e.g. dash); use it when possible to ++ # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ +- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + ++ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so ++ # create the $tmpdir first (and fail if unsuccessful) to make sure ++ # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && +- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ $mkdirprog $mkdir_mode "$tmpdir" && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. +- ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ test_tmpdir="$tmpdir/a" ++ ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && +- $mkdirprog -m$different_mode -p -- "$tmpdir" && { +- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi +- rmdir "$tmpdir/d" "$tmpdir" ++ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. +- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; diff -uNr a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch --- a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch false +++ b/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch d7a1a071defebc9e49d1b2bc830e4025e5f69baadff8503766fc2dfdb9311189562c58f79ba9a04e436a2e65f4cb4397f777ccfe7cb45f57a2434eb935ef8f9c @@ -0,0 +1,37 @@ +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 + +From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <praiskup@redhat.com> +Date: Tue, 7 Jul 2015 10:54:24 +0200 +Subject: [PATCH] bin/automake: escape '{' in regexp pattern + +Based on perlre(1) documentation: +.. in Perl v5.26, literal uses of a curly bracket will be required +to be escaped, say by preceding them with a backslash ("\{" ) or +enclosing them within square brackets ("[{]") .. + +References: +https://bugzilla.redhat.com/1239379 + +* bin/automake.in (substitute_ac_subst_variables): Escape the +occurrence of '{' character. +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index 0c29184..c294ced 100644 +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker + sub substitute_ac_subst_variables + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } + +-- +2.1.0 + diff -uNr a/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch b/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch --- a/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch false +++ b/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch 90085c6d9d03a845066b9afd0d83d28b41aac46dc7fb73129c52c0bd18f3d3eb4c09d1280e66568beea53831fc1f1ed48241d05493f6ced099b7334b418c1032 @@ -0,0 +1,36 @@ +bug#30616: automake-1.16: aclocal is unable to process AM_PATH_PYTHON with variable as value + +http://lists.gnu.org/archive/html/bug-automake/2018-02/msg00012.html + +--- a/m4/python.m4 ++++ b/m4/python.m4 +@@ -36,24 +36,12 @@ AC_DEFUN([AM_PATH_PYTHON], + [ + dnl Find a Python interpreter. Python versions prior to 2.0 are not + dnl supported. (2.0 was released on October 16, 2000). +- m4_define_default([am_py_min_ver], m4_ifval([$1], [$1], [2.0])) +- dnl The arbitrary default maximum version. +- m4_define_default([am_py_max_ver], [4.0]) +- ++ dnl FIXME: Remove the need to hard-code Python versions here. + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], +- [[python] \ +- dnl If we want some Python 2 versions (min version <= 2.7), +- dnl also search for "python2". +- m4_if(m4_version_compare(am_py_min_ver, [2.8]), [-1], [python2], []) \ +- [python3] \ +- dnl Construct a comma-separated list of interpreter names (python2.6, +- dnl python2.7, etc). We only care about the first 3 characters of the +- dnl version strings (major-dot-minor; not +- dnl major-dot-minor-dot-bugfix[-dot-whatever]) +- m4_foreach([py_ver], +- m4_esyscmd_s(seq -s[[", "]] -f["[[%.1f]]"] m4_substr(am_py_max_ver, [0], [3]) -0.1 m4_substr(am_py_min_ver, [0], [3])), +- dnl Remove python2.8 and python2.9 since they will never exist +- [m4_bmatch(py_ver, [2.[89]], [], [python]py_ver)])]) ++[python python2 python3 python3.9 python3.8 python3.7 python3.6 dnl ++ python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 dnl ++ python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl ++ python2.1 python2.0]) + + AC_ARG_VAR([PYTHON], [the Python interpreter]) + diff -uNr a/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch --- a/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch false +++ b/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch a7de136154ae71514bbea92d1c10e7cbde70f83a5d2265e6751fe204c6ee249f8ff589ec2fa89efd07d7a49ae5b2969d90eb2047885148883dcd6e322f9c816b @@ -0,0 +1,65 @@ +http://bugs.gentoo.org/295357 + +(Makefile.in mangled a little for 1.4_p6) + +From 449d20aa12e13fefd848604225fc83d0c39c61d0 Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Tue, 1 Dec 2009 22:48:15 +0100 +Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs + +* automake.in (handle_dist_worker): Do not make all directories +group- or world-writable. Instead, use 755. + +Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +--- + Makefile.in | 4 ++-- + automake.in | 4 ++-- + 4 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 93da407..59eb9f4 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -456,7 +456,7 @@ dist-all: distdir + distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) +- -chmod 777 $(distdir) ++ -chmod 755 $(distdir) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +@@ -477,7 +477,7 @@ distdir: $(DISTFILES) + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- chmod 777 $(distdir)/$$subdir; \ ++ chmod 755 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ +diff --git a/automake.in b/automake.in +index 8eceea7..8f48236 100755 +--- a/automake.in ++++ b/automake.in +@@ -2336,7 +2336,7 @@ sub handle_dist_worker + # Create dist directory. + $output_rules .= ("\t-rm -rf \$(distdir)\n" + . "\tmkdir \$(distdir)\n" +- . "\t-chmod 777 \$(distdir)\n"); ++ . "\t-chmod 755 \$(distdir)\n"); + } + + # Only run automake in `dist' target if --include-deps and +@@ -2468,7 +2468,7 @@ sub handle_dist_worker + . "\t" . ' test -d $(distdir)/$$subdir ' . "\\\n" + . "\t" . ' || mkdir $(distdir)/$$subdir ' . "\\\n" + . "\t" . ' || exit 1; ' . "\\\n" +- . "\t" . ' chmod 777 $(distdir)/$$subdir; ' . "\\\n" ++ . "\t" . ' chmod 755 $(distdir)/$$subdir; ' . "\\\n" + . "\t" . ' (cd $$subdir' + . ' && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(' + . (($relative_dir eq '.') ? 'distdir' : 'top_distdir') +-- +1.6.5.4 + diff -uNr a/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch b/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch --- a/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch false +++ b/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch 67b580e9ee6b3a1a72ca150d2feaf9f0e27cde9d931995af5c4b1533ce9053f36bee6d340242ee5a467005228db9f06b1ba4db82c820203657938f4103d109b0 @@ -0,0 +1,11 @@ +--- ansi2knr.c.orig 2005-01-30 06:54:09.702046352 -0500 ++++ ansi2knr.c 2005-01-30 06:54:17.719827464 -0500 +@@ -132,7 +132,7 @@ + + #endif /* not HAVE_CONFIG_H */ + +-#if STDC_HEADERS ++#if STDC_HEADERS || HAVE_STDLIB_H + # include <stdlib.h> + #else + /* diff -uNr a/sys-devel/automake/files/automake-1.4-libtoolize.patch b/sys-devel/automake/files/automake-1.4-libtoolize.patch --- a/sys-devel/automake/files/automake-1.4-libtoolize.patch false +++ b/sys-devel/automake/files/automake-1.4-libtoolize.patch ccb74dbc306e740fee77418beb9fe8a36a016f7590d75f51ac7cec962fdbfebe0ba6018821559cedf5b029e1156203105abe6182b18c531290c6474b6c649b5d @@ -0,0 +1,17 @@ +Patch from redhat/fedora which made it into upstream. + +--- automake.in Wed Jul 12 11:40:03 2000 ++++ automake.in Thu Nov 9 07:04:46 2000 +@@ -6882,9 +6882,11 @@ + $suppress = 1; + + # Maybe run libtoolize. ++ @libtoolize_args = ('--automake'); ++ push @libtoolize_args, '-c' if $copy_missing; + if ($seen_libtool + && grep ($_ eq $file, @libtoolize_files) +- && system ('libtoolize', '--automake')) ++ && system ('libtoolize', @libtoolize_args)) + { + $message = "installing \`$errfile'"; + $suppress = 0; diff -uNr a/sys-devel/automake/files/automake-1.4-nls-nuisances.patch b/sys-devel/automake/files/automake-1.4-nls-nuisances.patch --- a/sys-devel/automake/files/automake-1.4-nls-nuisances.patch false +++ b/sys-devel/automake/files/automake-1.4-nls-nuisances.patch c2912252a124dda5ce2c8bb486130cb0cb61da1a8f53dc7aaff1ddfb820da4d2cfa434e05d737e1bd8ecfedcea508bc40bc438305f7fa3815c8d56acf4a91404 @@ -0,0 +1,19 @@ +--- configure ++++ configure +@@ -46,6 +46,16 @@ + infodir='${prefix}/info' + mandir='${prefix}/man' + ++# NLS nuisances. ++# Only set these to C if already set. These must not be set unconditionally ++# because not all systems understand e.g. LANG=C (notably SCO). ++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! ++# Non-C LC_CTYPE values break the ctype check. ++if test "${LANG+set}" = set; then LANG=C; export LANG; fi ++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi ++if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi ++ + # Initialize some other variables. + subdirs= + MFLAGS= MAKEFLAGS= diff -uNr a/sys-devel/automake/files/automake-1.4-perl-5.11.patch b/sys-devel/automake/files/automake-1.4-perl-5.11.patch --- a/sys-devel/automake/files/automake-1.4-perl-5.11.patch false +++ b/sys-devel/automake/files/automake-1.4-perl-5.11.patch 5a2feac297fa3a8ea96cf4b6add4d697ce41ce62005759a52984aa6c3f114c0ad466b30e1d90b708c6167c90437c5946cf45c2e18b5eeedfeca6ade737ebf553 @@ -0,0 +1,28 @@ +From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Sun, 29 Nov 2009 20:35:03 +0100 +Subject: [PATCH] avoid a warning from perl-5.11 + +* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's +"/d" modifier. + +Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +--- + ChangeLog | 6 ++++++ + lib/Automake/Wrap.pm | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +--- a/automake.in ++++ b/automake.in +@@ -5126,7 +5126,7 @@ sub pretty_print_internal + # character counts for eight. So we count the number of Tabs and + # multiply by 7. + local ($fill_length) = length ($fill); +- $fill_length += 7 * ($fill =~ tr/\t/\t/d); ++ $fill_length += 7 * ($fill =~ tr/\t/\t/); + + local ($bol) = ($head eq ''); + foreach (@values) +-- +2.1.3 + diff -uNr a/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch b/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch --- a/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch false +++ b/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch 7e33ec7aec4df5e4d89e658aca60e540bbc751f23433efcc9c3983572b5ed5b545052294465324352f0c740a2c112ddf48f498ef9670caa0238be1184ef655d2 @@ -0,0 +1,23 @@ +at some point, a perl update broke this syntax. use a newer style that works +with at least perl-5.16. + +--- a/automake.in ++++ b/automake.in +@@ -983,7 +983,7 @@ sub finish_languages + + # Compute the function name of the finisher and then call it. + $name = 'lang_' . $lang . '_finish'; +- do $name (); ++ &$name (); + } + + # If the project is entirely C++ or entirely Fortran 77, don't +@@ -1144,7 +1144,7 @@ sub handle_single_transform_list + # Found the language, so see what it says. + local ($subr) = 'lang_' . $lang . '_rewrite'; + # Note: computed subr call. +- local ($r) = do $subr ($base, $extension); ++ local ($r) = &$subr ($base, $extension); + # Skip this entry if we were asked not to process it. + next if ! $r; + diff -uNr a/sys-devel/automake/files/automake-1.4-subdirs-89656.patch b/sys-devel/automake/files/automake-1.4-subdirs-89656.patch --- a/sys-devel/automake/files/automake-1.4-subdirs-89656.patch false +++ b/sys-devel/automake/files/automake-1.4-subdirs-89656.patch 9f7ae95273109fd6aa497adf0070f5f33d8235db6fb92aea9ec938bec6d55fe07660a239f9e77dcf4c849ef7b6e5f770b82c629e3efdeb94abf63cf76a2be734 @@ -0,0 +1,22 @@ +Patch from redhat/fedora which made it into upstream. + +--- automake-1.4-p6/subdirs.am.subdirs 2001-07-16 22:47:36.000000000 -0700 ++++ automake-1.4-p6/subdirs.am 2003-04-25 08:24:35.000000000 -0700 +@@ -27,7 +27,7 @@ + all-recursive install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ + check-recursive installcheck-recursive info-recursive dvi-recursive: +- @set fnord $(MAKEFLAGS); amf=$$2; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -55,7 +55,7 @@ check-recursive installcheck-recursive i + ## bombs. + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @set fnord $(MAKEFLAGS); amf=$$2; \ ++ @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ diff -uNr a/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch --- a/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch false +++ b/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch f4c9ddcfe83c8cf07daa154cffa7f6d3a5268d7e6c664357b573bbdf45fd13da0f066bf0e26c9144a1afc067006aa7d53a4a40de57a25a656688b11d83bfbb91 @@ -0,0 +1,60 @@ +http://bugs.gentoo.org/295357 + +From b1c42762931e9cd03aee3e4b4284dc2920c9eabc Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Tue, 1 Dec 2009 22:48:15 +0100 +Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs + +* lib/am/distdir.am (distdir): Do not make all directories +group- or world-writable. Instead, use 755. + +Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +--- + Makefile.in | 3 ++- + lib/am/distdir.am | 9 +++------ + 4 files changed, 15 insertions(+), 7 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index ebbfd2f..76991db 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -379,7 +379,8 @@ distdir: $(DISTFILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="${top_distdir}" distdir="$(distdir)" \ + dist-info +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ +diff --git a/lib/am/distdir.am b/lib/am/distdir.am +index e808966..0a01c4e 100644 +--- a/lib/am/distdir.am ++++ b/lib/am/distdir.am +@@ -127,11 +127,7 @@ if %?DIST-TARGETS% + endif %?DIST-TARGETS% + ## + ## This complex find command will try to avoid changing the modes of +-## links into the source tree, in case they're hard-linked. It will +-## also make directories writable by everybody, because some +-## brain-dead tar implementations change ownership and permissions of +-## a directory before extracting the files, thus becoming unable to +-## extract them. ++## links into the source tree, in case they're hard-linked. + ## + ## Ignore return result from chmod, because it might give an error + ## if we chmod a symlink. +@@ -144,7 +140,8 @@ endif %?DIST-TARGETS% + ## the file in place in the source tree. + ## + if %?TOPDIR_P% +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ +-- +1.6.5.4 + diff -uNr a/sys-devel/automake/files/automake-1.5-perl-5.11.patch b/sys-devel/automake/files/automake-1.5-perl-5.11.patch --- a/sys-devel/automake/files/automake-1.5-perl-5.11.patch false +++ b/sys-devel/automake/files/automake-1.5-perl-5.11.patch 656ed18da5c00d868510d3df6bc6f80f916b969ad17fd2857dd8f04ec5b884885bb1c06940178057e78518ae343fb6b47dcfa5ebffe35870c6a57fc7b8ec2a1c @@ -0,0 +1,28 @@ +From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Sun, 29 Nov 2009 20:35:03 +0100 +Subject: [PATCH] avoid a warning from perl-5.11 + +* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's +"/d" modifier. + +Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +--- + ChangeLog | 6 ++++++ + lib/Automake/Wrap.pm | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +--- a/automake.in ++++ b/automake.in +@@ -5277,7 +5277,7 @@ sub pretty_print_internal + # character counts for eight. So we count the number of Tabs and + # multiply by 7. + my $fill_length = length ($fill); +- $fill_length += 7 * ($fill =~ tr/\t/\t/d); ++ $fill_length += 7 * ($fill =~ tr/\t/\t/); + + foreach (@values) + { +-- +2.1.3 + diff -uNr a/sys-devel/automake/files/automake-1.5-slot.patch b/sys-devel/automake/files/automake-1.5-slot.patch --- a/sys-devel/automake/files/automake-1.5-slot.patch false +++ b/sys-devel/automake/files/automake-1.5-slot.patch 0de51e2ddab95486891ff473a8f258cf24a529ec01f49c2e3ed2ec71ab67b8cd72d1ba8d8a14a158345e3b25412065a7d84073a5f973c6e8c7f007c09e6e5992 @@ -0,0 +1,42 @@ +--- aclocal.in.orig 2004-10-22 11:11:05.361192040 -0400 ++++ aclocal.in 2004-10-22 11:11:45.362110976 -0400 +@@ -33,5 +33,5 @@ + $prefix = "@prefix@"; + # Note that this isn't pkgdatadir, but a separate directory. +-$acdir = "@datadir@/aclocal"; ++$acdir = "@datadir@/aclocal-1.5"; + + # Some globals. +@@ -116,4 +116,5 @@ + + local (@dirlist) = &parse_arguments (@ARGV); ++push (@dirlist, "/usr/share/aclocal") if (!grep(/^--acdir/, @ARGV)); + &scan_m4_files (@dirlist); + &scan_configure; +@@ -203,5 +204,5 @@ + if ($print_and_exit) + { +- print $acdir, "\n"; ++ print "/usr/share/aclocal", "\n"; + exit 0; + } +--- automake.in.orig 2004-10-22 11:14:10.787003032 -0400 ++++ automake.in 2004-10-22 11:14:22.072287408 -0400 +@@ -32,7 +32,7 @@ + BEGIN + { + my $prefix = "@prefix@"; +- my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@"; ++ my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-1.5"; + unshift @INC, "$perllibdir"; + } + +@@ -127,7 +127,7 @@ + my $VERSION = "@VERSION@"; + my $PACKAGE = "@PACKAGE@"; + my $prefix = "@prefix@"; +-my $libdir = "@datadir@/@PACKAGE@"; ++my $libdir = "@datadir@/@PACKAGE@-1.5"; + + # String constants. + my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n'; diff -uNr a/sys-devel/automake/files/automake-1.5-target_hook.patch b/sys-devel/automake/files/automake-1.5-target_hook.patch --- a/sys-devel/automake/files/automake-1.5-target_hook.patch false +++ b/sys-devel/automake/files/automake-1.5-target_hook.patch 0f4cbe86790b3351da240b7cf4f5f0a96362c9623b868366a1c1aff1ef222a72521ff9a7cf8d962603ae971e985e3afc482fe746f4985d743a12f45989498666 @@ -0,0 +1,36 @@ +diff -C 2 -r -N /tmp/automake-1.5/automake.in automake-1.5/automake.in +*** /tmp/automake-1.5/automake.in Thu Aug 23 07:26:53 2001 +--- automake-1.5/automake.in Tue Feb 5 20:38:55 2002 +*************** +*** 1941,1945 **** + + # Let the language do some special magic if required. +! $lang->target_hook ($aggregate, $object, $full); + + if ($derived_source) +--- 1941,1947 ---- + + # Let the language do some special magic if required. +! if (defined $lang) { +! $lang->target_hook ($aggregate, $object, $full); +! } + + if ($derived_source) +diff -C 2 -r -N /tmp/automake-1.5/m4/depout.m4 automake-1.5/m4/depout.m4 +*** /tmp/automake-1.5/m4/depout.m4 Mon May 14 02:01:09 2001 +--- automake-1.5/m4/depout.m4 Wed Jan 30 22:03:33 2002 +*************** +*** 13,18 **** + for mf in $CONFIG_FILES; do + case "$mf" in +! Makefile) dirpart=.;; +! */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; + *) continue;; + esac +--- 13,18 ---- + for mf in $CONFIG_FILES; do + case "$mf" in +! Makefile|GNUmakefile) dirpart=.;; +! */Makefile|*/GNUmakefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; + *) continue;; + esac diff -uNr a/sys-devel/automake/files/automake-1.5-test-fixes.patch b/sys-devel/automake/files/automake-1.5-test-fixes.patch --- a/sys-devel/automake/files/automake-1.5-test-fixes.patch false +++ b/sys-devel/automake/files/automake-1.5-test-fixes.patch a432164465374107745787820963181cde1c478f2d31ac2031ac65663c3c81efb52be9f98a720831e41bb494a302b3dceb73a93d9563c2ffde9a4c70f31577a9 @@ -0,0 +1,65 @@ +Fix the tests so they don't fail :) +http://bugs.gentoo.org/79505 + +insthook: +update the head/tail syntax since coreutils has deprecated the old style + +dirname: +just disable the pos + +ccnoco: +rip patches from fedora + +depcomp2: #181484 +fix false positive when using newer autoconf -- it throws a warning based +on dataroot which causes a failure when there was none + +--- automake-1.5/tests/insthook.test ++++ automake-1.5/tests/insthook.test +@@ -17 +17 @@ +-test x$lnum != x && tail +$lnum Makefile.in | head -3 | grep install-exec-hook ++test x$lnum != x && tail -n +$lnum Makefile.in | head -n 3 | grep install-exec-hook +--- automake-1.5/tests/dirname.test ++++ automake-1.5/tests/dirname.test +@@ -1,2 +1,3 @@ + #! /bin/sh ++exit 0 + +--- automake-1.5/tests/ccnoco.test ++++ automake-1.5/tests/ccnoco.test +@@ -39,7 +39,6 @@ + } + END + +-$needs_autoconf + gcc -v || exit 77 + + cat > Mycomp << 'END' +@@ -51,7 +50,7 @@ + ;; + esac + +-exec gcc ${1+"$@"} ++exec gcc "$@" + END + + chmod +x Mycomp +@@ -59,6 +58,10 @@ + set -e + + ++# Ignore user CFLAGS. ++CFLAGS= ++export CFLAGS ++ + for conf in configure.1 configure.3; do + cp $conf configure.in + +--- automake-1.5/tests/depcomp2.test ++++ automake-1.5/tests/depcomp2.test +@@ -17,4 +17,5 @@ + cat > Makefile.am << 'END' + SUBDIRS = subdir ++datarootdir = @datarootdir@ + END + diff -uNr a/sys-devel/automake/files/automake-1.6.3-test-fixes.patch b/sys-devel/automake/files/automake-1.6.3-test-fixes.patch --- a/sys-devel/automake/files/automake-1.6.3-test-fixes.patch false +++ b/sys-devel/automake/files/automake-1.6.3-test-fixes.patch 53af725c6c4ebf674258805e2cfccdbe2f2602ca1715ba85cd01f419edcdf76b16dd47485bc7db35241a7ca950d30b3c340f49bdc776af847320480693045035 @@ -0,0 +1,28 @@ +Fix the tests so they don't fail :) + +depcomp2: #159557 #181484 +fix false positive when using newer autoconf -- it throws a warning based +on dataroot which causes a failure when there was none + +man2: #159557 +grab update from newer automake + +--- automake-1.6.3/tests/depcomp2.test ++++ automake-1.6.3/tests/depcomp2.test +@@ -17,4 +17,5 @@ + cat > Makefile.am << 'END' + SUBDIRS = subdir ++datarootdir = @datarootdir@ + END + +--- automake-1.6.3/tests/man2.test ++++ automake-1.6.3/tests/man2.test +@@ -23,7 +23,7 @@ + $AUTOMAKE + + # Let's play with $DESTDIR too, it shouldn't hurt. +-./configure --prefix='' ++./configure --prefix='' --mandir=/man + DESTDIR="`pwd`/=inst" $MAKE -e SHELL=/bin/sh install + + test -f ./=inst/man/man2/foo.2 diff -uNr a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch --- a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch false +++ b/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch 4bb88948ffd60d4313005c31e2bff84589049d5a8c0d54e3b488f8b6a2f0b7e989cf7e073cccf33a8f413cc156b234d7247096ddd0ae50bd714f58f168450935 @@ -0,0 +1,15 @@ +--- Makefile.in 2003-06-30 17:07:30.000000000 +0000 ++++ Makefile.in 2003-06-30 17:09:28.000000000 +0000 +@@ -199,8 +199,9 @@ + + .texi.info: + @rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9] +- $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ +- -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++ cd $(srcdir) \ ++ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ ++ `echo $< | sed 's,.*/,,'` + + .texi.dvi: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ diff -uNr a/sys-devel/automake/files/automake-1.7.9-libtool-2.patch b/sys-devel/automake/files/automake-1.7.9-libtool-2.patch --- a/sys-devel/automake/files/automake-1.7.9-libtool-2.patch false +++ b/sys-devel/automake/files/automake-1.7.9-libtool-2.patch 039b6f778933699c55267075f5954ba14454ef545813c205e8fb6e9fddfcdc04b7aea9c7f53a171c1abb3e869db65aa1206d01d86de081a1a73df4e8d815c9e6 @@ -0,0 +1,43 @@ +fixup tests w/libtool-2 + +https://bugs.gentoo.org/257544 + +--- automake-1.7.9/tests/libtool5.test ++++ automake-1.7.9/tests/libtool5.test +@@ -45,5 +45,6 @@ + END + + libtoolize ++[ -e config.guess ] || libtoolize --install + $ACLOCAL + $AUTOMAKE +--- automake-1.7.9/tests/ltcond2.test ++++ automake-1.7.9/tests/ltcond2.test +@@ -73,6 +73,7 @@ + echo 'int main() { print(); return 0; }' >main.c + + libtoolize ++[ -e config.guess ] || libtoolize --install + $ACLOCAL + $AUTOCONF + $AUTOMAKE +--- automake-1.7.9/tests/ltcond.test ++++ automake-1.7.9/tests/ltcond.test +@@ -62,6 +62,7 @@ + mkdir empty + + libtoolize ++[ -e config.guess ] || libtoolize --install + $ACLOCAL + $AUTOCONF + $AUTOMAKE +--- automake-1.7.9/tests/ltconv.test ++++ automake-1.7.9/tests/ltconv.test +@@ -111,6 +111,7 @@ + EOF + + libtoolize ++[ -e config.guess ] || libtoolize --install + $ACLOCAL + $AUTOCONF + $AUTOMAKE diff -uNr a/sys-devel/automake/files/automake-1.7.9-test-fixes.patch b/sys-devel/automake/files/automake-1.7.9-test-fixes.patch --- a/sys-devel/automake/files/automake-1.7.9-test-fixes.patch false +++ b/sys-devel/automake/files/automake-1.7.9-test-fixes.patch f5d9dd262a164d2a0a3e93582354ff23efaeb013613ebbeaac5cbeb2406ebbda7ab394dae04147aca8a6e02b4d81ed8a746e3e80cb4953ee8024b235aa638b0b @@ -0,0 +1,46 @@ +Fix the tests so they don't fail :) + +exdir2 man2 transform: #159557 #162565 +grab updates from newer automake + +mkdir-tests.m4: +when mixing newer gettext with this automake, the tests bomb out +as AM_PROG_MKDIR_P is not provided properly + +--- automake-1.7.9/tests/man2.test ++++ automake-1.7.9/tests/man2.test +@@ -41,7 +41,7 @@ + $AUTOMAKE + + # Let's play with $DESTDIR too, it shouldn't hurt. +-./configure --prefix='' ++./configure --prefix='' --mandir=/man + DESTDIR="`pwd`/_inst" $MAKE -e install + + test -f ./_inst/man/man2/foo.2 +--- automake-1.7.9/tests/transform.test ++++ automake-1.7.9/tests/transform.test +@@ -56,7 +56,7 @@ + $AUTOCONF + $AUTOMAKE + +-./configure --program-prefix=gnu- --prefix `pwd`/inst ++./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man + $MAKE + $MAKE test-install + $MAKE uninstall +--- automake-1.7.9/tests/exdir2.test ++++ automake-1.7.9/tests/exdir2.test +@@ -23,7 +23,7 @@ + . ./defs || exit 1 + + cat > Makefile.am << 'EOF' +-html_DATA = zot.html ++quuz_DATA = zot.html + pkgdata_DATA = qbert + EOF + +--- automake-1.7.9/m4/mkdir-tests.m4 ++++ automake-1.7.9/m4/mkdir-tests.m4 +@@ -0,0 +1 @@ ++AC_DEFUN([AM_PROG_MKDIR_P]) diff -uNr a/sys-devel/automake/files/automake-1.8-perl-5.11.patch b/sys-devel/automake/files/automake-1.8-perl-5.11.patch --- a/sys-devel/automake/files/automake-1.8-perl-5.11.patch false +++ b/sys-devel/automake/files/automake-1.8-perl-5.11.patch 68897026230c88a200b000d379216a32c2b6347fe2ef21a751cad16bd99190b25f48c3ddffab3acbe38cb6d50ce87a00f304ab22808b3f1026554a8fbf5addae @@ -0,0 +1,30 @@ +From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Sun, 29 Nov 2009 20:35:03 +0100 +Subject: [PATCH] avoid a warning from perl-5.11 + +* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's +"/d" modifier. + +Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +--- + ChangeLog | 6 ++++++ + lib/Automake/Wrap.pm | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm +index 09a135a..66213d1 100644 +--- a/lib/Automake/Wrap.pm ++++ b/lib/Automake/Wrap.pm +@@ -55,7 +55,7 @@ sub tab_length($) + { + my ($txt) = @_; + my $len = length ($txt); +- $len += 7 * ($txt =~ tr/\t/\t/d); ++ $len += 7 * ($txt =~ tr/\t/\t/); + return $len; + } + +-- +2.1.3 + diff -uNr a/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch b/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch --- a/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch false +++ b/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch 6bed4527bbc7474939dc80c6b661451f414ec0a1521f0064eac581d83101cf11b69236d2a9861671489ba1a99d139d9e626c59bc8286b2841b58f5a45f6d4589 @@ -0,0 +1,36 @@ +--- automake-1.8.2/doc/Makefile.in 2004-02-03 21:59:01.585999688 +0200 ++++ automake-1.8.2.info/doc/Makefile.in 2004-02-03 22:04:03.893042032 +0200 +@@ -175,29 +175,10 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + .texi.info: +- restore=: && \ +- backupdir="$(am__leading_dot)am$$$$" && \ +- am__cwd=`pwd` && cd $(srcdir) && \ +- rm -rf $$backupdir && mkdir $$backupdir && \ +- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ +- if test -f $$f; then \ +- mv $$f $$backupdir; \ +- restore=mv; \ +- fi; \ +- done; \ +- cd "$$am__cwd"; \ +- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ +- -o $@ $<; \ +- then \ +- rc=0; \ +- cd $(srcdir); \ +- else \ +- rc=$$?; \ +- cd $(srcdir) && \ +- $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ +- fi; \ +- rm -rf $$backupdir; \ +- exit $$rc ++ @rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9] ++ cd $(srcdir) \ ++ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ ++ `echo $< | sed 's,.*/,,'` + + .texi.dvi: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ diff -uNr a/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch b/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch --- a/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch false +++ b/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch 38bfb0f3f01c886b4c76da3053e52fed0b982f6e18f86be1bb33d0229a7b9f54dc7856f13cfa949b61e9807d77a1081a61b9e33c56738ea4e279acf3035c8999 @@ -0,0 +1,60 @@ +http://bugs.gentoo.org/295357 + +From 4331fc7423036e68a9e480fb0ff56934b5d2be0e Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Tue, 1 Dec 2009 22:07:45 +0100 +Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs + +* lib/am/distdir.am (distdir): Do not make all directories +group- or world-writable. Instead, use 755. + +Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +--- + Makefile.in | 3 ++- + lib/am/distdir.am | 9 +++------ + 4 files changed, 17 insertions(+), 8 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index f6971b4..c753eaa 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -389,7 +389,8 @@ distdir: $(DISTFILES) + || exit 1; \ + fi; \ + done +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ +diff --git a/lib/am/distdir.am b/lib/am/distdir.am +index 0ed0593..91dbe6b 100644 +--- a/lib/am/distdir.am ++++ b/lib/am/distdir.am +@@ -190,11 +190,7 @@ if %?DIST-TARGETS% + endif %?DIST-TARGETS% + ## + ## This complex find command will try to avoid changing the modes of +-## links into the source tree, in case they're hard-linked. It will +-## also make directories writable by everybody, because some +-## brain-dead tar implementations change ownership and permissions of +-## a directory before extracting the files, thus becoming unable to +-## extract them. ++## links into the source tree, in case they're hard-linked. + ## + ## Ignore return result from chmod, because it might give an error + ## if we chmod a symlink. +@@ -207,7 +203,8 @@ endif %?DIST-TARGETS% + ## the file in place in the source tree. + ## + if %?TOPDIR_P% +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ +-- +1.6.5.4 + diff -uNr a/sys-devel/automake/files/automake-1.8.5-test-fixes.patch b/sys-devel/automake/files/automake-1.8.5-test-fixes.patch --- a/sys-devel/automake/files/automake-1.8.5-test-fixes.patch false +++ b/sys-devel/automake/files/automake-1.8.5-test-fixes.patch a2434d08782395753861c6182ef0c612d41c322bf4dab4360a531ac617949ccd88732244564a0fdc64701d494c5f686c66b69d4b9a59a43156a0fc1d0f4e484b @@ -0,0 +1,43 @@ +Fix the tests so they don't fail :) + +exdir2 man2 transform: #159557 #162565 +grab updates from newer automake + +--- automake-1.8.5/tests/man2.test ++++ automake-1.8.5/tests/man2.test +@@ -41,7 +41,7 @@ + $AUTOMAKE + + # Let's play with $DESTDIR too, it shouldn't hurt. +-./configure --prefix='' ++./configure --prefix='' --mandir=/man + DESTDIR="`pwd`/_inst" $MAKE -e install + + test -f ./_inst/man/man2/foo.2 +--- automake-1.8.5/tests/transform.test ++++ automake-1.8.5/tests/transform.test +@@ -56,7 +56,7 @@ + $AUTOCONF + $AUTOMAKE + +-./configure --program-prefix=gnu- --prefix `pwd`/inst ++./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man + $MAKE + $MAKE test-install + $MAKE uninstall +--- automake-1.8.5/tests/exdir2.test ++++ automake-1.8.5/tests/exdir2.test +@@ -25,11 +25,11 @@ + set -e + + cat > Makefile.am << 'EOF' +-html_DATA = zot.html ++quuz_DATA = zot.html + pkgdata_DATA = qbert + EOF + + $ACLOCAL + AUTOMAKE_fails + grep 'pkgdatadir' stderr && exit 1 +-grep 'Makefile.am:1:.*htmldir.*undefined' stderr ++grep 'Makefile.am:1:.*quuzdir.*undefined' stderr diff -uNr a/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch b/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch --- a/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch false +++ b/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch 284fc388809bb1eef86dd264b97dd65ddcc53b77d6fb0ced61e446521876138c20af01294514e18c91031f152b9ed23f89f64abcfaa57f84cbea8bd95ef1e41b @@ -0,0 +1,39 @@ +http://bugs.gentoo.org/197366 + +commit 8952f7248c2637426bcf83d38f07a8b02124a06e +Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +Date: Wed May 10 20:50:53 2006 +0000 + + * tests/aclocal7.test: Add `$sleep's between file touching + and automake resp aclocal+automake invocations, to ensure + they complete with a time stamp strictly later than the touched + file. + +diff --git a/tests/aclocal7.test b/tests/aclocal7.test +index 787565c..f6d5e31 100755 +--- a/tests/aclocal7.test ++++ b/tests/aclocal7.test +@@ -89,6 +89,7 @@ test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in + touch fragment.inc + $sleep + touch foo ++$sleep + $ACLOCAL -I m4 + $AUTOMAKE --no-force + # Only ./Makefile.in should change. +@@ -101,6 +102,7 @@ grep README Makefile.in && exit 1 + : > README + $sleep + touch foo ++$sleep + $AUTOMAKE --no-force + # Even if no dependency change, the content changed. + test `ls -1t Makefile.in foo | sed 1q` = Makefile.in +@@ -111,6 +113,7 @@ grep README Makefile.in + : > sub/Makefile.in + $sleep + touch foo ++$sleep + $ACLOCAL -I m4 + $AUTOMAKE --no-force + # Only sub/Makefile.in should change. diff -uNr a/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch b/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch --- a/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch false +++ b/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch 2bdfe6ef79bf41ca417b4cab9639fb59e0a3728c09e8f1ff8e2331f285ca8fd51e9a840f7de17ef898d6b7167a2291e97ba93e04ac19d15e7720d7b4cc11d56a @@ -0,0 +1,29 @@ +http://bugs.gentoo.org/126388 + +2006-03-16 Mike Frysinger <vapier@gentoo.org> + + * aclocal.in (scan_configure_dep): Ignore ## lines. + (scan_file): Remove dnl and # comments. + +--- a/aclocal.in ++++ b/aclocal.in +@@ -227,6 +227,8 @@ + foreach (split ("\n", $contents)) + { + ++$line; ++ # Ignore `##' lines. ++ next if /^##/; + # Remove comments from current line. + s/\bdnl\b.*$//; + s/\#.*$//; +@@ -311,6 +313,10 @@ + + $contents .= $_; + ++ # Remove comments from current line. ++ s/\bdnl\b.*$//; ++ s/\#.*$//; ++ + while (/$ac_defun_rx/go) + { + if (! defined $1) diff -uNr a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch b/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch --- a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch false +++ b/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch dd020869d9868430213cd4de3ff37d417b55ae0e8facedd83f77a70d8378d0ba75587ce8383778ab651e410a59371d88a96b0abd48036f69cfe1097980935bc9 @@ -0,0 +1,31 @@ +http://bugs.gentoo.org/107435 +http://lists.gnu.org/archive/html/automake/2005-09/msg00088.html + +2005-09-27 Stepan Kasal <address@hidden> + + * automake.in (handle_single_transform): Direct suffix rule preserves + the directory prefix, so the generated object name should contain + it, too. + +--- a/automake.in 2005-09-17 15:05:39.000000000 +0200 ++++ b/automake.in 2005-09-27 17:10:47.000000000 +0200 +@@ -1755,6 +1755,10 @@ + # This is probably the result of a direct suffix rule. + # In this case we just accept the rewrite. + $object = "$base$extension"; ++ if ($directory ne '') ++ { ++ $object = $directory . '/' . $object; ++ } + $linker = ''; + } + else +@@ -1824,7 +1828,7 @@ + + # For Java, the way we're handling it right now, a + # `..' component doesn't make sense. +- if ($lang->name eq 'java' && $object =~ /(\/|^)\.\.\//) ++ if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//) + { + err_am "`$full' should not contain a `..' component"; + } diff -uNr a/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch b/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch --- a/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch false +++ b/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch 30aa5330346d7e2e47def8541c7a19f9182ebbe12c9b3a80b38493feee74c6d435fb1063520983a869dad69eb03665af2447752ba6f07b5879d63e96b70b4e81 @@ -0,0 +1,33 @@ +--- a/doc/Makefile.in.orig 2005-07-11 00:39:31.000000000 -0400 ++++ b/doc/Makefile.in 2005-07-11 00:40:46.000000000 -0400 +@@ -187,26 +187,10 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + .texi.info: +- restore=: && backupdir="$(am__leading_dot)am$$$$" && \ +- am__cwd=`pwd` && cd $(srcdir) && \ +- rm -rf $$backupdir && mkdir $$backupdir && \ +- if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ +- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ +- if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ +- done; \ +- else :; fi && \ +- cd "$$am__cwd"; \ +- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ +- -o $@ $<; \ +- then \ +- rc=0; \ +- cd $(srcdir); \ +- else \ +- rc=$$?; \ +- cd $(srcdir) && \ +- $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ +- fi; \ +- rm -rf $$backupdir; exit $$rc ++ @rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9] ++ cd $(srcdir) \ ++ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ ++ `echo $< | sed 's,.*/,,'` + + .texi.dvi: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ diff -uNr a/sys-devel/automake/files/automake-1.9.6-subst-test.patch b/sys-devel/automake/files/automake-1.9.6-subst-test.patch --- a/sys-devel/automake/files/automake-1.9.6-subst-test.patch false +++ b/sys-devel/automake/files/automake-1.9.6-subst-test.patch 64f44e17a938bef8b4459114ad23d0ca681afc00eba5c6ad50b7a8d3391cb75c2112ab56d3ed40f82c8cb6253fc2358116f77b0eb6297007f0a026c4d3f8448e @@ -0,0 +1,42 @@ +https://bugs.gentoo.org/222225 + +Patch from automake upstream git-repo to fix "make check" with newer versions of autoconf + +From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> +Date: Sun, 22 Jul 2007 09:06:23 +0000 (+0000) +Subject: * tests/subst.test: Move the AC_SUBST into a macro definition. +X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff_plain;h=3d85de7baa9edf21c56401db3d25ef8a8e8d7797 + +* tests/subst.test: Move the AC_SUBST into a macro definition. +Avoids an error from CVS Autoconf. +* THANKS: Update. +Report by Benoit Sigoure. +--- +diff --git a/tests/subst.test b/tests/subst.test +index 33e925d..a72af85 100755 +--- a/tests/subst.test ++++ b/tests/subst.test +@@ -1,5 +1,5 @@ + #! /bin/sh +-# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc. ++# Copyright (C) 1996, 2001, 2002, 2007 Free Software Foundation, Inc. + # + # This file is part of GNU Automake. + # +@@ -24,8 +24,14 @@ + . ./defs || exit 1 + + cat >> configure.in << 'END' +-AC_SUBST($1) +-AC_SUBST([$]$1) dnl this is the actual invocation that was used ++dnl This test used to have the following lines, which cannot have ++dnl worked sensibly with Autoconf for years, however: ++dnl AC_SUBST($1) ++dnl AC_SUBST([$]$1) dnl this is the actual invocation that was used ++dnl ++AC_DEFUN([FOO], ++[AC_SUBST([$1])]) ++FOO([BAR]) + END + + : > Makefile.am diff -uNr a/sys-devel/automake/metadata.xml b/sys-devel/automake/metadata.xml --- a/sys-devel/automake/metadata.xml false +++ b/sys-devel/automake/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest --- a/sys-devel/automake-wrapper/Manifest false +++ b/sys-devel/automake-wrapper/Manifest 79cbd1971063a9a6f4656b9ce1595e5296799dad76b1a1034c6046eefcf3a8d7a88d5f176d96a9c5b8a2da60f8d7d22a6eed93dc359a01c5407749a862349fc9 @@ -0,0 +1,4 @@ +AUX am-wrapper-10.sh 4626 BLAKE2B f7261f39e06afa88eb0b52c5ccdcbb2b4fabe3bda4fdb50ef2c974d4a03101439decb76edee3d0534a621fd4ca4e5d574a3af2701e382f7c07f838a5235ae6ef SHA512 6f1611000ac2dd901a24efd133522274aa8feea02610645f3b1332a3f294de687f65e995b398a487b1d030c74dd278f65fcd224007ebe7e950af03660cc38f60 +AUX am-wrapper-11.sh 4626 BLAKE2B 2a96abc5b93db360a3ce074d84b21d7f875ff42d54f99030d8589b84efc94b411d8fb1a707716a060dc4a66c59f2a84d1e50a70f681faa62358fc7ae7a5a7d77 SHA512 452c0c52ef65b1ad5ad8d8f5c9c12cb9ff18eb03faaf7217c52a7dcf2a9832c7d4a59dbd8cc6325a0035a6650cc913f9b842615d053bd0f0c5c5177e660dbfca +EBUILD automake-wrapper-10.ebuild 928 BLAKE2B 2f7e20be41a1ad2b46b49e6879d796d16e7993cd7b1c5e7e759bc6382628479b10228ee3dafb0907baa9e581ece9b430f259e12cf3b83adf508c90805765d00e SHA512 93becb2a61c0099453cc085a5da5114b55fa5e67a322cc801d3887be66ba29a4fb690d3f1c582314c38bae8ec404452de6ffa3e7254d9b8ce7c68f830133154e +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild --- a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild false +++ b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild d50db22b43c6dd14daa6789417758c08a1d59dde247d099b4c2d73d21ff997aef5ab0067f5283a89663334e73ca75d4d35dc110bfa61fda200242ad4738f12e9 @@ -0,0 +1,34 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="wrapper for automake to manage multiple automake versions" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +S=${WORKDIR} + +src_unpack() { + cp "${FILESDIR}"/am-wrapper-${PV}.sh "${S}"/ || die +} + +src_prepare() { + # usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell + if use prefix ; then + sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' \ + "${S}"/am-wrapper-${PV}.sh || die + fi +} + +src_install() { + newbin "${S}"/am-wrapper-${PV}.sh automake + dosym automake /usr/bin/aclocal + + keepdir /usr/share/aclocal +} diff -uNr a/sys-devel/automake-wrapper/files/am-wrapper-10.sh b/sys-devel/automake-wrapper/files/am-wrapper-10.sh --- a/sys-devel/automake-wrapper/files/am-wrapper-10.sh false +++ b/sys-devel/automake-wrapper/files/am-wrapper-10.sh a245a160b8f441f1084b217e306635e4e48337a7a9e23a42cea3c9673f024f1b2b62ee94ce2d531f9cb1f9917ab0782aeec02a5f808582a8b010e45bd589a6e5 @@ -0,0 +1,186 @@ +#!/bin/sh +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Executes the correct automake version. +# +# If WANT_AUTOMAKE is set (can be a whitespace delimited list of versions): +# - attempt to find an installed version using those +# - if magic keyword 'latest' is found, pick the latest version that exists +# - if nothing found, warn, and proceed as if WANT_AUTOMAKE was not set (below) +# If WANT_AUTOMAKE is not set: +# - Try to detect the version of automake used to generate things (look at +# Makefile.in and aclocal.m4 and any other useful file) +# - If detected version is not found, warn and proceed as if blank slate +# - Try to locate the latest version of automake that exists and run it + +(set -o posix) 2>/dev/null && set -o posix + +_stderr() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 1>&2; } +warn() { _stderr "warning: $*"; } +err() { _stderr "error: $*"; exit 1; } +unset IFS +which() { + local p + IFS=: # we don't use IFS anywhere, so don't bother saving/restoring + for p in ${PATH} ; do + p="${p}/$1" + [ -e "${p}" ] && echo "${p}" && return 0 + done + unset IFS + return 1 +} + +# +# Sanitize argv[0] since it isn't always a full path #385201 +# +argv0=${0##*/} +case $0 in + ${argv0}) + # find it in PATH + if ! full_argv0=$(which "${argv0}") ; then + err "could not locate ${argv0}; file a bug" + fi + ;; + *) + # re-use full/relative paths + full_argv0=$0 + ;; +esac + +if ! seq 0 0 2>/dev/null 1>&2 ; then #338518 + seq() { + local f l i + case $# in + 1) f=1 i=1 l=$1;; + 2) f=$1 i=1 l=$2;; + 3) f=$1 i=$2 l=$3;; + esac + while :; do + [ $l -lt $f -a $i -gt 0 ] && break + [ $f -lt $l -a $i -lt 0 ] && break + echo $f + : $(( f += i )) + done + return 0 + } +fi + +# +# Set up bindings between actual version and WANT_AUTOMAKE; +# Start with last known versions to speed up lookup process. +# +LAST_KNOWN_AUTOMAKE_VER="15" +vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`) + +# +# Helper to scan for a usable program based on version. +# +binary= +all_vers= +find_binary() { + local v + all_vers="${all_vers} $*" # For error messages. + for v ; do + if [ -x "${full_argv0}-${v}" ] ; then + binary="${full_argv0}-${v}" + binary_ver=${v} + return 0 + fi + done + return 1 +} + +# +# Try and find a usable automake version. First check the WANT_AUTOMAKE +# setting (whitespace delimited list), then fallback to the latest. +# +find_latest() { + if ! find_binary ${vers} ; then + # Brute force it. + find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`) + fi +} +for wx in ${WANT_AUTOMAKE:-latest} ; do + if [ "${wx}" = "latest" ] ; then + find_latest && break + else + find_binary ${wx} && break + fi +done + +if [ -z "${binary}" ] && [ -n "${WANT_AUTOMAKE}" ] ; then + warn "could not locate installed version for WANT_AUTOMAKE='${WANT_AUTOMAKE}'; ignoring" + unset WANT_AUTOMAKE + find_latest +fi + +if [ -z "${binary}" ] ; then + err "Unable to locate any usuable version of automake.\n" \ + "\tI tried these versions:${all_vers}\n" \ + "\tWith a base name of '${full_argv0}'." +fi + +# +# autodetect helpers +# +do_awk() { + local file=$1 ; shift + local v=$(awk -v regex="$*" '{ + if (ret = match($0, regex)) { + s = substr($0, ret, RLENGTH) + ret = match(s, "[0-9]\\.[0-9]+") + print substr(s, ret, RLENGTH) + exit + } + }' "${file}") + case " ${auto_vers} " in + *" ${v} "*) ;; + *) auto_vers="${auto_vers:+${auto_vers} }${v}" ;; + esac +} + +# +# autodetect routine +# +if [ -z "${WANT_AUTOMAKE}" ] ; then + auto_vers= + if [ -r "Makefile.in" ] ; then + do_awk Makefile.in '^# Makefile.in generated (automatically )?by automake [0-9]\\.[0-9]+' + fi + if [ -r "aclocal.m4" ] ; then + do_awk aclocal.m4 'generated automatically by aclocal [0-9]\\.[0-9]+' + do_awk aclocal.m4 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\$\\[?[0-9]\\.[0-9]+[^)]*\\]?\$' + fi + # We don't need to set $binary here as it has already been setup for us + # earlier to the latest available version. + if [ -n "${auto_vers}" ] ; then + if ! find_binary ${auto_vers} ; then + warn "auto-detected versions not found (${auto_vers}); falling back to latest available" + fi + fi +fi + +if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then + if [ -n "${WANT_AUTOMAKE}" ] ; then + warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}" + fi + warn "DEBUG: will execute <${binary}>" +fi + +# +# for further consistency +# +export WANT_AUTOMAKE="${binary_ver}" + +# +# Now try to run the binary +# +if [ ! -x "${binary}" ] ; then + # this shouldn't happen + err "${binary} is missing or not executable.\n" \ + "\tPlease try installing the correct version of automake." +fi + +exec "${binary}" "$@" +# The shell will error out if `exec` failed. diff -uNr a/sys-devel/automake-wrapper/files/am-wrapper-11.sh b/sys-devel/automake-wrapper/files/am-wrapper-11.sh --- a/sys-devel/automake-wrapper/files/am-wrapper-11.sh false +++ b/sys-devel/automake-wrapper/files/am-wrapper-11.sh 40e254520fad43a7158c18cd9d12b2d3409cc1411de10d8394f24cdcde595a08d2ed874149e86192e6bc947dc2a4554c680f40e9374718fa4528620fe935ba79 @@ -0,0 +1,186 @@ +#!/bin/sh +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Executes the correct automake version. +# +# If WANT_AUTOMAKE is set (can be a whitespace delimited list of versions): +# - attempt to find an installed version using those +# - if magic keyword 'latest' is found, pick the latest version that exists +# - if nothing found, warn, and proceed as if WANT_AUTOMAKE was not set (below) +# If WANT_AUTOMAKE is not set: +# - Try to detect the version of automake used to generate things (look at +# Makefile.in and aclocal.m4 and any other useful file) +# - If detected version is not found, warn and proceed as if blank slate +# - Try to locate the latest version of automake that exists and run it + +(set -o posix) 2>/dev/null && set -o posix + +_stderr() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 1>&2; } +warn() { _stderr "warning: $*"; } +err() { _stderr "error: $*"; exit 1; } +unset IFS +which() { + local p + IFS=: # we don't use IFS anywhere, so don't bother saving/restoring + for p in ${PATH} ; do + p="${p}/$1" + [ -e "${p}" ] && echo "${p}" && return 0 + done + unset IFS + return 1 +} + +# +# Sanitize argv[0] since it isn't always a full path #385201 +# +argv0=${0##*/} +case $0 in + ${argv0}) + # find it in PATH + if ! full_argv0=$(which "${argv0}") ; then + err "could not locate ${argv0}; file a bug" + fi + ;; + *) + # re-use full/relative paths + full_argv0=$0 + ;; +esac + +if ! seq 0 0 2>/dev/null 1>&2 ; then #338518 + seq() { + local f l i + case $# in + 1) f=1 i=1 l=$1;; + 2) f=$1 i=1 l=$2;; + 3) f=$1 i=$2 l=$3;; + esac + while :; do + [ $l -lt $f -a $i -gt 0 ] && break + [ $f -lt $l -a $i -lt 0 ] && break + echo $f + : $(( f += i )) + done + return 0 + } +fi + +# +# Set up bindings between actual version and WANT_AUTOMAKE; +# Start with last known versions to speed up lookup process. +# +LAST_KNOWN_AUTOMAKE_VER="16" +vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`) + +# +# Helper to scan for a usable program based on version. +# +binary= +all_vers= +find_binary() { + local v + all_vers="${all_vers} $*" # For error messages. + for v ; do + if [ -x "${full_argv0}-${v}" ] ; then + binary="${full_argv0}-${v}" + binary_ver=${v} + return 0 + fi + done + return 1 +} + +# +# Try and find a usable automake version. First check the WANT_AUTOMAKE +# setting (whitespace delimited list), then fallback to the latest. +# +find_latest() { + if ! find_binary ${vers} ; then + # Brute force it. + find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`) + fi +} +for wx in ${WANT_AUTOMAKE:-latest} ; do + if [ "${wx}" = "latest" ] ; then + find_latest && break + else + find_binary ${wx} && break + fi +done + +if [ -z "${binary}" ] && [ -n "${WANT_AUTOMAKE}" ] ; then + warn "could not locate installed version for WANT_AUTOMAKE='${WANT_AUTOMAKE}'; ignoring" + unset WANT_AUTOMAKE + find_latest +fi + +if [ -z "${binary}" ] ; then + err "Unable to locate any usuable version of automake.\n" \ + "\tI tried these versions:${all_vers}\n" \ + "\tWith a base name of '${full_argv0}'." +fi + +# +# autodetect helpers +# +do_awk() { + local file=$1 ; shift + local v=$(awk -v regex="$*" '{ + if (ret = match($0, regex)) { + s = substr($0, ret, RLENGTH) + ret = match(s, "[0-9]\\.[0-9]+") + print substr(s, ret, RLENGTH) + exit + } + }' "${file}") + case " ${auto_vers} " in + *" ${v} "*) ;; + *) auto_vers="${auto_vers:+${auto_vers} }${v}" ;; + esac +} + +# +# autodetect routine +# +if [ -z "${WANT_AUTOMAKE}" ] ; then + auto_vers= + if [ -r "Makefile.in" ] ; then + do_awk Makefile.in '^# Makefile.in generated (automatically )?by automake [0-9]\\.[0-9]+' + fi + if [ -r "aclocal.m4" ] ; then + do_awk aclocal.m4 'generated automatically by aclocal [0-9]\\.[0-9]+' + do_awk aclocal.m4 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\$\\[?[0-9]\\.[0-9]+[^)]*\\]?\$' + fi + # We don't need to set $binary here as it has already been setup for us + # earlier to the latest available version. + if [ -n "${auto_vers}" ] ; then + if ! find_binary ${auto_vers} ; then + warn "auto-detected versions not found (${auto_vers}); falling back to latest available" + fi + fi +fi + +if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then + if [ -n "${WANT_AUTOMAKE}" ] ; then + warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}" + fi + warn "DEBUG: will execute <${binary}>" +fi + +# +# for further consistency +# +export WANT_AUTOMAKE="${binary_ver}" + +# +# Now try to run the binary +# +if [ ! -x "${binary}" ] ; then + # this shouldn't happen + err "${binary} is missing or not executable.\n" \ + "\tPlease try installing the correct version of automake." +fi + +exec "${binary}" "$@" +# The shell will error out if `exec` failed. diff -uNr a/sys-devel/automake-wrapper/metadata.xml b/sys-devel/automake-wrapper/metadata.xml --- a/sys-devel/automake-wrapper/metadata.xml false +++ b/sys-devel/automake-wrapper/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest --- a/sys-devel/bc/Manifest false +++ b/sys-devel/bc/Manifest b15d5b97796c1dbb3c30bb1486bd36d57035626182c9dde2d0121f20631ebea6ee01e608fd6b42d0458ed2324f9a7f2e8c59d08019fbf01a12b669749e8a44a9 @@ -0,0 +1,5 @@ +AUX bc-1.06.95-mem-leak.patch 588 BLAKE2B b81094c82c02c47bc60d949f8aa50e1a9d00bb678d6759f9ac3a695d2e01d38b942a426a024f2e3023d4c67b3c7b40f1c968a9b066573da99823c0bccbcfbf6e SHA512 3a1f354b8979586b39e6e3f93f2df7d38c2f221fb00ceef7db6cb6b51712c0fc27dbbd75635a8e4e9e2f8f100c5a39cdc1d4c1cfc32bd6c406af94edef37e40d +AUX bc-1.06.95-void_uninitialized.patch 351 BLAKE2B ad293d5efcebc2cf85a2d1a99e850f5c104e57b92cb3070739719f578d3eac38bfb92ba4b5cd5040fe8a711db5b77a4a673e080e27b233878adf1457cbc49073 SHA512 6d2803d831d8a3137c3d867606f8d40455a6f984bfe844e10e276e24cbd5d9fd1ff21b81ea91775dd7e1e55484cdde7bf859fa3e9a17887bdf548b32cdc46dae +DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1 +EBUILD bc-1.06.95-r2.ebuild 1613 BLAKE2B e1d2fd5f1773de65df554e46c801c52ebc2d808e1b297c8cb04faadf95d19322b87a3407f3a7c3481025f2eb8f6c5a5f25a67f7c0c773ad97d8114a2eaf624ec SHA512 4627d647763feea0c67664f448879765fb563870ee3b174788ad0f7fb7ee3ec4ff4240655efd56fdba34d3b45c4269f0b6679200696a3a80ce2a25baf83ab647 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild --- a/sys-devel/bc/bc-1.06.95-r2.ebuild false +++ b/sys-devel/bc/bc-1.06.95-r2.ebuild 681072d43af3fde81e0680069f6730f7f8876cce66e5b7d3e1b390c025301d056a7332f8838d6e88cfd8a2ba09c985261579f199fcf22e31b0608c8779eb5fd3 @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Handy console-based calculator utility" +HOMEPAGE="https://www.gnu.org/software/bc/bc.html" +SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2 + mirror://gnu/bc/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="libedit readline static" + +RDEPEND=" + !readline? ( libedit? ( dev-libs/libedit:= ) ) + readline? ( + >=sys-libs/readline-4.1:0= + >=sys-libs/ncurses-5.2:= + ) +" +DEPEND=" + ${RDEPEND} + sys-devel/flex + virtual/yacc +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-void_uninitialized.patch #349339 + epatch "${FILESDIR}"/${P}-mem-leak.patch #264889 +} + +src_configure() { + export CONFIG_SHELL=${BASH} + + local libedit + if use readline ; then + libedit="--without-libedit" + else + libedit=$(use_with libedit) + fi + use static && append-ldflags -static + # Clobber any CONFIG_SHELL setting the user has forced on us. + # We should be able to delete this w/the next release as it + # should use updated autoconf. + CONFIG_SHELL=/bin/bash \ + econf \ + $(use_with readline) \ + ${libedit} + + # Do not regen docs -- configure produces a small fragment that includes + # the version info which causes all pages to regen (newer file). #554774 + touch -r doc doc/* +} + +src_compile() { + emake AR="$(tc-getAR)" +} diff -uNr a/sys-devel/bc/files/bc-1.06.95-mem-leak.patch b/sys-devel/bc/files/bc-1.06.95-mem-leak.patch --- a/sys-devel/bc/files/bc-1.06.95-mem-leak.patch false +++ b/sys-devel/bc/files/bc-1.06.95-mem-leak.patch 5ea6a8b7ee39de2fd01de4c674d7933af38f74689ec2ebdbd838a9bca53db3826b69f100d42ffd5d0016de55672c82f348c670f399711fac7ee04a2181482246 @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/264889 + +--- a/bc/bc.y ++++ b/bc/bc.y +@@ -569,6 +569,7 @@ expression : named_expression ASSIGN_OP + generate (">"); + break; + } ++ free($2); + } + | expression '+' expression + { +--- a/bc/util.c ++++ b/bc/util.c +@@ -602,8 +602,7 @@ lookup (name, namekind) + case FUNCTDEF: + if (id->f_name != 0) + { +- if (namekind != FUNCT) +- free(name); ++ free(name); + /* Check to see if we are redefining a math lib function. */ + if (use_math && namekind == FUNCTDEF && id->f_name <= 6) + id->f_name = next_func++; diff -uNr a/sys-devel/bc/files/bc-1.06.95-void_uninitialized.patch b/sys-devel/bc/files/bc-1.06.95-void_uninitialized.patch --- a/sys-devel/bc/files/bc-1.06.95-void_uninitialized.patch false +++ b/sys-devel/bc/files/bc-1.06.95-void_uninitialized.patch 302c86b01d1651b1827b44cbd5ffe3dad5dfa4b1c1fbff124dc3fb10faccf53b4e79415830c502902cb3c59ed7ac1f3c7f59fb0e6203ca60c17645565237bddd @@ -0,0 +1,13 @@ +http://www.pixelbeat.org/programming/oss_bug_flow.html +https://bugs.gentoo.org/349339 + +--- bc/storage.c ++++ bc/storage.c +@@ -99,6 +99,7 @@ + { + f = &functions[indx]; + f->f_defined = FALSE; ++ f->f_void = FALSE; + f->f_body = (char *) bc_malloc (BC_START_SIZE); + f->f_body_size = BC_START_SIZE; + f->f_code_size = 0; diff -uNr a/sys-devel/bc/metadata.xml b/sys-devel/bc/metadata.xml --- a/sys-devel/bc/metadata.xml false +++ b/sys-devel/bc/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/bin86/Manifest b/sys-devel/bin86/Manifest --- a/sys-devel/bin86/Manifest false +++ b/sys-devel/bin86/Manifest 6763364827a41f429ec152451290102cc9f6c237634e0cf89d599e7519c62ab4f30bf9cf16f0889a1be4a2c620a72fbbb7ead366b2645f748056f5893ce60b47 @@ -0,0 +1,4 @@ +AUX bin86-0.16.17-amd64-build.patch 327 BLAKE2B 076e7fb11802f082f94f3e688553ae9f561609ae6675c67105ee9a30292185edd12b90a5149bc34ba6d6a453ce7648943c732a865bb238a4ebe5e8185ce6ed51 SHA512 8e4102c5b0848249c69fd9b3f16a93b12bbe8dce9771b78514bf423bec7b0144677f4eae07cb0ea479bf03dbd21092fdb2ce0a028df95f28c37d48b660466c13 +DIST bin86-0.16.21.tar.gz 154283 BLAKE2B 6c88a5cf86623130f6ed45cefb9ee9293d8888f4d0e5712d96a24a6fe84bbe5002869761e9c39bb20c8af74e3fe76cf65632ef43e55d81d0e5cb9212f3cae56a SHA512 e80e06965fbdcf13100aae4690071d01a6efe74aed7ff8f14e5892c6803393a1b5acda1296e0f0e1837dfb73e0edd02e9cccfeabbeabe1b68fa6b6b85ced1f56 +EBUILD bin86-0.16.21.ebuild 875 BLAKE2B 127b25d1212b1d78e2ac7f5cecb7b15fb7883b6986b6467710788a37199d516f9ef9fa7387885eb191c67cce3c645699a5c2ddd9a58a3217f40e1ebaf37dd72c SHA512 3aa240eba74f60da7f66163e30d552a316969c1ed82cd4d7e1b473322bddc57996264685ea30fca329f083c2d68af28ca8eef8f49b391c2d88088364f8fdf2a7 +MISC metadata.xml 479 BLAKE2B b05ad19dac9e88d9714a0a5b176187b8c3b3c7514f73b8a1a5d8f1498c02900546e9ad3aa04edc4c6a1b9d07035e8ab0a8bd66c853aa27babf302bd8ae92ea18 SHA512 89e8c96a44e57ccae73c66141904a99e0128587fd62acc8b2d3e860636ab05396e9842c80152ab27860850a7582dd4097fefb465e0d0a86761b96614d8c0992d diff -uNr a/sys-devel/bin86/bin86-0.16.21.ebuild b/sys-devel/bin86/bin86-0.16.21.ebuild --- a/sys-devel/bin86/bin86-0.16.21.ebuild false +++ b/sys-devel/bin86/bin86-0.16.21.ebuild 9f2f4944d9ac6e57c1988c4c0b2b184f108f70b2c336b3e837f6dd1fb0f4400dfe8f06d27fd30477ada8e468ad8f7dc4ae6405d1b28d1b422382c57a4e6226a7 @@ -0,0 +1,34 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit toolchain-funcs eutils + +DESCRIPTION="Assembler and loader used to create kernel bootsector" +HOMEPAGE="http://v3.sk/~lkundrak/dev86/" +SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +src_prepare() { + use elibc_musl && CPPFLAGS="${CPPFLAGS} -U__linux__" + sed -i \ + -e '/^PREFIX/s:=.*:=$(DESTDIR)/usr:' \ + -e '/^MANDIR/s:)/man/man1:)/share/man/man1:' \ + -e '/^INSTALL_OPTS/s:-s::' \ + -e "/^CFLAGS/s:=.*:=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}:" \ + -e "/^LDFLAGS/s:=.*:=${LDFLAGS}:" \ + Makefile || die + epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch + eapply_user + tc-export CC +} + +src_install() { + dodir /usr/bin /usr/share/man/man1 + default +} diff -uNr a/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch b/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch --- a/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch false +++ b/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch 91d6d0580405e06153ad96489f64c0ca300b6dd77fe961befa7a14135546f9c12590593490f0078e1736b1eb85b89e2009ecc92484f608cfe072e70d238710f6 @@ -0,0 +1,17 @@ +This should make it built on other archictectures as well + +https://bugs.gentoo.org/428228 + +--- ld/x86_aout.h ++++ ld/x86_aout.h +@@ -13,7 +13,9 @@ + typedef long Long; + #define __OUT_OK 1 + #else +-typedef char Long[4]; ++#define __OUT_OK 1 ++#include <inttypes.h> ++typedef int32_t Long; + #endif + + struct exec { /* a.out header */ diff -uNr a/sys-devel/bin86/metadata.xml b/sys-devel/bin86/metadata.xml --- a/sys-devel/bin86/metadata.xml false +++ b/sys-devel/bin86/metadata.xml 371dce5c9ad6feda5250d2f630e5383c32a4276e27f65a187ee4f534a4b7ae346726c3bfe08e84dd083e3d2bd269f020344129c56c114db27be84f11d3dc64a8 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> + +<upstream> + <remote-id type="github">lkundrak/dev86</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest --- a/sys-devel/binutils/Manifest false +++ b/sys-devel/binutils/Manifest a0546d36ce6da753b79fb0de15e612b8d6011419d18511662f9f0a680e0f8304d84b2a732f1e1e2d44750375d0193bcf064fa59bbfb38ac5c1c624a31953141b @@ -0,0 +1,6 @@ +AUX binutils-2.29.1-nogoldtest.patch 730 BLAKE2B f4f5926511866e58566abc224d2bae1336eb2cbfb63ae6d2a8a3b1f455f24d31fe0ecaee616eb6075712b8d90c40495a639c413c7229c9dfa741a5d284ff2911 SHA512 dd94d947fd25a770990ebc711fba6f680c90677e726f7cdc5435dd121f57e28e3a19343805e514045513bb011094f3a1fe2c4178d1be73e5d38a24abcc2b88e5 +AUX binutils-configure-LANG.patch 2082 BLAKE2B 5db7ce0626dee8f3d84547eaccc5a2808bbb55657dd22c890782446fc9fe3e84683277d8da675067d9fd494d99dd292883174e133e440ce6a90d22a9f1aa9142 SHA512 1caf25d5e332d7de313b6be73e753fdde7b02235af564a9c06517f5874127998eeed731388617b75f54be6fec21835b78a54ce6c7162a33e25411fe3c78efee7 +DIST binutils-2.29.1-patches-3.tar.xz 20904 BLAKE2B 5549cb2412123e4ad3a13935762cc0dca46215950dbf38a149caf4c6416da382a0fd7ecffe97b10bce4dfdcef5edc2673d49bb21e9d37be37e33b454a8c2bc1a SHA512 ba54efaf9e9f668d2922972acd2cdf5c3e6f174cfcc73d29953ab4ba6e157ce0cb500c583568a4e3baaaa92c9d30c394a327f29b51292acc66f8d3f20f5eae2a +DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7cabae424cff5e8495d1f064da24b6ef9e1c19d1d1adad2dca7142372782023f66b4b4223170a49b96ba3834266fe878 SHA512 4063d34555526922376ccceb3f14b43e287442e82a8038cf50f4f51ad97d438c672c0e310ca4b856c9aff5aa9911073e256e8298a7a3f1844eeb60b90d955592 +EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289 +MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d diff -uNr a/sys-devel/binutils/binutils-2.29.1-r1.ebuild b/sys-devel/binutils/binutils-2.29.1-r1.ebuild --- a/sys-devel/binutils/binutils-2.29.1-r1.ebuild false +++ b/sys-devel/binutils/binutils-2.29.1-r1.ebuild 6cf29f02826a85ee43be5188f7e3bc5d66b87f40102899bc5998a5f933decd77f82c9c4d30bb66d4ba0c925f6717a37c4a97963d385af50d9e39f3d94b2b57ab @@ -0,0 +1,12 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PATCHVER="3" +ELF2FLT_VER="" +inherit toolchain-binutils + +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" + +PATCHES=( "${FILESDIR}/${P}-nogoldtest.patch" ) diff -uNr a/sys-devel/binutils/files/binutils-2.29.1-nogoldtest.patch b/sys-devel/binutils/files/binutils-2.29.1-nogoldtest.patch --- a/sys-devel/binutils/files/binutils-2.29.1-nogoldtest.patch false +++ b/sys-devel/binutils/files/binutils-2.29.1-nogoldtest.patch e42f5f8cc55fcc3a6102be03ba08a3384fa203817179e66c04350969cac5f1f4425d0ebbb6ffaf2fb069d2dd917f3d83b10c215b28a8a9c9eca83611c8a2b1f1 @@ -0,0 +1,27 @@ +From 40f6e93e5078f16897f23856886566fe3b546206 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Fri, 3 Nov 2017 21:51:35 +0100 +Subject: [PATCH] Gentoo: Disable gold testsuite for users since it fails + upstream + +https://bugs.gentoo.org/634348 +https://sourceware.org/bugzilla/show_bug.cgi?id=21090 +--- + Makefile.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 3acb83b8de..49de829bfa 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -2340,7 +2340,6 @@ check-host: \ + maybe-check-mpc \ + maybe-check-isl \ + maybe-check-libelf \ +- maybe-check-gold \ + maybe-check-gprof \ + maybe-check-intl \ + maybe-check-tcl \ +-- +2.15.0 + diff -uNr a/sys-devel/binutils/files/binutils-configure-LANG.patch b/sys-devel/binutils/files/binutils-configure-LANG.patch --- a/sys-devel/binutils/files/binutils-configure-LANG.patch false +++ b/sys-devel/binutils/files/binutils-configure-LANG.patch 70fce17b82901bb1d7bf144e25b72bb2cf6071b0c851582ed52f94d1935f2a04ff6e70f42026cece1b8d49ae4c34503c30092b420bba0e35d1aa1f643d15fc19 @@ -0,0 +1,65 @@ +The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in +option parsing, it may break. + +http://bugs.gentoo.org/103483 +http://bugs.gentoo.org/122216 + +--- configure ++++ configure +@@ -54,6 +54,19 @@ + infodir='${prefix}/info' + mandir='${prefix}/man' + ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ unset $as_var ++ fi ++done ++ + # Initialize some other variables. + subdirs= + MFLAGS= MAKEFLAGS= +@@ -452,16 +463,6 @@ + esac + done + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +- + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -rf conftest* confdefs.h + # AIX cpp loses on an empty file, so make sure it contains at least a newline. +@@ -1850,6 +1850,19 @@ + # Compiler output produced by configure, useful for debugging + # configure, is in ./config.log if it exists. + ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then ++ eval \$as_var=C; export \$as_var ++ else ++ unset \$as_var ++ fi ++done ++ + ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" + for ac_option + do diff -uNr a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml --- a/sys-devel/binutils/metadata.xml false +++ b/sys-devel/binutils/metadata.xml cda428dbc6f23ef4f2cedf8ddfc456aa38c02a25ebcf5bd24cc7a1737c43e45544ad8945ddb58ba609601acaaf532380db5c5cdf64711f89fc2c772b54d38cc2 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> +<email>toolchain@gentoo.org</email> +<name>Gentoo Toolchain Project</name> +</maintainer> +<use> +<flag name="multitarget">Adds support to binutils for cross compiling (does not work with gas)</flag> +</use> +<upstream> +<remote-id type="cpe">cpe:/a:gnu:binutils</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest --- a/sys-devel/binutils-config/Manifest false +++ b/sys-devel/binutils-config/Manifest e30fbd558bcbaa9768f64dffd22ded6e36f89f6021a7b1f3e03e71d4a1bdcb3fbc538a1649747287bb73fe2162f6dac5569f38c802de3e2178429d9bb0e0c26e @@ -0,0 +1,6 @@ +AUX binutils-config-5 12583 BLAKE2B 154ec05047c0b66fe8ed2164c388c8b3b91fcd83cd807b98bc01cd5792692d7b0e8d42e991083757e619ecfaecb1403fb141364b00660c81ea728df3baec28b5 SHA512 cbe8c6840096f30c49135f51f8c67e59fb53733fba902c5e458bbb1cc00f4c469ad768ba12d5f0d50996b2f3d19ba2060c91f771b73197a41b257112bf137429 +AUX binutils-config-5.1 12386 BLAKE2B 23ea0165db58116fc2e8655f09a094e8dfc2cad51d58df5bf45eaa78a01e73c45e17cfa845aadcf65828f2ff7b149a01e9188ae85e3f56c8c83170078211cd69 SHA512 79cd64c734650d76e47e4e6a84aab408ca39d04b57fbd6ecbe953089f246e52c05a6d3d1dd69ff8864e71246c8b6f53f4b89902963ae4f6b7194b949cb0f724c +AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455 +AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203 +EBUILD binutils-config-5-r4.ebuild 1116 BLAKE2B 43903ecf891d48aaa1a55aa76a0c3f786af3938305fce38074bc829f8201b6ba41760c31b956257a37dc39362330de90167f64134f381eb106b5749dc06067a9 SHA512 32586f809e5ec53b9d08204264711048c1fbf6e41ec1daf8f68a4573cc42e4b5c4698b9dd8cd333195f9548897eeb0edbc2fbc27b60b22302283d04b77c0a4b6 +MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 diff -uNr a/sys-devel/binutils-config/binutils-config-5-r4.ebuild b/sys-devel/binutils-config/binutils-config-5-r4.ebuild --- a/sys-devel/binutils-config/binutils-config-5-r4.ebuild false +++ b/sys-devel/binutils-config/binutils-config-5-r4.ebuild 2b991809cc9242c6a2e7b56cd66016c8f505e8ff774440678476986d1f5370b6d457c0d3db32d5be6ca176805e4cc2a89a949104c826961263e1d19202f39647 @@ -0,0 +1,43 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit prefix + +DESCRIPTION="Utility to change the binutils version being used" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +# We also RDEPEND on sys-apps/findutils which is in base @system +RDEPEND="sys-apps/gentoo-functions + !<app-admin/eselect-1.4.5" + +S=${WORKDIR} + +src_install() { + newbin "${FILESDIR}"/${PN}-${PV} ${PN} + use prefix && eprefixify "${ED}"/usr/bin/${PN} + sed -i "s:@PV@:${PVR}:g" "${ED}"/usr/bin/${PN} || die + doman "${FILESDIR}"/${PN}.8 + + insinto /usr/share/eselect/modules + doins "${FILESDIR}"/binutils.eselect +} + +pkg_preinst() { + # Force a refresh when upgrading from an older version that symlinked + # in all the libs & includes that binutils-libs handles. #528088 + if has_version "<${CATEGORY}/${PN}-5" ; then + local bc current + bc="${ED}/usr/bin/binutils-config" + if current=$("${bc}" -c) ; then + "${bc}" "${current}" + fi + fi +} diff -uNr a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5 --- a/sys-devel/binutils-config/files/binutils-config-5 false +++ b/sys-devel/binutils-config/files/binutils-config-5 df08f8977779bf5bf9fbbdbe85a8a52895b5cc9aea5854582cc964e3cd56dfd15d8592eaba171c5d77b175ef00cc6bcf710d8e15064bce1fa26b7506d33819ab @@ -0,0 +1,490 @@ +#!/bin/bash +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Format of /etc/env.d/binutils/: +# config-TARGET: CURRENT=version for TARGET +# TARGET-VER: has a TARGET and VER variable + +EPREFIX="@GENTOO_PORTAGE_EPREFIX@" +if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then + EPREFIX="" +fi + +: ${ROOT:=/} +[[ ${ROOT} != */ ]] && ROOT="${ROOT}/" +[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}" + +EROOT="${ROOT%/}${EPREFIX}/" + +cd "${EPREFIX}/" + +trap ":" INT QUIT TSTP + +argv0=${0##*/} +FUNCTIONS_SH="${EPREFIX}/lib/gentoo/functions.sh" +source ${FUNCTIONS_SH} || { + echo "${argv0}: Could not source ${FUNCTIONS_SH}!" 1>&2 + exit 1 +} +esyslog() { :; } +die() { eerror "${argv0}: $*"; exit 1; } +umask 022 + +usage() { +cat << USAGE_END +Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}[binutils profile]${NORMAL} + +${HILITE}General Options:${NORMAL} + ${GOOD}-c, --get-current-profile${NORMAL} Print current profile + ${GOOD}-l, --list-profiles${NORMAL} Print a list of available profiles + ${GOOD}-u, --uninstall${NORMAL} Remove all signs of specified target + ${GOOD}-d, --debug${NORMAL} Execute with debug output + +${HILITE}General Cruft:${NORMAL} + ${GOOD}--linker${NORMAL} <linker> Switch to specified linker (if supported) + +Profile names are of the form: ${BRACKET}<CTARGET>-<binutils version>${NORMAL} +For example: ${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL} + +For more info, please see ${HILITE}binutils-config${NORMAL}(8). +USAGE_END + + exit ${1:-1} +} + +mv_if_diff() { + if cmp -s "$1" "$2" ; then + rm -f "$1" + else + mv -f "$1" "$2" + fi +} +atomic_ln() { + local target=$1 linkdir=$2 linkname=$3 linktmp linkfull + linktmp="${linkdir}/.binutils-config.tmp.${linkname}" + linkfull="${linkdir}/${linkname}" + if [[ -d ${linkfull} ]] ; then + # if linking to a dir, we need a little magic to + # make it atomic since `mv -T` is not portable + rm -rf "${linktmp}" + mkdir -p "${linktmp}" + ln -sf "${target}" "${linktmp}/${linkname}" + mv "${linktmp}/${linkname}" "${linktmp}/../" + rmdir "${linktmp}" + else + # `ln` will expand into unlink();symlink(); which + # is not atomic for a small amount of time, but + # `mv` is a single rename() call + ln -sf "${target}" "${linktmp}" + mv "${linktmp}" "${linkfull}" + fi +} + +setup_env() { + unset TARGET VER LIBPATH + source "${ENV_D}/${PROFILE}" + if [[ -z ${TARGET} ]] ; then + eerror "${PROFILE} is invalid (no \$TARGET defined) :(" + return 1 + fi + if [[ -z ${VER} ]] ; then + eerror "${PROFILE} is invalid (no \$VER defined) :(" + return 1 + fi + + # + # Generate binary symlinks + # + BINPATH="" + BINPATH_LINKS="" + if [[ ${TARGET} != ${HOST} ]] ; then + # + # Newer paths: /usr/${HOST}/${TARGET}/... + # Older paths: /usr/${TARGET}/... + # + if [[ -d "${EROOT}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then + BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} + BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET} + fi + fi + if [[ -z ${BINPATH} ]] ; then + BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER} + BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin + fi +} + +# Lists of headers that various versions have installed. +HEADERS=( + ansidecl.h bfd.h bfdlink.h demangle.h dis-asm.h dyn-string.h + fibheap.h hashtab.h libiberty.h objalloc.h plugin-api.h + splay-tree.h symcat.h +) + +switch_profile() { + local x + + ebegin "Switching to ${PROFILE}" + + setup_env || return 1 + + cd "${ROOT}/${BINPATH}" || exit 1 + mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin" + for x in * ; do + atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}" + atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin" "${TARGET}-${x}" + if [[ ${TARGET} == ${HOST} ]] ; then + atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}" + fi + done + + # + # Generate library / ldscripts symlinks + # + : ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}} + cd "${ROOT}/${LIBPATH}" || exit 1 + if [[ ${TARGET} == ${HOST} ]] ; then + dstlib=${EROOT}/usr/${HOST}/lib + else + dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib + fi + # When upgrading, we need to clean up ldscripts and libs. + # Don't symlink back in the libs -- the binutils-lib package handles + # these now. + # TODO: Stop requiring even the ldscripts symlink. + mkdir -p "${dstlib}" + rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts + atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" + find -L "${dstlib}" -xtype l -name 'lib*' -delete + # Detect older binutils w/broken rpaths. #562460 + # We can hardcode the "/lib" part since that's what the binutils + # configure scripts have. They did not include any other path. + if [[ $(scanelf -qF '%r#F' "${ROOT}/${BINPATH}/as") == */lib ]] ; then + ewarn "Old cross-binutils detected; please re-emerge to fix (see bug #562460)." + for x in lib* ; do + atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}" + done + fi + + # + # Clean out old generated include symlinks + # + INCPATH=${LIBPATH}/include + if [[ -d ${ROOT}/${INCPATH} ]] ; then + cd "${ROOT}/${INCPATH}" || exit 1 + if [[ ${HOST} == ${TARGET} ]] ; then + # The binutils-lib package handles these files now. + for x in libiberty "${HEADERS[@]}" ; do + x="${EROOT}/usr/include/${x}" + if [[ -L ${x} ]] ; then + rm "${x}" + fi + done + else + # Clean out old path -- cannot use '-exec {} +' syntax here + find . -type f -exec rm -f "${EROOT}/usr/${TARGET}/usr/include/{}" \; + rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null + rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null + rmdir "${EROOT}/usr/${TARGET}" >& /dev/null + fi + fi + + # + # Make sure proper paths get updated + # + local env_update_flag="--no-ldconfig" + if [[ ${TARGET} == ${HOST} ]] ; then + # Delete old config now that binutils-libs installs these files. + # Note: This skips ldconfig update if env.d had LDPATH, but meh. + # Most people have upgraded to ld.so.conf.d, and someone else will + # eventually re-run ldconfig for us. + x="${EROOT}"/etc/ld.so.conf.d/05binutils.conf + if [[ -e ${x} ]]; then + rm -f "${x}" + env_update_flag="" + fi + + DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER} + local e="${EROOT}"/etc/env.d/05binutils + local ee="${e}.tmp" + rm -f "${ee}" + [[ -d ${ROOT}/${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}" + [[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}" + mv_if_diff "${ee}" "${e}" + fi + + local c="${ENV_D}/config-${TARGET}" + local cc="${c}.tmp" + echo "CURRENT=${VER}" > "${cc}" + mv_if_diff "${cc}" "${c}" + + eend 0 + + # + # Regen env.d if need/can be + # + if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then + env-update ${env_update_flag} + echo + ewarn "Please remember to run:" + echo + ewarn " # . ${EPREFIX}/etc/profile" + echo + fi + + return 0 +} + +uninstall_target() { + : ${TARGET:=${UARG}} + + if [[ ${TARGET} == ${HOST} ]] ; then + die "refusing to uninstall native binutils" + fi + + shopt -s nullglob + PROFILE="" + + for PROFILE in "${ENV_D}"/${TARGET}-* ; do + ewarn "Removing all signs of ${PROFILE##*/}" + rm -f "${ENV_D}"/${PROFILE} + done + if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then + die "no profiles exist for '${TARGET}'" + fi + + rm -f "${ENV_D}"/config-${TARGET} + + local x + for x in \ + addr2line ar as c++filt dwp elf2flt elfedit flthdr gprof \ + ld ld.{bfd,gold,real} \ + nm objcopy objdump ranlib readelf size strings strip + do + x=( + "${EROOT}"/usr/bin/${TARGET}-${x} + "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x} + "${EROOT}"/usr/libexec/gcc/${TARGET}/${x} + ) + rm -f "${x[@]}" + done + for x in "${HEADERS[@]}" ; do + rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x} + done + for x in bfd iberty opcodes ; do + rm -f "${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la} + done + # Delete broken symlinks + local destdir="${EROOT}/usr/${HOST}/${TARGET}" + rm -f "${destdir}"/lib/ldscripts + find -L "${destdir}"/lib -type l -exec rm {} + + rmdir \ + "${destdir}"/{bin,include,lib,usr} \ + "${destdir}" \ + "${EROOT}"/var/db/pkg/cross-${TARGET} \ + "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \ + "${EROOT}"/usr/libexec/gcc/${TARGET} \ + 2>/dev/null + + rm -f "${ENV_D}"/${TARGET}-* +} + +set_current_profile() { + if [[ ! -f ${ENV_D}/config-${TARGET} ]] ; then + eerror "${argv0}: unable to locate a profile for target: ${TARGET}" + return 1 + fi + + source "${ENV_D}/config-${TARGET}" + + if [[ -z ${CURRENT} ]] ; then + eerror "${argv0}: no binutils profile is active!" + return 1 + fi + + echo "${TARGET}-${CURRENT}" + + return 0 +} +get_current_profile() { echo "${PROFILE}" ; } + +list_profiles() { + local x i target + + if [[ ${ROOT} != / ]] ; then + echo "Using binutils-config info in ${ROOT}" + fi + + set -- "${ENV_D}"/* + target= + i=1 + + for x ; do + # skip broken links and config files + [[ -f ${x} ]] || continue + [[ ${x} == */config-* ]] && continue + + source "${x}" + if [[ ${target} != ${TARGET} ]] ; then + [[ -n ${target} ]] && echo + target=${TARGET} + fi + + x=${x##*/} + if [[ -e ${ENV_D}/config-${TARGET} ]] ; then + source "${ENV_D}/config-${TARGET}" + if [[ ${VER} == ${CURRENT} ]] ; then + [[ ${TARGET} == ${HOST} ]] \ + && x="${x} ${GOOD}*${NORMAL}" \ + || x="${x} ${HILITE}*${NORMAL}" + fi + fi + + # We would align the [...] field like so: + #printf ' [%*ss] %s\n' ${##} "${i}" "${x}" + # but this breaks simple scripting: `binutils -l | awk '{print $2}'` + + # Or we could align the target col like so: + #printf ' [%s]%*s %s\n' "${i}" $(( ${##} - ${#i} )) "" "${x}" + # but i'm not sold that it looks better + + # So keep it simple ... only makes a diff anyways for crazy people + # like me which have 100+ binutils packages installed ... + echo " [$i] ${x}" + ((++i)) + done +} + +switch_linker() { + local bpath ld=$1 + + case ${ld} in + ld.*) ;; + *) die "not supported: linker must start with 'ld.'" ;; + esac + + setup_env || return 1 + bpath="${ROOT}/${BINPATH}" + + # does this binutils even support the requested linker ? + if [[ ! -e ${bpath}/${ld} ]] ; then + die "sorry, but ${PROFILE} doesn't support the ${ld} linker" + fi + + # switch it up + ebegin "Setting default linker to ${ld} for ${PROFILE}" + atomic_ln ${ld} "${bpath}" ld + eend $? +} + +set_HOST() { + # Set HOST to CHOST if it isn't already set + : ${HOST:=${CHOST:-$(portageq envvar CHOST)}} +} + +ENV_D="${EROOT}etc/env.d/binutils" + +DEBUG="no" +NEED_ACTION="yes" +DOIT="switch_profile" +PROFILE="current" +HOST="" +TARGET="" +unset UARG + +select_action() { + if [[ ${NEED_ACTION} != "no" ]] ; then + NEED_ACTION="no" + DOIT=$1 + else + die "one action at a time!" + fi +} + +while [[ $# -gt 0 ]] ; do + x=$1 + shift + case ${x} in + -c|--get-current-profile) select_action get_current_profile ;; + -l|--list|--list-profiles) select_action list_profiles ;; + -u|--uninstall) select_action uninstall_target ;; + --linker) select_action "switch_linker $1"; shift ;; + -d|--debug) DEBUG="yes" ;; + -h|--help) usage 0 ;; + -V|--version) + ver="@PV@" + echo "binutils-config-${ver/@'PV'@/git}" + exit 0 + ;; + -*) + die "invalid switch! Try '--help'." + ;; + *) + if [[ ${UARG+set} == "set" ]] ; then + die "only one profile/target at a time please" + fi + NEED_ACTION="maybe" + UARG=${x} + ;; + esac +done + +[[ ${NEED_ACTION} == "yes" ]] && usage 1 +[[ ${DEBUG} == "yes" ]] && set -x + +# All operations need to know the current HOST to figure out +# what is a native target and what is a cross target +set_HOST + +# All operations need to know the profile the user wants +case ${DOIT} in +switch_profile|switch_linker_*) + # decode user's profile choice + x=${UARG:-$(TARGET=${HOST} set_current_profile)} + PROFILE="" + if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then + # User gave us a # representing the profile + i=1 + for y in "${ENV_D}"/* ; do + [[ ${y/config-} != ${y} ]] && continue + + if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]] ; then + PROFILE=${y##*/} + break + fi + ((++i)) + done + fi + + if [[ -z ${PROFILE} ]] ; then + # User gave us a full HOST-ver + x=${x##*/} + if [[ -f ${ENV_D}/${x} ]] ; then + # Valid HOST-ver yeah! + PROFILE=${x} + else + # Not a valid HOST-ver ... + if [[ ! -f ${ENV_D}/config-${x} ]] ; then + # Maybe they just gave us a ver ... + if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then + x=${HOST}-${x} + else + die "could not locate '$x' in '${ENV_D}/'!" + fi + PROFILE=${x} + else + # Maybe they just gave us a target ... pick active profile + PROFILE=$(TARGET=${x} set_current_profile) + fi + fi + fi + ;; +*) + # lookup current profile as the user gave us a target + PROFILE=$(TARGET=${UARG:-${HOST}} set_current_profile) || exit 1 + ;; +esac + +eval ${DOIT} + +# vim:ts=4 diff -uNr a/sys-devel/binutils-config/files/binutils-config-5.1 b/sys-devel/binutils-config/files/binutils-config-5.1 --- a/sys-devel/binutils-config/files/binutils-config-5.1 false +++ b/sys-devel/binutils-config/files/binutils-config-5.1 70b617d9c06a3729db26ecb88fd7d219fe62b28f8e7d8dd9d319585e85e338487af93c1b64c897f0b1696ffac514f1c2afd74669630a4693533b01b2a7e81333 @@ -0,0 +1,482 @@ +#!/bin/bash +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Format of /etc/env.d/binutils/: +# config-TARGET: CURRENT=version for TARGET +# TARGET-VER: has a TARGET and VER variable + +EPREFIX="@GENTOO_PORTAGE_EPREFIX@" +if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then + EPREFIX="" +fi + +: ${ROOT:=/} +[[ ${ROOT} != */ ]] && ROOT="${ROOT}/" +[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}" + +EROOT="${ROOT%/}${EPREFIX}/" + +cd "${EPREFIX}/" + +trap ":" INT QUIT TSTP + +argv0=${0##*/} +FUNCTIONS_SH="${EPREFIX}/lib/gentoo/functions.sh" +source ${FUNCTIONS_SH} || { + echo "${argv0}: Could not source ${FUNCTIONS_SH}!" 1>&2 + exit 1 +} +esyslog() { :; } +die() { eerror "${argv0}: $*"; exit 1; } +umask 022 + +usage() { +cat << USAGE_END +Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}[binutils profile]${NORMAL} + +${HILITE}General Options:${NORMAL} + ${GOOD}-c, --get-current-profile${NORMAL} Print current profile + ${GOOD}-l, --list-profiles${NORMAL} Print a list of available profiles + ${GOOD}-u, --uninstall${NORMAL} Remove all signs of specified target + ${GOOD}-d, --debug${NORMAL} Execute with debug output + +${HILITE}General Cruft:${NORMAL} + ${GOOD}--linker${NORMAL} <linker> Switch to specified linker (if supported) + +Profile names are of the form: ${BRACKET}<CTARGET>-<binutils version>${NORMAL} +For example: ${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL} + +For more info, please see ${HILITE}binutils-config${NORMAL}(8). +USAGE_END + + exit ${1:-1} +} + +mv_if_diff() { + if cmp -s "$1" "$2" ; then + rm -f "$1" + else + mv -f "$1" "$2" + fi +} +atomic_ln() { + local target=$1 linkdir=$2 linkname=$3 linktmp linkfull + linktmp="${linkdir}/.binutils-config.tmp.${linkname}" + linkfull="${linkdir}/${linkname}" + if [[ -d ${linkfull} ]] ; then + # if linking to a dir, we need a little magic to + # make it atomic since `mv -T` is not portable + rm -rf "${linktmp}" + mkdir -p "${linktmp}" + ln -sf "${target}" "${linktmp}/${linkname}" + mv "${linktmp}/${linkname}" "${linktmp}/../" + rmdir "${linktmp}" + else + # `ln` will expand into unlink();symlink(); which + # is not atomic for a small amount of time, but + # `mv` is a single rename() call + ln -sf "${target}" "${linktmp}" + mv "${linktmp}" "${linkfull}" + fi +} + +setup_env() { + unset TARGET VER LIBPATH + source "${ENV_D}/${PROFILE}" + if [[ -z ${TARGET} ]] ; then + eerror "${PROFILE} is invalid (no \$TARGET defined) :(" + return 1 + fi + if [[ -z ${VER} ]] ; then + eerror "${PROFILE} is invalid (no \$VER defined) :(" + return 1 + fi + + # + # Generate binary symlinks + # + BINPATH="" + BINPATH_LINKS="" + if [[ ${TARGET} != ${HOST} ]] ; then + # + # Newer paths: /usr/${HOST}/${TARGET}/... + # Older paths: /usr/${TARGET}/... + # + if [[ -d "${EROOT}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then + BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} + BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET} + fi + fi + if [[ -z ${BINPATH} ]] ; then + BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER} + BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin + fi +} + +# Lists of headers that various versions have installed. +HEADERS=( + ansidecl.h bfd.h bfdlink.h demangle.h dis-asm.h dyn-string.h + fibheap.h hashtab.h libiberty.h objalloc.h plugin-api.h + splay-tree.h symcat.h +) + +switch_profile() { + local x + + ebegin "Switching to ${PROFILE}" + + setup_env || return 1 + + cd "${ROOT}/${BINPATH}" || exit 1 + mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin" + for x in * ; do + atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}" + atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin" "${TARGET}-${x}" + if [[ ${TARGET} == ${HOST} ]] ; then + atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}" + fi + done + + # + # Generate library / ldscripts symlinks + # + : ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}} + cd "${ROOT}/${LIBPATH}" || exit 1 + if [[ ${TARGET} == ${HOST} ]] ; then + dstlib=${EROOT}/usr/${HOST}/lib + else + dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib + fi + # When upgrading, we need to clean up ldscripts and libs. + # Don't symlink back in the libs -- the binutils-lib package handles + # these now. + # TODO: Stop requiring even the ldscripts symlink. + mkdir -p "${dstlib}" + rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts + atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" + find -L "${dstlib}" -xtype l -name 'lib*' -delete + # Detect older binutils w/broken rpaths. #562460 + # We can hardcode the "/lib" part since that's what the binutils + # configure scripts have. They did not include any other path. + if [[ $(scanelf -qF '%r#F' "${ROOT}/${BINPATH}/as") == */lib ]] ; then + ewarn "Old cross-binutils detected; please re-emerge to fix (see bug #562460)." + for x in lib* ; do + atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}" + done + fi + + # + # Clean out old generated include symlinks + # + INCPATH=${LIBPATH}/include + if [[ -d ${ROOT}/${INCPATH} ]] ; then + cd "${ROOT}/${INCPATH}" || exit 1 + if [[ ${HOST} != ${TARGET} ]] ; then + # Clean out old path -- cannot use '-exec {} +' syntax here + find . -type f -exec rm -f "${EROOT}/usr/${TARGET}/usr/include/{}" \; + rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null + rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null + rmdir "${EROOT}/usr/${TARGET}" >& /dev/null + fi + fi + + # + # Make sure proper paths get updated + # + local env_update_flag="--no-ldconfig" + if [[ ${TARGET} == ${HOST} ]] ; then + # Delete old config now that binutils-libs installs these files. + # Note: This skips ldconfig update if env.d had LDPATH, but meh. + # Most people have upgraded to ld.so.conf.d, and someone else will + # eventually re-run ldconfig for us. + x="${EROOT}"/etc/ld.so.conf.d/05binutils.conf + if [[ -e ${x} ]]; then + rm -f "${x}" + env_update_flag="" + fi + + DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER} + local e="${EROOT}"/etc/env.d/05binutils + local ee="${e}.tmp" + rm -f "${ee}" + [[ -d ${ROOT}/${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}" + [[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}" + mv_if_diff "${ee}" "${e}" + fi + + local c="${ENV_D}/config-${TARGET}" + local cc="${c}.tmp" + echo "CURRENT=${VER}" > "${cc}" + mv_if_diff "${cc}" "${c}" + + eend 0 + + # + # Regen env.d if need/can be + # + if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then + env-update ${env_update_flag} + echo + ewarn "Please remember to run:" + echo + ewarn " # . ${EPREFIX}/etc/profile" + echo + fi + + return 0 +} + +uninstall_target() { + : ${TARGET:=${UARG}} + + if [[ ${TARGET} == ${HOST} ]] ; then + die "refusing to uninstall native binutils" + fi + + shopt -s nullglob + PROFILE="" + + for PROFILE in "${ENV_D}"/${TARGET}-* ; do + ewarn "Removing all signs of ${PROFILE##*/}" + rm -f "${ENV_D}"/${PROFILE} + done + if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then + die "no profiles exist for '${TARGET}'" + fi + + rm -f "${ENV_D}"/config-${TARGET} + + local x + for x in \ + addr2line ar as c++filt dwp elf2flt elfedit flthdr gprof \ + ld ld.{bfd,gold,real} \ + nm objcopy objdump ranlib readelf size strings strip + do + x=( + "${EROOT}"/usr/bin/${TARGET}-${x} + "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x} + "${EROOT}"/usr/libexec/gcc/${TARGET}/${x} + ) + rm -f "${x[@]}" + done + for x in "${HEADERS[@]}" ; do + rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x} + done + for x in bfd iberty opcodes ; do + rm -f "${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la} + done + # Delete broken symlinks + local destdir="${EROOT}/usr/${HOST}/${TARGET}" + rm -f "${destdir}"/lib/ldscripts + find -L "${destdir}"/lib -type l -exec rm {} + + rmdir \ + "${destdir}"/{bin,include,lib,usr} \ + "${destdir}" \ + "${EROOT}"/var/db/pkg/cross-${TARGET} \ + "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \ + "${EROOT}"/usr/libexec/gcc/${TARGET} \ + 2>/dev/null + + rm -f "${ENV_D}"/${TARGET}-* +} + +set_current_profile() { + if [[ ! -f ${ENV_D}/config-${TARGET} ]] ; then + eerror "${argv0}: unable to locate a profile for target: ${TARGET}" + return 1 + fi + + source "${ENV_D}/config-${TARGET}" + + if [[ -z ${CURRENT} ]] ; then + eerror "${argv0}: no binutils profile is active!" + return 1 + fi + + echo "${TARGET}-${CURRENT}" + + return 0 +} +get_current_profile() { echo "${PROFILE}" ; } + +list_profiles() { + local x i target + + if [[ ${ROOT} != / ]] ; then + echo "Using binutils-config info in ${ROOT}" + fi + + set -- "${ENV_D}"/* + target= + i=1 + + for x ; do + # skip broken links and config files + [[ -f ${x} ]] || continue + [[ ${x} == */config-* ]] && continue + + source "${x}" + if [[ ${target} != ${TARGET} ]] ; then + [[ -n ${target} ]] && echo + target=${TARGET} + fi + + x=${x##*/} + if [[ -e ${ENV_D}/config-${TARGET} ]] ; then + source "${ENV_D}/config-${TARGET}" + if [[ ${VER} == ${CURRENT} ]] ; then + [[ ${TARGET} == ${HOST} ]] \ + && x="${x} ${GOOD}*${NORMAL}" \ + || x="${x} ${HILITE}*${NORMAL}" + fi + fi + + # We would align the [...] field like so: + #printf ' [%*ss] %s\n' ${##} "${i}" "${x}" + # but this breaks simple scripting: `binutils -l | awk '{print $2}'` + + # Or we could align the target col like so: + #printf ' [%s]%*s %s\n' "${i}" $(( ${##} - ${#i} )) "" "${x}" + # but i'm not sold that it looks better + + # So keep it simple ... only makes a diff anyways for crazy people + # like me which have 100+ binutils packages installed ... + echo " [$i] ${x}" + ((++i)) + done +} + +switch_linker() { + local bpath ld=$1 + + case ${ld} in + ld.*) ;; + *) die "not supported: linker must start with 'ld.'" ;; + esac + + setup_env || return 1 + bpath="${ROOT}/${BINPATH}" + + # does this binutils even support the requested linker ? + if [[ ! -e ${bpath}/${ld} ]] ; then + die "sorry, but ${PROFILE} doesn't support the ${ld} linker" + fi + + # switch it up + ebegin "Setting default linker to ${ld} for ${PROFILE}" + atomic_ln ${ld} "${bpath}" ld + eend $? +} + +set_HOST() { + # Set HOST to CHOST if it isn't already set + : ${HOST:=${CHOST:-$(portageq envvar CHOST)}} +} + +ENV_D="${EROOT}etc/env.d/binutils" + +DEBUG="no" +NEED_ACTION="yes" +DOIT="switch_profile" +PROFILE="current" +HOST="" +TARGET="" +unset UARG + +select_action() { + if [[ ${NEED_ACTION} != "no" ]] ; then + NEED_ACTION="no" + DOIT=$1 + else + die "one action at a time!" + fi +} + +while [[ $# -gt 0 ]] ; do + x=$1 + shift + case ${x} in + -c|--get-current-profile) select_action get_current_profile ;; + -l|--list|--list-profiles) select_action list_profiles ;; + -u|--uninstall) select_action uninstall_target ;; + --linker) select_action "switch_linker $1"; shift ;; + -d|--debug) DEBUG="yes" ;; + -h|--help) usage 0 ;; + -V|--version) + ver="@PV@" + echo "binutils-config-${ver/@'PV'@/git}" + exit 0 + ;; + -*) + die "invalid switch! Try '--help'." + ;; + *) + if [[ ${UARG+set} == "set" ]] ; then + die "only one profile/target at a time please" + fi + NEED_ACTION="maybe" + UARG=${x} + ;; + esac +done + +[[ ${NEED_ACTION} == "yes" ]] && usage 1 +[[ ${DEBUG} == "yes" ]] && set -x + +# All operations need to know the current HOST to figure out +# what is a native target and what is a cross target +set_HOST + +# All operations need to know the profile the user wants +case ${DOIT} in +switch_profile|switch_linker_*) + # decode user's profile choice + x=${UARG:-$(TARGET=${HOST} set_current_profile)} + PROFILE="" + if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then + # User gave us a # representing the profile + i=1 + for y in "${ENV_D}"/* ; do + [[ ${y/config-} != ${y} ]] && continue + + if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]] ; then + PROFILE=${y##*/} + break + fi + ((++i)) + done + fi + + if [[ -z ${PROFILE} ]] ; then + # User gave us a full HOST-ver + x=${x##*/} + if [[ -f ${ENV_D}/${x} ]] ; then + # Valid HOST-ver yeah! + PROFILE=${x} + else + # Not a valid HOST-ver ... + if [[ ! -f ${ENV_D}/config-${x} ]] ; then + # Maybe they just gave us a ver ... + if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then + x=${HOST}-${x} + else + die "could not locate '$x' in '${ENV_D}/'!" + fi + PROFILE=${x} + else + # Maybe they just gave us a target ... pick active profile + PROFILE=$(TARGET=${x} set_current_profile) + fi + fi + fi + ;; +*) + # lookup current profile as the user gave us a target + PROFILE=$(TARGET=${UARG:-${HOST}} set_current_profile) || exit 1 + ;; +esac + +eval ${DOIT} + +# vim:ts=4 diff -uNr a/sys-devel/binutils-config/files/binutils-config.8 b/sys-devel/binutils-config/files/binutils-config.8 --- a/sys-devel/binutils-config/files/binutils-config.8 false +++ b/sys-devel/binutils-config/files/binutils-config.8 a22684a920ac92a50d713077aa8510f98f76b4e7ff8768682244b0f42b804d0f97aeff78860883c4a58cddeefda90bc37557d6d448d64a2fa2d97ea9e07a9cc9 @@ -0,0 +1,73 @@ +.TH "BINUTILS-CONFIG" "8" "Jan 2005" "Gentoo" "Gentoo" +.SH "NAME" +binutils-config \- manage active versions of the binutils programs +.SH "DESCRIPTION" +The \fBbinutils-config\fR script allows you to switch between different +versions of binutils when you have installed multiple copies (see +USE=multislot). It also allows you to manage multiple cross-compiling +targets simultaneously. + +Remember, you may have one version of binutils active per \fICTARGET\fR, +and changing the version for one target has no bearing on any other. So +changing an active cross-compiler will not break your native compiler +(i.e. \fICHOST\fR). +.SH "SYNOPSIS" +\fBbinutils-config\fR [\fIcrufty options\fR] \fIPROFILE\fR + +\fBbinutils-config\fR \fB--get-current-profile\fR \fI[TARGET]\fR + +\fBbinutils-config\fR \fB--list-profiles\fR + +\fBbinutils-config\fR \fB--uninstall\fR \fITARGET\fR +.SH "GENERIC OPTIONS" +.TP +\fBPROFILE\fR +Change the system to use the specified binutils version. This may take the +form of the list index number (the number shown on the left in the +\fB\-\-list\-profiles\fR output), a full \fITARGET-VERSION\fR (useful when +working with cross-compilers), just a \fITARGET\fR where the \fIVERSION\fR +is picked from the active, or just a binutils \fIVERSION\fR where the +\fITARGET\fR is assumed to be the native \fIHOST\fR value. +.TP +\fBTARGET\fR +Similiar to \fBPROFILE\fR, but this is only the target and no version info +(i.e. \fICTARGET\fR or \fICHOST\fR). +.TP +\fB\-c\fR, \fB\-\-get\-current\-profile\fR \fI[TARGET]\fR +Display the active profile for \fITARGET\fR. If none is specified, the +host system's \fITARGET\fR will be shown (i.e. \fICHOST\fR). +.TP +\fB\-l\fR, \fB\-\-list\-profiles\fR +Show all the profiles that your system currently has installed and what +versions are active. The active native version is noted with a bright green +asterisk while the active cross-compiler versions are noted with a light blue +asterisk. +.TP +\fB-u\fR, \fB\-\-uninstall\fR \fITARGET\fR +This is really for internal use only. Used to remove all traces of the +\fITARGET\fR binutils from your system. +.SH "CRUFTY OPTIONS" +.TP +\fB\-\-linker\fR \fB<linker>\fR +Change the default linker for the specified \fIPROFILE\fR to the \fB<linker>\fR. +Common names are \fBld.gold\fR for the newer gold linker and \fBld.bfd\fR for +the classic linker. Note that not all targets support the gold linker. +.SH "REPORTING BUGS" +Please report bugs via https://bugs.gentoo.org/ +.SH "SEE ALSO" +.BR ar (1), +.BR as (1), +.BR ld (1), +.BR nm (1), +.BR objcopy (1), +.BR ranlib (1), +.BR readelf (1), +.BR strings (1), +.BR strip (1) +.SH "FILES" +.nf +.BR /usr/bin/binutils-config +.BR /etc/env.d/binutils/* +.fi +.SH "AUTHORS" +Mike Frysinger <vapier@gentoo.org> diff -uNr a/sys-devel/binutils-config/files/binutils.eselect b/sys-devel/binutils-config/files/binutils.eselect --- a/sys-devel/binutils-config/files/binutils.eselect false +++ b/sys-devel/binutils-config/files/binutils.eselect 7f992210b277c549b9e221e91c6115e7f3d203621e1f3c6fd4bcd3f9da70fd526e9ddb4efe8df616aff9804fd1a391fb213516472a2a30e0c4ed99f76aa90670 @@ -0,0 +1,45 @@ +# -*-eselect-*- vim: ft=eselect +# Copyright 2005-2015 Gentoo Foundation +# Distributed under the terms of the GNU GPL version 2 or later + +DESCRIPTION="Manage installed versions of sys-devel/binutils" +MAINTAINER="toolchain@gentoo.org" + +### list action + +describe_list() { + echo "List all installed version of binutils" +} + +do_list() { + binutils-config -l +} + +### set action + +describe_set() { + echo "Activate one of the installed binutils" +} + +describe_set_parameters() { + echo "<target>" +} + +describe_set_options() { + echo "target : Target name or number (from 'list' action)" +} + +do_set() { + [[ $# -eq 1 ]] || die -q "Please specify exactly one version to activate!" + binutils-config "$1" +} + +### show action + +describe_show() { + echo "Print the currently active binutils version" +} + +do_show() { + binutils-config -c +} diff -uNr a/sys-devel/binutils-config/metadata.xml b/sys-devel/binutils-config/metadata.xml --- a/sys-devel/binutils-config/metadata.xml false +++ b/sys-devel/binutils-config/metadata.xml 5b0e15e61f051e1a13c1ac271d554a4fb7a7d8da760f4d0679d0af6ea0fe8e3187dfd05c859adbd61c4d2ce27344288f92ba6278b267f8e667da2f1fd192ec52 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest --- a/sys-devel/bison/Manifest false +++ b/sys-devel/bison/Manifest 501eb274f57144c5bdd3db0ab8d5785d5c20d19ecc7ed685ae9f2020102472f926d7fd8ac4c009bbd8569eba26ba2390df3be0e09e4afcd83bf9010b617688c3 @@ -0,0 +1,4 @@ +DIST bison-3.0.4-patchset.tar.xz 8216 BLAKE2B dd059a7a24faf351fa28bc72b6e183935d4409f91b5dcd8640a14d01b480a3e5b28ddb8f5660f16300a3cf1639d67bd3436d016fa304bb4666c9a43fd7897bd7 SHA512 87b62c5848360fee5b566c664c378ff08bb81d2b6c07b0d385ebd4dfd6b1a687af1da96ed43ca120695877cfc5e30a149ef35424c7a332e9223179dab6665d0b +DIST bison-3.0.4.tar.xz 1973796 BLAKE2B 6320424a5fece04734325226981af287e5745c898df7f0f79c26207599227f40e9ef54f93b2e231e20766ab9a19c0b266545bc5d0bfeabbb958e3e2f6686386c SHA512 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412 +EBUILD bison-3.0.4-r1.ebuild 2469 BLAKE2B 6a0f5900ccd90f71bab9816e0e78a0bcd34f8e4f71517afb8c5d17422e1a19fdc5fe96c06827d4dcbce487b8293b34c36857a133c5ba79cc8c95876ff46057cb SHA512 5cd934e6cb839e468062f726317758e57e9d34dcdb525c9cdb0ce562eb537d25bbc52196b8249a3a6044b2d14a9112d0a1169edc71c13dc29c78c200dcfaf88b +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild --- a/sys-devel/bison/bison-3.0.4-r1.ebuild false +++ b/sys-devel/bison/bison-3.0.4-r1.ebuild 8cea93b8b22ec81f8027670bc30e3bddd05fb065443e7b5f04b4a3c698f61661d959c5a3e6990cafffa46c69cf9fb156a7c0a48475b8097e96e3b4abe5380111 @@ -0,0 +1,78 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit flag-o-matic eutils + +DESCRIPTION="A general-purpose (yacc-compatible) parser generator" +HOMEPAGE="https://www.gnu.org/software/bison/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples nls static test" + +RDEPEND=">=sys-devel/m4-1.4.16" +DEPEND="${RDEPEND} + sys-devel/flex + examples? ( dev-lang/perl ) + nls? ( sys-devel/gettext ) + test? ( dev-lang/perl )" + +DOCS=( AUTHORS ChangeLog-2012 NEWS README THANKS TODO ) # ChangeLog-1998 PACKAGING README-alpha README-release + +src_prepare() { + epatch "${WORKDIR}"/${P}-patchset/${P}-optional-perl.patch #538300 + epatch "${WORKDIR}"/${P}-patchset/${P}-darwin17-printf-n.patch #632500 + epatch "${WORKDIR}"/${P}-patchset/${P}-fix-tests-gcc-7.patch #638308 + # The makefiles make the man page depend on the configure script + # which we patched above. Touch it to prevent regeneration. + touch doc/bison.1 #548778 #538300#9 + # Avoid regenerating the info page when the timezone is diff. #574492 + sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die + # ugly workaround to avoid maintainer mode (see #647410 and #648012) + printf '#!/bin/sh\nexit 0\n' > build-aux/missing || die +} + +src_configure() { + use static && append-ldflags -static + + # We don't need perl unless we run tests. + use test || export ac_cv_path_PERL=true + econf \ + --docdir='$(datarootdir)'/doc/${PF} \ + $(use_enable examples) \ + $(use_enable nls) +} + +src_install() { + default + + # This one is installed by dev-util/yacc + mv "${ED}"/usr/bin/yacc{,.bison} || die + mv "${ED}"/usr/share/man/man1/yacc{,.bison}.1 || die + + # We do not need liby.a + rm -r "${ED}"/usr/lib* || die + + # Move to documentation directory and leave compressing for EAPI>=4 + mv "${ED}"/usr/share/${PN}/README "${ED}"/usr/share/doc/${PF}/README.data +} + +pkg_postinst() { + local f="${EROOT}/usr/bin/yacc" + if [[ ! -e ${f} ]] ; then + ln -s yacc.bison "${f}" + fi +} + +pkg_postrm() { + # clean up the dead symlink when we get unmerged #377469 + local f="${EROOT}/usr/bin/yacc" + if [[ -L ${f} && ! -e ${f} ]] ; then + rm -f "${f}" + fi +} diff -uNr a/sys-devel/bison/metadata.xml b/sys-devel/bison/metadata.xml --- a/sys-devel/bison/metadata.xml false +++ b/sys-devel/bison/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest --- a/sys-devel/flex/Manifest false +++ b/sys-devel/flex/Manifest 622cbbdcd5d1d05767319afa7a23411465ac7edc51b1cb2432e14396dc4ba6325dabb80e2bc8600c422712d8e59a47e5da32acbb548fd4b6b07f10ef1694c059 @@ -0,0 +1,6 @@ +AUX flex-2.6.3-reentrant.patch 2816 BLAKE2B fb90930961c12dd94e8baae73a83e6c8f0e8cf452d783f77415ae0cc94698d9224db8ead39648975e82d2deb6cd3003d3a9b11a892711ee5fd99ac1043ac8f8c SHA512 105017a1020b339f08ce0c45c9c41ba6b5e42bb9dba22b258947f8d18ed697804c59e5cfa5e995b54652a54e6a500ccb2036b38001bab433d7af6f01c71feda4 +AUX flex-2.6.4-fix-build-with-glibc2.6+.patch 20281 BLAKE2B 859e15a65473a74635db3759f3607fd6a96ffa0949a1b532bd31ad589391d9fee9f14b04c741b3e50224f5e31ce987398344009d8cdb20dadfa15383b6f03067 SHA512 e9a03bf18a6fbc3546d96213cb483d46fa0b18609e03b37c4e5ac5427935d2694bd86ee73cf5c28ffd6bd7cec018f203e82e7c685e9426a7ba2e6d60d2a44135 +AUX flex-2.6.4-libobjdir.patch 770 BLAKE2B 0771af247117123e3efed3e2a0c8a71573c81dc1e8d2e364a887aa49d3bf3a5198042396d1df1e2c0ae196df098241eba0e2b35e953f9a5be3d43d2408a97536 SHA512 76e3a3e19fe9c9b6b3e0fcfea98feb0eaf03fdc683e3695045b3246b57538a52842b455a9aebed87548d2b8ee3e7d34dca5ff355f06648911866b3b621b40f86 +DIST flex-2.6.4.tar.gz 1419096 BLAKE2B c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62 SHA512 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e +EBUILD flex-2.6.4-r1.ebuild 2086 BLAKE2B e837a47544d923341d51434be0baac3b90f8186ea7eba58bd9c708acdfa9529bf87bd85cc966f50e59033ff172554330a5856e146bd06f2a334e315e960ef71e SHA512 3a6e70a9717915f9329e8140eedc51f3de2e3dc89afe2d7545ee84af1fee9d617bb183eb1d108978ae3fff67f2be5c7133560461cca5dd12ace1ff4829f3824f +MISC metadata.xml 382 BLAKE2B 646b83d59e7560578fda79014272359cc99b041469d05189e17a53359aa08182372b27a180b67580ade4e4df42e4deacbcebda555d727dea57e43ecd99f8a90f SHA512 074161b6d11f46cb704846d60cbc0fe44672a5feacd39107968516d292d12cfbf5975290f23d45abf9a74fdd4bbcf5aad77d48c924d3f57a71b3887b23ec2047 diff -uNr a/sys-devel/flex/files/flex-2.6.3-reentrant.patch b/sys-devel/flex/files/flex-2.6.3-reentrant.patch --- a/sys-devel/flex/files/flex-2.6.3-reentrant.patch false +++ b/sys-devel/flex/files/flex-2.6.3-reentrant.patch fc5ed7a7d34fc810737ae2187d22fb9be55906d89419efe991a1cfc0d6391c518509e803eb65e532551f1801648eb1482b8fd931cd3eaf2661bc6b4365ca2cce @@ -0,0 +1,82 @@ +From 078b46c69d063aef1715b11348a2871d6036f253 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <christos@zoulas.com> +Date: Sun, 22 Jan 2017 18:34:30 +0100 +Subject: [PATCH] Add more defines in the non-reentrant part. + +Fix the reentrant part; don't "#define yyfoo yyfoo" because it breaks +code that does #ifndef yywrap .. +--- + src/flex.skl | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/flex.skl b/src/flex.skl +index 190700f..6a7cde4 100644 +--- a/src/flex.skl ++++ b/src/flex.skl +@@ -61,11 +61,17 @@ m4_changequote([[, ]]) + m4_ifelse(M4_YY_PREFIX,yy,, + #define yy_create_buffer M4_YY_PREFIX[[_create_buffer]] + #define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]] +-#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] ++#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]] ++#define yy_scan_string M4_YY_PREFIX[[_scan_string]] ++#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]] + #define yy_init_buffer M4_YY_PREFIX[[_init_buffer]] + #define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]] + #define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]] + #define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]] ++#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]] ++#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]] ++#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]] ++#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] + #define yyin M4_YY_PREFIX[[in]] + #define yyleng M4_YY_PREFIX[[leng]] + #define yylex M4_YY_PREFIX[[lex]] +@@ -107,7 +113,7 @@ m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]]) + + m4preproc_define(`M4_GEN_PREFIX', + ``[[#define yy$1 ]]M4_YY_PREFIX[[$1]] +-m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') ++%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + + %if-c++-only + /* The c++ scanner is a mess. The FlexLexer.h header file relies on the +@@ -120,6 +126,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + %endif + + %if-c-only ++m4_ifelse(M4_YY_PREFIX,yy,, + M4_GEN_PREFIX(`_create_buffer') + M4_GEN_PREFIX(`_delete_buffer') + M4_GEN_PREFIX(`_scan_buffer') +@@ -155,6 +162,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + M4_GEN_PREFIX(`set_column') + ]]) + M4_GEN_PREFIX(`wrap') ++) + %endif + + m4_ifdef( [[M4_YY_BISON_LVAL]], +@@ -170,11 +178,14 @@ m4_ifdef( [[<M4_YY_BISON_LLOC>]], + ]]) + + ++m4_ifelse(M4_YY_PREFIX,yy,, + M4_GEN_PREFIX(`alloc') + M4_GEN_PREFIX(`realloc') + M4_GEN_PREFIX(`free') ++) + + %if-c-only ++m4_ifelse(M4_YY_PREFIX,yy,, + m4_ifdef( [[M4_YY_NOT_REENTRANT]], + [[ + M4_GEN_PREFIX(`text') +@@ -184,6 +195,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]], + M4_GEN_PREFIX(`_flex_debug') + M4_GEN_PREFIX(`lineno') + ]]) ++) + %endif + + diff -uNr a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch --- a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch false +++ b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch cbd7fa0987a0c7c730815e5e8b6da32ed27173697c9a76ebd0aee87a5f181086f64e2cd623aa04c0b4aa81568ca87ddc63493cd99f327b3d6871f15f494bee09 @@ -0,0 +1,767 @@ +Backport of https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380 + +Bug: https://bugs.gentoo.org/628744 + +--- a/configure ++++ b/configure +@@ -3605,13 +3605,142 @@ test -z "$SED" && SED=sed + Xsed="$SED -e 1s/^X//" + + ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 ++$as_echo_n "checking how to run the C preprocessor... " >&6; } ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++ if ${ac_cv_prog_CPP+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # Double quotes because CPP needs to be expanded ++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ break ++fi + ++ done ++ ac_cv_prog_CPP=$CPP + ++fi ++ CPP=$ac_cv_prog_CPP ++else ++ ac_cv_prog_CPP=$CPP ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 ++$as_echo "$CPP" >&6; } ++ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext + ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext + ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : + ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } ++fi + ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +@@ -3744,91 +3873,208 @@ $as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +-$as_echo_n "checking for fgrep... " >&6; } +-if ${ac_cv_path_FGREP+:} false; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 + else +- if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +- then ac_cv_path_FGREP="$GREP -F" +- else +- if test -z "$FGREP"; then +- ac_path_FGREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in fgrep; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" +- as_fn_executable_p "$ac_path_FGREP" || continue +-# Check for GNU ac_path_FGREP and select it if it is found. +- # Check for GNU $ac_path_FGREP +-case `"$ac_path_FGREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $as_echo 'FGREP' >> "conftest.nl" +- "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- as_fn_arith $ac_count + 1 && ac_count=$as_val +- if test $ac_count -gt ${ac_path_FGREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_FGREP="$ac_path_FGREP" +- ac_path_FGREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> + +- $ac_path_FGREP_found && break 3 +- done +- done +- done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_FGREP"; then +- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 +- fi +-else +- ac_cv_path_FGREP=$FGREP +-fi ++int ++main () ++{ + +- fi ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdc=yes ++else ++ ac_cv_header_stdc=no + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +-$as_echo "$ac_cv_path_FGREP" >&6; } +- FGREP="$ac_cv_path_FGREP" +- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-test -z "$GREP" && GREP=grep ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <string.h> + ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then : + ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* + ++fi + ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdlib.h> + ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then : + ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* + ++fi + ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then : ++ : ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <ctype.h> ++#include <stdlib.h> ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif + ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : + ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi + ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then + ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + ++fi + ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" ++if test "x$ac_cv_header_minix_config_h" = xyes; then : ++ MINIX=yes ++else ++ MINIX= ++fi ++ ++ ++ if test "$MINIX" = yes; then + ++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + + ++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h ++ ++ ++$as_echo "#define _MINIX 1" >>confdefs.h ++ ++ fi ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 ++$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } ++if ${ac_cv_safe_to_define___extensions__+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++# define __EXTENSIONS__ 1 ++ $ac_includes_default ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_safe_to_define___extensions__=yes ++else ++ ac_cv_safe_to_define___extensions__=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 ++$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } ++ test $ac_cv_safe_to_define___extensions__ = yes && ++ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h ++ ++ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h ++ ++ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h ++ ++ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ++ ++ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h ++ ++ ++for ac_header in dlfcn.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_dlfcn_h" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DLFCN_H 1 ++_ACEOF ++ ++fi ++ ++done + + + # Check whether --with-gnu-ld was given. +@@ -6898,288 +7144,6 @@ func_munge_path_list () + esac + } + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +-$as_echo_n "checking how to run the C preprocessor... " >&6; } +-# On Suns, sometimes $CPP names a directory. +-if test -n "$CPP" && test -d "$CPP"; then +- CPP= +-fi +-if test -z "$CPP"; then +- if ${ac_cv_prog_CPP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- # Double quotes because CPP needs to be expanded +- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +- do +- ac_preproc_ok=false +-for ac_c_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- # <limits.h> exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <ac_nonexistent.h> +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- break +-fi +- +- done +- ac_cv_prog_CPP=$CPP +- +-fi +- CPP=$ac_cv_prog_CPP +-else +- ac_cv_prog_CPP=$CPP +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +-$as_echo "$CPP" >&6; } +-ac_preproc_ok=false +-for ac_c_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- # <limits.h> exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <ac_nonexistent.h> +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- +-else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details" "$LINENO" 5; } +-fi +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +-$as_echo_n "checking for ANSI C header files... " >&6; } +-if ${ac_cv_header_stdc+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <stdlib.h> +-#include <stdarg.h> +-#include <string.h> +-#include <float.h> +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_header_stdc=yes +-else +- ac_cv_header_stdc=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-if test $ac_cv_header_stdc = yes; then +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <string.h> +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then : +- +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +- +-fi +- +-if test $ac_cv_header_stdc = yes; then +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <stdlib.h> +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then : +- +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +- +-fi +- +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then : +- : +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <ctype.h> +-#include <stdlib.h> +-#if ((' ' & 0x0FF) == 0x020) +-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#else +-# define ISLOWER(c) \ +- (('a' <= (c) && (c) <= 'i') \ +- || ('j' <= (c) && (c) <= 'r') \ +- || ('s' <= (c) && (c) <= 'z')) +-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +-#endif +- +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +-int +-main () +-{ +- int i; +- for (i = 0; i < 256; i++) +- if (XOR (islower (i), ISLOWER (i)) +- || toupper (i) != TOUPPER (i)) +- return 2; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- +-else +- ac_cv_header_stdc=no +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +-fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +-$as_echo "$ac_cv_header_stdc" >&6; } +-if test $ac_cv_header_stdc = yes; then +- +-$as_echo "#define STDC_HEADERS 1" >>confdefs.h +- +-fi +- +-# On IRIX 5.3, sys/types and inttypes.h are conflicting. +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do : +- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +-" +-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +-for ac_header in dlfcn.h +-do : +- ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +-" +-if test "x$ac_cv_header_dlfcn_h" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_DLFCN_H 1 +-_ACEOF +- +-fi +- +-done +- +- +- + + + # Set options +--- a/src/config.h.in ++++ b/src/config.h.in +@@ -207,6 +207,9 @@ + /* Define to the m4 executable name. */ + #undef M4 + ++/* Define to 1 if your C compiler doesn't accept -c and -o together. */ ++#undef NO_MINUS_C_MINUS_O ++ + /* Name of package */ + #undef PACKAGE + +@@ -239,6 +242,28 @@ + /* Define to 1 if you have the ANSI C header files. */ + #undef STDC_HEADERS + ++/* Enable extensions on AIX 3, Interix. */ ++#ifndef _ALL_SOURCE ++# undef _ALL_SOURCE ++#endif ++/* Enable GNU extensions on systems that have them. */ ++#ifndef _GNU_SOURCE ++# undef _GNU_SOURCE ++#endif ++/* Enable threading extensions on Solaris. */ ++#ifndef _POSIX_PTHREAD_SEMANTICS ++# undef _POSIX_PTHREAD_SEMANTICS ++#endif ++/* Enable extensions on HP NonStop. */ ++#ifndef _TANDEM_SOURCE ++# undef _TANDEM_SOURCE ++#endif ++/* Enable general extensions on Solaris. */ ++#ifndef __EXTENSIONS__ ++# undef __EXTENSIONS__ ++#endif ++ ++ + /* Version number of package */ + #undef VERSION + +@@ -246,6 +271,16 @@ + `char[]'. */ + #undef YYTEXT_POINTER + ++/* Define to 1 if on MINIX. */ ++#undef _MINIX ++ ++/* Define to 2 if the system does not provide POSIX.1 features except with ++ this defined. */ ++#undef _POSIX_1_SOURCE ++ ++/* Define to 1 if you need to in order for `stat' and other things to work. */ ++#undef _POSIX_SOURCE ++ + /* Define to empty if `const' does not conform to ANSI C. */ + #undef const + diff -uNr a/sys-devel/flex/files/flex-2.6.4-libobjdir.patch b/sys-devel/flex/files/flex-2.6.4-libobjdir.patch --- a/sys-devel/flex/files/flex-2.6.4-libobjdir.patch false +++ b/sys-devel/flex/files/flex-2.6.4-libobjdir.patch cfc95b05ee43cca0ec7073d57fa69baa6fbfaa693733b77bd1cbf41eaa34ea090c7006244f4c577ba36183c27d31e15e066e5908e8e06f925569bb799c15abdc @@ -0,0 +1,26 @@ +https://github.com/westes/flex/commit/24e73c4446841eda8d4ea01298e887059e8c1472 + +Bug: https://bugs.gentoo.org/625508 + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -79,6 +79,8 @@ COMMON_SOURCES = \ + + LDADD = $(LIBOBJS) @LIBINTL@ + ++$(LIBOBJS): $(LIBOBJDIR)$(am__dirstamp) ++ + include_HEADERS = \ + FlexLexer.h + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -1688,6 +1688,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \ + @CROSS_TRUE@$(stage1flex_OBJECTS): CPPFLAGS=$(CPPFLAGS_FOR_BUILD) + @CROSS_TRUE@$(stage1flex_OBJECTS): LDFLAGS=$(LDFLAGS_FOR_BUILD) + ++$(LIBOBJS): $(LIBOBJDIR)$(am__dirstamp) ++ + skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c + $(SHELL) $(srcdir)/mkskel.sh $(srcdir) $(m4) $(VERSION) > $@.tmp + mv $@.tmp $@ diff -uNr a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild --- a/sys-devel/flex/flex-2.6.4-r1.ebuild false +++ b/sys-devel/flex/flex-2.6.4-r1.ebuild c2be53b2ca150741fce5236407cbd927f6c38646dedb938d082339ff548f9a2d2416de39505aba21436808df582929d576e2c551df7e3b9e980350b99dd9cc83 @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils flag-o-matic libtool multilib-minimal + +DESCRIPTION="The Fast Lexical Analyzer" +HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex" +SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="FLEX" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls static test" + +# We want bison explicitly and not yacc in general #381273 +RDEPEND="sys-devel/m4" +DEPEND="${RDEPEND} + app-arch/xz-utils + nls? ( sys-devel/gettext ) + test? ( sys-devel/bison )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.4-libobjdir.patch + "${FILESDIR}"/${PN}-2.6.4-fix-build-with-glibc2.6+.patch +) + +src_prepare() { + default + + # Disable running in the tests/ subdir as it has a bunch of built sources + # that cannot be made conditional (automake limitation). #568842 + if ! use test ; then + sed -i \ + -e '/^SUBDIRS =/,/^$/{/tests/d}' \ + Makefile.in || die + fi + elibtoolize # Prefix always needs this +} + +src_configure() { + use static && append-ldflags -static + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # Do not install shared libs #503522 + ECONF_SOURCE=${S} \ + econf \ + --disable-shared \ + $(use_enable nls) \ + --docdir='$(datarootdir)/doc/'${PF} +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + cd src || die + emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)' + fi +} + +multilib_src_test() { + multilib_is_native_abi && emake check +} + +multilib_src_install() { + if multilib_is_native_abi; then + default + else + cd src || die + emake DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS + fi +} + +multilib_src_install_all() { + einstalldocs + dodoc ONEWS + prune_libtool_files --all + rm "${ED}"/usr/share/doc/${PF}/COPYING || die + dosym flex /usr/bin/lex +} diff -uNr a/sys-devel/flex/metadata.xml b/sys-devel/flex/metadata.xml --- a/sys-devel/flex/metadata.xml false +++ b/sys-devel/flex/metadata.xml e62b8526cb6f4d735d46ab0b5ffb4eb935b2cae51bf9473e1935359429366781c3338d1e996085a3458649bf56a2951ae2ea4bb17a68eb6f553d1d8543bc5b4a @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">flex</remote-id> + <remote-id type="github">westes/flex</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest --- a/sys-devel/gcc/Manifest false +++ b/sys-devel/gcc/Manifest 780bfbe850e13f7d63e5abccf390d7b996218b3d3095bbe170083088d12e7638eef50ee24530e2aa9e36925e08f9bed5c8cbd8a9a13f98f96d449b5ac0fc157d @@ -0,0 +1,67 @@ +AUX 0001-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch 7629 BLAKE2B 7d913d73cf2211767cb90aeb8ac4ab87f6d5bd10ff0e25fbcdbbb2162a008e8743c36e91f0cbf3442d87ad238a7d8af60895dcc66937c4810eccea1c9008a67d SHA512 892b3ae664a980c65d739b7aebd912ab13a9e475febfea6c6a67dd49f7711155c366f785f41350bc6be9800dd0dfe265e3fb61d7f6870b25a99cdfb1415c9455 +AUX 0002-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch 2260 BLAKE2B b53d65341bacab98ff923f333c741c7bfa3ce19af29832004fc9a1e71ae0bac889845597d30e7498cbc658cb4a200daed8c4ec7a207e8f61c6b322579232e83b SHA512 9f9ed532581485b9c6a51c95e42b4525f5912a9d3982d1bd893a97257caf93771b89805bf5b5f21601e6cb69b3e1a577a12455b3bef38dd7b8bb1c8e2be98db1 +AUX 4.9.4/boehm_gc.patch 4398 BLAKE2B d9b50b2ea5e40f409e3c902acdd19d8037ce9e60d04c708f7d2017b5cdafa0b743d8bc628cdcc227c3b920dc21a766e8746b2deef6dd75317b11dc1bfd57836d SHA512 8f201e6075e20b432c56ff5b610a79024b67335643a9c36426479f5b876d19d5f0e914ad38f3e68ff80243f560001c5245b2b6716285142d27cc7d8d719834ca +AUX 4.9.4/gthread.patch 1751 BLAKE2B 1c821cb0cbe819c3bc65e4dc257da53cb133aed4a08d12d4804015cc9e27dfb722ae1a0eb4d4689883416bb38124f88e55f639d4da78d63aa71e443e968da12a SHA512 cd04309f74b115aaf15c1a1ea53e5ed9549454fca3b4f68bf2f5077fc028c5a6fda90db21037fd7a9a9cedb8d636781d7ca23dc12afb536fcde9df060952ac16 +AUX 4.9.4/posix_memalign.patch 1155 BLAKE2B 7a080313ff060a2f3d681c889fe1eb8e46124bbd8d378b004b8c0096f93bb8dbbad240b5045f33be9a649a57872d9265052e4d499a728470eb65ab413a9f244a SHA512 7dec7a092320fcf770e137cfd501237cc76e72606d56d947081ed9c269e0e60756e6fc0b08a0af100987d4c5c021827ff0c157f4fddf1d46fc44fc8604e639a1 +AUX 5.4.0/cilkrts.patch 1798 BLAKE2B f79006529b7d307fb81f2cb09bea9e01cb4a33f35793acf286ed8a79608f8f1ed98e2dcd0788b8b8c0a21468a3064b17ef47b3f384f0c09b6f3f7a41a419a70d SHA512 1779793b90e8e8fb4532fc17d488e211a8c7c193d13c5ee99f5295ffa1e3516b07f4341fd6821e502602db470ae3ffd12eb2e9c07f4cbce796879616e39a2c1e +AUX 5.4.0/linker_path.patch 9241 BLAKE2B 4234d0ebdca414d29d9ab51ad622d0adce819fee7d06333a3aaa6d76ac71e1f44820e18745672c9602ec30b02a954aca87d758688faf5366eedd2ca335a5e3b9 SHA512 f5997d46772517f9538cabbfd01f78225301f6747a8106198c9fe0a591e53ed1c490bf89310848ae89135079928c8325880294c766d4983394b0eec0fcfd8046 +AUX 5.4.0/musl.patch 19066 BLAKE2B 5497f7681f2f654ed8fcd9183b459039145e497af4fadb3f5021ec0553e2132e372c128927c7c93137835b4a32e0289f396f07ad225877a3ab837889e79a84e7 SHA512 56020b6759929053e0256150dbf5ba824fc0c1d4f574e1f4af066d6cdcb8199d8b8986008aaf46727454054091f7e9c4bd33bd2dd4e27c21a60fcbc4312103bc +AUX 5.4.0/ppc-secure_plt.patch 2161 BLAKE2B 1fac2a9846626e75283f5bffa1f8f6591325a1d2b5f4c590e3dfe8984f6221d691c7a40962fcc30d867cf3affff98c1bb287b5a4d3f624d2c0530aa7ba638722 SHA512 4ba9780f4cbbe30afe9e40831f2ee57d9979ada093dc15511bef6ec69f97198034a8d07a8efa0884b66d904c7ad5b86a69b52a0ba41c3110680bf01d7b051388 +AUX 6.3.0/cpu_indicator.patch 1357 BLAKE2B 6ff546ef9f00433020af136f96dabb902853ef06a307065e3e7bd47ba803639f112a2ab71cf0f52a141d28d5b7dea06338e1e3f6a4e30d4e0989df514a141632 SHA512 a656b9760fd11111c1237d168d099d4b3c2ddc5e9e632780f8468f60f8dfdb5235d251a03f9b4c3e029255171ca57ad742ec4164cbd1336584ce28cb64af15a9 +AUX 6.3.0/musl.patch 1202 BLAKE2B 363d3259e5c21c4c55c2f9d5cf96bce8bb53f04bd48e4086bd6d1531605fe960f5dbd4d2bd4d35d80f812ece74197b54be57fbea9131f9ec5eb054c0798fab31 SHA512 dd9b6b5f57177afcde51880a1f20c37fc24f5d078a248672ea1695a10359d8defd1c6cd9eb96986ba166ac8289d751e0a0eefe7f370c82568f3a44c858df174e +AUX 7.1.0/posix_memalign.patch 1181 BLAKE2B 00add2d4acd61c0d9d8b281ef6ba68c3b8c25cc5b110fc597ac08cc1463fcc5fa83c4ec4204f3b97c4d8ddbb2f61504944e36a3631235dee4b2036bd94e81916 SHA512 e9b512a9be77eb7e78ec11ac8cb3cb444290b6922ef612835be7c3e4af98540b4206c886bf3e511ffe508157dcb8e50445b059aa57c1ba366ec466753e850b42 +AUX awk/fixlafiles.awk 7700 BLAKE2B db97e4a9546c0771bc7542514ce8cbbf40813a800b9ab541d113f4aac260e5eed3c5daeeb15ce6fa9ccb32e95942d4afb43bd46c5941792dbba997d3470e0f0e SHA512 5ed208e116769741dda7274f15c5b3bdfd482cd926261038bc696644b73aa0d0e950d7fbfc0eb1a90529dd134fa548c46499a18c77470a05d87ae76bc1b3acd2 +AUX awk/fixlafiles.awk-no_gcc_la 8480 BLAKE2B f8f5eacd79f46f601d42eaf61345512d451afcc90e3eea018ff83b87b63b0317834630cb5333d324fef2f7cb8749ef12e5da8ba30747cd06cae14fd13370c96f SHA512 7487115a3c4d6cf0edaf4b0ffeb87225d8fbcb7e595e2e99974582e0cce5868d7e292044db2631380c185553866554763eac4c3024347dbdb2cbf68679923294 +AUX c89 412 BLAKE2B 04236b6a32e8819c65713821e769d5bf55f194fb6bdaa61c48ad09c7e13e123d3e4725394b3a922445efaa951849f4e87f96e34a55d3e229dbedc50ca1816f44 SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924 +AUX c99 446 BLAKE2B 061fcbef85149de611c4692c99c2c5ebeeef045637b999dbea0d1922398e16361cedbd461ed6aaf0c49c6269900a4c346f5026d8c22780044e1cc8afee74be4e SHA512 bf3b0eb1125d5e89b433954fcbf805cd86dec5a6eeb23df685ebf3ff83a610573f2ffcec65d893244c845936a73918387cba026710c65c854b2c94a78b007989 +AUX fix_libtool_files.sh 1528 BLAKE2B 6eb08445473d21ec6a21338f5a8c0eea9517d8d109f8830a9165f48e89548e840c452d98a668ceae60580c1539c40eb46ce4c0e83b1fe6199f66422bb6fb3e46 SHA512 c0698e7af969a701d7a2fa68cabb728d6271aeb7cca4d53bbb306906dc1b6a30a756ec01df2eae03712fd21865ff2779a0cd92e44c15774a812f935e7fb308ae +AUX gcc-4.8.3-musl-fix-libc5-assumption.patch 529 BLAKE2B cd1eb3529a0ba8447f3c33baf5c1cb153fb90fb1091bd6d92f652545b2ac12b14a7a99d0af9ee12be310c17d08e5818ffb9db41bb8cd3b5073d04923fe44f24a SHA512 7fac0b48acf187d4a56f63148af51a17fff75d97fbe2b8256efbb51ba26d74ea06e11e0834f04f5d1f4b492cfd5860b52252428b9c87d7dfbe813d4601e782d5 +AUX gcc-4.8.5-posix_memalign.patch 1114 BLAKE2B fcbd96587fac37f64a30c4991e38fb0f6c92f8b419b3893b8d84398ff0797ed4ef4f8e8b714f45abf2dfdd3fa6669e32af0ed6003b8742e82a0d6d8952cfa0a8 SHA512 27e1a29e039dcc4c5190416702d1d95d48fbaeaac6440d81584989fe71a12f7bf5a484241ced9aa82b9f050eb3be8786d9584ba5299d304e7ed30506755880bc +AUX gcc-4.9.3-musl-linker-path.patch 3556 BLAKE2B 803bc48089334f338c95f71a23f3de141d5075549ae828963a2e35907234dd88a0dd13a61d92b09096c802560a9aeda0ad6bd043140da400d93e8c136b6b0e21 SHA512 cf58b49311c1a7a4cbb04a2ffeccdaa278872512e67b72ebe292fa155f419dc6025d158b67d58265de67edbd18c6af67f28c6f6806b581a8fdb9015ad2ee0aa3 +AUX gcc-4.9.3-musl-res_state.patch 699 BLAKE2B 5751469840a7b65fb5689915a4641ebe04fc1182f4b8f043f818476bbb8988831e4205f1470c4a563d9c4de5d8ec600facbe70295295124c360c2e799c3973f9 SHA512 93f59d16e026672051b5a65110f78ace0c91a4f1365b861e22741fbc42b92c4490e55068ae845bbcbb5af9221fb874e0b855a763189528a646e757b133117e28 +AUX gcc-4.9.3-pr68470.patch 2053 BLAKE2B bb9d20681f93bc2cd782badc865a924588f12cf50f710ff5da211d99cc3687d97955ffb28653c3d44289ef1fb4852165c9574e391e0f81e9b9741376fc0feb97 SHA512 5950b4782034add9ded16ab4b6d7b2d5e2bbda1a3ae7f465d50c6a95469359d287126c1a57ac9d8c6ea2c61d7b18ff880b2ac2b25eec48f038452f87f0e24393 +AUX gcc-4.9.3-secure-plt.patch 1478 BLAKE2B 47eea3487f7a995a813c0237b7b681309cb9a18c5b9b273b6597d6653dddd7216fbcd6edb523925de4bdc2d1adcd4d6d87dcb1aa605462ddcf5d0801a1761cf5 SHA512 95f04716bad41fe3f290d44d21d1dad35548b801b56de331acac8bdf56019583a04681418a805a0b4dbfe19e9b51cecceff984cea257be58d3e7780c6cfc58a5 +AUX gcc-4.9.3-tree-vect-data-refs-correctness.patch 315 BLAKE2B e01637905f43583d13068d5bab0a12fc58c1071ad932acc05e0c4cef57339781025b25f43029272e7a4f4ccdcd9d346c6af45f22dfb8ad735d1a4cfe65c1d32d SHA512 88d93c061ef72035522270ab60c8c2ec04e2fa2d69763f45b9eab0c37b19c23920484358d7556ad885775071ac04cf94684a2cd8ed93418d5f0c54ac3a045c9d +AUX gcc-5.4.0-pr68470.patch 2012 BLAKE2B 177048e987937ed11dcc519eeeac1e88c499595d7e4016db8a4a5b24c76d865e4d80d259a4b1320c519435918b963eb7e97de24888aa3dc3c15f8d1b7e27ad56 SHA512 dea9ab12a37b88308424af2882b4755366745c204cd74e6892374d4aeb0981487f9fa1d44ab4d4e6184c83547c3ea30ed731719fa074bea62bdf8bfcf1dfbca0 +AUX gcc-5.4.0-pr70473.patch 1665 BLAKE2B 917e29b596cb322c9dd118668db74093a0d6d7d4eb711ae78e22218f03b0a02ae2c0bbbb6936e63d78cf76fe277840b49fd28b0281ab7a2b1ed42cd3e3181288 SHA512 6fc8f70a1e34ae475d15fb20e198b63f00a11eff3bd09f1518b76d9622d32c9500beb49065bb1a32dc40119146f009bbda21fd0e74bc200771384b547f282680 +AUX gcc-5.4.0-pr71696-CVE-2016-6131.patch 7759 BLAKE2B 2e8dbcbe76e4850e1a8f2be64e9919cab08063d5797241eb4cf924871930e2bcbf8c673c85ce53bbb45c00a7a5db167e172c7cfa222144eabc63e9b2b894eefe SHA512 234918537a87c2a607cb0cd0f3127f84916c96d11c8bf80ddc270ad7a6c038c15e985d52e5ed8a054bdc51f46e1ba4e0fdf8de2f4ce4bef5c78f68a3c29578fc +AUX gcc-7.2.0-pr69728.patch 1150 BLAKE2B 2fa78be560a354754e6011e5fb4fb519fb10fea5d7f29eb03df2ffbc736f3193779f0f7c411c1fcaf98b7b1b94740cf588d94f7a821821e502cee241e53477ee SHA512 1cd9fc5037253027cd1d1e24a4a6ac3dec2ff95dd48671ffd8368456ba4f9624422b44e3d655815fc7b0bca8fb8fa967c8afe44e55d25df17628a3e8f9d87a05 +AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129 +AUX gcc-configure-texinfo.patch 337 BLAKE2B 6408817927f71c5c55a19510a95e1aaad9b56be216ec1c753920b55a435d70579e27ff5bb8ecbeea1b9ff1c8ae62b940fbf10bf876c3d7ecf6cd662d9b693100 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5 +AUX gcc-spec-env-r1.patch 3148 BLAKE2B 30ceb113a510092a907b445c4b2131f148f7fef54a00a88b5c389bbf93b8b61bc12c86a07df03d57280759e5485ac0cd89ea69826ace01b5720681ca3102640b SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16 +AUX gcc-spec-env.patch 1544 BLAKE2B ebd019ff63f6a8526f741f1760925538f10b25c7d5fc69bc015e27bdb468ddf1239aa9d0af21520ed1f286babc98b7418828e212b68415d238cd2c78b43db2f1 SHA512 ce9c1f923e2c6d17347ec2d3d8482351a9644194b2753627389294d43bb4f11b9c2ef41eda1b46ad83d09901a0bedebd5b6b8a57a198646030ab61e8d2d8cb48 +AUX musl-gcc-patches-4.9.3/aarch64.diff 447 BLAKE2B a0ee1858813698f51b02bb789feb40fecc46318e4045a246f6bab9603fc73958543df61bec53272134ff2f80c53503c7678262f2154b0d774c6703a396e35fcb SHA512 748de2e03e7974b89e0201f1908b3825192ac8d7a2fbe7f5390cb663cee22aa3776162e30e6abd8d7203ad772d2186ff67adf20e9618a1bdda2f25a671cfe4af +AUX musl-gcc-patches-4.9.3/arm.diff 1682 BLAKE2B ac274fdb1cf64b3d3c023fab7a2eea6294b3f3458105fcb11a224dc79614c98e54d4ae19aba3b9fc846cffe768dfde1b9ec5cca3060e1f793512877f34bfbd5f SHA512 743f5118c2bc083214cea40f24e641ec31354cafe792c5244a2a8305eafabb88efe03a55c275d69c93073a4dd9cfff82d81ab68bea6faa2da326dbba0644063c +AUX musl-gcc-patches-4.9.3/gcc-autoconf-musl.diff 2361 BLAKE2B 012c7d244da3db1cda835a08bfb7a0719fc06e46543211587cdb584eea1161b33c913e5665b8728fe4403865c66dd6b865d948995177d650e264922bcd40843d SHA512 0b7351361a947448e4aa3d022e317523c8cce3f69691e78fae5fb6941d410622d44fb3ade9d8a0ee06fa2212e9fc0abf2b86470592e92dca41d312bf320c07c6 +AUX musl-gcc-patches-4.9.3/gcc-config-musl.diff 7556 BLAKE2B f50098c3a1ce53a69a18ecce9ef1461f0b4aa6e8317f5348b4b743799f072bd8a1ef263d8b11e334f3d40fa3f755260a14cf10886f5f91071cd77caeebd149cc SHA512 812d23df546cdeaa46eb238a9e2e16933f971e964a8805d951c232a38198184be8c34a38a75d483dfb1c84c4d8533027cb5a718e4bb1f069499677dd8fe6ba2b +AUX musl-gcc-patches-4.9.3/gcc-ssp.diff 458 BLAKE2B 0ead7cda927b6402ddd2d89b33903618e46ff6ff9737c14ec7e033055f804ef1f4e65cf5708df97690e730bf2d2f2eaf5844ccc69e414c3990b578f1b26fa4a5 SHA512 0b106c9c31aec38e24e0003a0db2c096d54d115ad166d9e53b780b8e3d7b1c02123a49ad87dc5625da5550eb7a3c59244f88f055afa1c95316eaa0706bad22f6 +AUX musl-gcc-patches-4.9.3/gomp-posix.diff 592 BLAKE2B f3c0dde56ec047be256fc9800033a0161dbf0c9f59a1ef1001cdc00dd84670989e9a9ad79e611723c0b72ff3f84fa6e7971cfb4ab1540e3dd7e6d2652016f0c1 SHA512 6370ddb8666822589c77d44ee281e46dbcb64198cf2ab147f25e2fad26a91fd3b27755c88c5aec9b8250195bce2b27d64cf8b1f240b338aa82dbce1a810629ef +AUX musl-gcc-patches-4.9.3/gthread.diff 589 BLAKE2B 95317567a73737c32d2df87b8a037042b06143cf8baa4a8d724bff9925ef3d704c3a75aebeb2644642891bf913a49a3c937d4a6777055475c44d207beedecc78 SHA512 74f9138383d91eafb8b69949773c3ed90fb57c0c718a02319d37b495b10fffeb8855254317f7645a81a8cb597aedae64140aafc2411701b4a22427910d0cc498 +AUX musl-gcc-patches-4.9.3/kill-fixincludes.diff 581 BLAKE2B f150440769cf5cece2239ebe3fc77b4efe210d7b0dcefb6e2c2185892d90e57f5496cbcaa5f53b55bb978d9ab08cd826edf2e5a679ef527b3a79bc012b61e952 SHA512 63367cce74ab5ebb4edf12bf42c2b8d58134ecabea76b4c43d6c96f66870e23ee061ac0d400ea5b20926a2e73994b44ca4efcd1f83350aa580abd6f9d339fa84 +AUX musl-gcc-patches-4.9.3/libstdc++-generic.diff 844 BLAKE2B d3d14d5d3839abd3248705f0d249c342509adef2d236477c38c47f04fcc33a318ae861d2a3287983b288c64be3e30f853734d67208d675107375d8413f218ac6 SHA512 1950a6dd56478993fbb70004109e617e2336453aff342b8acad02e7f2b5309abd039f6bc0f22f4f6c3b698b6dac8ef87d59dea5e3396549276ba39d43293d106 +AUX musl-gcc-patches-4.9.3/microblaze-size_t.diff 1212 BLAKE2B 3c2d4611367c4b963c63813e8655fd30e9e6eea864c6a391edd3e39d88f792144db48f901ff8c76a286b4516da94414d6e9ffea6f76f4e7c2635abad142e7d6f SHA512 0864f69ed2fd9ceaf89547c4493d8a28cefd141b6d85b3c9c128f21f37b4298dc6ba434d02bc996bcefd0d22edd6d616ac8b0401c1c3af9d192c12bd3ea93b1d +AUX musl-gcc-patches-4.9.3/microblaze.diff 915 BLAKE2B 4fbfa11fbb49bf0bb1bf83d13d56e334b996c85fa6382c61eb747cd1c5a89b4aa7617908a87af906973ecbbf874a5ec5a6d373e52124d6b97d018b918e8c5439 SHA512 38bb2c4f041ec161f98ef6bf2d7639f54f26d446a40085be65d2ec693b2f15adcfb6318a47e317d440c9438fcce5018cb994cdb233c8ab982f754b0f9a7d61ec +AUX musl-gcc-patches-4.9.3/mips.diff 657 BLAKE2B 3460b458da3ef2d978ab0c356649ac1efb94af2dea439cce1f0f2526b40e60ba29ca6003ea2ba3219eb66f583505619d042664351838b6f59e540566d57feac8 SHA512 6bca1fc5b9194ca19396979cb18177f90f67e9a3a1302e87c1ba20fb96c8bd5b7ad8ca6c187e93f2497614501b559244277fb4bed9ccd2a8a7c5570e69be1a24 +AUX musl-gcc-patches-4.9.3/powerpc.diff 4563 BLAKE2B e76541b04e57b4324db27c2bad8c3ded11f565f927a38b7384ac9ba0da849633d41b7fd3bcf5c3da6cb2c3d1c8977c4274ace8e60739f1228f74b47c05fe6d9e SHA512 aafb985debb98fb8709a7d30a9faff467ffce4601807f39de97ee72fc737484b1ddae3cec74a7472f008f5e07902e886afcbbd2e56a8209fe5ec37e7b4523c1c +AUX musl-gcc-patches-4.9.3/sh.diff 576 BLAKE2B 23732791ffb7800658e931963fc5448235ef540860ba06607ddad15d656519f9def472e085c4f8d5f5e61c3cb819130f7a1bd5f6fef7dfee06b181713191da23 SHA512 1a762db4a44638a5d969e36a3b614dc2e60c9d1c04479507958ba545fc46bc1451088d27827fc8724159563a611159e9aa1b1db06558563d8bac945cbd444d31 +AUX musl-gcc-patches-4.9.3/unwind-dliterate.diff 1413 BLAKE2B 31fdc9ff16ef74786fe4f24a2c1f25ff76b5fa2df7ee585a71762f235bfdc6c169ae17d0ee296b1e7033860e7c3e7c2848598c20ee74ecc56ca885b72fccd34f SHA512 9993b2492eed96030fee231417178e27d600ae05d2e8d63adf87464938c11484754ea2f061c3059c0742a7cdef6ec7a234d7e10100b800b8964e758ef9d0ff9d +AUX musl-gcc-patches-4.9.3/vis_hide.diff 578 BLAKE2B a550b66cc9788a48e641463acc71b8f7e6b0aef9505920d24889bd0188873219ac9f57fc2c9bf43f7a01065f5c44685cc09be8d198f2d1052cd464af915a04db SHA512 91aa840673c25345775907cbf64ad5494751e07069d30a19c887f976615ee61c2e05e8077879d108d4ff42963d62edc0a861c182ceeb25475c45a7fda6d148d4 +AUX musl-gcc-patches-4.9.3/x86.diff 1869 BLAKE2B 704b600681909f18a0e4c7b559458e66c33018afeecb968da066b3fbf528f2bab0010dddfdbd864bf565baeba3c53ee32b8fd6db14063f23b2cb8396c7658ba9 SHA512 d7c3efcf9debc2f45bf5332f90da5a0dd1ed8c937326410d9f7537c8f19f7fab054d9a5e6023dd0cc2d3851a440f28e1243c9ef827f98953186b3eba64fdf3f6 +AUX spectre-0001-mindirect-branch.patch 33526 BLAKE2B 8f8e62650aecaac9f30e058814c196c1a699a78cb7cce24de25735d87ef6c41bc3c06da06d92f94dbb948f3681bf32f4ac98fe139b1b5e983ac1f40457753cde SHA512 997f82bb97250794b75dc73da1c97581724ea4e9934b8c0008d32133b10c4f3f325f151ad26b941399d14dd7df5abac1d66787b10e3c72e94ab905c349f2e641 +AUX spectre-0002-mfunction-return.patch 15944 BLAKE2B 2eb074f29e8b35aa7b3e1055555b31430ed7039a98ddb9e1c94734e544f2a7a56eddf8cf1635339954db2fd47db4d230112d431f926d345867a50f59018d313c SHA512 5333629039f2fd0b26c87831ae1fd1ac54fe6041ed63440a9c02c8d01ac68e1917cee773bf144f37e98acf364b98420c18b3c3491e3038e7e7b2f956a8ef41dd +AUX spectre-0003-mindirect-branch-register.patch 12760 BLAKE2B 7acabf26f11c845cdedf4bd37b37f17c67cc77878904b29d18ea0015d08d6b509ac7e62965f05995309592c8b29940691fcc8a7e82a7c7d9de3396ef3260fa4d SHA512 334ccb42d7ce705657265c9537d207fd28f1a4a4316ded9e5279d10a392907c99004b607fcc15c65955b45ee39b970ab5128feb736c63263142753140514cb4f +AUX spectre-0004-v-register-modifier.patch 3977 BLAKE2B 2b7b370816251cbfa116865be2e638f10f2ee939c8d423ad46935dba9c954585d37e34af4d30280da97c1fdc9b616559e03256cb4e71d3a3d14cec9402f1b1df SHA512 01c729c95d83a5179cb571dac22a05cad6de3e56dc8f78bb4ae6e816096839ec1dafa9021f056c758a73ebf34e22e85aeb189643423e5d212b4263caed4fffb2 +AUX spectre-0005-mcmodel-large.patch 4166 BLAKE2B c9e420af171d4aadf1a13a2a5af126eb6c823bc8b051152254fb3cdeae4e467e3732941dd611423ad1ebf7860a05f529bbb42de160c82cb9dfa8c42b9a197722 SHA512 bb12871e64fab9f6ca695efa457c0d3647afa18c01a21fa0cfde5216501c81d16e54b4c7995bf9a3f0100e72ad9b8a01971f94a7be271a8a7aa6c88f66739585 +DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e +DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 +DIST gcc-4.9.4-patches-1.0.tar.bz2 22266 BLAKE2B 38536e8a86a8296754311633b73da0bd7dddb3a6ac65e4b5ba1dde352789e9114a1129aad11bcb988a1baadec6fdf893290c6af83bb9fad5613f35a37ebbb12e SHA512 cc2407221f858bad38b57d31f635314f91794293695e23d255685d8bec20b9db19c7dc76bbf5e8184c2ba0ccb530958b09bae4d8a402ca27cadf463f46bfb995 +DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285 +DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db +DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe +DIST gcc-5.4.0-patches-1.8.tar.bz2 32886 BLAKE2B 85879ba552ff21e198de568b2a1f2544d6cf542174af3ca571e41a504373bbc8912a87177a413883f194d909237eeeaf65366e6b93c2b917f803b3edd10bbff5 SHA512 10c1102a37d9d485665cca606318a1da6eec2188998d340b91a371c9defa6fae285619f9cadad2546de0b7f1068e9eaf653714462d3331db3197308799927a6b +DIST gcc-5.4.0-piepatches-v0.6.5.tar.bz2 14551 BLAKE2B 6f3de9be0990a7580785821d8c85114a1907571c06bdf3a15ad91258f7c9e8bb6a4d2ddb8615f33bedf0ad036d215507e004fc095f788e40c824ae0ab3ffbb05 SHA512 4890f0713d261982ab81a20f93c5f65193aa1dfa171e3f9e5867f0b80ec7c1e76c5a997b1a4e6f47f8ce36af54ac91125c5bff8bf6d971b7d77c65a57a40a3c0 +DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 BLAKE2B fa436d1c1d9c150714092132f816740f8218dfeb4f9a6a8c830ea54d211a020f209e6fd1fcc313b2560b82c7855120053d346af72b7c12c88a7a948379dd2356 SHA512 009f34197e79c5e8c6497a0db01ac45cc657e92e56a663b4f3281661d108b2a129cd977fab5f0064f225d6812ae91e82bab22a2b10ae02c486881eeed85ec7a3 +DIST gcc-5.4.0.tar.bz2 95661481 BLAKE2B bf882acfa28cc1064cddd21e25332fff6bc65505d6af9acb2e455916edbc4f6b1de9b3524867f51d7819fc4f213ce21332fbf67cf71cd6c7b96fb8907e51d570 SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b +EBUILD gcc-4.9.4-r100.ebuild 2314 BLAKE2B e0fb202f2853d46c7bf8b8a2265295d830cf47909d8b90794c01867eeea29a588aece7159c796b42fafc9585d0b22894be89e79306074d9670b7f90ec1c44d16 SHA512 ee2e4412ff8716e4f9267d001b7f06421b46338e2c6b9fc5aa529e3788f99374ef59fab7a11d4db8017bb47e1ccfd6817fe8225e60a12cf6ab399f48eac508a2 +EBUILD gcc-5.4.0-r4.ebuild 1924 BLAKE2B a245d9ec1b6ae355ae3935ff09bd2aac04ea1aa9c77d0dae6fead9130f1c789c7839dea6d691211c5b54f85314fc7825536b75a4273ab3b27b91174903073e50 SHA512 70ee8d918b0365e43b3ad6120fb84c062c84343838757d606923b6292f3881d94d794673204d91140b10410e7fa0f65969318248510ea0c7817fa2500434cb11 +MISC metadata.xml 2431 BLAKE2B 55f569c0d8957b5074eb88c064238e06b7179b927b50f0c713429e91fc07d8afd52b863f041f5b3879cab5c84abc98e25d25f9d2445d8b2444e9f1be9a2b0376 SHA512 6b6bbfca3b473a9f73cd6381a8bfcb2ef8153ceca2b68aca18d79b5ff2eb8cb8b031fc5174e6d222b5a3812ec2bc0adc1fd07ce58139c9e207e92ef9182793dc diff -uNr a/sys-devel/gcc/files/0001-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch b/sys-devel/gcc/files/0001-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch --- a/sys-devel/gcc/files/0001-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch false +++ b/sys-devel/gcc/files/0001-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch 8bbb756067d537477acaae0c783a238bf9eb8773181f4d33794ea67eeae2b31498fd9ffe54590129b605de172d7d564d31ba8ed3c84a612ff2df0a667bbba4a1 @@ -0,0 +1,237 @@ +From: "H.J. Lu" <hjl.tools@gmail.com> +To: gcc-patches@gcc.gnu.org +Subject: [1/3] GCC 7: i386: Move struct ix86_frame to machine_function +Date: Sun, 14 Jan 2018 07:02:35 -0800 + +Make ix86_frame available to i386 code generation. This is needed to +backport the patch set of -mindirect-branch= to mitigate variant #2 of +the speculative execution vulnerabilities on x86 processors identified +by CVE-2017-5715, aka Spectre. + + Backport from mainline + * config/i386/i386.c (ix86_frame): Moved to ... + * config/i386/i386.h (ix86_frame): Here. + (machine_function): Add frame. + * config/i386/i386.c (ix86_compute_frame_layout): Repace the + frame argument with &cfun->machine->frame. + (ix86_can_use_return_insn_p): Don't pass &frame to + ix86_compute_frame_layout. Copy frame from cfun->machine->frame. + (ix86_can_eliminate): Likewise. + (ix86_expand_prologue): Likewise. + (ix86_expand_epilogue): Likewise. + (ix86_expand_split_stack_prologue): Likewise. +--- + gcc/config/i386/i386.c | 68 ++++++++++---------------------------------------- + gcc/config/i386/i386.h | 53 ++++++++++++++++++++++++++++++++++++++- + 2 files changed, 65 insertions(+), 56 deletions(-) + +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c +index 8a3782c0298..813337242d8 100644 +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -2444,53 +2444,6 @@ struct GTY(()) stack_local_entry { + struct stack_local_entry *next; + }; + +-/* Structure describing stack frame layout. +- Stack grows downward: +- +- [arguments] +- <- ARG_POINTER +- saved pc +- +- saved static chain if ix86_static_chain_on_stack +- +- saved frame pointer if frame_pointer_needed +- <- HARD_FRAME_POINTER +- [saved regs] +- <- regs_save_offset +- [padding0] +- +- [saved SSE regs] +- <- sse_regs_save_offset +- [padding1] | +- | <- FRAME_POINTER +- [va_arg registers] | +- | +- [frame] | +- | +- [padding2] | = to_allocate +- <- STACK_POINTER +- */ +-struct ix86_frame +-{ +- int nsseregs; +- int nregs; +- int va_arg_size; +- int red_zone_size; +- int outgoing_arguments_size; +- +- /* The offsets relative to ARG_POINTER. */ +- HOST_WIDE_INT frame_pointer_offset; +- HOST_WIDE_INT hard_frame_pointer_offset; +- HOST_WIDE_INT stack_pointer_offset; +- HOST_WIDE_INT hfp_save_offset; +- HOST_WIDE_INT reg_save_offset; +- HOST_WIDE_INT sse_reg_save_offset; +- +- /* When save_regs_using_mov is set, emit prologue using +- move instead of push instructions. */ +- bool save_regs_using_mov; +-}; +- + /* Which cpu are we scheduling for. */ + enum attr_cpu ix86_schedule; + +@@ -2582,7 +2535,7 @@ static unsigned int ix86_function_arg_boundary (machine_mode, + const_tree); + static rtx ix86_static_chain (const_tree, bool); + static int ix86_function_regparm (const_tree, const_tree); +-static void ix86_compute_frame_layout (struct ix86_frame *); ++static void ix86_compute_frame_layout (void); + static bool ix86_expand_vector_init_one_nonzero (bool, machine_mode, + rtx, rtx, int); + static void ix86_add_new_builtins (HOST_WIDE_INT, HOST_WIDE_INT); +@@ -11903,7 +11856,8 @@ ix86_can_use_return_insn_p (void) + if (crtl->args.pops_args && crtl->args.size >= 32768) + return 0; + +- ix86_compute_frame_layout (&frame); ++ ix86_compute_frame_layout (); ++ frame = cfun->machine->frame; + return (frame.stack_pointer_offset == UNITS_PER_WORD + && (frame.nregs + frame.nsseregs) == 0); + } +@@ -12389,8 +12343,8 @@ ix86_can_eliminate (const int from, const int to) + HOST_WIDE_INT + ix86_initial_elimination_offset (int from, int to) + { +- struct ix86_frame frame; +- ix86_compute_frame_layout (&frame); ++ ix86_compute_frame_layout (); ++ struct ix86_frame frame = cfun->machine->frame; + + if (from == ARG_POINTER_REGNUM && to == HARD_FRAME_POINTER_REGNUM) + return frame.hard_frame_pointer_offset; +@@ -12429,8 +12383,9 @@ ix86_builtin_setjmp_frame_value (void) + /* Fill structure ix86_frame about frame of currently computed function. */ + + static void +-ix86_compute_frame_layout (struct ix86_frame *frame) ++ix86_compute_frame_layout (void) + { ++ struct ix86_frame *frame = &cfun->machine->frame; + unsigned HOST_WIDE_INT stack_alignment_needed; + HOST_WIDE_INT offset; + unsigned HOST_WIDE_INT preferred_alignment; +@@ -13737,7 +13692,8 @@ ix86_expand_prologue (void) + m->fs.sp_offset = INCOMING_FRAME_SP_OFFSET; + m->fs.sp_valid = true; + +- ix86_compute_frame_layout (&frame); ++ ix86_compute_frame_layout (); ++ frame = m->frame; + + if (!TARGET_64BIT && ix86_function_ms_hook_prologue (current_function_decl)) + { +@@ -14405,7 +14361,8 @@ ix86_expand_epilogue (int style) + bool using_drap; + + ix86_finalize_stack_realign_flags (); +- ix86_compute_frame_layout (&frame); ++ ix86_compute_frame_layout (); ++ frame = m->frame; + + m->fs.sp_valid = (!frame_pointer_needed + || (crtl->sp_is_unchanging +@@ -14915,7 +14872,8 @@ ix86_expand_split_stack_prologue (void) + gcc_assert (flag_split_stack && reload_completed); + + ix86_finalize_stack_realign_flags (); +- ix86_compute_frame_layout (&frame); ++ ix86_compute_frame_layout (); ++ frame = cfun->machine->frame; + allocate = frame.stack_pointer_offset - INCOMING_FRAME_SP_OFFSET; + + /* This is the label we will branch to if we have enough stack +diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h +index 9c776dc5172..f9b91286a01 100644 +--- a/gcc/config/i386/i386.h ++++ b/gcc/config/i386/i386.h +@@ -2451,9 +2451,56 @@ enum avx_u128_state + + #define FASTCALL_PREFIX '@' + ++#ifndef USED_FOR_TARGET ++/* Structure describing stack frame layout. ++ Stack grows downward: ++ ++ [arguments] ++ <- ARG_POINTER ++ saved pc ++ ++ saved static chain if ix86_static_chain_on_stack ++ ++ saved frame pointer if frame_pointer_needed ++ <- HARD_FRAME_POINTER ++ [saved regs] ++ <- regs_save_offset ++ [padding0] ++ ++ [saved SSE regs] ++ <- sse_regs_save_offset ++ [padding1] | ++ | <- FRAME_POINTER ++ [va_arg registers] | ++ | ++ [frame] | ++ | ++ [padding2] | = to_allocate ++ <- STACK_POINTER ++ */ ++struct GTY(()) ix86_frame ++{ ++ int nsseregs; ++ int nregs; ++ int va_arg_size; ++ int red_zone_size; ++ int outgoing_arguments_size; ++ ++ /* The offsets relative to ARG_POINTER. */ ++ HOST_WIDE_INT frame_pointer_offset; ++ HOST_WIDE_INT hard_frame_pointer_offset; ++ HOST_WIDE_INT stack_pointer_offset; ++ HOST_WIDE_INT hfp_save_offset; ++ HOST_WIDE_INT reg_save_offset; ++ HOST_WIDE_INT sse_reg_save_offset; ++ ++ /* When save_regs_using_mov is set, emit prologue using ++ move instead of push instructions. */ ++ bool save_regs_using_mov; ++}; ++ + /* Machine specific frame tracking during prologue/epilogue generation. */ + +-#ifndef USED_FOR_TARGET + struct GTY(()) machine_frame_state + { + /* This pair tracks the currently active CFA as reg+offset. When reg +@@ -2512,6 +2559,9 @@ struct GTY(()) machine_function { + int varargs_fpr_size; + int optimize_mode_switching[MAX_386_ENTITIES]; + ++ /* Cached initial frame layout for the current function. */ ++ struct ix86_frame frame; ++ + /* Number of saved registers USE_FAST_PROLOGUE_EPILOGUE + has been computed for. */ + int use_fast_prologue_epilogue_nregs; +@@ -2594,6 +2644,7 @@ struct GTY(()) machine_function { + #define ix86_current_function_calls_tls_descriptor \ + (ix86_tls_descriptor_calls_expanded_in_cfun && df_regs_ever_live_p (SP_REG)) + #define ix86_static_chain_on_stack (cfun->machine->static_chain_on_stack) ++#define ix86_red_zone_size (cfun->machine->frame.red_zone_size) + + /* Control behavior of x86_file_start. */ + #define X86_FILE_START_VERSION_DIRECTIVE false + diff -uNr a/sys-devel/gcc/files/0002-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch b/sys-devel/gcc/files/0002-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch --- a/sys-devel/gcc/files/0002-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch false +++ b/sys-devel/gcc/files/0002-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch c3ebd22473812c9e386f647a4c00e51dd904a29a49ddef5fe79c2acbd8a4c2c08ce706b73d1831a0815ed903baaee49772c13beff0f5e37867090deeaf346c96 @@ -0,0 +1,68 @@ +From: "H.J. Lu" <hjl.tools@gmail.com> +To: gcc-patches@gcc.gnu.org +Subject: [2/3] GCC 7: i386: Use reference of struct ix86_frame to avoid copy +Date: Sun, 14 Jan 2018 07:02:36 -0800 + +When there is no need to make a copy of ix86_frame, we can use reference +of struct ix86_frame to avoid copy. + +Tested on x86-64. + + Backport from mainline + * config/i386/i386.c (ix86_can_use_return_insn_p): Use reference + of struct ix86_frame. + (ix86_initial_elimination_offset): Likewise. + (ix86_expand_split_stack_prologue): Likewise. +--- + gcc/config/i386/i386.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c +index 813337242d8..397ef7cac26 100644 +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -11843,8 +11843,6 @@ symbolic_reference_mentioned_p (rtx op) + bool + ix86_can_use_return_insn_p (void) + { +- struct ix86_frame frame; +- + /* Don't use `ret' instruction in interrupt handler. */ + if (! reload_completed + || frame_pointer_needed +@@ -11857,7 +11855,7 @@ ix86_can_use_return_insn_p (void) + return 0; + + ix86_compute_frame_layout (); +- frame = cfun->machine->frame; ++ struct ix86_frame &frame = cfun->machine->frame; + return (frame.stack_pointer_offset == UNITS_PER_WORD + && (frame.nregs + frame.nsseregs) == 0); + } +@@ -12344,7 +12342,7 @@ HOST_WIDE_INT + ix86_initial_elimination_offset (int from, int to) + { + ix86_compute_frame_layout (); +- struct ix86_frame frame = cfun->machine->frame; ++ struct ix86_frame &frame = cfun->machine->frame; + + if (from == ARG_POINTER_REGNUM && to == HARD_FRAME_POINTER_REGNUM) + return frame.hard_frame_pointer_offset; +@@ -14860,7 +14858,6 @@ static GTY(()) rtx split_stack_fn_large; + void + ix86_expand_split_stack_prologue (void) + { +- struct ix86_frame frame; + HOST_WIDE_INT allocate; + unsigned HOST_WIDE_INT args_size; + rtx_code_label *label; +@@ -14873,7 +14870,7 @@ ix86_expand_split_stack_prologue (void) + + ix86_finalize_stack_realign_flags (); + ix86_compute_frame_layout (); +- frame = cfun->machine->frame; ++ struct ix86_frame &frame = cfun->machine->frame; + allocate = frame.stack_pointer_offset - INCOMING_FRAME_SP_OFFSET; + + /* This is the label we will branch to if we have enough stack + diff -uNr a/sys-devel/gcc/files/4.9.4/boehm_gc.patch b/sys-devel/gcc/files/4.9.4/boehm_gc.patch --- a/sys-devel/gcc/files/4.9.4/boehm_gc.patch false +++ b/sys-devel/gcc/files/4.9.4/boehm_gc.patch 4901635ccc068db55ab19a620550bf6ab06314ab02c73de53e29f24a3c4763fd4f8fa086abf824e221b438da03b02cca447a78db53ebedfcdcbeb9d8eb4a2215 @@ -0,0 +1,104 @@ +diff -Naur gcc-4.9.4.orig/boehm-gc/dyn_load.c gcc-4.9.4/boehm-gc/dyn_load.c +--- gcc-4.9.4.orig/boehm-gc/dyn_load.c 2012-11-04 14:56:02.000000000 -0800 ++++ gcc-4.9.4/boehm-gc/dyn_load.c 2016-12-25 13:22:28.000677992 -0800 +@@ -459,10 +459,7 @@ + /* For glibc 2.2.4+. Unfortunately, it doesn't work for older */ + /* versions. Thanks to Jakub Jelinek for most of the code. */ + +-# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \ +- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ +- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) +- ++#if defined(LINUX) + /* We have the header files for a glibc that includes dl_iterate_phdr. */ + /* It may still not be available in the library on the target system. */ + /* Thus we also treat it as a weak symbol. */ +diff -Naur gcc-4.9.4.orig/boehm-gc/include/private/gcconfig.h gcc-4.9.4/boehm-gc/include/private/gcconfig.h +--- gcc-4.9.4.orig/boehm-gc/include/private/gcconfig.h 2013-12-21 12:42:39.000000000 -0800 ++++ gcc-4.9.4/boehm-gc/include/private/gcconfig.h 2016-12-25 13:22:28.001678000 -0800 +@@ -696,9 +696,7 @@ + # ifdef __ELF__ + # define DYNAMIC_LOADING + # include <features.h> +-# if defined(__GLIBC__)&& __GLIBC__>=2 +-# define SEARCH_FOR_DATA_START +-# else /* !GLIBC2 */ ++# if defined(__GLIBC__) && __GLIBC__ < 2 + extern char **__environ; + # define DATASTART ((ptr_t)(&__environ)) + /* hideous kludge: __environ is the first */ +@@ -709,6 +707,8 @@ + /* would include .rodata, which may */ + /* contain large read-only data tables */ + /* that we'd rather not scan. */ ++# else ++# define SEARCH_FOR_DATA_START + # endif /* !GLIBC2 */ + extern int _end[]; + # define DATAEND (_end) +@@ -1167,9 +1167,7 @@ + # define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff)) + # endif + # include <features.h> +-# if defined(__GLIBC__) && __GLIBC__ >= 2 +-# define SEARCH_FOR_DATA_START +-# else ++# if defined(__GLIBC__) && __GLIBC__ < 2 + extern char **__environ; + # define DATASTART ((ptr_t)(&__environ)) + /* hideous kludge: __environ is the first */ +@@ -1180,6 +1178,8 @@ + /* would include .rodata, which may */ + /* contain large read-only data tables */ + /* that we'd rather not scan. */ ++# else ++# define SEARCH_FOR_DATA_START + # endif + extern int _end[]; + # define DATAEND (_end) +@@ -1387,10 +1387,10 @@ + # define HBLKSIZE 4096 + # endif + # define USE_GENERIC_PUSH_REGS +-# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 || __GLIBC__ > 2 +-# define LINUX_STACKBOTTOM +-# else ++# if __GLIBC__ == 2 && __GLIBC_MINOR__ < 2 || __GLIBC__ < 2 + # define STACKBOTTOM 0x80000000 ++# else ++# define LINUX_STACKBOTTOM + # endif + # endif /* Linux */ + # ifdef EWS4800 +@@ -1904,9 +1904,7 @@ + # ifdef __ELF__ + # define DYNAMIC_LOADING + # include <features.h> +-# if defined(__GLIBC__) && __GLIBC__ >= 2 +-# define SEARCH_FOR_DATA_START +-# else ++# if defined(__GLIBC__) && __GLIBC__ < 2 + extern char **__environ; + # define DATASTART ((ptr_t)(&__environ)) + /* hideous kludge: __environ is the first */ +@@ -1917,6 +1915,8 @@ + /* would include .rodata, which may */ + /* contain large read-only data tables */ + /* that we'd rather not scan. */ ++# else ++# define SEARCH_FOR_DATA_START + # endif + extern int _end[]; + # define DATAEND (_end) +diff -Naur gcc-4.9.4.orig/boehm-gc/os_dep.c gcc-4.9.4/boehm-gc/os_dep.c +--- gcc-4.9.4.orig/boehm-gc/os_dep.c 2013-03-06 07:08:58.000000000 -0800 ++++ gcc-4.9.4/boehm-gc/os_dep.c 2016-12-25 13:22:28.002678009 -0800 +@@ -26,7 +26,7 @@ + # define __KERNEL__ + # include <asm/signal.h> + # undef __KERNEL__ +-# else ++# elif defined(__GLIBC__) + /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */ + /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */ + /* prototypes, so we have to include the top-level sigcontext.h to */ diff -uNr a/sys-devel/gcc/files/4.9.4/gthread.patch b/sys-devel/gcc/files/4.9.4/gthread.patch --- a/sys-devel/gcc/files/4.9.4/gthread.patch false +++ b/sys-devel/gcc/files/4.9.4/gthread.patch f0af3e620e8723f07779932d98b4383f813a7a08d3d53b14b6ffb428a72162b574c03a0be8376ec1aaed83bdfa04aef26548d3a73ccaff1e892277cb92ed11e0 @@ -0,0 +1,37 @@ +diff -Naur gcc-4.9.4.orig/libgfortran/acinclude.m4 gcc-4.9.4/libgfortran/acinclude.m4 +--- gcc-4.9.4.orig/libgfortran/acinclude.m4 2016-12-24 16:16:53.481696091 -0800 ++++ gcc-4.9.4/libgfortran/acinclude.m4 2016-12-24 16:42:52.045622116 -0800 +@@ -100,7 +100,7 @@ + [Define to 1 if the target supports #pragma weak]) + fi + case "$host" in +- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* ) ++ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* ) + AC_DEFINE(GTHREAD_USE_WEAK, 0, + [Define to 0 if the target shouldn't use #pragma weak]) + ;; +diff -Naur gcc-4.9.4.orig/libgfortran/configure gcc-4.9.4/libgfortran/configure +--- gcc-4.9.4.orig/libgfortran/configure 2016-12-24 16:16:53.557696818 -0800 ++++ gcc-4.9.4/libgfortran/configure 2016-12-24 16:43:06.557762874 -0800 +@@ -26355,7 +26355,7 @@ + + fi + case "$host" in +- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* ) ++ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* ) + + $as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h + +diff -Naur gcc-4.9.4.orig/libstdc++-v3/config/os/generic/os_defines.h gcc-4.9.4/libstdc++-v3/config/os/generic/os_defines.h +--- gcc-4.9.4.orig/libstdc++-v3/config/os/generic/os_defines.h 2016-12-24 16:16:55.523715643 -0800 ++++ gcc-4.9.4/libstdc++-v3/config/os/generic/os_defines.h 2016-12-24 16:44:10.273380874 -0800 +@@ -33,4 +33,9 @@ + // System-specific #define, typedefs, corrections, etc, go here. This + // file will come before all others. + ++// Disable the weak reference logic in gthr.h for os/generic because it ++// is broken on every platform unless there is implementation specific ++// workaround in gthr-posix.h and at link-time for static linking. ++#define _GLIBCXX_GTHREAD_USE_WEAK 0 ++ + #endif diff -uNr a/sys-devel/gcc/files/4.9.4/posix_memalign.patch b/sys-devel/gcc/files/4.9.4/posix_memalign.patch --- a/sys-devel/gcc/files/4.9.4/posix_memalign.patch false +++ b/sys-devel/gcc/files/4.9.4/posix_memalign.patch 8d48f2d0258dc2fced2a1ce718bf54adca9575ec5c97cc72ee557a44d7bcc37196a186a74834895984a893bfa2253ab882ce9402be834287326aab36f6808c6e @@ -0,0 +1,29 @@ +diff -Naur gcc-4.9.4.orig/gcc/config/i386/pmm_malloc.h gcc-4.9.4/gcc/config/i386/pmm_malloc.h +--- gcc-4.9.4.orig/gcc/config/i386/pmm_malloc.h 2016-12-24 16:17:07.001825547 -0800 ++++ gcc-4.9.4/gcc/config/i386/pmm_malloc.h 2016-12-24 16:20:25.242723710 -0800 +@@ -27,12 +27,13 @@ + #include <stdlib.h> + + /* We can't depend on <stdlib.h> since the prototype of posix_memalign +- may not be visible. */ ++ may not be visible and we can't pollute the namespace either. */ + #ifndef __cplusplus +-extern int posix_memalign (void **, size_t, size_t); ++extern int __gcc_posix_memalign (void **, size_t, size_t) + #else +-extern "C" int posix_memalign (void **, size_t, size_t) throw (); ++extern "C" int __gcc_posix_memalign (void **, size_t, size_t) throw () + #endif ++__asm__("posix_memalign"); + + static __inline void * + _mm_malloc (size_t size, size_t alignment) +@@ -42,7 +43,7 @@ + return malloc (size); + if (alignment == 2 || (sizeof (void *) == 8 && alignment == 4)) + alignment = sizeof (void *); +- if (posix_memalign (&ptr, alignment, size) == 0) ++ if (__gcc_posix_memalign (&ptr, alignment, size) == 0) + return ptr; + else + return NULL; diff -uNr a/sys-devel/gcc/files/5.4.0/cilkrts.patch b/sys-devel/gcc/files/5.4.0/cilkrts.patch --- a/sys-devel/gcc/files/5.4.0/cilkrts.patch false +++ b/sys-devel/gcc/files/5.4.0/cilkrts.patch 035dc203c144a6b9260c9d42c788a5a2b4cc5f245b894aa3d7f8dd15be5cdd5f1ff0bb3c829ff6fec136778ea1830e79c4dfb154f5a8fee8654be997a2e6f4fb @@ -0,0 +1,46 @@ +diff -Naur gcc-5.4.0.orig/libcilkrts/runtime/os-unix.c gcc-5.4.0/libcilkrts/runtime/os-unix.c +--- gcc-5.4.0.orig/libcilkrts/runtime/os-unix.c 2014-05-21 04:08:58.000000000 -0700 ++++ gcc-5.4.0/libcilkrts/runtime/os-unix.c 2016-12-24 15:35:14.225647627 -0800 +@@ -51,6 +51,7 @@ + #if defined __linux__ + # include <sys/sysinfo.h> + # include <sys/syscall.h> ++# include <sched.h> + #elif defined __APPLE__ + # include <sys/sysctl.h> + // Uses sysconf(_SC_NPROCESSORS_ONLN) in verbose output +@@ -400,28 +401,19 @@ + + COMMON_SYSDEP void __cilkrts_yield(void) + { +-#if __APPLE__ || __FreeBSD__ || __VXWORKS__ +- // On MacOS, call sched_yield to yield quantum. I'm not sure why we +- // don't do this on Linux also. +- sched_yield(); +-#elif defined(__DragonFly__) +- // On DragonFly BSD, call sched_yield to yield quantum. +- sched_yield(); +-#elif defined(__MIC__) ++#if defined(__MIC__) + // On MIC, pthread_yield() really trashes things. Arch's measurements + // showed that calling _mm_delay_32() (or doing nothing) was a better + // option. Delaying 1024 clock cycles is a reasonable compromise between + // giving up the processor and latency starting up when work becomes + // available + _mm_delay_32(1024); +-#elif defined(__ANDROID__) || (defined(__sun__) && defined(__svr4__)) +- // On Android and Solaris, call sched_yield to yield quantum. I'm not +- // sure why we don't do this on Linux also. +- sched_yield(); +-#else +- // On Linux, call pthread_yield (which in turn will call sched_yield) +- // to yield quantum. ++#elif defined(__sun__) && !defined(__svr4__) ++ // On old SunOS call pthread_yield to yield a quantum. + pthread_yield(); ++#else ++ // On other platforms call sched_yield to yield a quantum. ++ sched_yield(); + #endif + } + diff -uNr a/sys-devel/gcc/files/5.4.0/linker_path.patch b/sys-devel/gcc/files/5.4.0/linker_path.patch --- a/sys-devel/gcc/files/5.4.0/linker_path.patch false +++ b/sys-devel/gcc/files/5.4.0/linker_path.patch 18127a7c339b622d9d477e380d2337a7e410cae15c3fbb6b0e2a1d96d060f50cccd275d68a9b423f58d9c9ab645f121680ea4816ccb59115e428447178d2cb22 @@ -0,0 +1,213 @@ +diff -Naur gcc-5.4.0.orig/gcc/config/aarch64/aarch64-linux.h gcc-5.4.0/gcc/config/aarch64/aarch64-linux.h +--- gcc-5.4.0.orig/gcc/config/aarch64/aarch64-linux.h 2015-07-24 09:00:26.000000000 -0700 ++++ gcc-5.4.0/gcc/config/aarch64/aarch64-linux.h 2016-12-24 14:48:44.236623207 -0800 +@@ -23,6 +23,9 @@ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" + ++#undef MUSL_DYNAMIC_LINKER ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" ++ + #undef ASAN_CC1_SPEC + #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" + +diff -Naur gcc-5.4.0.orig/gcc/config/arm/linux-eabi.h gcc-5.4.0/gcc/config/arm/linux-eabi.h +--- gcc-5.4.0.orig/gcc/config/arm/linux-eabi.h 2016-12-24 15:27:49.152307307 -0800 ++++ gcc-5.4.0/gcc/config/arm/linux-eabi.h 2016-12-24 14:50:04.522429254 -0800 +@@ -77,6 +77,23 @@ + %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ + %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" + ++/* For ARM musl currently supports four dynamic linkers: ++ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI ++ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI ++ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB ++ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB ++ musl does not support the legacy OABI mode. ++ All the dynamic linkers live in /lib. ++ We default to soft-float, EL. */ ++#undef MUSL_DYNAMIC_LINKER ++#if TARGET_BIG_ENDIAN_DEFAULT ++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" ++#endif ++#define MUSL_DYNAMIC_LINKER \ ++ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" ++ + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ + #undef LINK_SPEC +diff -Naur gcc-5.4.0.orig/gcc/config/i386/linux.h gcc-5.4.0/gcc/config/i386/linux.h +--- gcc-5.4.0.orig/gcc/config/i386/linux.h 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/gcc/config/i386/linux.h 2016-12-24 14:50:54.802934056 -0800 +@@ -21,3 +21,6 @@ + + #define GNU_USER_LINK_EMULATION "elf_i386" + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++ ++#undef MUSL_DYNAMIC_LINKER ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" +diff -Naur gcc-5.4.0.orig/gcc/config/i386/linux64.h gcc-5.4.0/gcc/config/i386/linux64.h +--- gcc-5.4.0.orig/gcc/config/i386/linux64.h 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/gcc/config/i386/linux64.h 2016-12-24 14:51:15.579142643 -0800 +@@ -30,3 +30,10 @@ + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" ++ ++#undef MUSL_DYNAMIC_LINKER32 ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" ++#undef MUSL_DYNAMIC_LINKER64 ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" ++#undef MUSL_DYNAMIC_LINKERX32 ++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" +diff -Naur gcc-5.4.0.orig/gcc/config/microblaze/linux.h gcc-5.4.0/gcc/config/microblaze/linux.h +--- gcc-5.4.0.orig/gcc/config/microblaze/linux.h 2015-05-28 07:08:19.000000000 -0700 ++++ gcc-5.4.0/gcc/config/microblaze/linux.h 2016-12-24 14:58:26.290647241 -0800 +@@ -28,10 +28,20 @@ + #undef TLS_NEEDS_GOT + #define TLS_NEEDS_GOT 1 + +-#define DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++ ++#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:el}" ++#endif ++ ++#undef MUSL_DYNAMIC_LINKER ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" ++ + #undef SUBTARGET_EXTRA_SPECS + #define SUBTARGET_EXTRA_SPECS \ +- { "dynamic_linker", DYNAMIC_LINKER } ++ { "dynamic_linker", GNU_USER_DYNAMIC_LINKER } + + #undef LINK_SPEC + #define LINK_SPEC "%{shared:-shared} \ +diff -Naur gcc-5.4.0.orig/gcc/config/mips/linux.h gcc-5.4.0/gcc/config/mips/linux.h +--- gcc-5.4.0.orig/gcc/config/mips/linux.h 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/gcc/config/mips/linux.h 2016-12-24 15:01:34.093670361 -0800 +@@ -37,7 +37,13 @@ + #define UCLIBC_DYNAMIC_LINKERN32 \ + "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" + ++#undef MUSL_DYNAMIC_LINKER32 ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" ++#undef MUSL_DYNAMIC_LINKER64 ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" ++ + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" + #define GNU_USER_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +- BIONIC_DYNAMIC_LINKERN32) ++ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) +diff -Naur gcc-5.4.0.orig/gcc/config/rs6000/linux64.h gcc-5.4.0/gcc/config/rs6000/linux64.h +--- gcc-5.4.0.orig/gcc/config/rs6000/linux64.h 2015-03-09 16:18:57.000000000 -0700 ++++ gcc-5.4.0/gcc/config/rs6000/linux64.h 2016-12-24 15:03:44.985080397 -0800 +@@ -363,19 +367,32 @@ + #else + #define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}" + #endif ++ ++#define MUSL_DYNAMIC_LINKER32 \ ++ "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKER64 \ ++ "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" ++ + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) \ ++ "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" + #elif DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) \ ++ "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) \ ++ "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER32 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ ++ MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ ++ MUSL_DYNAMIC_LINKER64) + + #undef DEFAULT_ASM_ENDIAN + #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) +diff -Naur gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h gcc-5.4.0/gcc/config/rs6000/sysv4.h +--- gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h 2015-09-24 06:46:45.000000000 -0700 ++++ gcc-5.4.0/gcc/config/rs6000/sysv4.h 2016-12-24 15:08:38.507113094 -0800 +@@ -757,17 +762,27 @@ + + #define LINK_START_LINUX_SPEC "" + ++#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","") ++ + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER \ ++ "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) \ ++ "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) \ ++ "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) \ ++ "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ ++ MUSL_DYNAMIC_LINKER) + + #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +diff -Naur gcc-5.4.0.orig/gcc/config/sh/linux.h gcc-5.4.0/gcc/config/sh/linux.h +--- gcc-5.4.0.orig/gcc/config/sh/linux.h 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/gcc/config/sh/linux.h 2016-12-24 15:09:54.568853072 -0800 +@@ -43,6 +43,27 @@ + + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + ++#if TARGET_ENDIAN_DEFAULT == MASK_LITTLE_ENDIAN ++#define MUSL_DYNAMIC_LINKER_E "%{mb:eb}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{!ml:eb}" ++#endif ++ ++#if TARGET_CPU_DEFAULT & (MASK_HARD_SH2A_DOUBLE | MASK_SH4) ++/* "-nofpu" if any nofpu option is specified. */ ++#define MUSL_DYNAMIC_LINKER_FP \ ++ "%{m1|m2|m2a-nofpu|m3|m4-nofpu|m4-100-nofpu|m4-200-nofpu|m4-300-nofpu|" \ ++ "m4-340|m4-400|m4-500|m4al:-nofpu}" ++#else ++/* "-nofpu" if none of the hard fpu options are specified. */ ++#define MUSL_DYNAMIC_LINKER_FP "%{m2a|m4|m4-100|m4-200|m4-300|m4a:;:-nofpu}" ++#endif ++ ++#undef MUSL_DYNAMIC_LINKER ++#define MUSL_DYNAMIC_LINKER \ ++ "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \ ++ "%{mfdpic:-fdpic}.so.1" ++ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" + + #undef SUBTARGET_LINK_EMUL_SUFFIX diff -uNr a/sys-devel/gcc/files/5.4.0/musl.patch b/sys-devel/gcc/files/5.4.0/musl.patch --- a/sys-devel/gcc/files/5.4.0/musl.patch false +++ b/sys-devel/gcc/files/5.4.0/musl.patch efaf7d717260eafff861d59d32ff125f1302ed12c924dcb75d0e021b7b905ccac3ffe2dd937c0b12f08c39a945970da25b76d94df35ca9785e520c257c80c2f3 @@ -0,0 +1,502 @@ +diff -Naur gcc-5.4.0.orig/fixincludes/mkfixinc.sh gcc-5.4.0/fixincludes/mkfixinc.sh +--- gcc-5.4.0.orig/fixincludes/mkfixinc.sh 2012-10-28 14:42:48.000000000 -0700 ++++ gcc-5.4.0/fixincludes/mkfixinc.sh 2016-12-24 14:47:04.324620119 -0800 +@@ -19,7 +19,8 @@ + powerpc-*-eabi* | \ + powerpc-*-rtems* | \ + powerpcle-*-eabisim* | \ +- powerpcle-*-eabi* ) ++ powerpcle-*-eabi* | \ ++ *-musl* ) + # IF there is no include fixing, + # THEN create a no-op fixer and exit + (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} +diff -Naur gcc-5.4.0.orig/gcc/config/glibc-stdint.h gcc-5.4.0/gcc/config/glibc-stdint.h +--- gcc-5.4.0.orig/gcc/config/glibc-stdint.h 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/gcc/config/glibc-stdint.h 2016-12-24 15:24:46.234527766 -0800 +@@ -22,6 +22,12 @@ + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + <http://www.gnu.org/licenses/>. */ + ++/* Systems using musl libc should use this header and make sure ++ OPTION_MUSL is defined correctly before using the TYPE macros. */ ++#ifndef OPTION_MUSL ++#define OPTION_MUSL 0 ++#endif ++ + #define SIG_ATOMIC_TYPE "int" + + #define INT8_TYPE "signed char" +@@ -43,12 +49,12 @@ + #define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int") + + #define INT_FAST8_TYPE "signed char" +-#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") +-#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") ++#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int") ++#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int") + #define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int") + #define UINT_FAST8_TYPE "unsigned char" +-#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int") +-#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int") ++#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int") ++#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int") + #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int") + + #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") +diff -Naur gcc-5.4.0.orig/gcc/config/linux.c gcc-5.4.0/gcc/config/linux.c +--- gcc-5.4.0.orig/gcc/config/linux.c 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/gcc/config/linux.c 2016-12-24 15:35:58.913083568 -0800 +@@ -26,7 +26,7 @@ + bool + linux_libc_has_function (enum function_class fn_class) + { +- if (OPTION_GLIBC) ++ if (OPTION_GLIBC || OPTION_MUSL) + return true; + if (OPTION_BIONIC) + if (fn_class == function_c94 +diff -Naur gcc-5.4.0.orig/gcc/config/linux.h gcc-5.4.0/gcc/config/linux.h +--- gcc-5.4.0.orig/gcc/config/linux.h 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/gcc/config/linux.h 2016-12-24 14:55:26.718712791 -0800 +@@ -32,10 +32,14 @@ + #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) + #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) + #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) ++#undef OPTION_MUSL ++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) + #else + #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) + #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) + #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) ++#undef OPTION_MUSL ++#define OPTION_MUSL (linux_libc == LIBC_MUSL) + #endif + + #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ +@@ -50,21 +54,25 @@ + } while (0) + + /* Determine which dynamic linker to use depending on whether GLIBC or +- uClibc or Bionic is the default C library and whether +- -muclibc or -mglibc or -mbionic has been passed to change the default. */ ++ uClibc or Bionic or musl is the default C library and whether ++ -muclibc or -mglibc or -mbionic or -mmusl has been passed to change ++ the default. */ + +-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ +- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" ++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ ++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" + + #if DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) + #elif DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) + #elif DEFAULT_LIBC == LIBC_BIONIC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) + #else + #error "Unsupported DEFAULT_LIBC" + #endif /* DEFAULT_LIBC */ +@@ -81,24 +89,101 @@ + #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" + #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" + #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32" ++/* Should be redefined for each target that supports musl. */ ++#define MUSL_DYNAMIC_LINKER "/dev/null" ++#define MUSL_DYNAMIC_LINKER32 "/dev/null" ++#define MUSL_DYNAMIC_LINKER64 "/dev/null" ++#define MUSL_DYNAMIC_LINKERX32 "/dev/null" + + #define GNU_USER_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ +- BIONIC_DYNAMIC_LINKER) ++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + #define GNU_USER_DYNAMIC_LINKER32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ +- BIONIC_DYNAMIC_LINKER32) ++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ +- BIONIC_DYNAMIC_LINKER64) ++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + #define GNU_USER_DYNAMIC_LINKERX32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ +- BIONIC_DYNAMIC_LINKERX32) ++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) + + /* Whether we have Bionic libc runtime */ + #undef TARGET_HAS_BIONIC + #define TARGET_HAS_BIONIC (OPTION_BIONIC) + ++/* musl avoids problematic includes by rearranging the include directories. ++ * Unfortunately, this is mostly duplicated from cppdefault.c */ ++#if DEFAULT_LIBC == LIBC_MUSL ++#define INCLUDE_DEFAULTS_MUSL_GPP \ ++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ ++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ ++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, ++ ++#ifdef LOCAL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_LOCAL \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_LOCAL ++#endif ++ ++#ifdef PREFIX_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_PREFIX ++#endif ++ ++#ifdef CROSS_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_CROSS \ ++ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#ifdef TOOL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_TOOL \ ++ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_TOOL ++#endif ++ ++#ifdef NATIVE_SYSTEM_HEADER_DIR ++#define INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_NATIVE ++#endif ++ ++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) ++# undef INCLUDE_DEFAULTS_MUSL_LOCAL ++# define INCLUDE_DEFAULTS_MUSL_LOCAL ++# undef INCLUDE_DEFAULTS_MUSL_NATIVE ++# define INCLUDE_DEFAULTS_MUSL_NATIVE ++#else ++# undef INCLUDE_DEFAULTS_MUSL_CROSS ++# define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#undef INCLUDE_DEFAULTS ++#define INCLUDE_DEFAULTS \ ++ { \ ++ INCLUDE_DEFAULTS_MUSL_GPP \ ++ INCLUDE_DEFAULTS_MUSL_LOCAL \ ++ INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ INCLUDE_DEFAULTS_MUSL_CROSS \ ++ INCLUDE_DEFAULTS_MUSL_TOOL \ ++ INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ ++ { 0, 0, 0, 0, 0, 0 } \ ++ } ++#endif ++ + #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ + /* This is a *uclinux* target. We don't define below macros to normal linux + versions, because doing so would require *uclinux* targets to include +diff -Naur gcc-5.4.0.orig/gcc/config/linux.opt gcc-5.4.0/gcc/config/linux.opt +--- gcc-5.4.0.orig/gcc/config/linux.opt 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/gcc/config/linux.opt 2016-12-24 14:56:23.784327534 -0800 +@@ -28,5 +28,9 @@ + Use GNU C library + + muclibc +-Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) ++Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl) + Use uClibc C library ++ ++mmusl ++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic) ++Use musl C library. +diff -Naur gcc-5.4.0.orig/gcc/config/rs6000/linux64.h gcc-5.4.0/gcc/config/rs6000/linux64.h +--- gcc-5.4.0.orig/gcc/config/rs6000/linux64.h 2015-03-09 16:18:57.000000000 -0700 ++++ gcc-5.4.0/gcc/config/rs6000/linux64.h 2016-12-24 15:03:44.985080397 -0800 +@@ -299,10 +299,14 @@ + #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) + #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) + #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) ++#undef OPTION_MUSL ++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) + #else + #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) + #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) + #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) ++#undef OPTION_MUSL ++#define OPTION_MUSL (linux_libc == LIBC_MUSL) + #endif + + /* Determine what functions are present at the runtime; +diff -Naur gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h gcc-5.4.0/gcc/config/rs6000/sysv4.h +--- gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h 2015-09-24 06:46:45.000000000 -0700 ++++ gcc-5.4.0/gcc/config/rs6000/sysv4.h 2016-12-24 15:08:38.507113094 -0800 +@@ -943,3 +959,73 @@ + /* This target uses the sysv4.opt file. */ + #define TARGET_USES_SYSV4_OPT 1 + ++/* Include order changes for musl, same as in generic linux.h. */ ++#if DEFAULT_LIBC == LIBC_MUSL ++#define INCLUDE_DEFAULTS_MUSL_GPP \ ++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ ++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ ++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, ++ ++#ifdef LOCAL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_LOCAL \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_LOCAL ++#endif ++ ++#ifdef PREFIX_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_PREFIX ++#endif ++ ++#ifdef CROSS_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_CROSS \ ++ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#ifdef TOOL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_TOOL \ ++ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_TOOL ++#endif ++ ++#ifdef NATIVE_SYSTEM_HEADER_DIR ++#define INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_NATIVE ++#endif ++ ++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) ++# undef INCLUDE_DEFAULTS_MUSL_LOCAL ++# define INCLUDE_DEFAULTS_MUSL_LOCAL ++# undef INCLUDE_DEFAULTS_MUSL_NATIVE ++# define INCLUDE_DEFAULTS_MUSL_NATIVE ++#else ++# undef INCLUDE_DEFAULTS_MUSL_CROSS ++# define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#undef INCLUDE_DEFAULTS ++#define INCLUDE_DEFAULTS \ ++ { \ ++ INCLUDE_DEFAULTS_MUSL_GPP \ ++ INCLUDE_DEFAULTS_MUSL_LOCAL \ ++ INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ INCLUDE_DEFAULTS_MUSL_CROSS \ ++ INCLUDE_DEFAULTS_MUSL_TOOL \ ++ INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ ++ { 0, 0, 0, 0, 0, 0 } \ ++ } ++#endif +diff -Naur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc +--- gcc-5.4.0.orig/gcc/config.gcc 2016-12-24 15:28:09.922509373 -0800 ++++ gcc-5.4.0/gcc/config.gcc 2016-12-24 15:39:19.482040184 -0800 +@@ -575,7 +575,7 @@ + esac + + # Common C libraries. +-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" ++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" + + # 32-bit x86 processors supported by --with-arch=. Each processor + # MUST be separated by exactly one space. +@@ -720,6 +720,9 @@ + *-*-*uclibc*) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" + ;; ++ *-*-*musl*) ++ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" ++ ;; + *) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" + ;; +@@ -1438,7 +1441,7 @@ + extra_options="${extra_options} linux-android.opt" + # Assume modern glibc if not targeting Android nor uclibc. + case ${target} in +- *-*-*android*|*-*-*uclibc*) ++ *-*-*android*|*-*-*uclibc*|*-*-*musl*) + ;; + *) + default_gnu_indirect_function=yes +@@ -1507,7 +1510,7 @@ + extra_options="${extra_options} linux-android.opt" + # Assume modern glibc if not targeting Android nor uclibc. + case ${target} in +- *-*-*android*|*-*-*uclibc*) ++ *-*-*android*|*-*-*uclibc*|*-*-*musl*) + ;; + *) + default_gnu_indirect_function=yes +diff -Naur gcc-5.4.0.orig/gcc/configure gcc-5.4.0/gcc/configure +--- gcc-5.4.0.orig/gcc/configure 2016-12-24 15:28:54.117939552 -0800 ++++ gcc-5.4.0/gcc/configure 2016-12-24 15:13:46.057105137 -0800 +@@ -27837,6 +27837,9 @@ + else + gcc_cv_libc_provides_ssp=no + case "$target" in ++ *-*-musl*) ++ # All versions of musl provide stack protector ++ gcc_cv_libc_provides_ssp=yes;; + *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) + # glibc 2.4 and later provides __stack_chk_fail and + # either __stack_chk_guard, or TLS access to stack guard canary. +@@ -27869,6 +27872,7 @@ + # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now + # simply assert that glibc does provide this, which is true for all + # realistically usable GNU/Hurd configurations. ++ # All supported versions of musl provide it as well + gcc_cv_libc_provides_ssp=yes;; + *-*-darwin* | *-*-freebsd*) + ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail" +@@ -27965,6 +27969,9 @@ + gcc_cv_target_dl_iterate_phdr=no + fi + ;; ++ *-linux-musl*) ++ gcc_cv_target_dl_iterate_phdr=yes ++ ;; + esac + + if test x$gcc_cv_target_dl_iterate_phdr = xyes; then +diff -Naur gcc-5.4.0.orig/gcc/configure.ac gcc-5.4.0/gcc/configure.ac +--- gcc-5.4.0.orig/gcc/configure.ac 2016-12-24 15:28:32.129725419 -0800 ++++ gcc-5.4.0/gcc/configure.ac 2016-12-24 15:14:52.372750299 -0800 +@@ -5287,6 +5287,9 @@ + gcc_cv_libc_provides_ssp, + [gcc_cv_libc_provides_ssp=no + case "$target" in ++ *-*-musl*) ++ # All versions of musl provide stack protector ++ gcc_cv_libc_provides_ssp=yes;; + *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) + # glibc 2.4 and later provides __stack_chk_fail and + # either __stack_chk_guard, or TLS access to stack guard canary. +@@ -5313,6 +5316,7 @@ + # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now + # simply assert that glibc does provide this, which is true for all + # realistically usable GNU/Hurd configurations. ++ # All supported versions of musl provide it as well + gcc_cv_libc_provides_ssp=yes;; + *-*-darwin* | *-*-freebsd*) + AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes], +@@ -5386,6 +5390,9 @@ + gcc_cv_target_dl_iterate_phdr=no + fi + ;; ++ *-linux-musl*) ++ gcc_cv_target_dl_iterate_phdr=yes ++ ;; + esac + GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) + if test x$gcc_cv_target_dl_iterate_phdr = xyes; then +diff -Naur gcc-5.4.0.orig/libgcc/unwind-dw2-fde-dip.c gcc-5.4.0/libgcc/unwind-dw2-fde-dip.c +--- gcc-5.4.0.orig/libgcc/unwind-dw2-fde-dip.c 2015-01-27 02:02:26.000000000 -0800 ++++ gcc-5.4.0/libgcc/unwind-dw2-fde-dip.c 2016-12-24 15:16:56.850961302 -0800 +@@ -59,6 +59,12 @@ + + #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ + && defined(TARGET_DL_ITERATE_PHDR) \ ++ && defined(__linux__) ++# define USE_PT_GNU_EH_FRAME ++#endif ++ ++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ ++ && defined(TARGET_DL_ITERATE_PHDR) \ + && (defined(__DragonFly__) || defined(__FreeBSD__)) + # define ElfW __ElfN + # define USE_PT_GNU_EH_FRAME +diff -Naur gcc-5.4.0.orig/libitm/config/arm/hwcap.cc gcc-5.4.0/libitm/config/arm/hwcap.cc +--- gcc-5.4.0.orig/libitm/config/arm/hwcap.cc 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/libitm/config/arm/hwcap.cc 2016-12-24 15:19:01.076169845 -0800 +@@ -40,7 +40,7 @@ + + #ifdef __linux__ + #include <unistd.h> +-#include <sys/fcntl.h> ++#include <fcntl.h> + #include <elf.h> + + static void __attribute__((constructor)) +diff -Naur gcc-5.4.0.orig/libitm/config/linux/x86/tls.h gcc-5.4.0/libitm/config/linux/x86/tls.h +--- gcc-5.4.0.orig/libitm/config/linux/x86/tls.h 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/libitm/config/linux/x86/tls.h 2016-12-24 15:20:21.897956131 -0800 +@@ -25,16 +25,19 @@ + #ifndef LIBITM_X86_TLS_H + #define LIBITM_X86_TLS_H 1 + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + /* Use slots in the TCB head rather than __thread lookups. + GLIBC has reserved words 10 through 13 for TM. */ + #define HAVE_ARCH_GTM_THREAD 1 + #define HAVE_ARCH_GTM_THREAD_DISP 1 + #endif ++#endif + + #include "config/generic/tls.h" + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + namespace GTM HIDDEN { + + #ifdef __x86_64__ +@@ -101,5 +104,6 @@ + + } // namespace GTM + #endif /* >= GLIBC 2.10 */ ++#endif + + #endif // LIBITM_X86_TLS_H +diff -Naur gcc-5.4.0.orig/libstdc++-v3/configure.host gcc-5.4.0/libstdc++-v3/configure.host +--- gcc-5.4.0.orig/libstdc++-v3/configure.host 2015-06-24 02:59:28.000000000 -0700 ++++ gcc-5.4.0/libstdc++-v3/configure.host 2016-12-24 15:21:16.012482591 -0800 +@@ -273,6 +273,9 @@ + freebsd*) + os_include_dir="os/bsd/freebsd" + ;; ++ linux-musl*) ++ os_include_dir="os/generic" ++ ;; + gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) + if [ "$uclibc" = "yes" ]; then + os_include_dir="os/uclibc" diff -uNr a/sys-devel/gcc/files/5.4.0/ppc-secure_plt.patch b/sys-devel/gcc/files/5.4.0/ppc-secure_plt.patch --- a/sys-devel/gcc/files/5.4.0/ppc-secure_plt.patch false +++ b/sys-devel/gcc/files/5.4.0/ppc-secure_plt.patch f0c24ea5a5267836f8ace6e0b7d1599b60756b0c36401c74f6a952fb8a98c50158eea614f120e97af892fb45f9f291c8d2a0ec3ec60e81d4af53b53b9c3b3115 @@ -0,0 +1,59 @@ +diff -Naur gcc-5.4.0.orig/gcc/config/rs6000/secureplt.h gcc-5.4.0/gcc/config/rs6000/secureplt.h +--- gcc-5.4.0.orig/gcc/config/rs6000/secureplt.h 2015-01-05 04:33:28.000000000 -0800 ++++ gcc-5.4.0/gcc/config/rs6000/secureplt.h 2016-12-24 15:04:26.850531396 -0800 +@@ -18,3 +18,4 @@ + <http://www.gnu.org/licenses/>. */ + + #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" ++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +diff -Naur gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h gcc-5.4.0/gcc/config/rs6000/sysv4.h +--- gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h 2015-09-24 06:46:45.000000000 -0700 ++++ gcc-5.4.0/gcc/config/rs6000/sysv4.h 2016-12-24 15:08:38.507113094 -0800 +@@ -537,6 +537,9 @@ + #ifndef CC1_SECURE_PLT_DEFAULT_SPEC + #define CC1_SECURE_PLT_DEFAULT_SPEC "" + #endif ++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC ++#define LINK_SECURE_PLT_DEFAULT_SPEC "" ++#endif + + /* Pass -G xxx to the compiler. */ + #undef CC1_SPEC +@@ -567,6 +570,7 @@ + : %(link_start_default) }" + + #define LINK_START_DEFAULT_SPEC "" ++#define LINK_SECURE_PLT_SPEC LINK_SECURE_PLT_DEFAULT_SPEC + + #undef LINK_SPEC + #define LINK_SPEC "\ +@@ -574,6 +578,7 @@ + %{R*} \ + %(link_shlib) \ + %{!T*: %(link_start) } \ ++%{!static: %{!mbss-plt: %(link_secure_plt)}} \ + %(link_os)" + + /* Shared libraries are not default. */ +@@ -889,6 +904,7 @@ + { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ + { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ + { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ ++ { "link_secure_plt", LINK_SECURE_PLT_SPEC }, \ + { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ + { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ + { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ +diff -Naur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc +--- gcc-5.4.0.orig/gcc/config.gcc 2016-12-24 15:28:09.922509373 -0800 ++++ gcc-5.4.0/gcc/config.gcc 2016-12-24 15:39:19.482040184 -0800 +@@ -2413,6 +2416,10 @@ + powerpc*-*-linux*paired*) + tm_file="${tm_file} rs6000/750cl.h" ;; + esac ++ case ${target} in ++ *-linux*-musl*) ++ enable_secureplt=yes ;; ++ esac + if test x${enable_secureplt} = xyes; then + tm_file="rs6000/secureplt.h ${tm_file}" + fi diff -uNr a/sys-devel/gcc/files/6.3.0/cpu_indicator.patch b/sys-devel/gcc/files/6.3.0/cpu_indicator.patch --- a/sys-devel/gcc/files/6.3.0/cpu_indicator.patch false +++ b/sys-devel/gcc/files/6.3.0/cpu_indicator.patch 74f3156bf60ef36f294ef63f651f4d1ac29b67e9b8f1bf314907e5e3a1424cbd652ae003c5ef80b169f84ec067402623a77c607b0b35e6396bf70d1c9db8a13e @@ -0,0 +1,30 @@ +diff -Naur gcc-6.2.0.orig/gcc/config/i386/i386.c gcc-6.2.0/gcc/config/i386/i386.c +--- gcc-6.2.0.orig/gcc/config/i386/i386.c 2016-12-24 15:55:23.355343088 -0800 ++++ gcc-6.2.0/gcc/config/i386/i386.c 2016-12-24 15:55:58.718681693 -0800 +@@ -40325,10 +40325,10 @@ + { + case IX86_BUILTIN_CPU_INIT: + { +- /* Make it call __cpu_indicator_init in libgcc. */ ++ /* Make it call __cpu_indicator_init_local in libgcc. */ + tree call_expr, fndecl, type; + type = build_function_type_list (integer_type_node, NULL_TREE); +- fndecl = build_fn_decl ("__cpu_indicator_init", type); ++ fndecl = build_fn_decl ("__cpu_indicator_init_local", type); + call_expr = build_call_expr (fndecl, 0); + return expand_expr (call_expr, target, mode, EXPAND_NORMAL); + } +diff -Naur gcc-6.2.0.orig/libgcc/config/i386/cpuinfo.c gcc-6.2.0/libgcc/config/i386/cpuinfo.c +--- gcc-6.2.0.orig/libgcc/config/i386/cpuinfo.c 2016-12-24 15:55:15.817270911 -0800 ++++ gcc-6.2.0/libgcc/config/i386/cpuinfo.c 2016-12-24 15:57:05.399320163 -0800 +@@ -485,7 +485,7 @@ + return 0; + } + +-#if defined SHARED && defined USE_ELF_SYMVER +-__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0"); +-__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0"); ++#ifndef SHARED ++int __cpu_indicator_init_local (void) ++ __attribute__ ((weak, alias ("__cpu_indicator_init"))); + #endif diff -uNr a/sys-devel/gcc/files/6.3.0/musl.patch b/sys-devel/gcc/files/6.3.0/musl.patch --- a/sys-devel/gcc/files/6.3.0/musl.patch false +++ b/sys-devel/gcc/files/6.3.0/musl.patch 2c1cbcde9afe2712bb056adf3596f753ae0a8125ec9542c9dfb8148c44a3483462fa13b6edab7c24a70801f912496a3426e0bcc9cbf7e8e5b72b36ec09b976d3 @@ -0,0 +1,33 @@ +diff -Naur gcc-6.2.0.orig/gcc/config/linux.c gcc-6.2.0/gcc/config/linux.c +--- gcc-6.2.0.orig/gcc/config/linux.c 2016-12-24 15:55:23.308342638 -0800 ++++ gcc-6.2.0/gcc/config/linux.c 2016-12-24 16:00:51.852488459 -0800 +@@ -26,7 +26,7 @@ + bool + linux_libc_has_function (enum function_class fn_class) + { +- if (OPTION_GLIBC) ++ if (OPTION_GLIBC || OPTION_MUSL) + return true; + if (OPTION_BIONIC) + if (fn_class == function_c94 +diff -Naur gcc-6.2.0.orig/gcc/config.gcc gcc-6.2.0/gcc/config.gcc +--- gcc-6.2.0.orig/gcc/config.gcc 2016-12-24 15:55:15.957272251 -0800 ++++ gcc-6.2.0/gcc/config.gcc 2016-12-24 16:02:12.297258721 -0800 +@@ -1484,7 +1484,7 @@ + extra_options="${extra_options} linux-android.opt" + # Assume modern glibc if not targeting Android nor uclibc. + case ${target} in +- *-*-*android*|*-*-*uclibc*) ++ *-*-*android*|*-*-*uclibc*|*-*-*musl*) + ;; + *) + default_gnu_indirect_function=yes +@@ -1553,7 +1553,7 @@ + extra_options="${extra_options} linux-android.opt" + # Assume modern glibc if not targeting Android nor uclibc. + case ${target} in +- *-*-*android*|*-*-*uclibc*) ++ *-*-*android*|*-*-*uclibc*|*-*-*musl*) + ;; + *) + default_gnu_indirect_function=yes diff -uNr a/sys-devel/gcc/files/7.1.0/posix_memalign.patch b/sys-devel/gcc/files/7.1.0/posix_memalign.patch --- a/sys-devel/gcc/files/7.1.0/posix_memalign.patch false +++ b/sys-devel/gcc/files/7.1.0/posix_memalign.patch 65d4a1506ce94d74a1cd518a293d07aaba6e2eb5afab855bcc170090273c9237a18415d075fa14915ec0d8774924d96f201209f86183c5cef88e06482e704ab9 @@ -0,0 +1,29 @@ +diff -Naur gcc-7.1.0.orig/gcc/config/i386/pmm_malloc.h gcc-7.1.0/gcc/config/i386/pmm_malloc.h +--- gcc-7.1.0.orig/gcc/config/i386/pmm_malloc.h 2017-01-01 04:07:43.000000000 -0800 ++++ gcc-7.1.0/gcc/config/i386/pmm_malloc.h 2017-05-07 11:35:22.878398460 -0700 +@@ -27,12 +27,13 @@ + #include <stdlib.h> + + /* We can't depend on <stdlib.h> since the prototype of posix_memalign +- may not be visible. */ ++ may not be visible and we can't pollute the namespace either. */ + #ifndef __cplusplus +-extern int posix_memalign (void **, size_t, size_t); ++extern int __gcc_posix_memalign (void **, size_t, size_t) + #else +-extern "C" int posix_memalign (void **, size_t, size_t) throw (); ++extern "C" int __gcc_posix_memalign (void **, size_t, size_t) throw () + #endif ++__asm__("posix_memalign"); + + static __inline void * + _mm_malloc (size_t __size, size_t __alignment) +@@ -42,7 +43,7 @@ + return malloc (__size); + if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4)) + __alignment = sizeof (void *); +- if (posix_memalign (&__ptr, __alignment, __size) == 0) ++ if (__gcc_posix_memalign (&__ptr, __alignment, __size) == 0) + return __ptr; + else + return NULL; diff -uNr a/sys-devel/gcc/files/awk/fixlafiles.awk b/sys-devel/gcc/files/awk/fixlafiles.awk --- a/sys-devel/gcc/files/awk/fixlafiles.awk false +++ b/sys-devel/gcc/files/awk/fixlafiles.awk 06623d4c3c589453b1b04884ee864748b010d0d8ea2b6ecb093e100700b2e04010e5a73976070272df00eb34afa8e2831a5f28992ebaa0e35ddb1e10c55d805a @@ -0,0 +1,314 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# +# Helper functions +# +function printn(string) { + printf("%s", string) +} +function einfo(string) { + printf(" \033[32;01m*\033[0m %s\n", string) +} +function einfon(string) { + printf(" \033[32;01m*\033[0m %s", string) +} +function ewarn(string) { + printf(" \033[33;01m*\033[0m %s\n", string) +} +function ewarnn(string) { + printf(" \033[33;01m*\033[0m %s", string) +} +function eerror(string) { + printf(" \033[31;01m*\033[0m %s\n", string) +} + +# +# assert(condition, errmsg) +# assert that a condition is true. Otherwise exit. +# +function assert(condition, string) { + if (! condition) { + printf("%s:%d: assertion failed: %s\n", + FILENAME, FNR, string) > "/dev/stderr" + _assert_exit = 1 + exit 1 + } +} + +# +# system(command, return) +# wrapper that normalizes return codes ... +# +function dosystem(command, ret) { + ret = 0 + ret = system(command) + if (ret == 0) + return 1 + else + return 0 +} + +BEGIN { + # + # Get our variables from environment + # + OLDVER = ENVIRON["OLDVER"] + OLDCHOST = ENVIRON["OLDCHOST"] + + if (OLDVER == "") { + eerror("Could not get OLDVER!"); + exit 1 + } + + # Setup some sane defaults + LIBCOUNT = 2 + HAVE_GCC34 = 0 + DIRLIST[1] = "/lib" + DIRLIST[2] = "/usr/lib" + + # + # Walk /etc/ld.so.conf to discover all our library paths + # + pipe = "cat /etc/ld.so.conf | sort 2>/dev/null" + while(((pipe) | getline ldsoconf_data) > 0) { + if (ldsoconf_data !~ /^[[:space:]]*#/) { + if (ldsoconf_data == "") continue + + # Remove any trailing comments + sub(/#.*$/, "", ldsoconf_data) + # Remove any trailing spaces + sub(/[[:space:]]+$/, "", ldsoconf_data) + + # If there's more than one path per line, split + # it up as if they were sep lines + split(ldsoconf_data, nodes, /[:,[:space:]]/) + + # Now add the rest from ld.so.conf + for (x in nodes) { + # wtf does this line do ? + sub(/=.*/, "", nodes[x]) + # Prune trailing / + sub(/\/$/, "", nodes[x]) + + if (nodes[x] == "") continue + + # + # Drop the directory if its a child directory of + # one that was already added ... + # For example, if we have: + # /usr/lib /usr/libexec /usr/lib/mozilla /usr/lib/nss + # We really just want to save /usr/lib /usr/libexec + # + CHILD = 0 + for (y in DIRLIST) { + if (nodes[x] ~ "^" DIRLIST[y] "(/|$)") { + CHILD = 1 + break + } + } + if (CHILD) continue + + DIRLIST[++LIBCOUNT] = nodes[x] + } + } + } + close(pipe) + + # + # Get line from gcc's output containing CHOST + # + pipe = "gcc -print-file-name=libgcc.a 2>/dev/null" + if ((!((pipe) | getline TMP_CHOST)) || (TMP_CHOST == "")) { + close(pipe) + + # If we fail to get the CHOST, see if we can get the CHOST + # portage thinks we are using ... + pipe = "/usr/bin/portageq envvar 'CHOST'" + assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST") + } else { + # Check pre gcc-3.4.x versions + CHOST = gensub("^.+lib/gcc-lib/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST) + + if (CHOST == TMP_CHOST || CHOST == "") { + # Check gcc-3.4.x or later + CHOST = gensub("^.+lib/gcc/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST); + + if (CHOST == TMP_CHOST || CHOST == "") + CHOST = "" + else + HAVE_GCC34 = 1 + } + } + close(pipe) + + if (CHOST == "") { + eerror("Could not get gcc's CHOST!") + exit 1 + } + + if (OLDCHOST != "") + if (OLDCHOST == CHOST) + OLDCHOST = "" + + GCCLIBPREFIX_OLD = "/usr/lib/gcc-lib/" + GCCLIBPREFIX_NEW = "/usr/lib/gcc/" + + if (HAVE_GCC34) + GCCLIBPREFIX = GCCLIBPREFIX_NEW + else + GCCLIBPREFIX = GCCLIBPREFIX_OLD + + GCCLIB = GCCLIBPREFIX CHOST + + if (OLDCHOST != "") { + OLDGCCLIB1 = GCCLIBPREFIX_OLD OLDCHOST + OLDGCCLIB2 = GCCLIBPREFIX_NEW OLDCHOST + } + + # Get current gcc's version + pipe = "gcc -dumpversion" + assert(((pipe) | getline NEWVER), "(" pipe ") | getline NEWVER)") + close(pipe) + + if (NEWVER == "") { + eerror("Could not get gcc's version!") + exit 1 + } + + # Nothing to do ? + if ((OLDVER == NEWVER) && (OLDCHOST == "")) + exit 0 + + # + # Ok, now let's scan for the .la files and actually fix them up + # + for (x = 1; x <= LIBCOUNT; x++) { + # Do nothing if the target dir is gcc's internal library path + if (DIRLIST[x] ~ GCCLIBPREFIX_OLD || + DIRLIST[x] ~ GCCLIBPREFIX_NEW) + continue + + einfo(" [" x "/" LIBCOUNT "] Scanning " DIRLIST[x] " ...") + + pipe = "find " DIRLIST[x] "/ -name '*.la' 2>/dev/null" + while (((pipe) | getline la_files) > 0) { + + # Do nothing if the .la file is located in gcc's internal lib path + if (la_files ~ GCCLIBPREFIX_OLD || + la_files ~ GCCLIBPREFIX_NEW) + continue + + CHANGED = 0 + CHOST_CHANGED = 0 + + # See if we need to fix the .la file + while ((getline la_data < (la_files)) > 0) { + if (OLDCHOST != "") { + if ((gsub(OLDGCCLIB1 "[/[:space:]]+", + GCCLIB, la_data) > 0) || + (gsub(OLDGCCLIB2 "[/[:space:]]+", + GCCLIB, la_data) > 0)) { + CHANGED = 1 + CHOST_CHANGED = 1 + } + } + if (OLDVER != NEWVER) { + if ((gsub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "[/[:space:]]*", + GCCLIB "/" NEWVER, la_data) > 0) || + (gsub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "[/[:space:]]*", + GCCLIB "/" NEWVER, la_data) > 0)) + CHANGED = 1 + } + } + close(la_files) + + # Do the actual changes in a second loop, as we can then + # verify that CHOST_CHANGED among things is correct ... + if (CHANGED) { + ewarnn(" FIXING: " la_files " ...") + + if (CHANGED) + printn("[") + + # Clear the temp file (removing rather than '>foo' is better + # out of a security point of view?) + dosystem("rm -f " la_files ".new") + + while ((getline la_data < (la_files)) > 0) { + if (OLDCHOST != "") { + tmpstr = gensub(OLDGCCLIB1 "([/[:space:]]+)", + GCCLIB "\\1", "g", la_data) + tmpstr = gensub(OLDGCCLIB2 "([/[:space:]]+)", + GCCLIB "\\1", "g", tmpstr) + + if (la_data != tmpstr) { + printn("c") + la_data = tmpstr + } + + if (CHOST_CHANGED > 0) { + # We try to be careful about CHOST changes outside + # the gcc library path (meaning we cannot match it + # via /GCCLIBPREFIX CHOST/) ... + + # Catch: + # + # dependency_libs=' -L/usr/CHOST/{bin,lib}' + # + gsub("-L/usr/" OLDCHOST "/", + "-L/usr/" CHOST "/", la_data) + # Catch: + # + # dependency_libs=' -L/usr/lib/gcc-lib/CHOST/VER/../../../../CHOST/lib' + # + la_data = gensub("(" GCCLIB "/[^[:space:]]+)/" OLDCHOST "/", + "\\1/" CHOST "/", "g", la_data) + } + } + + if (OLDVER != NEWVER) { + # Catch: + # + # dependency_libs=' -L/usr/lib/gcc/CHOST/VER' + # + tmpstr = gensub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "([/[:space:]]+)", + GCCLIB "/" NEWVER "\\1", "g", la_data) + tmpstr = gensub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "([/[:space:]]+)", + GCCLIB "/" NEWVER "\\1", "g", tmpstr) + + if (la_data != tmpstr) { + # Catch: + # + # dependency_libs=' -L/usr/lib/gcc-lib/../../CHOST/lib' + # + # in cases where we have gcc34 + tmpstr = gensub(GCCLIBPREFIX_OLD "(../../" CHOST "/lib)", + GCCLIBPREFIX "\\1", "g", tmpstr) + tmpstr = gensub(GCCLIBPREFIX_NEW "(../../" CHOST "/lib)", + GCCLIBPREFIX "\\1", "g", tmpstr) + printn("v") + la_data = tmpstr + } + } + + print la_data >> (la_files ".new") + } + + if (CHANGED) + print "]" + + close(la_files) + close(la_files ".new") + + assert(dosystem("mv -f " la_files ".new " la_files), + "dosystem(\"mv -f " la_files ".new " la_files "\")") + } + } + + close(pipe) + } +} + +# vim:ts=4 diff -uNr a/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la b/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la --- a/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la false +++ b/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la 7484378823a6706ecd6b421f235c766f5fb10b3e80fdfb6e1e07655067a87e71ddc9ed2d4396d7d17869c522cfa15c8cfeeeb96a0c2446353198475aa12aed5e @@ -0,0 +1,335 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# +# Helper functions +# +function printn(string) { + printf("%s", string) +} +function einfo(string) { + printf(" \033[32;01m*\033[0m %s\n", string) +} +function einfon(string) { + printf(" \033[32;01m*\033[0m %s", string) +} +function ewarn(string) { + printf(" \033[33;01m*\033[0m %s\n", string) +} +function ewarnn(string) { + printf(" \033[33;01m*\033[0m %s", string) +} +function eerror(string) { + printf(" \033[31;01m*\033[0m %s\n", string) +} + +# +# assert(condition, errmsg) +# assert that a condition is true. Otherwise exit. +# +function assert(condition, string) { + if (! condition) { + printf("%s:%d: assertion failed: %s\n", + FILENAME, FNR, string) > "/dev/stderr" + _assert_exit = 1 + exit 1 + } +} + +# +# system(command, return) +# wrapper that normalizes return codes ... +# +function dosystem(command, ret) { + ret = 0 + ret = system(command) + if (ret == 0) + return 1 + else + return 0 +} + +# +# parse_ld_conf(config_file) +# +function parse_ld_conf(conf, pipe, ldsoconf_data, CHILD, y) { + pipe = "cd /etc; cat " conf " | sort 2>/dev/null" + while(((pipe) | getline ldsoconf_data) > 0) { + if (ldsoconf_data ~ /^[[:space:]]*#/) + continue + if (ldsoconf_data == "") + continue + + # Handle the "include" keyword + if (ldsoconf_data ~ /^include /) { + sub(/^include /, "", ldsoconf_data) + parse_ld_conf(ldsoconf_data) + continue + } + + # Remove any trailing comments + sub(/#.*$/, "", ldsoconf_data) + # Remove any trailing spaces + sub(/[[:space:]]+$/, "", ldsoconf_data) + # Eat duplicate slashes + sub(/\/\//, "/", ldsoconf_data) + # Prune trailing / + sub(/\/$/, "", ldsoconf_data) + + # + # Drop the directory if its a child directory of + # one that was already added ... + # For example, if we have: + # /usr/lib /usr/libexec /usr/lib/mozilla /usr/lib/nss + # We really just want to save /usr/lib /usr/libexec + # + CHILD = 0 + for (y in DIRLIST) { + if (ldsoconf_data ~ "^" DIRLIST[y] "(/|$)") { + CHILD = 1 + break + } + } + if (CHILD) continue + + DIRLIST[++LIBCOUNT] = ldsoconf_data + } + close(pipe) +} + +BEGIN { + # + # Get our variables from environment + # + OLDVER = ENVIRON["OLDVER"] + OLDCHOST = ENVIRON["OLDCHOST"] + + if (OLDVER == "") { + eerror("Could not get OLDVER!"); + exit 1 + } + + # Setup some sane defaults + LIBCOUNT = 2 + HAVE_GCC34 = 0 + DIRLIST[1] = "/lib" + DIRLIST[2] = "/usr/lib" + + # + # Walk /etc/ld.so.conf to discover all our library paths + # + parse_ld_conf("/etc/ld.so.conf") + + # + # Get line from gcc's output containing CHOST + # + pipe = "gcc -print-file-name=libgcc.a 2>/dev/null" + if ((!((pipe) | getline TMP_CHOST)) || (TMP_CHOST == "")) { + close(pipe) + + # If we fail to get the CHOST, see if we can get the CHOST + # portage thinks we are using ... + pipe = "/usr/bin/portageq envvar 'CHOST'" + assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST") + } else { + # Check pre gcc-3.4.x versions + CHOST = gensub("^.+lib/gcc-lib/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST) + + if (CHOST == TMP_CHOST || CHOST == "") { + # Check gcc-3.4.x or later + CHOST = gensub("^.+lib/gcc/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST); + + if (CHOST == TMP_CHOST || CHOST == "") + CHOST = "" + else + HAVE_GCC34 = 1 + } + } + close(pipe) + + if (CHOST == "") { + eerror("Could not get gcc's CHOST!") + exit 1 + } + + if (OLDCHOST != "") + if (OLDCHOST == CHOST) + OLDCHOST = "" + + GCCLIBPREFIX_OLD = "/usr/lib/gcc-lib/" + GCCLIBPREFIX_NEW = "/usr/lib/gcc/" + + if (HAVE_GCC34) + GCCLIBPREFIX = GCCLIBPREFIX_NEW + else + GCCLIBPREFIX = GCCLIBPREFIX_OLD + + GCCLIB = GCCLIBPREFIX CHOST + + if (OLDCHOST != "") { + OLDGCCLIB1 = GCCLIBPREFIX_OLD OLDCHOST + OLDGCCLIB2 = GCCLIBPREFIX_NEW OLDCHOST + } + + # Get current gcc's version + pipe = "gcc -dumpversion" + assert(((pipe) | getline NEWVER), "(" pipe ") | getline NEWVER)") + close(pipe) + + if (NEWVER == "") { + eerror("Could not get gcc's version!") + exit 1 + } + + # Nothing to do ? + # NB: Do not check for (OLDVER == NEWVER) anymore, as we might need to + # replace libstdc++.la .... + if ((OLDVER == "") && (OLDCHOST == "")) + exit 0 + + # + # Ok, now let's scan for the .la files and actually fix them up + # + for (x = 1; x <= LIBCOUNT; x++) { + # Do nothing if the target dir is gcc's internal library path + if (DIRLIST[x] ~ GCCLIBPREFIX_OLD || + DIRLIST[x] ~ GCCLIBPREFIX_NEW) + continue + + einfo(" [" x "/" LIBCOUNT "] Scanning " DIRLIST[x] " ...") + + pipe = "find " DIRLIST[x] "/ -name '*.la' 2>/dev/null" + while (((pipe) | getline la_files) > 0) { + + # Do nothing if the .la file is located in gcc's internal lib path + if (la_files ~ GCCLIBPREFIX_OLD || + la_files ~ GCCLIBPREFIX_NEW) + continue + + CHANGED = 0 + CHOST_CHANGED = 0 + + # See if we need to fix the .la file + while ((getline la_data < (la_files)) > 0) { + if (OLDCHOST != "") { + if ((gsub(OLDGCCLIB1 "[/[:space:]]+", + GCCLIB, la_data) > 0) || + (gsub(OLDGCCLIB2 "[/[:space:]]+", + GCCLIB, la_data) > 0)) { + CHANGED = 1 + CHOST_CHANGED = 1 + } + } + if (OLDVER != NEWVER) { + if ((gsub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "[/[:space:]]*", + GCCLIB "/" NEWVER, la_data) > 0) || + (gsub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "[/[:space:]]*", + GCCLIB "/" NEWVER, la_data) > 0)) + CHANGED = 1 + } + # We now check if we have libstdc++.la, as we remove the + # libtool linker scripts for gcc ... + # We do this last, as we only match the new paths + if (gsub(GCCLIB "/" NEWVER "/libstdc\\+\\+\\.la", + "-lstdc++", la_data) > 0) + CHANGED = 1 + } + close(la_files) + + # Do the actual changes in a second loop, as we can then + # verify that CHOST_CHANGED among things is correct ... + if (CHANGED) { + ewarnn(" FIXING: " la_files " ...[") + + # Clear the temp file (removing rather than '>foo' is better + # out of a security point of view?) + dosystem("rm -f " la_files ".new") + + while ((getline la_data < (la_files)) > 0) { + if (OLDCHOST != "") { + tmpstr = gensub(OLDGCCLIB1 "([/[:space:]]+)", + GCCLIB "\\1", "g", la_data) + tmpstr = gensub(OLDGCCLIB2 "([/[:space:]]+)", + GCCLIB "\\1", "g", tmpstr) + + if (la_data != tmpstr) { + printn("c") + la_data = tmpstr + } + + if (CHOST_CHANGED > 0) { + # We try to be careful about CHOST changes outside + # the gcc library path (meaning we cannot match it + # via /GCCLIBPREFIX CHOST/) ... + + # Catch: + # + # dependency_libs=' -L/usr/CHOST/{bin,lib}' + # + gsub("-L/usr/" OLDCHOST "/", + "-L/usr/" CHOST "/", la_data) + # Catch: + # + # dependency_libs=' -L/usr/lib/gcc-lib/CHOST/VER/../../../../CHOST/lib' + # + la_data = gensub("(" GCCLIB "/[^[:space:]]+)/" OLDCHOST "/", + "\\1/" CHOST "/", "g", la_data) + } + } + + if (OLDVER != NEWVER) { + # Catch: + # + # dependency_libs=' -L/usr/lib/gcc/CHOST/VER' + # + tmpstr = gensub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "([/[:space:]]+)", + GCCLIB "/" NEWVER "\\1", "g", la_data) + tmpstr = gensub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "([/[:space:]]+)", + GCCLIB "/" NEWVER "\\1", "g", tmpstr) + + if (la_data != tmpstr) { + # Catch: + # + # dependency_libs=' -L/usr/lib/gcc-lib/../../CHOST/lib' + # + # in cases where we have gcc34 + tmpstr = gensub(GCCLIBPREFIX_OLD "(../../" CHOST "/lib)", + GCCLIBPREFIX "\\1", "g", tmpstr) + tmpstr = gensub(GCCLIBPREFIX_NEW "(../../" CHOST "/lib)", + GCCLIBPREFIX "\\1", "g", tmpstr) + printn("v") + la_data = tmpstr + } + } + + # We now check if we have libstdc++.la, as we remove the + # libtool linker scripts for gcc and any referencese in any + # libtool linker scripts. + # We do this last, as we only match the new paths + tmpstr = gensub(GCCLIB "/" NEWVER "/libstdc\\+\\+\\.la", + "-lstdc++", "g", la_data); + if (la_data != tmpstr) { + printn("l") + la_data = tmpstr + } + + print la_data >> (la_files ".new") + } + + if (CHANGED) + print "]" + + close(la_files) + close(la_files ".new") + + assert(dosystem("mv -f " la_files ".new " la_files), + "dosystem(\"mv -f " la_files ".new " la_files "\")") + } + } + + close(pipe) + } +} + +# vim:ts=4 diff -uNr a/sys-devel/gcc/files/c89 b/sys-devel/gcc/files/c89 --- a/sys-devel/gcc/files/c89 false +++ b/sys-devel/gcc/files/c89 8a238b201a17395ef92dd3e03e2d7ba694627a28f8cb386ada4765f59a7728221caed4fdd1782f385003dac9f50ad16cfdcebe971098a4cca102ef7f0d2767c2 @@ -0,0 +1,20 @@ +#! /bin/sh + +# Call the appropriate C compiler with options to accept ANSI/ISO C +# The following options are the same (as of gcc-2.95): +# -ansi +# -std=c89 +# -std=iso9899:1990 + +for i; do + case "$i" in + -ansi|-std=c89|-std=iso9899:1990) + ;; + -std=*) + echo >&2 "`basename $0` called with non ANSI/ISO C90 option $i" + exit 1 + ;; + esac +done + +exec gcc -std=c89 -pedantic -U_FORTIFY_SOURCE "$@" diff -uNr a/sys-devel/gcc/files/c99 b/sys-devel/gcc/files/c99 --- a/sys-devel/gcc/files/c99 false +++ b/sys-devel/gcc/files/c99 db9e4068c72f183f443048c27e20888576ba6715806a3ce736528322da867701c4ac07e7f0330fafbcaa4422aae0dc8aac7b0a39d3c112e1a7826f881c71d069 @@ -0,0 +1,21 @@ +#! /bin/sh + +# Call the appropriate C compiler with options to accept ANSI/ISO C +# The following options are the same (as of gcc-3.3): +# -std=c99 +# -std=c9x +# -std=iso9899:1999 +# -std=iso9899:199x + +for i; do + case "$i" in + -std=c9[9x]|-std=iso9899:199[9x]) + ;; + -ansi|-std=*) + echo >&2 "`basename $0` called with non ANSI/ISO C99 option $i" + exit 1 + ;; + esac +done + +exec gcc -std=c99 -pedantic -U_FORTIFY_SOURCE ${1+"$@"} diff -uNr a/sys-devel/gcc/files/fix_libtool_files.sh b/sys-devel/gcc/files/fix_libtool_files.sh --- a/sys-devel/gcc/files/fix_libtool_files.sh false +++ b/sys-devel/gcc/files/fix_libtool_files.sh 90c0d78bb157b4dbff452d91f9039c8b14978b3707a13f88f848aaa910250e9d590d4e864b408f6a5507a9a37c14bc1933b3fa420add38cd51bae87a21640c67 @@ -0,0 +1,67 @@ +#!/bin/sh +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +usage() { +cat << "USAGE_END" +Usage: fix_libtool_files.sh <old-gcc-version> [--oldarch <old-CHOST>] + + Where <old-gcc-version> is the version number of the + previous gcc version. For example, if you updated to + gcc-3.2.1, and you had gcc-3.2 installed, run: + + # fix_libtool_files.sh 3.2 + + If you updated to gcc-3.2.3, and the old CHOST was i586-pc-linux-gnu + but you now have CHOST as i686-pc-linux-gnu, run: + + # fix_libtool_files.sh 3.2 --oldarch i586-pc-linux-gnu + + Note that if only the CHOST and not the version changed, you can run + it with the current version and the '--oldarch <old-CHOST>' arguments, + and it will do the expected: + + # fix_libtool_files.sh `gcc -dumpversion` --oldarch i586-pc-linux-gnu + +USAGE_END + exit 1 +} + +case $2 in +--oldarch) [ $# -ne 3 ] && usage ;; +*) [ $# -ne 1 ] && usage ;; +esac + +ARGV1=$1 +ARGV2=$2 +ARGV3=$3 + +. /etc/profile || exit 1 + +if [ ${EUID:-0} -ne 0 ] ; then + echo "${0##*/}: Must be root." + exit 1 +fi + +# make sure the files come out sane +umask 0022 + +OLDCHOST= +[ "${ARGV2}" = "--oldarch" ] && OLDCHOST=${ARGV3} + +AWKDIR="/usr/share/gcc-data" + +if [ ! -r "${AWKDIR}/fixlafiles.awk" ] ; then + echo "${0##*/}: ${AWKDIR}/fixlafiles.awk does not exist!" + exit 1 +fi + +OLDVER=${ARGV1} + +export OLDVER OLDCHOST + +echo "Scanning libtool files for hardcoded gcc library paths..." +exec gawk -f "${AWKDIR}/fixlafiles.awk" + +# vim:ts=4 diff -uNr a/sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch b/sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch --- a/sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch false +++ b/sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch fea6d89c4610d115ba68f0eaabeed6aeddcf8d3d9256e2b4d6741719002f079143ddf3875cfbd79e2272ba0b30cc2ce24a08b28166bf121b7cdf76f82ef10ffb @@ -0,0 +1,11 @@ +--- /var/tmp/portage/sys-devel/gcc-4.8.3-r99/work/gcc-4.8.3/boehm-gc/os_dep.c 2013-03-06 15:08:58.000000000 +0000 ++++ gcc-4.8.3.new/boehm-gc/os_dep.c 2014-10-24 18:25:39.963379871 +0000 +@@ -41,7 +41,7 @@ + # else /* not 2 <= __GLIBC__ */ + /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */ + /* one. Check LINUX_VERSION_CODE to see which we should reference. */ +-# include <asm/sigcontext.h> ++//# include <asm/sigcontext.h> + # endif /* 2 <= __GLIBC__ */ + # endif + # endif diff -uNr a/sys-devel/gcc/files/gcc-4.8.5-posix_memalign.patch b/sys-devel/gcc/files/gcc-4.8.5-posix_memalign.patch --- a/sys-devel/gcc/files/gcc-4.8.5-posix_memalign.patch false +++ b/sys-devel/gcc/files/gcc-4.8.5-posix_memalign.patch b6ec199c1f012debe329fb326bd51d3a48b0edf5dcfe12a25cfef6fc6c10ab40b7d8f9f223d510758525303a3e94f4d67388ba4fab510150e26f277465d67430 @@ -0,0 +1,30 @@ +diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h +index 901001b..321fcd3 100644 +--- a/gcc/config/i386/pmm_malloc.h ++++ b/gcc/config/i386/pmm_malloc.h +@@ -27,12 +27,13 @@ + #include <stdlib.h> + + /* We can't depend on <stdlib.h> since the prototype of posix_memalign +- may not be visible. */ ++ may not be visible and we can't pollute the namespace either. */ + #ifndef __cplusplus +-extern int posix_memalign (void **, size_t, size_t); ++extern int __gcc_posix_memalign (void **, size_t, size_t) + #else +-extern "C" int posix_memalign (void **, size_t, size_t) throw (); ++extern "C" int __gcc_posix_memalign (void **, size_t, size_t) throw () + #endif ++__asm__("posix_memalign"); + + static __inline void * + _mm_malloc (size_t size, size_t alignment) +@@ -42,7 +43,7 @@ _mm_malloc (size_t size, size_t alignment) + return malloc (size); + if (alignment == 2 || (sizeof (void *) == 8 && alignment == 4)) + alignment = sizeof (void *); +- if (posix_memalign (&ptr, alignment, size) == 0) ++ if (__gcc_posix_memalign (&ptr, alignment, size) == 0) + return ptr; + else + return NULL; diff -uNr a/sys-devel/gcc/files/gcc-4.9.3-musl-linker-path.patch b/sys-devel/gcc/files/gcc-4.9.3-musl-linker-path.patch --- a/sys-devel/gcc/files/gcc-4.9.3-musl-linker-path.patch false +++ b/sys-devel/gcc/files/gcc-4.9.3-musl-linker-path.patch c9fc4003b629a93c9638680838713708037f2218b981bbf4980737ed1993691d19918942e35f6586fe74e2b74a4d9f18dac47cc9442d270f6a5f8ea9a5c952dc @@ -0,0 +1,74 @@ +diff -Naur gcc-4.9.3.orig/gcc/config/arm/linux-eabi.h gcc-4.9.3/gcc/config/arm/linux-eabi.h +--- gcc-4.9.3.orig/gcc/config/arm/linux-eabi.h 2014-01-02 22:23:26.000000000 +0000 ++++ gcc-4.9.3/gcc/config/arm/linux-eabi.h 2015-10-02 19:12:32.583700214 +0000 +@@ -68,8 +68,8 @@ + GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ + + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" +-#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" ++#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-musl-arm.so.1" ++#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-musl-armhf.so.1" + #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT + + #define GLIBC_DYNAMIC_LINKER \ +diff -Naur gcc-4.9.3.orig/gcc/config/i386/linux64.h gcc-4.9.3/gcc/config/i386/linux64.h +--- gcc-4.9.3.orig/gcc/config/i386/linux64.h 2014-01-02 22:23:26.000000000 +0000 ++++ gcc-4.9.3/gcc/config/i386/linux64.h 2015-10-02 19:12:32.583700214 +0000 +@@ -27,6 +27,6 @@ + #define GNU_USER_LINK_EMULATION64 "elf_x86_64" + #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" +diff -Naur gcc-4.9.3.orig/gcc/config/mips/linux.h gcc-4.9.3/gcc/config/mips/linux.h +--- gcc-4.9.3.orig/gcc/config/mips/linux.h 2014-01-02 22:23:26.000000000 +0000 ++++ gcc-4.9.3/gcc/config/mips/linux.h 2015-10-02 19:12:32.584700214 +0000 +@@ -17,8 +17,12 @@ + along with GCC; see the file COPYING3. If not see + <http://www.gnu.org/licenses/>. */ + +-#define GLIBC_DYNAMIC_LINKER \ +- "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}" ++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ ++#define GLIBC_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define GLIBC_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++#define GLIBC_DYNAMIC_LINKER "/lib/ld-musl-mips" GLIBC_DYNAMIC_LINKER_E ".so.1" + + #undef UCLIBC_DYNAMIC_LINKER + #define UCLIBC_DYNAMIC_LINKER \ +diff -Naur gcc-4.9.3.orig/gcc/config/rs6000/linux64.h gcc-4.9.3/gcc/config/rs6000/linux64.h +--- gcc-4.9.3.orig/gcc/config/rs6000/linux64.h 2015-03-09 23:19:19.000000000 +0000 ++++ gcc-4.9.3/gcc/config/rs6000/linux64.h 2015-10-02 19:12:32.584700214 +0000 +@@ -363,12 +363,8 @@ + #undef LINK_OS_DEFAULT_SPEC + #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#ifdef LINUX64_DEFAULT_ABI_ELFv2 +-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}" +-#else +-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}" +-#endif ++#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC +diff -Naur gcc-4.9.3.orig/gcc/config/rs6000/sysv4.h gcc-4.9.3/gcc/config/rs6000/sysv4.h +--- gcc-4.9.3.orig/gcc/config/rs6000/sysv4.h 2014-07-24 17:25:19.000000000 +0000 ++++ gcc-4.9.3/gcc/config/rs6000/sysv4.h 2015-10-02 19:12:32.584700214 +0000 +@@ -761,7 +761,7 @@ + + #define LINK_START_LINUX_SPEC "" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" + #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC + #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" diff -uNr a/sys-devel/gcc/files/gcc-4.9.3-musl-res_state.patch b/sys-devel/gcc/files/gcc-4.9.3-musl-res_state.patch --- a/sys-devel/gcc/files/gcc-4.9.3-musl-res_state.patch false +++ b/sys-devel/gcc/files/gcc-4.9.3-musl-res_state.patch cb16520381299de378b47884e9a7fc54640f592522c6249c4eb52de2689317cd688697a0d207d262856285c9129c708c68047adf6ff6f006596682d1d1e5359b @@ -0,0 +1,12 @@ +diff -Naur gcc-4.9.3.orig/libsanitizer/tsan/tsan_platform_linux.cc gcc-4.9.3/libsanitizer/tsan/tsan_platform_linux.cc +--- gcc-4.9.3.orig/libsanitizer/tsan/tsan_platform_linux.cc 2013-12-05 09:18:38.000000000 +0000 ++++ gcc-4.9.3/libsanitizer/tsan/tsan_platform_linux.cc 2015-10-02 19:19:15.765680892 +0000 +@@ -351,7 +351,7 @@ + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { + int cnt = 0; +- __res_state *statp = (__res_state*)state; ++ res_state statp = (res_state)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { + if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) + fds[cnt++] = statp->_u._ext.nssocks[i]; diff -uNr a/sys-devel/gcc/files/gcc-4.9.3-pr68470.patch b/sys-devel/gcc/files/gcc-4.9.3-pr68470.patch --- a/sys-devel/gcc/files/gcc-4.9.3-pr68470.patch false +++ b/sys-devel/gcc/files/gcc-4.9.3-pr68470.patch 80b8d29db2d9227d6ef3333ea153da3c50e62af03fdb05c413387fd9be3c7fb2196c4c23417052d0b6c2d6bd8f905899830fccb2db9a957b77908df6be2aad01 @@ -0,0 +1,58 @@ +diff --git a/gcc-4.9.3.orig/gcc/ipa-split.c b/gcc-4.9.3/gcc/ipa-split.c +index 0d1495d..688c954 100644 +--- a/gcc-4.9.3.orig/gcc/ipa-split.c ++++ b/gcc-4.9.3/gcc/ipa-split.c +@@ -1122,7 +1122,6 @@ split_function (struct split_point *split_point) + edge e; + edge_iterator ei; + tree retval = NULL, real_retval = NULL; +- bool split_part_return_p = false; + gimple last_stmt = NULL; + unsigned int i; + tree arg, ddef; +@@ -1162,12 +1161,28 @@ split_function (struct split_point *split_point) + args_to_pass.safe_push (arg); + } + +- /* See if the split function will return. */ ++ /* See if the split function or the main part will return. */ ++ bool main_part_return_p = false; ++ bool split_part_return_p = false; + FOR_EACH_EDGE (e, ei, return_bb->preds) +- if (bitmap_bit_p (split_point->split_bbs, e->src->index)) +- break; +- if (e) +- split_part_return_p = true; ++ { ++ if (bitmap_bit_p (split_point->split_bbs, e->src->index)) ++ split_part_return_p = true; ++ else ++ main_part_return_p = true; ++ } ++ /* The main part also returns if we we split on a fallthru edge ++ and the split part returns. */ ++ if (split_part_return_p) ++ FOR_EACH_EDGE (e, ei, split_point->entry_bb->preds) ++ { ++ if (! bitmap_bit_p (split_point->split_bbs, e->src->index) ++ && single_succ_p (e->src)) ++ { ++ main_part_return_p = true; ++ break; ++ } ++ } + + /* Add return block to what will become the split function. + We do not return; no return block is needed. */ +@@ -1212,6 +1227,11 @@ split_function (struct split_point *split_point) + else + bitmap_set_bit (split_point->split_bbs, return_bb->index); + ++ /* If the main part doesn't return pretend the return block wasn't ++ found for all of the following. */ ++ if (! main_part_return_p) ++ return_bb = EXIT_BLOCK_PTR_FOR_FN (cfun); ++ + /* If RETURN_BB has virtual operand PHIs, they must be removed and the + virtual operand marked for renaming as we change the CFG in a way that + tree-inline is not able to compensate for. diff -uNr a/sys-devel/gcc/files/gcc-4.9.3-secure-plt.patch b/sys-devel/gcc/files/gcc-4.9.3-secure-plt.patch --- a/sys-devel/gcc/files/gcc-4.9.3-secure-plt.patch false +++ b/sys-devel/gcc/files/gcc-4.9.3-secure-plt.patch 635b10156fd6b6a12592cd7a3fdfa0a9d553851c185a14487b4faa1be8730aac2382088495a6f3d0b164e9b8642bc9ac4a33c1d9e688efe2f129f792151ce7a2 @@ -0,0 +1,39 @@ +diff --git a/gcc/config/rs6000/secureplt.h b/gcc/config/rs6000/secureplt.h +index b463463..77edf2a 100644 +--- a/gcc/config/rs6000/secureplt.h ++++ b/gcc/config/rs6000/secureplt.h +@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3. If not see + <http://www.gnu.org/licenses/>. */ + + #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" ++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h +index 7b2f9bd..c77bf5c 100644 +--- a/gcc/config/rs6000/sysv4.h ++++ b/gcc/config/rs6000/sysv4.h +@@ -537,6 +537,9 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN) + #ifndef CC1_SECURE_PLT_DEFAULT_SPEC + #define CC1_SECURE_PLT_DEFAULT_SPEC "" + #endif ++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC ++#define LINK_SECURE_PLT_DEFAULT_SPEC "" ++#endif + + /* Pass -G xxx to the compiler. */ + #undef CC1_SPEC +@@ -574,6 +577,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN) + %{R*} \ + %(link_shlib) \ + %{!T*: %(link_start) } \ ++%{!static: %(link_secure_plt_default)} \ + %(link_target) \ + %(link_os)" + +@@ -889,6 +893,7 @@ ncrtn.o%s" + { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ + { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ + { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ ++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ + { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ + { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ + { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ diff -uNr a/sys-devel/gcc/files/gcc-4.9.3-tree-vect-data-refs-correctness.patch b/sys-devel/gcc/files/gcc-4.9.3-tree-vect-data-refs-correctness.patch --- a/sys-devel/gcc/files/gcc-4.9.3-tree-vect-data-refs-correctness.patch false +++ b/sys-devel/gcc/files/gcc-4.9.3-tree-vect-data-refs-correctness.patch 63034d6e08ba02307a900c7309c1ee3c131167c68df2e965c0e33fc645520557861d414a8f4448ee5741988da397a25b27351fb52d88e6cd38ac12fb3340caa9 @@ -0,0 +1,11 @@ +--- trunk/gcc/tree-vect-data-refs.c 2015/11/20 16:15:57 230666 ++++ trunk/gcc/tree-vect-data-refs.c 2015/11/20 16:27:17 +@@ -2545,6 +2545,8 @@ + if (t2 == NULL) + return 1; + ++ STRIP_NOPS (t1); ++ STRIP_NOPS (t2); + + if (TREE_CODE (t1) != TREE_CODE (t2)) + return TREE_CODE (t1) < TREE_CODE (t2) ? -1 : 1; diff -uNr a/sys-devel/gcc/files/gcc-5.4.0-pr68470.patch b/sys-devel/gcc/files/gcc-5.4.0-pr68470.patch --- a/sys-devel/gcc/files/gcc-5.4.0-pr68470.patch false +++ b/sys-devel/gcc/files/gcc-5.4.0-pr68470.patch 36a5b871a9b33cb1e182f32404e6f7e9d180f38a32397ab2fe97c24ca6d08b93e849ca5bd581706a2353d2795d1e0dabab5b37f930d183a0f6002ea401b06527 @@ -0,0 +1,57 @@ +diff -Naur gcc-5.4.0.orig/gcc/ipa-split.c gcc-5.4.0/gcc/ipa-split.c +--- gcc-5.4.0.orig/gcc/ipa-split.c 2016-03-30 05:27:12.000000000 -0700 ++++ gcc-5.4.0/gcc/ipa-split.c 2016-12-24 17:10:50.205152721 -0800 +@@ -1246,7 +1246,6 @@ + edge e; + edge_iterator ei; + tree retval = NULL, real_retval = NULL, retbnd = NULL; +- bool split_part_return_p = false; + bool with_bounds = chkp_function_instrumented_p (current_function_decl); + gimple last_stmt = NULL; + unsigned int i; +@@ -1287,12 +1286,28 @@ + args_to_pass.safe_push (arg); + } + +- /* See if the split function will return. */ ++ /* See if the split function or the main part will return. */ ++ bool main_part_return_p = false; ++ bool split_part_return_p = false; + FOR_EACH_EDGE (e, ei, return_bb->preds) +- if (bitmap_bit_p (split_point->split_bbs, e->src->index)) +- break; +- if (e) +- split_part_return_p = true; ++ { ++ if (bitmap_bit_p (split_point->split_bbs, e->src->index)) ++ split_part_return_p = true; ++ else ++ main_part_return_p = true; ++ } ++ /* The main part also returns if we we split on a fallthru edge ++ and the split part returns. */ ++ if (split_part_return_p) ++ FOR_EACH_EDGE (e, ei, split_point->entry_bb->preds) ++ { ++ if (! bitmap_bit_p (split_point->split_bbs, e->src->index) ++ && single_succ_p (e->src)) ++ { ++ main_part_return_p = true; ++ break; ++ } ++ } + + /* Add return block to what will become the split function. + We do not return; no return block is needed. */ +@@ -1336,6 +1351,11 @@ + else + bitmap_set_bit (split_point->split_bbs, return_bb->index); + ++ /* If the main part doesn't return pretend the return block wasn't ++ found for all of the following. */ ++ if (! main_part_return_p) ++ return_bb = EXIT_BLOCK_PTR_FOR_FN (cfun); ++ + /* If RETURN_BB has virtual operand PHIs, they must be removed and the + virtual operand marked for renaming as we change the CFG in a way that + tree-inline is not able to compensate for. diff -uNr a/sys-devel/gcc/files/gcc-5.4.0-pr70473.patch b/sys-devel/gcc/files/gcc-5.4.0-pr70473.patch --- a/sys-devel/gcc/files/gcc-5.4.0-pr70473.patch false +++ b/sys-devel/gcc/files/gcc-5.4.0-pr70473.patch b4db74371952812120bb81b97d1d2926b7c48cd8ca977d222e913badd21b9f55fceaf08f3fac5825bc1f49c0c3c4004cc101aa052698c9d7f0e82cfb8f8354e2 @@ -0,0 +1,43 @@ +--- a/gcc/config/arm/cortex-a8-neon.md 2016/08/26 10:22:08 239771 ++++ b/gcc/config/arm/cortex-a8-neon.md 2016/08/26 10:23:20 239772 +@@ -357,30 +357,34 @@ + (eq_attr "type" "fmuls")) + "cortex_a8_vfp,cortex_a8_vfplite*11") + ++;; Don't model a reservation for more than 15 cycles as this explodes the ++;; state space of the automaton for little gain. It is unlikely that the ++;; scheduler will find enough instructions to hide the full latency of the ++;; instructions. + (define_insn_reservation "cortex_a8_vfp_muld" 17 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fmuld")) +- "cortex_a8_vfp,cortex_a8_vfplite*16") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_macs" 21 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fmacs,ffmas")) +- "cortex_a8_vfp,cortex_a8_vfplite*20") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_macd" 26 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fmacd,ffmad")) +- "cortex_a8_vfp,cortex_a8_vfplite*25") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_divs" 37 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fdivs, fsqrts")) +- "cortex_a8_vfp,cortex_a8_vfplite*36") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_divd" 65 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fdivd, fsqrtd")) +- "cortex_a8_vfp,cortex_a8_vfplite*64") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + ;; Comparisons can actually take 7 cycles sometimes instead of four, + ;; but given all the other instructions lumped into type=ffarith that + diff -uNr a/sys-devel/gcc/files/gcc-5.4.0-pr71696-CVE-2016-6131.patch b/sys-devel/gcc/files/gcc-5.4.0-pr71696-CVE-2016-6131.patch --- a/sys-devel/gcc/files/gcc-5.4.0-pr71696-CVE-2016-6131.patch false +++ b/sys-devel/gcc/files/gcc-5.4.0-pr71696-CVE-2016-6131.patch 922d38ffde3515663dd9eb4e86235163cb01b02625b6e8a96f0353dec74649d936501ee2c3803846de2963ebc8f88250b1469ff5e16e073bd8ae69eee01c9257 @@ -0,0 +1,252 @@ +From b3f6b32165d3f437bd0ac6269c3c499b68ecf036 Mon Sep 17 00:00:00 2001 +From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Thu, 4 Aug 2016 16:53:18 +0000 +Subject: [PATCH] Fix for PR71696 in Libiberty Demangler +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[BZ #71696] -- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71696 + +2016-08-04 Marcel Böhme <boehme.marcel@gmail.com> + + PR c++/71696 + * cplus-dem.c: Prevent infinite recursion when there is a cycle + in the referencing of remembered mangled types. + (work_stuff): New stack to keep track of the remembered mangled + types that are currently being processed. + (push_processed_type): New method to push currently processed + remembered type onto the stack. + (pop_processed_type): New method to pop currently processed + remembered type from the stack. + (work_stuff_copy_to_from): Copy values of new variables. + (delete_non_B_K_work_stuff): Free stack memory. + (demangle_args): Push/Pop currently processed remembered type. + (do_type): Do not demangle a cyclic reference and push/pop + referenced remembered type. + +cherry-picked from commit of +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239143 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport [master] +CVE: CVE-2016-6131 +Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> +--- + libiberty/ChangeLog | 17 ++++++++ + libiberty/cplus-dem.c | 78 ++++++++++++++++++++++++++++++++--- + libiberty/testsuite/demangle-expected | 18 ++++++++ + 3 files changed, 108 insertions(+), 5 deletions(-) + +diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog +index 9859ad3..7939480 100644 +--- a/libiberty/ChangeLog ++++ b/libiberty/ChangeLog +@@ -1,3 +1,20 @@ ++2016-08-04 Marcel Böhme <boehme.marcel@gmail.com> ++ ++ PR c++/71696 ++ * cplus-dem.c: Prevent infinite recursion when there is a cycle ++ in the referencing of remembered mangled types. ++ (work_stuff): New stack to keep track of the remembered mangled ++ types that are currently being processed. ++ (push_processed_type): New method to push currently processed ++ remembered type onto the stack. ++ (pop_processed_type): New method to pop currently processed ++ remembered type from the stack. ++ (work_stuff_copy_to_from): Copy values of new variables. ++ (delete_non_B_K_work_stuff): Free stack memory. ++ (demangle_args): Push/Pop currently processed remembered type. ++ (do_type): Do not demangle a cyclic reference and push/pop ++ referenced remembered type. ++ + 2016-06-03 Release Manager + + * GCC 5.4.0 released. +diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c +index 7514e57..f21e630 100644 +--- a/libiberty/cplus-dem.c ++++ b/libiberty/cplus-dem.c +@@ -144,6 +144,9 @@ struct work_stuff + string* previous_argument; /* The last function argument demangled. */ + int nrepeats; /* The number of times to repeat the previous + argument. */ ++ int *proctypevec; /* Indices of currently processed remembered typevecs. */ ++ int proctypevec_size; ++ int nproctypes; + }; + + #define PRINT_ANSI_QUALIFIERS (work -> options & DMGL_ANSI) +@@ -435,6 +438,10 @@ iterate_demangle_function (struct work_stuff *, + + static void remember_type (struct work_stuff *, const char *, int); + ++static void push_processed_type (struct work_stuff *, int); ++ ++static void pop_processed_type (struct work_stuff *); ++ + static void remember_Btype (struct work_stuff *, const char *, int, int); + + static int register_Btype (struct work_stuff *); +@@ -1301,6 +1308,10 @@ work_stuff_copy_to_from (struct work_stuff *to, struct work_stuff *from) + memcpy (to->btypevec[i], from->btypevec[i], len); + } + ++ if (from->proctypevec) ++ to->proctypevec = ++ XDUPVEC (int, from->proctypevec, from->proctypevec_size); ++ + if (from->ntmpl_args) + to->tmpl_argvec = XNEWVEC (char *, from->ntmpl_args); + +@@ -1329,11 +1340,17 @@ delete_non_B_K_work_stuff (struct work_stuff *work) + /* Discard the remembered types, if any. */ + + forget_types (work); +- if (work -> typevec != NULL) ++ if (work->typevec != NULL) + { +- free ((char *) work -> typevec); +- work -> typevec = NULL; +- work -> typevec_size = 0; ++ free ((char *) work->typevec); ++ work->typevec = NULL; ++ work->typevec_size = 0; ++ } ++ if (work->proctypevec != NULL) ++ { ++ free (work->proctypevec); ++ work->proctypevec = NULL; ++ work->proctypevec_size = 0; + } + if (work->tmpl_argvec) + { +@@ -3552,6 +3569,8 @@ static int + do_type (struct work_stuff *work, const char **mangled, string *result) + { + int n; ++ int i; ++ int is_proctypevec; + int done; + int success; + string decl; +@@ -3564,6 +3583,7 @@ do_type (struct work_stuff *work, const char **mangled, string *result) + + done = 0; + success = 1; ++ is_proctypevec = 0; + while (success && !done) + { + int member; +@@ -3616,8 +3636,15 @@ do_type (struct work_stuff *work, const char **mangled, string *result) + success = 0; + } + else ++ for (i = 0; i < work->nproctypes; i++) ++ if (work -> proctypevec [i] == n) ++ success = 0; ++ ++ if (success) + { +- remembered_type = work -> typevec[n]; ++ is_proctypevec = 1; ++ push_processed_type (work, n); ++ remembered_type = work->typevec[n]; + mangled = &remembered_type; + } + break; +@@ -3840,6 +3867,9 @@ do_type (struct work_stuff *work, const char **mangled, string *result) + string_delete (result); + string_delete (&decl); + ++ if (is_proctypevec) ++ pop_processed_type (work); ++ + if (success) + /* Assume an integral type, if we're not sure. */ + return (int) ((tk == tk_none) ? tk_integral : tk); +@@ -4252,6 +4282,41 @@ do_arg (struct work_stuff *work, const char **mangled, string *result) + } + + static void ++push_processed_type (struct work_stuff *work, int typevec_index) ++{ ++ if (work->nproctypes >= work->proctypevec_size) ++ { ++ if (!work->proctypevec_size) ++ { ++ work->proctypevec_size = 4; ++ work->proctypevec = XNEWVEC (int, work->proctypevec_size); ++ } ++ else ++ { ++ if (work->proctypevec_size < 16) ++ /* Double when small. */ ++ work->proctypevec_size *= 2; ++ else ++ { ++ /* Grow slower when large. */ ++ if (work->proctypevec_size > (INT_MAX / 3) * 2) ++ xmalloc_failed (INT_MAX); ++ work->proctypevec_size = (work->proctypevec_size * 3 / 2); ++ } ++ work->proctypevec ++ = XRESIZEVEC (int, work->proctypevec, work->proctypevec_size); ++ } ++ } ++ work->proctypevec [work->nproctypes++] = typevec_index; ++} ++ ++static void ++pop_processed_type (struct work_stuff *work) ++{ ++ work->nproctypes--; ++} ++ ++static void + remember_type (struct work_stuff *work, const char *start, int len) + { + char *tem; +@@ -4515,10 +4580,13 @@ demangle_args (struct work_stuff *work, const char **mangled, + { + string_append (declp, ", "); + } ++ push_processed_type (work, t); + if (!do_arg (work, &tem, &arg)) + { ++ pop_processed_type (work); + return (0); + } ++ pop_processed_type (work); + if (PRINT_ARG_TYPES) + { + string_appends (declp, &arg); +diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected +index 1d8b771..d690b23 100644 +--- a/libiberty/testsuite/demangle-expected ++++ b/libiberty/testsuite/demangle-expected +@@ -4429,3 +4429,21 @@ __vt_90000000000cafebabe + + _Z80800000000000000000000 + _Z80800000000000000000000 ++# ++# Tests write access violation PR70926 ++ ++0__Ot2m02R5T0000500000 ++0__Ot2m02R5T0000500000 ++# ++ ++0__GT50000000000_ ++0__GT50000000000_ ++# ++ ++__t2m05B500000000000000000_ ++__t2m05B500000000000000000_ ++# ++# Tests stack overflow PR71696 ++ ++__10%0__S4_0T0T0 ++%0<>::%0(%0<>) +-- +2.9.3 + + diff -uNr a/sys-devel/gcc/files/gcc-7.2.0-pr69728.patch b/sys-devel/gcc/files/gcc-7.2.0-pr69728.patch --- a/sys-devel/gcc/files/gcc-7.2.0-pr69728.patch false +++ b/sys-devel/gcc/files/gcc-7.2.0-pr69728.patch 3fcacdf02c9e7dafd37d2900af1b7662bb47251c3c40e3bbd64d2d06578e099b92ab009c81867c1465b2ac7c9cf4a2668ba1590b5c7c4a5b78eb5477d866aba7 @@ -0,0 +1,26 @@ +diff -Naur gcc-7.2.0.orig/gcc/graphite-sese-to-poly.c gcc-7.2.0/gcc/graphite-sese-to-poly.c +--- gcc-7.2.0.orig/gcc/graphite-sese-to-poly.c 2017-11-29 12:32:19.000188886 -0800 ++++ gcc-7.2.0/gcc/graphite-sese-to-poly.c 2017-11-29 12:32:35.858188584 -0800 +@@ -1043,6 +1043,14 @@ + if (empty < 0 || empty) + return empty < 0 ? isl_schedule_free (schedule) : schedule; + ++ isl_union_set *domain = isl_schedule_get_domain (schedule); ++ /* We cannot apply an empty domain to pbbs in this loop so return early. */ ++ if (isl_union_set_is_empty (domain)) ++ { ++ isl_union_set_free (domain); ++ return schedule; ++ } ++ + isl_space *space = isl_set_get_space (iterators); + int loop_index = isl_space_dim (space, isl_dim_set) - 1; + +@@ -1063,7 +1071,6 @@ + prefix = isl_multi_aff_set_tuple_id (prefix, isl_dim_out, label); + + int n = isl_multi_aff_dim (prefix, isl_dim_in); +- isl_union_set *domain = isl_schedule_get_domain (schedule); + isl_multi_union_pw_aff *mupa = outer_projection_mupa (domain, n); + mupa = isl_multi_union_pw_aff_apply_multi_aff (mupa, prefix); + return isl_schedule_insert_partial_schedule (schedule, mupa); diff -uNr a/sys-devel/gcc/files/gcc-configure-LANG.patch b/sys-devel/gcc/files/gcc-configure-LANG.patch --- a/sys-devel/gcc/files/gcc-configure-LANG.patch false +++ b/sys-devel/gcc/files/gcc-configure-LANG.patch 46b6442c782de0de581cae2d7a9c559afe9f1f3427843b655a42c685503485deda31c5113b8a6248a4d9073351a89969088d2350fa94d5539bd86bd1c222ac7a @@ -0,0 +1,64 @@ +The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in +option parsing, it may break. + +http://bugs.gentoo.org/103483 + +--- configure ++++ configure +@@ -54,6 +54,19 @@ + infodir='${prefix}/info' + mandir='${prefix}/man' + ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ unset $as_var ++ fi ++done ++ + # Initialize some other variables. + subdirs= + MFLAGS= MAKEFLAGS= +@@ -452,16 +463,6 @@ + esac + done + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +- + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -rf conftest* confdefs.h + # AIX cpp loses on an empty file, so make sure it contains at least a newline. +@@ -1850,6 +1850,19 @@ + # Compiler output produced by configure, useful for debugging + # configure, is in ./config.log if it exists. + ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then ++ eval \$as_var=C; export \$as_var ++ else ++ unset \$as_var ++ fi ++done ++ + ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" + for ac_option + do diff -uNr a/sys-devel/gcc/files/gcc-configure-texinfo.patch b/sys-devel/gcc/files/gcc-configure-texinfo.patch --- a/sys-devel/gcc/files/gcc-configure-texinfo.patch false +++ b/sys-devel/gcc/files/gcc-configure-texinfo.patch 2bfaa16eccd77a2cbe26a819587d0b5b007745874e5c3b1a7245f9d05d54f85cfa586248b47e3c6e589e59986298d3a94099e55c29f80ff80700a3337f8ff7c6 @@ -0,0 +1,16 @@ +Chances are quite good that the installed makeinfo is sufficient. +So ignore false positives where the makeinfo installed is so new +that it violates the cheesy version grep. + +http://bugs.gentoo.org/198182 + +--- configure ++++ configure +@@ -3573,6 +3573,6 @@ + : + else +- MAKEINFO="$MISSING makeinfo" ++ : + fi + ;; + diff -uNr a/sys-devel/gcc/files/gcc-spec-env-r1.patch b/sys-devel/gcc/files/gcc-spec-env-r1.patch --- a/sys-devel/gcc/files/gcc-spec-env-r1.patch false +++ b/sys-devel/gcc/files/gcc-spec-env-r1.patch 3671708506bda7370d19955319011fe4b04c91de77ae0be53826668d19cd36c7beea66091d14f13a33e777eb13c8407251ef6c215e4a10e2bea3d017e0dc808f @@ -0,0 +1,87 @@ +2013-08-22 Magnus Granberg <zorry@gentoo.org> + + * gcc/gcc.c (main): Add support for external spec file via the GCC_SPECS env var + and move the process of the user specifed specs. + + This allows us to easily control pie/ssp defaults with gcc-config profiles. + Original patch by Rob Holland + Extended to support multiple entries separated by ':' by Kevin F. Quinn + Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill + Modified to process the GCC_SPECS env var befor DRIVER_SELF_SPECS by Magnus Granberg + +--- gcc-4.8-20130210/gcc/gcc.c 2013-02-05 16:55:31.000000000 +0100 ++++ gcc-4.8-20130210-work/gcc/gcc.c 2013-07-26 02:32:14.625089864 +0200 +@@ -6427,6 +6428,48 @@ main (int argc, char **argv) + do_option_spec (option_default_specs[i].name, + option_default_specs[i].spec); + ++#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32)) ++ /* Add specs listed in GCC_SPECS. Note; in the process of separating ++ * each spec listed, the string is overwritten at token boundaries ++ * (':') with '\0', an effect of strtok_r(). ++ */ ++ specs_file = getenv ("GCC_SPECS"); ++ if (specs_file && (strlen(specs_file) > 0)) ++ { ++ char *spec, *saveptr; ++ for (spec=strtok_r(specs_file,":",&saveptr); ++ spec!=NULL; ++ spec=strtok_r(NULL,":",&saveptr)) ++ { ++ struct user_specs *user = (struct user_specs *) ++ xmalloc (sizeof (struct user_specs)); ++ user->next = (struct user_specs *) 0; ++ user->filename = spec; ++ if (user_specs_tail) ++ user_specs_tail->next = user; ++ else ++ user_specs_head = user; ++ user_specs_tail = user; ++ } ++ } ++#endif ++ /* Process any user specified specs in the order given on the command ++ * line. */ ++ for (uptr = user_specs_head; uptr; uptr = uptr->next) ++ { ++ char *filename = find_a_file (&startfile_prefixes, uptr->filename, ++ R_OK, true); ++ read_specs (filename ? filename : uptr->filename, false, true); ++ } ++ /* Process any user self specs. */ ++ { ++ struct spec_list *sl; ++ for (sl = specs; sl; sl = sl->next) ++ if (sl->name_len == sizeof "self_spec" - 1 ++ && !strcmp (sl->name, "self_spec")) ++ do_self_spec (*sl->ptr_spec); ++ } ++ + /* Process DRIVER_SELF_SPECS, adding any new options to the end + of the command line. */ + +@@ -6535,24 +6578,6 @@ main (int argc, char **argv) + PREFIX_PRIORITY_LAST, 0, 1); + } + +- /* Process any user specified specs in the order given on the command +- line. */ +- for (uptr = user_specs_head; uptr; uptr = uptr->next) +- { +- char *filename = find_a_file (&startfile_prefixes, uptr->filename, +- R_OK, true); +- read_specs (filename ? filename : uptr->filename, false, true); +- } +- +- /* Process any user self specs. */ +- { +- struct spec_list *sl; +- for (sl = specs; sl; sl = sl->next) +- if (sl->name_len == sizeof "self_spec" - 1 +- && !strcmp (sl->name, "self_spec")) +- do_self_spec (*sl->ptr_spec); +- } +- + if (compare_debug) + { + enum save_temps save; diff -uNr a/sys-devel/gcc/files/gcc-spec-env.patch b/sys-devel/gcc/files/gcc-spec-env.patch --- a/sys-devel/gcc/files/gcc-spec-env.patch false +++ b/sys-devel/gcc/files/gcc-spec-env.patch 31503f9ca227d01e2d16c0e04e779e7cf0c4c55f3f5ca9f1f5d683b2fce718c3b609e3b0dc5b9de0d96504f2367fb1d52f954a21e97cb933b98bed7d6b8538e7 @@ -0,0 +1,42 @@ + Add support for external spec file via the GCC_SPECS env var. This + allows us to easily control pie/ssp defaults with gcc-config profiles. + + Original patch by Rob Holland + Extended to support multiple entries separated by ':' by Kevin F. Quinn + Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill + +--- gcc-4/gcc/gcc.c ++++ gcc-4/gcc/gcc.c +@@ -6482,6 +6482,32 @@ + + /* Process any user specified specs in the order given on the command + line. */ ++#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32)) ++ /* Add specs listed in GCC_SPECS. Note; in the process of separating ++ * each spec listed, the string is overwritten at token boundaries ++ * (':') with '\0', an effect of strtok_r(). ++ */ ++ specs_file = getenv ("GCC_SPECS"); ++ if (specs_file && (strlen(specs_file) > 0)) ++ { ++ char *spec, *saveptr; ++ for (spec=strtok_r(specs_file,":",&saveptr); ++ spec!=NULL; ++ spec=strtok_r(NULL,":",&saveptr)) ++ { ++ struct user_specs *user = (struct user_specs *) ++ xmalloc (sizeof (struct user_specs)); ++ ++ user->next = (struct user_specs *) 0; ++ user->filename = spec; ++ if (user_specs_tail) ++ user_specs_tail->next = user; ++ else ++ user_specs_head = user; ++ user_specs_tail = user; ++ } ++ } ++#endif + for (uptr = user_specs_head; uptr; uptr = uptr->next) + { + char *filename = find_a_file (&startfile_prefixes, uptr->filename, diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/aarch64.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/aarch64.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/aarch64.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/aarch64.diff 9aa4091a4f1cc90c364bd135e154b9a599e14c30cd05fd744d2c12ba53281fdcdf5fbd7ba7f463ba7ce38507852e607de5237ebcb4c43236622ce9294c4ede1d @@ -0,0 +1,12 @@ +diff -r 7c6d89fb1832 gcc/config/aarch64/aarch64-linux.h +--- a/gcc/config/aarch64/aarch64-linux.h Sun Jul 26 15:32:28 2015 -0400 ++++ b/gcc/config/aarch64/aarch64-linux.h Sun Jul 26 15:32:30 2015 -0400 +@@ -23,6 +23,8 @@ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1" + ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" ++ + #define CPP_SPEC "%{pthread:-D_REENTRANT}" + + #define LINUX_TARGET_LINK_SPEC "%{h*} \ diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/arm.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/arm.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/arm.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/arm.diff b65216108e87de331598229a918df8cf6032ac8e575ce3c532f3c64c2930b564587213b43092fcd7630d8f26c2a86fd0a7c5692f305495fca3bc6773488f1dbd @@ -0,0 +1,46 @@ +# HG changeset patch +# Parent 92d83561106d17ca896328fcb4ec36cd4e2e9e16 +Support for arm-linux-musl. + +diff -r 92d83561106d gcc/config/arm/linux-eabi.h +--- a/gcc/config/arm/linux-eabi.h Sun Jul 26 15:32:23 2015 -0400 ++++ b/gcc/config/arm/linux-eabi.h Sun Jul 26 15:32:25 2015 -0400 +@@ -77,6 +77,23 @@ + %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ + %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" + ++/* For ARM musl currently supports four dynamic linkers: ++ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI ++ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI ++ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB ++ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB ++ musl does not support the legacy OABI mode. ++ All the dynamic linkers live in /lib. ++ We default to soft-float, EL. */ ++#undef MUSL_DYNAMIC_LINKER ++#if TARGET_BIG_ENDIAN_DEFAULT ++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" ++#endif ++#define MUSL_DYNAMIC_LINKER \ ++ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" ++ + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ + #undef LINK_SPEC +diff -r 92d83561106d libitm/config/arm/hwcap.cc +--- a/libitm/config/arm/hwcap.cc Sun Jul 26 15:32:23 2015 -0400 ++++ b/libitm/config/arm/hwcap.cc Sun Jul 26 15:32:25 2015 -0400 +@@ -40,7 +40,11 @@ + + #ifdef __linux__ + #include <unistd.h> ++#ifdef __GLIBC__ + #include <sys/fcntl.h> ++#else ++#include <fcntl.h> ++#endif + #include <elf.h> + + static void __attribute__((constructor)) diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-autoconf-musl.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-autoconf-musl.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-autoconf-musl.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-autoconf-musl.diff e35bfc3e292ef1ab26935d05fad97b5434bd208c770600b939b34bc98e8cc80faf79ce1a40f9836483b4e8c78ab32d4bd2d1858076c24a8da3edf38535a2cb54 @@ -0,0 +1,62 @@ +diff -r 3baeaed6c155 gcc/configure +--- a/gcc/configure Sun Jul 26 15:32:15 2015 -0400 ++++ b/gcc/configure Sun Jul 26 15:32:17 2015 -0400 +@@ -27449,6 +27449,9 @@ + else + gcc_cv_libc_provides_ssp=no + case "$target" in ++ *-*-musl*) ++ # All versions of musl provide stack protector ++ gcc_cv_libc_provides_ssp=yes;; + *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) + # glibc 2.4 and later provides __stack_chk_fail and + # either __stack_chk_guard, or TLS access to stack guard canary. +@@ -27481,6 +27484,7 @@ + # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now + # simply assert that glibc does provide this, which is true for all + # realistically usable GNU/Hurd configurations. ++ # All supported versions of musl provide it as well + gcc_cv_libc_provides_ssp=yes;; + *-*-darwin* | *-*-freebsd*) + ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail" +@@ -27570,6 +27574,9 @@ + gcc_cv_target_dl_iterate_phdr=no + fi + ;; ++ *-linux-musl*) ++ gcc_cv_target_dl_iterate_phdr=yes ++ ;; + esac + + if test x$gcc_cv_target_dl_iterate_phdr = xyes; then +diff -r 3baeaed6c155 gcc/configure.ac +--- a/gcc/configure.ac Sun Jul 26 15:32:15 2015 -0400 ++++ b/gcc/configure.ac Sun Jul 26 15:32:17 2015 -0400 +@@ -5076,6 +5076,9 @@ + gcc_cv_libc_provides_ssp, + [gcc_cv_libc_provides_ssp=no + case "$target" in ++ *-*-musl*) ++ # All versions of musl provide stack protector ++ gcc_cv_libc_provides_ssp=yes;; + *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) + # glibc 2.4 and later provides __stack_chk_fail and + # either __stack_chk_guard, or TLS access to stack guard canary. +@@ -5102,6 +5105,7 @@ + # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now + # simply assert that glibc does provide this, which is true for all + # realistically usable GNU/Hurd configurations. ++ # All supported versions of musl provide it as well + gcc_cv_libc_provides_ssp=yes;; + *-*-darwin* | *-*-freebsd*) + AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes], +@@ -5168,6 +5172,9 @@ + gcc_cv_target_dl_iterate_phdr=no + fi + ;; ++ *-linux-musl*) ++ gcc_cv_target_dl_iterate_phdr=yes ++ ;; + esac + GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) + if test x$gcc_cv_target_dl_iterate_phdr = xyes; then diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-config-musl.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-config-musl.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-config-musl.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-config-musl.diff 55184bf8b2d6b57aa055b1e1f689b4b53fc8b13356f3b69c229de9ba654a0e1e922cc1ff847f8b0b3f0f0e98d13235847c568169e1fef46cff3f680ea2b138e2 @@ -0,0 +1,207 @@ +# HG changeset patch +# Parent fef9a6ed009159f294d8524a0bc1dda731990754 +Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. + +diff -r fef9a6ed0091 gcc/config.gcc +--- a/gcc/config.gcc Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/config.gcc Sun Jul 26 15:32:11 2015 -0400 +@@ -594,7 +594,7 @@ + esac + + # Common C libraries. +-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" ++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" + + # 32-bit x86 processors supported by --with-arch=. Each processor + # MUST be separated by exactly one space. +@@ -719,6 +719,9 @@ + *-*-*uclibc*) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" + ;; ++ *-*-*musl*) ++ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" ++ ;; + *) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" + ;; +diff -r fef9a6ed0091 gcc/config/linux.h +--- a/gcc/config/linux.h Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/config/linux.h Sun Jul 26 15:32:11 2015 -0400 +@@ -32,10 +32,12 @@ + #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) + #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) + #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) ++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) + #else + #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) + #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) + #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) ++#define OPTION_MUSL (linux_libc == LIBC_MUSL) + #endif + + #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ +@@ -53,18 +55,21 @@ + uClibc or Bionic is the default C library and whether + -muclibc or -mglibc or -mbionic has been passed to change the default. */ + +-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ +- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" ++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ ++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" + + #if DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) + #elif DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) + #elif DEFAULT_LIBC == LIBC_BIONIC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) + #else + #error "Unsupported DEFAULT_LIBC" + #endif /* DEFAULT_LIBC */ +@@ -84,21 +89,92 @@ + + #define GNU_USER_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ +- BIONIC_DYNAMIC_LINKER) ++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + #define GNU_USER_DYNAMIC_LINKER32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ +- BIONIC_DYNAMIC_LINKER32) ++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ +- BIONIC_DYNAMIC_LINKER64) ++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + #define GNU_USER_DYNAMIC_LINKERX32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ +- BIONIC_DYNAMIC_LINKERX32) ++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) + + /* Whether we have Bionic libc runtime */ + #undef TARGET_HAS_BIONIC + #define TARGET_HAS_BIONIC (OPTION_BIONIC) + ++/* musl avoids problematic includes by rearranging the include directories. ++ * Unfortunately, this is mostly duplicated from cppdefault.c */ ++#if DEFAULT_LIBC == LIBC_MUSL ++#define INCLUDE_DEFAULTS_MUSL_GPP \ ++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ ++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ ++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, ++ ++#ifdef LOCAL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_LOCAL \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_LOCAL ++#endif ++ ++#ifdef PREFIX_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_PREFIX ++#endif ++ ++#ifdef CROSS_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_CROSS \ ++ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#ifdef TOOL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_TOOL \ ++ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_TOOL ++#endif ++ ++#ifdef NATIVE_SYSTEM_HEADER_DIR ++#define INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_NATIVE ++#endif ++ ++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) ++# undef INCLUDE_DEFAULTS_MUSL_LOCAL ++# define INCLUDE_DEFAULTS_MUSL_LOCAL ++# undef INCLUDE_DEFAULTS_MUSL_NATIVE ++# define INCLUDE_DEFAULTS_MUSL_NATIVE ++#else ++# undef INCLUDE_DEFAULTS_MUSL_CROSS ++# define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#undef INCLUDE_DEFAULTS ++#define INCLUDE_DEFAULTS \ ++ { \ ++ INCLUDE_DEFAULTS_MUSL_GPP \ ++ INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ INCLUDE_DEFAULTS_MUSL_CROSS \ ++ INCLUDE_DEFAULTS_MUSL_TOOL \ ++ INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ ++ { 0, 0, 0, 0, 0, 0 } \ ++ } ++#endif ++ + #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ + /* This is a *uclinux* target. We don't define below macros to normal linux + versions, because doing so would require *uclinux* targets to include +diff -r fef9a6ed0091 gcc/config/linux.opt +--- a/gcc/config/linux.opt Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/config/linux.opt Sun Jul 26 15:32:11 2015 -0400 +@@ -30,3 +30,7 @@ + muclibc + Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) + Use uClibc C library ++ ++mmusl ++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) ++Use musl C library +diff -r fef9a6ed0091 gcc/ginclude/stddef.h +--- a/gcc/ginclude/stddef.h Sun Jul 26 15:32:09 2015 -0400 ++++ b/gcc/ginclude/stddef.h Sun Jul 26 15:32:11 2015 -0400 +@@ -181,6 +181,7 @@ + #ifndef _GCC_SIZE_T + #ifndef _SIZET_ + #ifndef __size_t ++#ifndef __DEFINED_size_t /* musl */ + #define __size_t__ /* BeOS */ + #define __SIZE_T__ /* Cray Unicos/Mk */ + #define _SIZE_T +@@ -197,6 +198,7 @@ + #define ___int_size_t_h + #define _GCC_SIZE_T + #define _SIZET_ ++#define __DEFINED_size_t /* musl */ + #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ + || defined(__FreeBSD_kernel__) + /* __size_t is a typedef on FreeBSD 5, must not trash it. */ +@@ -214,6 +216,7 @@ + typedef long ssize_t; + #endif /* __BEOS__ */ + #endif /* !(defined (__GNUG__) && defined (size_t)) */ ++#endif /* __DEFINED_size_t */ + #endif /* __size_t */ + #endif /* _SIZET_ */ + #endif /* _GCC_SIZE_T */ diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-ssp.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-ssp.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-ssp.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gcc-ssp.diff d72fe00d2319f9a357884bf451942dac0cddfa33af122f714cde1c910c4691f533507fb2e85c894a8f8e4c2c707f082335ea4eb2b7796ba83f3baa983770dc4b @@ -0,0 +1,12 @@ +diff -r 581c4dd64733 gcc/gcc.c +--- a/gcc/gcc.c Sun Jul 26 15:32:17 2015 -0400 ++++ b/gcc/gcc.c Sun Jul 26 15:32:19 2015 -0400 +@@ -670,7 +670,7 @@ + + #ifndef LINK_SSP_SPEC + #ifdef TARGET_LIBC_PROVIDES_SSP +-#define LINK_SSP_SPEC "%{fstack-protector:}" ++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all:-lssp_nonshared}" + #else + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-strong|fstack-protector-all:-lssp_nonshared -lssp}" + #endif diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gomp-posix.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gomp-posix.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gomp-posix.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gomp-posix.diff 459066b885a147e5c662021e7dd3e8e4cb2b1afb1d1d07027eea4ff3dc3cec0604045f39fd798b6e083bded69a48a1ff15851140618c7840c0e8fce068652523 @@ -0,0 +1,16 @@ +# HG changeset patch +# Parent 47dcb1f7b3a9c1b5d6b9d56303e7603fbe5a51f9 +A fix for libgomp to correctly request a POSIX version for time support. + +diff -r 47dcb1f7b3a9 libgomp/config/posix/time.c +--- a/libgomp/config/posix/time.c Sun Jul 26 15:32:11 2015 -0400 ++++ b/libgomp/config/posix/time.c Sun Jul 26 15:32:13 2015 -0400 +@@ -28,6 +28,8 @@ + The following implementation uses the most simple POSIX routines. + If present, POSIX 4 clocks should be used instead. */ + ++#define _POSIX_C_SOURCE 199309L /* for clocks */ ++ + #include "libgomp.h" + #include <unistd.h> + #if TIME_WITH_SYS_TIME diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gthread.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gthread.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gthread.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/gthread.diff 554bfc8039a6a0b20294c544121fd9c10beaab06c37c4a19f56069143164d9f6e584b8ce6a7a1bbeabd445367513ca5db2a0ad169c60a3a28681b7a719cc610b @@ -0,0 +1,16 @@ +Do not use weak references on any targets for gthread. Necessary on musl, safe elsewhere. + +diff -r d2b373a6ad39 libgcc/gthr.h +--- a/libgcc/gthr.h Thu Jan 29 18:59:33 2015 -0500 ++++ b/libgcc/gthr.h Thu Jan 29 19:00:03 2015 -0500 +@@ -136,10 +136,8 @@ + /* The pe-coff weak support isn't fully compatible to ELF's weak. + For static libraries it might would work, but as we need to deal + with shared versions too, we disable it for mingw-targets. */ +-#ifdef __MINGW32__ + #undef GTHREAD_USE_WEAK + #define GTHREAD_USE_WEAK 0 +-#endif + + #ifndef GTHREAD_USE_WEAK + #define GTHREAD_USE_WEAK 1 diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/kill-fixincludes.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/kill-fixincludes.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/kill-fixincludes.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/kill-fixincludes.diff 7278346179b4ed334be385545ee48b4d4d387d19811b33851c59e4114ac6b664fb85ffa59402519d7a60bd90635da157cfb871b04c9cb0d92078971a248a81c4 @@ -0,0 +1,17 @@ +# HG changeset patch +# Parent 9f2f4e02fced4d4810910db6cced26ed0d47c23f +Get rid of ever-broken fixincludes on musl. + +diff -r 9f2f4e02fced fixincludes/mkfixinc.sh +--- a/fixincludes/mkfixinc.sh Sun Jul 26 15:32:19 2015 -0400 ++++ b/fixincludes/mkfixinc.sh Sun Jul 26 15:32:21 2015 -0400 +@@ -19,7 +19,8 @@ + powerpc-*-eabi* | \ + powerpc-*-rtems* | \ + powerpcle-*-eabisim* | \ +- powerpcle-*-eabi* ) ++ powerpcle-*-eabi* | \ ++ *-musl* ) + # IF there is no include fixing, + # THEN create a no-op fixer and exit + (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/libstdc++-generic.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/libstdc++-generic.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/libstdc++-generic.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/libstdc++-generic.diff 73f46b2dffd3beedd0f96a38b3d28d67ec21ad667a7de62d183a8f8f0a63c2909c994612f7563043310f8d59f4d362da95271301fae087c4a1bf65e9465c1874 @@ -0,0 +1,31 @@ +# HG changeset patch +# Parent 889b7d97216603795ba8c5f4da8e616bef8feb9d +Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. + +diff -r 889b7d972166 libstdc++-v3/configure.host +--- a/libstdc++-v3/configure.host Sun Jul 26 15:30:11 2015 -0400 ++++ b/libstdc++-v3/configure.host Sun Jul 26 15:32:09 2015 -0400 +@@ -266,6 +266,13 @@ + os_include_dir="os/bsd/freebsd" + ;; + gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) ++ # check for musl by target ++ case "${host_os}" in ++ *-musl*) ++ os_include_dir="os/generic" ++ ;; ++ *) ++ + if [ "$uclibc" = "yes" ]; then + os_include_dir="os/uclibc" + elif [ "$bionic" = "yes" ]; then +@@ -274,6 +281,9 @@ + os_include_dir="os/gnu-linux" + fi + ;; ++ ++ esac ++ ;; + hpux*) + os_include_dir="os/hpux" + ;; diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze-size_t.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze-size_t.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze-size_t.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze-size_t.diff 3b294757404abab0459dcff435c84aec1691fba5db1c34f3938955a26bfa1d1f65d97f0dd037401e9abf55a14cab423d93623313d23f1c7222e1362925de9ab6 @@ -0,0 +1,39 @@ +From 478ee0c03a08e2ef9371fd88d516738936943e78 Mon Sep 17 00:00:00 2001 +From: David Holsgrove <david.holsgrove@xilinx.com> +Date: Fri, 28 Sep 2012 16:32:03 +1000 +Subject: [PATCH 06/11] [Patch, microblaze]: Add SIZE_TYPE and PTRDIFF_TYPE to + microblaze.h + +Fixes warnings like; + +warning: format '%zX' expects argument of type 'size_t', +but argument 3 has type 'unsigned int' [-Wformat] + +Changelog + +2013-03-18 David Holsgrove <david.holsgrove@xilinx.com> + + * gcc/config/microblaze/microblaze.h: Define SIZE_TYPE + and PTRDIFF_TYPE. + +Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> +--- + gcc/config/microblaze/microblaze.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff -r 97f8346ce240 gcc/config/microblaze/microblaze.h +--- a/gcc/config/microblaze/microblaze.h Sun Jul 26 15:32:32 2015 -0400 ++++ b/gcc/config/microblaze/microblaze.h Sun Jul 26 15:32:34 2015 -0400 +@@ -218,6 +218,12 @@ + #undef PTRDIFF_TYPE + #define PTRDIFF_TYPE "int" + ++#undef SIZE_TYPE ++#define SIZE_TYPE "unsigned int" ++ ++#undef PTRDIFF_TYPE ++#define PTRDIFF_TYPE "int" ++ + #define CONSTANT_ALIGNMENT(EXP, ALIGN) \ + ((TREE_CODE (EXP) == STRING_CST || TREE_CODE (EXP) == CONSTRUCTOR) \ + && (ALIGN) < BITS_PER_WORD \ diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/microblaze.diff 2b00517ec1f19232ef6e84588ba7f169bc8faeec2147525713eea79d855d41774baca3591037c0ec0c16fd16186ae7a7031a695ec0a0af38bdc24716fa72ad59 @@ -0,0 +1,31 @@ +# HG changeset patch +# Parent d548cc2d1cfea3241205efc347caec8ad78c21d4 +Microblaze support (again). + +diff -r d548cc2d1cfe gcc/config/microblaze/linux.h +--- a/gcc/config/microblaze/linux.h Sun Jul 26 15:32:30 2015 -0400 ++++ b/gcc/config/microblaze/linux.h Sun Jul 26 15:32:32 2015 -0400 +@@ -28,7 +28,22 @@ + #undef TLS_NEEDS_GOT + #define TLS_NEEDS_GOT 1 + +-#define DYNAMIC_LINKER "/lib/ld.so.1" ++#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++ ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" ++#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++ ++#if DEFAULT_LIBC == LIBC_MUSL ++#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER ++#else ++#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER ++#endif ++ ++ + #undef SUBTARGET_EXTRA_SPECS + #define SUBTARGET_EXTRA_SPECS \ + { "dynamic_linker", DYNAMIC_LINKER } diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/mips.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/mips.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/mips.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/mips.diff fc425b6d19ba198737a1072f85502a3fc70c01e8183a24c000c0251556ec31468915f174d703eb2bbe13876179e32b69f3339d585d13fb9fb5f139d0ce3f8d2f @@ -0,0 +1,18 @@ +# HG changeset patch +# Parent 270d6afd029dd396b69553e1d96f35d2ebdd2f99 +Support for mips-linux-musl. + +diff -r 270d6afd029d gcc/config/mips/linux.h +--- a/gcc/config/mips/linux.h Sun Jul 26 15:32:25 2015 -0400 ++++ b/gcc/config/mips/linux.h Sun Jul 26 15:32:26 2015 -0400 +@@ -23,3 +23,10 @@ + #undef UCLIBC_DYNAMIC_LINKER + #define UCLIBC_DYNAMIC_LINKER \ + "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" ++ ++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/powerpc.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/powerpc.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/powerpc.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/powerpc.diff 2508fe7f4c890cf8cfd8d3076c513c32f9f35b9e7055a9a586f55add451b6f7bc142cb1e5686fd3b98c64b39097828c27cd9c117f25c4babf3be8d49131f13d3 @@ -0,0 +1,108 @@ +# HG changeset patch +# Parent 3974ad9269f7e4c5605e0bb38db7418a69e6ee95 +Support for powerpc-linux-musl. + +diff -r 3974ad9269f7 gcc/config.gcc +--- a/gcc/config.gcc Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config.gcc Sun Jul 26 15:32:28 2015 -0400 +@@ -2344,6 +2344,10 @@ + powerpc*-*-linux*paired*) + tm_file="${tm_file} rs6000/750cl.h" ;; + esac ++ case ${target} in ++ *-linux*-musl*) ++ enable_secureplt=yes ;; ++ esac + if test x${enable_secureplt} = xyes; then + tm_file="rs6000/secureplt.h ${tm_file}" + fi +diff -r 3974ad9269f7 gcc/config/rs6000/linux64.h +--- a/gcc/config/rs6000/linux64.h Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config/rs6000/linux64.h Sun Jul 26 15:32:28 2015 -0400 +@@ -371,17 +371,21 @@ + #endif + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" + #elif DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER32 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + + #undef DEFAULT_ASM_ENDIAN + #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) +diff -r 3974ad9269f7 gcc/config/rs6000/secureplt.h +--- a/gcc/config/rs6000/secureplt.h Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config/rs6000/secureplt.h Sun Jul 26 15:32:28 2015 -0400 +@@ -18,3 +18,4 @@ + <http://www.gnu.org/licenses/>. */ + + #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" ++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +diff -r 3974ad9269f7 gcc/config/rs6000/sysv4.h +--- a/gcc/config/rs6000/sysv4.h Sun Jul 26 15:32:26 2015 -0400 ++++ b/gcc/config/rs6000/sysv4.h Sun Jul 26 15:32:28 2015 -0400 +@@ -537,6 +537,9 @@ + #ifndef CC1_SECURE_PLT_DEFAULT_SPEC + #define CC1_SECURE_PLT_DEFAULT_SPEC "" + #endif ++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC ++#define LINK_SECURE_PLT_DEFAULT_SPEC "" ++#endif + + /* Pass -G xxx to the compiler. */ + #define CC1_SPEC "%{G*} %(cc1_cpu)" \ +@@ -585,7 +588,8 @@ + + /* Override the default target of the linker. */ + #define LINK_TARGET_SPEC \ +- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") ++ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \ ++ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" + + /* Any specific OS flags. */ + #define LINK_OS_SPEC "\ +@@ -763,15 +767,18 @@ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + + #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -894,6 +901,7 @@ + { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ + { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ + { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ ++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ + { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ + { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ + { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/sh.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/sh.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/sh.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/sh.diff e76f4154e03b3668a59900fdc15dda24fe140ccac857a44bde7c66ba02b6fd0beb4af1977d177304311a026ad99375d7200dce7c3ca08d3cdad96bd61211ab3b @@ -0,0 +1,18 @@ +diff -r c5b39ce7672b gcc/config/sh/linux.h +--- a/gcc/config/sh/linux.h Fri Sep 28 16:32:03 2012 +1000 ++++ b/gcc/config/sh/linux.h Sun Jul 26 15:32:36 2015 -0400 +@@ -43,7 +43,14 @@ + + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + ++#if TARGET_BIG_ENDIAN_DEFAULT /* BE */ ++#define MUSL_DYNAMIC_LINKER_E "eb" ++#else ++#define MUSL_DYNAMIC_LINKER_E ++#endif ++ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1" + + #undef SUBTARGET_LINK_EMUL_SUFFIX + #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/unwind-dliterate.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/unwind-dliterate.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/unwind-dliterate.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/unwind-dliterate.diff b036732485c3d0621360319d776874ffd8d290cff00ddaf9d99b21f99e305b83c50b326bbbfe6a9095c88849625dba9ae3d1589ba5e511550cbfe41e1c001163 @@ -0,0 +1,43 @@ +diff -r ddc4b4034e51 libgcc/unwind-dw2-fde-dip.c +--- a/libgcc/unwind-dw2-fde-dip.c Sun Jul 26 15:32:13 2015 -0400 ++++ b/libgcc/unwind-dw2-fde-dip.c Sun Jul 26 15:32:15 2015 -0400 +@@ -46,33 +46,13 @@ + #include "unwind-compat.h" + #include "gthr.h" + +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ +- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) ++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) + # define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__BIONIC__) +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__FreeBSD__) && __FreeBSD__ >= 7 +-# define ElfW __ElfN +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__OpenBSD__) +-# define ElfW(type) Elf_##type +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(TARGET_DL_ITERATE_PHDR) \ +- && defined(__sun__) && defined(__svr4__) +-# define USE_PT_GNU_EH_FRAME ++# ifdef __OpenBSD__ ++# define ElfW(type) Elf_##type ++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7 ++# define ElfW __ElfN ++# endif + #endif + + #if defined(USE_PT_GNU_EH_FRAME) diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/vis_hide.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/vis_hide.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/vis_hide.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/vis_hide.diff 5efa3c347f122401086330862d6cdecbed8a9ee828eab3b78f9c75a18935c7ff85c6834e5e25c1fd2fb458e0279eda743d12e4878271079aed731174d20fd3af @@ -0,0 +1,15 @@ +Fix hidden visibility of libgcc.a symbols when building gcc stage 2 with + --disable-shared, as per musl ml: +http://www.openwall.com/lists/musl/2014/01/12/4 + +diff -Naur gcc-4.7.3.orig/libgcc/Makefile.in gcc-4.7.3/libgcc/Makefile.in +--- gcc-4.7.3.orig/libgcc/Makefile.in 2012-12-04 14:09:59.000000000 -0500 ++++ gcc-4.7.3/libgcc/Makefile.in 2014-02-27 08:33:31.537611370 -0500 +@@ -388,7 +388,7 @@ + else + # Not enable_shared. + iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items)) +-vis_hide = ++vis_hide = @vis_hide@ + gen-hide-list = echo > \$@ + endif diff -uNr a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/x86.diff b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/x86.diff --- a/sys-devel/gcc/files/musl-gcc-patches-4.9.3/x86.diff false +++ b/sys-devel/gcc/files/musl-gcc-patches-4.9.3/x86.diff 330f52044d410635259d1a0786b39f1d979b9bf2e776755018c9892fc8d80f3c5f70807832047701d5da189ff76951cfe2f839c1d2cf97445b30cb3cec6d2a36 @@ -0,0 +1,55 @@ +# HG changeset patch +# Parent ab9383ed51ae0c261e0c860fc6b953eb57976eef +Support for i386-linux-musl and x86_64-linux-musl. + +diff -r ab9383ed51ae gcc/config/i386/linux.h +--- a/gcc/config/i386/linux.h Sun Jul 26 15:32:21 2015 -0400 ++++ b/gcc/config/i386/linux.h Sun Jul 26 15:32:23 2015 -0400 +@@ -21,3 +21,4 @@ + + #define GNU_USER_LINK_EMULATION "elf_i386" + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" +diff -r ab9383ed51ae gcc/config/i386/linux64.h +--- a/gcc/config/i386/linux64.h Sun Jul 26 15:32:21 2015 -0400 ++++ b/gcc/config/i386/linux64.h Sun Jul 26 15:32:23 2015 -0400 +@@ -30,3 +30,7 @@ + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" ++ ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" ++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" +diff -r ab9383ed51ae libitm/config/linux/x86/tls.h +--- a/libitm/config/linux/x86/tls.h Sun Jul 26 15:32:21 2015 -0400 ++++ b/libitm/config/linux/x86/tls.h Sun Jul 26 15:32:23 2015 -0400 +@@ -25,16 +25,19 @@ + #ifndef LIBITM_X86_TLS_H + #define LIBITM_X86_TLS_H 1 + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + /* Use slots in the TCB head rather than __thread lookups. + GLIBC has reserved words 10 through 13 for TM. */ + #define HAVE_ARCH_GTM_THREAD 1 + #define HAVE_ARCH_GTM_THREAD_DISP 1 + #endif ++#endif + + #include "config/generic/tls.h" + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + namespace GTM HIDDEN { + + #ifdef __x86_64__ +@@ -101,5 +104,6 @@ + + } // namespace GTM + #endif /* >= GLIBC 2.10 */ ++#endif + + #endif // LIBITM_X86_TLS_H diff -uNr a/sys-devel/gcc/files/spectre-0001-mindirect-branch.patch b/sys-devel/gcc/files/spectre-0001-mindirect-branch.patch --- a/sys-devel/gcc/files/spectre-0001-mindirect-branch.patch false +++ b/sys-devel/gcc/files/spectre-0001-mindirect-branch.patch 07cb7c6fdd53706f1b043e0b98dca3b81d01608cf1bb942f50efa7760189079ec6bec70fd26d0c23338b75ef9841681c2543b9435391d77cc4c325f3404b9e7e @@ -0,0 +1,1084 @@ +From c6b72be421ded17e0c156070ba6e90aa6c335ed6 Mon Sep 17 00:00:00 2001 +From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Tue, 16 Jan 2018 10:59:42 +0000 +Subject: [PATCH] x86: Add -mindirect-branch= + +Add -mindirect-branch= option to convert indirect call and jump to call +and return thunks. The default is 'keep', which keeps indirect call and +jump unmodified. 'thunk' converts indirect call and jump to call and +return thunk. 'thunk-inline' converts indirect call and jump to inlined +call and return thunk. 'thunk-extern' converts indirect call and jump to +external call and return thunk provided in a separate object file. You +can control this behavior for a specific function by using the function +attribute indirect_branch. + +2 kinds of thunks are geneated. Memory thunk where the function address +is at the top of the stack: + +__x86_indirect_thunk: + call L2 +L1: + pause + lfence + jmp L1 +L2: + lea 8(%rsp), %rsp|lea 4(%esp), %esp + ret + +Indirect jmp via memory, "jmp mem", is converted to + + push memory + jmp __x86_indirect_thunk + +Indirect call via memory, "call mem", is converted to + + jmp L2 +L1: + push [mem] + jmp __x86_indirect_thunk +L2: + call L1 + +Register thunk where the function address is in a register, reg: + +__x86_indirect_thunk_reg: + call L2 +L1: + pause + lfence + jmp L1 +L2: + movq %reg, (%rsp)|movl %reg, (%esp) + ret + +where reg is one of (r|e)ax, (r|e)dx, (r|e)cx, (r|e)bx, (r|e)si, (r|e)di, +(r|e)bp, r8, r9, r10, r11, r12, r13, r14 and r15. + +Indirect jmp via register, "jmp reg", is converted to + + jmp __x86_indirect_thunk_reg + +Indirect call via register, "call reg", is converted to + + call __x86_indirect_thunk_reg + +gcc/ + + Backport from mainline + * config/i386/i386-opts.h (indirect_branch): New. + * config/i386/i386-protos.h (ix86_output_indirect_jmp): Likewise. + * config/i386/i386.c (ix86_using_red_zone): Disallow red-zone + with local indirect jump when converting indirect call and jump. + (ix86_set_indirect_branch_type): New. + (ix86_set_current_function): Call ix86_set_indirect_branch_type. + (indirectlabelno): New. + (indirect_thunk_needed): Likewise. + (indirect_thunk_bnd_needed): Likewise. + (indirect_thunks_used): Likewise. + (indirect_thunks_bnd_used): Likewise. + (INDIRECT_LABEL): Likewise. + (indirect_thunk_name): Likewise. + (output_indirect_thunk): Likewise. + (output_indirect_thunk_function): Likewise. + (ix86_output_indirect_branch_via_reg): Likewise. + (ix86_output_indirect_branch_via_push): Likewise. + (ix86_output_indirect_branch): Likewise. + (ix86_output_indirect_jmp): Likewise. + (ix86_code_end): Call output_indirect_thunk_function if needed. + (ix86_output_call_insn): Call ix86_output_indirect_branch if + needed. + (ix86_handle_fndecl_attribute): Handle indirect_branch. + (ix86_attribute_table): Add indirect_branch. + * config/i386/i386.h (machine_function): Add indirect_branch_type + and has_local_indirect_jump. + * config/i386/i386.md (indirect_jump): Set has_local_indirect_jump + to true. + (tablejump): Likewise. + (*indirect_jump): Use ix86_output_indirect_jmp. + (*tablejump_1): Likewise. + (simple_return_indirect_internal): Likewise. + * config/i386/i386.opt (mindirect-branch=): New option. + (indirect_branch): New. + (keep): Likewise. + (thunk): Likewise. + (thunk-inline): Likewise. + (thunk-extern): Likewise. + * doc/extend.texi: Document indirect_branch function attribute. + * doc/invoke.texi: Document -mindirect-branch= option. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256732 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + gcc/config/i386/i386-opts.h | 13 + + gcc/config/i386/i386-protos.h | 1 + + gcc/config/i386/i386.c | 648 ++++++++++++++++++++- + gcc/config/i386/i386.h | 7 + + gcc/config/i386/i386.md | 26 +- + gcc/config/i386/i386.opt | 20 + + gcc/doc/extend.texi | 10 + + gcc/doc/invoke.texi | 14 +- + 43 files changed, 1575 insertions(+), 19 deletions(-) + +diff --git a/gcc/config/i386/i386-opts.h b/gcc/config/i386/i386-opts.h +index 542cd0f..efcdc3b 100644 +--- a/gcc/config/i386/i386-opts.h ++++ b/gcc/config/i386/i386-opts.h +@@ -99,4 +99,17 @@ enum stack_protector_guard { + SSP_GLOBAL /* global canary */ + }; + ++/* This is used to mitigate variant #2 of the speculative execution ++ vulnerabilities on x86 processors identified by CVE-2017-5715, aka ++ Spectre. They convert indirect branches and function returns to ++ call and return thunks to avoid speculative execution via indirect ++ call, jmp and ret. */ ++enum indirect_branch { ++ indirect_branch_unset = 0, ++ indirect_branch_keep, ++ indirect_branch_thunk, ++ indirect_branch_thunk_inline, ++ indirect_branch_thunk_extern ++}; ++ + #endif +diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h +index d2cccf1..bcdd987 100644 +--- a/gcc/config/i386/i386-protos.h ++++ b/gcc/config/i386/i386-protos.h +@@ -313,6 +313,7 @@ extern enum attr_cpu ix86_schedule; + #endif + + extern const char * ix86_output_call_insn (rtx_insn *insn, rtx call_op); ++extern const char * ix86_output_indirect_jmp (rtx call_op, bool ret_p); + extern bool ix86_operands_ok_for_move_multiple (rtx *operands, bool load, + enum machine_mode mode); + +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c +index 1786640..7e779c1 100644 +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -4212,12 +4212,23 @@ make_pass_stv (gcc::context *ctxt) + return new pass_stv (ctxt); + } + +-/* Return true if a red-zone is in use. */ ++/* Return true if a red-zone is in use. We can't use red-zone when ++ there are local indirect jumps, like "indirect_jump" or "tablejump", ++ which jumps to another place in the function, since "call" in the ++ indirect thunk pushes the return address onto stack, destroying ++ red-zone. ++ ++ TODO: If we can reserve the first 2 WORDs, for PUSH and, another ++ for CALL, in red-zone, we can allow local indirect jumps with ++ indirect thunk. */ + + bool + ix86_using_red_zone (void) + { +- return TARGET_RED_ZONE && !TARGET_64BIT_MS_ABI; ++ return (TARGET_RED_ZONE ++ && !TARGET_64BIT_MS_ABI ++ && (!cfun->machine->has_local_indirect_jump ++ || cfun->machine->indirect_branch_type == indirect_branch_keep)); + } + + /* Return a string that documents the current -m options. The caller is +@@ -7148,6 +7159,37 @@ ix86_set_func_type (tree fndecl) + } + } + ++/* Set the indirect_branch_type field from the function FNDECL. */ ++ ++static void ++ix86_set_indirect_branch_type (tree fndecl) ++{ ++ if (cfun->machine->indirect_branch_type == indirect_branch_unset) ++ { ++ tree attr = lookup_attribute ("indirect_branch", ++ DECL_ATTRIBUTES (fndecl)); ++ if (attr != NULL) ++ { ++ tree args = TREE_VALUE (attr); ++ if (args == NULL) ++ gcc_unreachable (); ++ tree cst = TREE_VALUE (args); ++ if (strcmp (TREE_STRING_POINTER (cst), "keep") == 0) ++ cfun->machine->indirect_branch_type = indirect_branch_keep; ++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk") == 0) ++ cfun->machine->indirect_branch_type = indirect_branch_thunk; ++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk-inline") == 0) ++ cfun->machine->indirect_branch_type = indirect_branch_thunk_inline; ++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk-extern") == 0) ++ cfun->machine->indirect_branch_type = indirect_branch_thunk_extern; ++ else ++ gcc_unreachable (); ++ } ++ else ++ cfun->machine->indirect_branch_type = ix86_indirect_branch; ++ } ++} ++ + /* Establish appropriate back-end context for processing the function + FNDECL. The argument might be NULL to indicate processing at top + level, outside of any function scope. */ +@@ -7163,7 +7205,10 @@ ix86_set_current_function (tree fndecl) + one is extern inline and one isn't. Call ix86_set_func_type + to set the func_type field. */ + if (fndecl != NULL_TREE) +- ix86_set_func_type (fndecl); ++ { ++ ix86_set_func_type (fndecl); ++ ix86_set_indirect_branch_type (fndecl); ++ } + return; + } + +@@ -7183,6 +7228,7 @@ ix86_set_current_function (tree fndecl) + } + + ix86_set_func_type (fndecl); ++ ix86_set_indirect_branch_type (fndecl); + + tree new_tree = DECL_FUNCTION_SPECIFIC_TARGET (fndecl); + if (new_tree == NULL_TREE) +@@ -11930,6 +11976,220 @@ ix86_setup_frame_addresses (void) + # endif + #endif + ++/* Label count for call and return thunks. It is used to make unique ++ labels in call and return thunks. */ ++static int indirectlabelno; ++ ++/* True if call and return thunk functions are needed. */ ++static bool indirect_thunk_needed = false; ++/* True if call and return thunk functions with the BND prefix are ++ needed. */ ++static bool indirect_thunk_bnd_needed = false; ++ ++/* Bit masks of integer registers, which contain branch target, used ++ by call and return thunks functions. */ ++static int indirect_thunks_used; ++/* Bit masks of integer registers, which contain branch target, used ++ by call and return thunks functions with the BND prefix. */ ++static int indirect_thunks_bnd_used; ++ ++#ifndef INDIRECT_LABEL ++# define INDIRECT_LABEL "LIND" ++#endif ++ ++/* Fills in the label name that should be used for the indirect thunk. */ ++ ++static void ++indirect_thunk_name (char name[32], int regno, bool need_bnd_p) ++{ ++ if (USE_HIDDEN_LINKONCE) ++ { ++ const char *bnd = need_bnd_p ? "_bnd" : ""; ++ if (regno >= 0) ++ { ++ const char *reg_prefix; ++ if (LEGACY_INT_REGNO_P (regno)) ++ reg_prefix = TARGET_64BIT ? "r" : "e"; ++ else ++ reg_prefix = ""; ++ sprintf (name, "__x86_indirect_thunk%s_%s%s", ++ bnd, reg_prefix, reg_names[regno]); ++ } ++ else ++ sprintf (name, "__x86_indirect_thunk%s", bnd); ++ } ++ else ++ { ++ if (regno >= 0) ++ { ++ if (need_bnd_p) ++ ASM_GENERATE_INTERNAL_LABEL (name, "LITBR", regno); ++ else ++ ASM_GENERATE_INTERNAL_LABEL (name, "LITR", regno); ++ } ++ else ++ { ++ if (need_bnd_p) ++ ASM_GENERATE_INTERNAL_LABEL (name, "LITB", 0); ++ else ++ ASM_GENERATE_INTERNAL_LABEL (name, "LIT", 0); ++ } ++ } ++} ++ ++/* Output a call and return thunk for indirect branch. If BND_P is ++ true, the BND prefix is needed. If REGNO != -1, the function ++ address is in REGNO and the call and return thunk looks like: ++ ++ call L2 ++ L1: ++ pause ++ jmp L1 ++ L2: ++ mov %REG, (%sp) ++ ret ++ ++ Otherwise, the function address is on the top of stack and the ++ call and return thunk looks like: ++ ++ call L2 ++ L1: ++ pause ++ jmp L1 ++ L2: ++ lea WORD_SIZE(%sp), %sp ++ ret ++ */ ++ ++static void ++output_indirect_thunk (bool need_bnd_p, int regno) ++{ ++ char indirectlabel1[32]; ++ char indirectlabel2[32]; ++ ++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel1, INDIRECT_LABEL, ++ indirectlabelno++); ++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel2, INDIRECT_LABEL, ++ indirectlabelno++); ++ ++ /* Call */ ++ if (need_bnd_p) ++ fputs ("\tbnd call\t", asm_out_file); ++ else ++ fputs ("\tcall\t", asm_out_file); ++ assemble_name_raw (asm_out_file, indirectlabel2); ++ fputc ('\n', asm_out_file); ++ ++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel1); ++ ++ /* Pause + lfence. */ ++ fprintf (asm_out_file, "\tpause\n\tlfence\n"); ++ ++ /* Jump. */ ++ fputs ("\tjmp\t", asm_out_file); ++ assemble_name_raw (asm_out_file, indirectlabel1); ++ fputc ('\n', asm_out_file); ++ ++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel2); ++ ++ if (regno >= 0) ++ { ++ /* MOV. */ ++ rtx xops[2]; ++ xops[0] = gen_rtx_MEM (word_mode, stack_pointer_rtx); ++ xops[1] = gen_rtx_REG (word_mode, regno); ++ output_asm_insn ("mov\t{%1, %0|%0, %1}", xops); ++ } ++ else ++ { ++ /* LEA. */ ++ rtx xops[2]; ++ xops[0] = stack_pointer_rtx; ++ xops[1] = plus_constant (Pmode, stack_pointer_rtx, UNITS_PER_WORD); ++ output_asm_insn ("lea\t{%E1, %0|%0, %E1}", xops); ++ } ++ ++ if (need_bnd_p) ++ fputs ("\tbnd ret\n", asm_out_file); ++ else ++ fputs ("\tret\n", asm_out_file); ++} ++ ++/* Output a funtion with a call and return thunk for indirect branch. ++ If BND_P is true, the BND prefix is needed. If REGNO != -1, the ++ function address is in REGNO. Otherwise, the function address is ++ on the top of stack. */ ++ ++static void ++output_indirect_thunk_function (bool need_bnd_p, int regno) ++{ ++ char name[32]; ++ tree decl; ++ ++ /* Create __x86_indirect_thunk/__x86_indirect_thunk_bnd. */ ++ indirect_thunk_name (name, regno, need_bnd_p); ++ decl = build_decl (BUILTINS_LOCATION, FUNCTION_DECL, ++ get_identifier (name), ++ build_function_type_list (void_type_node, NULL_TREE)); ++ DECL_RESULT (decl) = build_decl (BUILTINS_LOCATION, RESULT_DECL, ++ NULL_TREE, void_type_node); ++ TREE_PUBLIC (decl) = 1; ++ TREE_STATIC (decl) = 1; ++ DECL_IGNORED_P (decl) = 1; ++ ++#if TARGET_MACHO ++ if (TARGET_MACHO) ++ { ++ switch_to_section (darwin_sections[picbase_thunk_section]); ++ fputs ("\t.weak_definition\t", asm_out_file); ++ assemble_name (asm_out_file, name); ++ fputs ("\n\t.private_extern\t", asm_out_file); ++ assemble_name (asm_out_file, name); ++ putc ('\n', asm_out_file); ++ ASM_OUTPUT_LABEL (asm_out_file, name); ++ DECL_WEAK (decl) = 1; ++ } ++ else ++#endif ++ if (USE_HIDDEN_LINKONCE) ++ { ++ cgraph_node::create (decl)->set_comdat_group (DECL_ASSEMBLER_NAME (decl)); ++ ++ targetm.asm_out.unique_section (decl, 0); ++ switch_to_section (get_named_section (decl, NULL, 0)); ++ ++ targetm.asm_out.globalize_label (asm_out_file, name); ++ fputs ("\t.hidden\t", asm_out_file); ++ assemble_name (asm_out_file, name); ++ putc ('\n', asm_out_file); ++ ASM_DECLARE_FUNCTION_NAME (asm_out_file, name, decl); ++ } ++ else ++ { ++ switch_to_section (text_section); ++ ASM_OUTPUT_LABEL (asm_out_file, name); ++ } ++ ++ DECL_INITIAL (decl) = make_node (BLOCK); ++ current_function_decl = decl; ++ allocate_struct_function (decl, false); ++ init_function_start (decl); ++ /* We're about to hide the function body from callees of final_* by ++ emitting it directly; tell them we're a thunk, if they care. */ ++ cfun->is_thunk = true; ++ first_function_block_is_cold = false; ++ /* Make sure unwind info is emitted for the thunk if needed. */ ++ final_start_function (emit_barrier (), asm_out_file, 1); ++ ++ output_indirect_thunk (need_bnd_p, regno); ++ ++ final_end_function (); ++ init_insn_lengths (); ++ free_after_compilation (cfun); ++ set_cfun (NULL); ++ current_function_decl = NULL; ++} ++ + static int pic_labels_used; + + /* Fills in the label name that should be used for a pc thunk for +@@ -11956,11 +12216,32 @@ ix86_code_end (void) + rtx xops[2]; + int regno; + ++ if (indirect_thunk_needed) ++ output_indirect_thunk_function (false, -1); ++ if (indirect_thunk_bnd_needed) ++ output_indirect_thunk_function (true, -1); ++ ++ for (regno = FIRST_REX_INT_REG; regno <= LAST_REX_INT_REG; regno++) ++ { ++ int i = regno - FIRST_REX_INT_REG + LAST_INT_REG + 1; ++ if ((indirect_thunks_used & (1 << i))) ++ output_indirect_thunk_function (false, regno); ++ ++ if ((indirect_thunks_bnd_used & (1 << i))) ++ output_indirect_thunk_function (true, regno); ++ } ++ + for (regno = AX_REG; regno <= SP_REG; regno++) + { + char name[32]; + tree decl; + ++ if ((indirect_thunks_used & (1 << regno))) ++ output_indirect_thunk_function (false, regno); ++ ++ if ((indirect_thunks_bnd_used & (1 << regno))) ++ output_indirect_thunk_function (true, regno); ++ + if (!(pic_labels_used & (1 << regno))) + continue; + +@@ -28461,12 +28742,292 @@ ix86_nopic_noplt_attribute_p (rtx call_op) + return false; + } + ++/* Output indirect branch via a call and return thunk. CALL_OP is a ++ register which contains the branch target. XASM is the assembly ++ template for CALL_OP. Branch is a tail call if SIBCALL_P is true. ++ A normal call is converted to: ++ ++ call __x86_indirect_thunk_reg ++ ++ and a tail call is converted to: ++ ++ jmp __x86_indirect_thunk_reg ++ */ ++ ++static void ++ix86_output_indirect_branch_via_reg (rtx call_op, bool sibcall_p) ++{ ++ char thunk_name_buf[32]; ++ char *thunk_name; ++ bool need_bnd_p = ix86_bnd_prefixed_insn_p (current_output_insn); ++ int regno = REGNO (call_op); ++ ++ if (cfun->machine->indirect_branch_type ++ != indirect_branch_thunk_inline) ++ { ++ if (cfun->machine->indirect_branch_type == indirect_branch_thunk) ++ { ++ int i = regno; ++ if (i >= FIRST_REX_INT_REG) ++ i -= (FIRST_REX_INT_REG - LAST_INT_REG - 1); ++ if (need_bnd_p) ++ indirect_thunks_bnd_used |= 1 << i; ++ else ++ indirect_thunks_used |= 1 << i; ++ } ++ indirect_thunk_name (thunk_name_buf, regno, need_bnd_p); ++ thunk_name = thunk_name_buf; ++ } ++ else ++ thunk_name = NULL; ++ ++ if (sibcall_p) ++ { ++ if (thunk_name != NULL) ++ { ++ if (need_bnd_p) ++ fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name); ++ else ++ fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name); ++ } ++ else ++ output_indirect_thunk (need_bnd_p, regno); ++ } ++ else ++ { ++ if (thunk_name != NULL) ++ { ++ if (need_bnd_p) ++ fprintf (asm_out_file, "\tbnd call\t%s\n", thunk_name); ++ else ++ fprintf (asm_out_file, "\tcall\t%s\n", thunk_name); ++ return; ++ } ++ ++ char indirectlabel1[32]; ++ char indirectlabel2[32]; ++ ++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel1, ++ INDIRECT_LABEL, ++ indirectlabelno++); ++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel2, ++ INDIRECT_LABEL, ++ indirectlabelno++); ++ ++ /* Jump. */ ++ if (need_bnd_p) ++ fputs ("\tbnd jmp\t", asm_out_file); ++ else ++ fputs ("\tjmp\t", asm_out_file); ++ assemble_name_raw (asm_out_file, indirectlabel2); ++ fputc ('\n', asm_out_file); ++ ++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel1); ++ ++ if (thunk_name != NULL) ++ { ++ if (need_bnd_p) ++ fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name); ++ else ++ fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name); ++ } ++ else ++ output_indirect_thunk (need_bnd_p, regno); ++ ++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel2); ++ ++ /* Call. */ ++ if (need_bnd_p) ++ fputs ("\tbnd call\t", asm_out_file); ++ else ++ fputs ("\tcall\t", asm_out_file); ++ assemble_name_raw (asm_out_file, indirectlabel1); ++ fputc ('\n', asm_out_file); ++ } ++} ++ ++/* Output indirect branch via a call and return thunk. CALL_OP is ++ the branch target. XASM is the assembly template for CALL_OP. ++ Branch is a tail call if SIBCALL_P is true. A normal call is ++ converted to: ++ ++ jmp L2 ++ L1: ++ push CALL_OP ++ jmp __x86_indirect_thunk ++ L2: ++ call L1 ++ ++ and a tail call is converted to: ++ ++ push CALL_OP ++ jmp __x86_indirect_thunk ++ */ ++ ++static void ++ix86_output_indirect_branch_via_push (rtx call_op, const char *xasm, ++ bool sibcall_p) ++{ ++ char thunk_name_buf[32]; ++ char *thunk_name; ++ char push_buf[64]; ++ bool need_bnd_p = ix86_bnd_prefixed_insn_p (current_output_insn); ++ int regno = -1; ++ ++ if (cfun->machine->indirect_branch_type ++ != indirect_branch_thunk_inline) ++ { ++ if (cfun->machine->indirect_branch_type == indirect_branch_thunk) ++ { ++ if (need_bnd_p) ++ indirect_thunk_bnd_needed = true; ++ else ++ indirect_thunk_needed = true; ++ } ++ indirect_thunk_name (thunk_name_buf, regno, need_bnd_p); ++ thunk_name = thunk_name_buf; ++ } ++ else ++ thunk_name = NULL; ++ ++ snprintf (push_buf, sizeof (push_buf), "push{%c}\t%s", ++ TARGET_64BIT ? 'q' : 'l', xasm); ++ ++ if (sibcall_p) ++ { ++ output_asm_insn (push_buf, &call_op); ++ if (thunk_name != NULL) ++ { ++ if (need_bnd_p) ++ fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name); ++ else ++ fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name); ++ } ++ else ++ output_indirect_thunk (need_bnd_p, regno); ++ } ++ else ++ { ++ char indirectlabel1[32]; ++ char indirectlabel2[32]; ++ ++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel1, ++ INDIRECT_LABEL, ++ indirectlabelno++); ++ ASM_GENERATE_INTERNAL_LABEL (indirectlabel2, ++ INDIRECT_LABEL, ++ indirectlabelno++); ++ ++ /* Jump. */ ++ if (need_bnd_p) ++ fputs ("\tbnd jmp\t", asm_out_file); ++ else ++ fputs ("\tjmp\t", asm_out_file); ++ assemble_name_raw (asm_out_file, indirectlabel2); ++ fputc ('\n', asm_out_file); ++ ++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel1); ++ ++ /* An external function may be called via GOT, instead of PLT. */ ++ if (MEM_P (call_op)) ++ { ++ struct ix86_address parts; ++ rtx addr = XEXP (call_op, 0); ++ if (ix86_decompose_address (addr, &parts) ++ && parts.base == stack_pointer_rtx) ++ { ++ /* Since call will adjust stack by -UNITS_PER_WORD, ++ we must convert "disp(stack, index, scale)" to ++ "disp+UNITS_PER_WORD(stack, index, scale)". */ ++ if (parts.index) ++ { ++ addr = gen_rtx_MULT (Pmode, parts.index, ++ GEN_INT (parts.scale)); ++ addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx, ++ addr); ++ } ++ else ++ addr = stack_pointer_rtx; ++ ++ rtx disp; ++ if (parts.disp != NULL_RTX) ++ disp = plus_constant (Pmode, parts.disp, ++ UNITS_PER_WORD); ++ else ++ disp = GEN_INT (UNITS_PER_WORD); ++ ++ addr = gen_rtx_PLUS (Pmode, addr, disp); ++ call_op = gen_rtx_MEM (GET_MODE (call_op), addr); ++ } ++ } ++ ++ output_asm_insn (push_buf, &call_op); ++ ++ if (thunk_name != NULL) ++ { ++ if (need_bnd_p) ++ fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name); ++ else ++ fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name); ++ } ++ else ++ output_indirect_thunk (need_bnd_p, regno); ++ ++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, indirectlabel2); ++ ++ /* Call. */ ++ if (need_bnd_p) ++ fputs ("\tbnd call\t", asm_out_file); ++ else ++ fputs ("\tcall\t", asm_out_file); ++ assemble_name_raw (asm_out_file, indirectlabel1); ++ fputc ('\n', asm_out_file); ++ } ++} ++ ++/* Output indirect branch via a call and return thunk. CALL_OP is ++ the branch target. XASM is the assembly template for CALL_OP. ++ Branch is a tail call if SIBCALL_P is true. */ ++ ++static void ++ix86_output_indirect_branch (rtx call_op, const char *xasm, ++ bool sibcall_p) ++{ ++ if (REG_P (call_op)) ++ ix86_output_indirect_branch_via_reg (call_op, sibcall_p); ++ else ++ ix86_output_indirect_branch_via_push (call_op, xasm, sibcall_p); ++} ++/* Output indirect jump. CALL_OP is the jump target. Jump is a ++ function return if RET_P is true. */ ++ ++const char * ++ix86_output_indirect_jmp (rtx call_op, bool ret_p) ++{ ++ if (cfun->machine->indirect_branch_type != indirect_branch_keep) ++ { ++ /* We can't have red-zone if this isn't a function return since ++ "call" in the indirect thunk pushes the return address onto ++ stack, destroying red-zone. */ ++ if (!ret_p && ix86_red_zone_size != 0) ++ gcc_unreachable (); ++ ++ ix86_output_indirect_branch (call_op, "%0", true); ++ return ""; ++ } ++ else ++ return "%!jmp\t%A0"; ++} ++ + /* Output the assembly for a call instruction. */ + + const char * + ix86_output_call_insn (rtx_insn *insn, rtx call_op) + { + bool direct_p = constant_call_address_operand (call_op, VOIDmode); ++ bool output_indirect_p ++ = (!TARGET_SEH ++ && cfun->machine->indirect_branch_type != indirect_branch_keep); + bool seh_nop_p = false; + const char *xasm; + +@@ -28476,10 +29037,21 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op) + { + if (ix86_nopic_noplt_attribute_p (call_op)) + { ++ direct_p = false; + if (TARGET_64BIT) +- xasm = "%!jmp\t{*%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; ++ { ++ if (output_indirect_p) ++ xasm = "{%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; ++ else ++ xasm = "%!jmp\t{*%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; ++ } + else +- xasm = "%!jmp\t{*%p0@GOT|[DWORD PTR %p0@GOT]}"; ++ { ++ if (output_indirect_p) ++ xasm = "{%p0@GOT|[DWORD PTR %p0@GOT]}"; ++ else ++ xasm = "%!jmp\t{*%p0@GOT|[DWORD PTR %p0@GOT]}"; ++ } + } + else + xasm = "%!jmp\t%P0"; +@@ -28489,9 +29061,17 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op) + else if (TARGET_SEH) + xasm = "%!rex.W jmp\t%A0"; + else +- xasm = "%!jmp\t%A0"; ++ { ++ if (output_indirect_p) ++ xasm = "%0"; ++ else ++ xasm = "%!jmp\t%A0"; ++ } + +- output_asm_insn (xasm, &call_op); ++ if (output_indirect_p && !direct_p) ++ ix86_output_indirect_branch (call_op, xasm, true); ++ else ++ output_asm_insn (xasm, &call_op); + return ""; + } + +@@ -28529,18 +29109,37 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op) + { + if (ix86_nopic_noplt_attribute_p (call_op)) + { ++ direct_p = false; + if (TARGET_64BIT) +- xasm = "%!call\t{*%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; ++ { ++ if (output_indirect_p) ++ xasm = "{%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; ++ else ++ xasm = "%!call\t{*%p0@GOTPCREL(%%rip)|[QWORD PTR %p0@GOTPCREL[rip]]}"; ++ } + else +- xasm = "%!call\t{*%p0@GOT|[DWORD PTR %p0@GOT]}"; ++ { ++ if (output_indirect_p) ++ xasm = "{%p0@GOT|[DWORD PTR %p0@GOT]}"; ++ else ++ xasm = "%!call\t{*%p0@GOT|[DWORD PTR %p0@GOT]}"; ++ } + } + else + xasm = "%!call\t%P0"; + } + else +- xasm = "%!call\t%A0"; ++ { ++ if (output_indirect_p) ++ xasm = "%0"; ++ else ++ xasm = "%!call\t%A0"; ++ } + +- output_asm_insn (xasm, &call_op); ++ if (output_indirect_p && !direct_p) ++ ix86_output_indirect_branch (call_op, xasm, false); ++ else ++ output_asm_insn (xasm, &call_op); + + if (seh_nop_p) + return "nop"; +@@ -41459,7 +42058,7 @@ ix86_handle_struct_attribute (tree *node, tree name, tree, int, + } + + static tree +-ix86_handle_fndecl_attribute (tree *node, tree name, tree, int, ++ix86_handle_fndecl_attribute (tree *node, tree name, tree args, int, + bool *no_add_attrs) + { + if (TREE_CODE (*node) != FUNCTION_DECL) +@@ -41468,6 +42067,29 @@ ix86_handle_fndecl_attribute (tree *node, tree name, tree, int, + name); + *no_add_attrs = true; + } ++ ++ if (is_attribute_p ("indirect_branch", name)) ++ { ++ tree cst = TREE_VALUE (args); ++ if (TREE_CODE (cst) != STRING_CST) ++ { ++ warning (OPT_Wattributes, ++ "%qE attribute requires a string constant argument", ++ name); ++ *no_add_attrs = true; ++ } ++ else if (strcmp (TREE_STRING_POINTER (cst), "keep") != 0 ++ && strcmp (TREE_STRING_POINTER (cst), "thunk") != 0 ++ && strcmp (TREE_STRING_POINTER (cst), "thunk-inline") != 0 ++ && strcmp (TREE_STRING_POINTER (cst), "thunk-extern") != 0) ++ { ++ warning (OPT_Wattributes, ++ "argument to %qE attribute is not " ++ "(keep|thunk|thunk-inline|thunk-extern)", name); ++ *no_add_attrs = true; ++ } ++ } ++ + return NULL_TREE; + } + +@@ -45776,6 +46398,8 @@ static const struct attribute_spec ix86_attribute_table[] = + ix86_handle_interrupt_attribute, false }, + { "no_caller_saved_registers", 0, 0, false, true, true, + ix86_handle_no_caller_saved_registers_attribute, false }, ++ { "indirect_branch", 1, 1, true, false, false, ++ ix86_handle_fndecl_attribute, false }, + + /* End element. */ + { NULL, 0, 0, false, false, false, NULL, false } +diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h +index 11727e5..d8370ae 100644 +--- a/gcc/config/i386/i386.h ++++ b/gcc/config/i386/i386.h +@@ -2609,6 +2609,13 @@ struct GTY(()) machine_function { + /* Function type. */ + ENUM_BITFIELD(function_type) func_type : 2; + ++ /* How to generate indirec branch. */ ++ ENUM_BITFIELD(indirect_branch) indirect_branch_type : 3; ++ ++ /* If true, the current function has local indirect jumps, like ++ "indirect_jump" or "tablejump". */ ++ BOOL_BITFIELD has_local_indirect_jump : 1; ++ + /* If true, the current function is a function specified with + the "interrupt" or "no_caller_saved_registers" attribute. */ + BOOL_BITFIELD no_caller_saved_registers : 1; +diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md +index dbe88f4..cd2e73c 100644 +--- a/gcc/config/i386/i386.md ++++ b/gcc/config/i386/i386.md +@@ -11627,13 +11627,18 @@ + { + if (TARGET_X32) + operands[0] = convert_memory_address (word_mode, operands[0]); ++ cfun->machine->has_local_indirect_jump = true; + }) + + (define_insn "*indirect_jump" + [(set (pc) (match_operand:W 0 "indirect_branch_operand" "rBw"))] + "" +- "%!jmp\t%A0" +- [(set_attr "type" "ibr") ++ "* return ix86_output_indirect_jmp (operands[0], false);" ++ [(set (attr "type") ++ (if_then_else (match_test "(cfun->machine->indirect_branch_type ++ != indirect_branch_keep)") ++ (const_string "multi") ++ (const_string "ibr"))) + (set_attr "length_immediate" "0") + (set_attr "maybe_prefix_bnd" "1")]) + +@@ -11676,14 +11681,19 @@ + + if (TARGET_X32) + operands[0] = convert_memory_address (word_mode, operands[0]); ++ cfun->machine->has_local_indirect_jump = true; + }) + + (define_insn "*tablejump_1" + [(set (pc) (match_operand:W 0 "indirect_branch_operand" "rBw")) + (use (label_ref (match_operand 1)))] + "" +- "%!jmp\t%A0" +- [(set_attr "type" "ibr") ++ "* return ix86_output_indirect_jmp (operands[0], false);" ++ [(set (attr "type") ++ (if_then_else (match_test "(cfun->machine->indirect_branch_type ++ != indirect_branch_keep)") ++ (const_string "multi") ++ (const_string "ibr"))) + (set_attr "length_immediate" "0") + (set_attr "maybe_prefix_bnd" "1")]) + +@@ -12354,8 +12364,12 @@ + [(simple_return) + (use (match_operand:SI 0 "register_operand" "r"))] + "reload_completed" +- "%!jmp\t%A0" +- [(set_attr "type" "ibr") ++ "* return ix86_output_indirect_jmp (operands[0], true);" ++ [(set (attr "type") ++ (if_then_else (match_test "(cfun->machine->indirect_branch_type ++ != indirect_branch_keep)") ++ (const_string "multi") ++ (const_string "ibr"))) + (set_attr "length_immediate" "0") + (set_attr "maybe_prefix_bnd" "1")]) + +diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt +index 9384e29..c076d9c 100644 +--- a/gcc/config/i386/i386.opt ++++ b/gcc/config/i386/i386.opt +@@ -927,3 +927,23 @@ Attempt to avoid generating instruction sequences containing ret bytes. + mgeneral-regs-only + Target Report RejectNegative Mask(GENERAL_REGS_ONLY) Var(ix86_target_flags) Save + Generate code which uses only the general registers. ++ ++mindirect-branch= ++Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_indirect_branch) Init(indirect_branch_keep) ++Convert indirect call and jump to call and return thunks. ++ ++Enum ++Name(indirect_branch) Type(enum indirect_branch) ++Known indirect branch choices (for use with the -mindirect-branch= option): ++ ++EnumValue ++Enum(indirect_branch) String(keep) Value(indirect_branch_keep) ++ ++EnumValue ++Enum(indirect_branch) String(thunk) Value(indirect_branch_thunk) ++ ++EnumValue ++Enum(indirect_branch) String(thunk-inline) Value(indirect_branch_thunk_inline) ++ ++EnumValue ++Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern) +diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi +index ba309d0..935381d 100644 +--- a/gcc/doc/extend.texi ++++ b/gcc/doc/extend.texi +@@ -5540,6 +5540,16 @@ Specify which floating-point unit to use. You must specify the + @code{target("fpmath=sse,387")} option as + @code{target("fpmath=sse+387")} because the comma would separate + different options. ++ ++@item indirect_branch("@var{choice}") ++@cindex @code{indirect_branch} function attribute, x86 ++On x86 targets, the @code{indirect_branch} attribute causes the compiler ++to convert indirect call and jump with @var{choice}. @samp{keep} ++keeps indirect call and jump unmodified. @samp{thunk} converts indirect ++call and jump to call and return thunk. @samp{thunk-inline} converts ++indirect call and jump to inlined call and return thunk. ++@samp{thunk-extern} converts indirect call and jump to external call ++and return thunk provided in a separate object file. + @end table + + On the x86, the inliner does not inline a +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 7311c10..4979c8c 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -1210,7 +1210,8 @@ See RS/6000 and PowerPC Options. + -msse2avx -mfentry -mrecord-mcount -mnop-mcount -m8bit-idiv @gol + -mavx256-split-unaligned-load -mavx256-split-unaligned-store @gol + -malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol +--mmitigate-rop -mgeneral-regs-only} ++-mmitigate-rop -mgeneral-regs-only @gol ++-mindirect-branch=@var{choice}} + + @emph{x86 Windows Options} + @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol +@@ -25686,6 +25687,17 @@ Generate code that uses only the general-purpose registers. This + prevents the compiler from using floating-point, vector, mask and bound + registers. + ++@item -mindirect-branch=@var{choice} ++@opindex -mindirect-branch ++Convert indirect call and jump with @var{choice}. The default is ++@samp{keep}, which keeps indirect call and jump unmodified. ++@samp{thunk} converts indirect call and jump to call and return thunk. ++@samp{thunk-inline} converts indirect call and jump to inlined call ++and return thunk. @samp{thunk-extern} converts indirect call and jump ++to external call and return thunk provided in a separate object file. ++You can control this behavior for a specific function by using the ++function attribute @code{indirect_branch}. @xref{Function Attributes}. ++ + @end table + + These @samp{-m} switches are supported in addition to the above diff -uNr a/sys-devel/gcc/files/spectre-0002-mfunction-return.patch b/sys-devel/gcc/files/spectre-0002-mfunction-return.patch --- a/sys-devel/gcc/files/spectre-0002-mfunction-return.patch false +++ b/sys-devel/gcc/files/spectre-0002-mfunction-return.patch 60fce3b0f5b6fc50474d5d47c006491fb6da52cc6900168c49f3fd7ed4657bda675f489d4067e309f42786acb742ffe706f22ba33a70b688d52017756d06c843 @@ -0,0 +1,447 @@ +From 357311dd400f7f72d2132f2f94161ece39bf08c6 Mon Sep 17 00:00:00 2001 +From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Tue, 16 Jan 2018 11:10:44 +0000 +Subject: [PATCH] x86: Add -mfunction-return= + +Add -mfunction-return= option to convert function return to call and +return thunks. The default is 'keep', which keeps function return +unmodified. 'thunk' converts function return to call and return thunk. +'thunk-inline' converts function return to inlined call and return thunk. +'thunk-extern' converts function return to external call and return +thunk provided in a separate object file. You can control this behavior +for a specific function by using the function attribute function_return. + +Function return thunk is the same as memory thunk for -mindirect-branch= +where the return address is at the top of the stack: + +__x86_return_thunk: + call L2 +L1: + pause + lfence + jmp L1 +L2: + lea 8(%rsp), %rsp|lea 4(%esp), %esp + ret + +and function return becomes + + jmp __x86_return_thunk + +gcc/ + + Backport from mainline + 2018-01-14 H.J. Lu <hongjiu.lu@intel.com> + + * config/i386/i386-protos.h (ix86_output_function_return): New. + * config/i386/i386.c (ix86_set_indirect_branch_type): Also + set function_return_type. + (indirect_thunk_name): Add ret_p to indicate thunk for function + return. + (output_indirect_thunk_function): Pass false to + indirect_thunk_name. + (ix86_output_indirect_branch_via_reg): Likewise. + (ix86_output_indirect_branch_via_push): Likewise. + (output_indirect_thunk_function): Create alias for function + return thunk if regno < 0. + (ix86_output_function_return): New function. + (ix86_handle_fndecl_attribute): Handle function_return. + (ix86_attribute_table): Add function_return. + * config/i386/i386.h (machine_function): Add + function_return_type. + * config/i386/i386.md (simple_return_internal): Use + ix86_output_function_return. + (simple_return_internal_long): Likewise. + * config/i386/i386.opt (mfunction-return=): New option. + (indirect_branch): Mention -mfunction-return=. + * doc/extend.texi: Document function_return function attribute. + * doc/invoke.texi: Document -mfunction-return= option. + +i386: Don't use ASM_OUTPUT_DEF for TARGET_MACHO + +ASM_OUTPUT_DEF isn't defined for TARGET_MACHO. Use ASM_OUTPUT_LABEL to +generate the __x86_return_thunk label, instead of the set directive. +Update testcase to remove the __x86_return_thunk label check. Since +-fno-pic is ignored on Darwin, update testcases to sscan or "push" +only on Linux. + +gcc/ + + Backport from mainline + 2018-01-15 H.J. Lu <hongjiu.lu@intel.com> + + PR target/83839 + * config/i386/i386.c (output_indirect_thunk_function): Use + ASM_OUTPUT_LABEL, instead of ASM_OUTPUT_DEF, for TARGET_MACHO + for __x86.return_thunk. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256734 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + gcc/config/i386/i386-protos.h | 1 + + gcc/config/i386/i386.c | 152 +++++++++++++++++++-- + gcc/config/i386/i386.h | 3 + + gcc/config/i386/i386.md | 9 +- + gcc/config/i386/i386.opt | 6 +- + gcc/doc/extend.texi | 9 ++ + gcc/doc/invoke.texi | 13 +- + 58 files changed, 641 insertions(+), 74 deletions(-) + +diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h +index bcdd987..42eece3 100644 +--- a/gcc/config/i386/i386-protos.h ++++ b/gcc/config/i386/i386-protos.h +@@ -314,6 +314,7 @@ extern enum attr_cpu ix86_schedule; + + extern const char * ix86_output_call_insn (rtx_insn *insn, rtx call_op); + extern const char * ix86_output_indirect_jmp (rtx call_op, bool ret_p); ++extern const char * ix86_output_function_return (bool long_p); + extern bool ix86_operands_ok_for_move_multiple (rtx *operands, bool load, + enum machine_mode mode); + +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c +index 7e779c1..8fb8902 100644 +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -7188,6 +7188,31 @@ ix86_set_indirect_branch_type (tree fndecl) + else + cfun->machine->indirect_branch_type = ix86_indirect_branch; + } ++ ++ if (cfun->machine->function_return_type == indirect_branch_unset) ++ { ++ tree attr = lookup_attribute ("function_return", ++ DECL_ATTRIBUTES (fndecl)); ++ if (attr != NULL) ++ { ++ tree args = TREE_VALUE (attr); ++ if (args == NULL) ++ gcc_unreachable (); ++ tree cst = TREE_VALUE (args); ++ if (strcmp (TREE_STRING_POINTER (cst), "keep") == 0) ++ cfun->machine->function_return_type = indirect_branch_keep; ++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk") == 0) ++ cfun->machine->function_return_type = indirect_branch_thunk; ++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk-inline") == 0) ++ cfun->machine->function_return_type = indirect_branch_thunk_inline; ++ else if (strcmp (TREE_STRING_POINTER (cst), "thunk-extern") == 0) ++ cfun->machine->function_return_type = indirect_branch_thunk_extern; ++ else ++ gcc_unreachable (); ++ } ++ else ++ cfun->machine->function_return_type = ix86_function_return; ++ } + } + + /* Establish appropriate back-end context for processing the function +@@ -12000,8 +12025,12 @@ static int indirect_thunks_bnd_used; + /* Fills in the label name that should be used for the indirect thunk. */ + + static void +-indirect_thunk_name (char name[32], int regno, bool need_bnd_p) ++indirect_thunk_name (char name[32], int regno, bool need_bnd_p, ++ bool ret_p) + { ++ if (regno >= 0 && ret_p) ++ gcc_unreachable (); ++ + if (USE_HIDDEN_LINKONCE) + { + const char *bnd = need_bnd_p ? "_bnd" : ""; +@@ -12016,7 +12045,10 @@ indirect_thunk_name (char name[32], int regno, bool need_bnd_p) + bnd, reg_prefix, reg_names[regno]); + } + else +- sprintf (name, "__x86_indirect_thunk%s", bnd); ++ { ++ const char *ret = ret_p ? "return" : "indirect"; ++ sprintf (name, "__x86_%s_thunk%s", ret, bnd); ++ } + } + else + { +@@ -12029,10 +12061,20 @@ indirect_thunk_name (char name[32], int regno, bool need_bnd_p) + } + else + { +- if (need_bnd_p) +- ASM_GENERATE_INTERNAL_LABEL (name, "LITB", 0); ++ if (ret_p) ++ { ++ if (need_bnd_p) ++ ASM_GENERATE_INTERNAL_LABEL (name, "LRTB", 0); ++ else ++ ASM_GENERATE_INTERNAL_LABEL (name, "LRT", 0); ++ } + else +- ASM_GENERATE_INTERNAL_LABEL (name, "LIT", 0); ++ { ++ if (need_bnd_p) ++ ASM_GENERATE_INTERNAL_LABEL (name, "LITB", 0); ++ else ++ ASM_GENERATE_INTERNAL_LABEL (name, "LIT", 0); ++ } + } + } + } +@@ -12127,7 +12169,7 @@ output_indirect_thunk_function (bool need_bnd_p, int regno) + tree decl; + + /* Create __x86_indirect_thunk/__x86_indirect_thunk_bnd. */ +- indirect_thunk_name (name, regno, need_bnd_p); ++ indirect_thunk_name (name, regno, need_bnd_p, false); + decl = build_decl (BUILTINS_LOCATION, FUNCTION_DECL, + get_identifier (name), + build_function_type_list (void_type_node, NULL_TREE)); +@@ -12170,6 +12212,36 @@ output_indirect_thunk_function (bool need_bnd_p, int regno) + ASM_OUTPUT_LABEL (asm_out_file, name); + } + ++ if (regno < 0) ++ { ++ /* Create alias for __x86.return_thunk/__x86.return_thunk_bnd. */ ++ char alias[32]; ++ ++ indirect_thunk_name (alias, regno, need_bnd_p, true); ++#if TARGET_MACHO ++ if (TARGET_MACHO) ++ { ++ fputs ("\t.weak_definition\t", asm_out_file); ++ assemble_name (asm_out_file, alias); ++ fputs ("\n\t.private_extern\t", asm_out_file); ++ assemble_name (asm_out_file, alias); ++ putc ('\n', asm_out_file); ++ ASM_OUTPUT_LABEL (asm_out_file, alias); ++ } ++#else ++ ASM_OUTPUT_DEF (asm_out_file, alias, name); ++ if (USE_HIDDEN_LINKONCE) ++ { ++ fputs ("\t.globl\t", asm_out_file); ++ assemble_name (asm_out_file, alias); ++ putc ('\n', asm_out_file); ++ fputs ("\t.hidden\t", asm_out_file); ++ assemble_name (asm_out_file, alias); ++ putc ('\n', asm_out_file); ++ } ++#endif ++ } ++ + DECL_INITIAL (decl) = make_node (BLOCK); + current_function_decl = decl; + allocate_struct_function (decl, false); +@@ -28775,7 +28847,7 @@ ix86_output_indirect_branch_via_reg (rtx call_op, bool sibcall_p) + else + indirect_thunks_used |= 1 << i; + } +- indirect_thunk_name (thunk_name_buf, regno, need_bnd_p); ++ indirect_thunk_name (thunk_name_buf, regno, need_bnd_p, false); + thunk_name = thunk_name_buf; + } + else +@@ -28884,7 +28956,7 @@ ix86_output_indirect_branch_via_push (rtx call_op, const char *xasm, + else + indirect_thunk_needed = true; + } +- indirect_thunk_name (thunk_name_buf, regno, need_bnd_p); ++ indirect_thunk_name (thunk_name_buf, regno, need_bnd_p, false); + thunk_name = thunk_name_buf; + } + else +@@ -29019,6 +29091,46 @@ ix86_output_indirect_jmp (rtx call_op, bool ret_p) + return "%!jmp\t%A0"; + } + ++/* Output function return. CALL_OP is the jump target. Add a REP ++ prefix to RET if LONG_P is true and function return is kept. */ ++ ++const char * ++ix86_output_function_return (bool long_p) ++{ ++ if (cfun->machine->function_return_type != indirect_branch_keep) ++ { ++ char thunk_name[32]; ++ bool need_bnd_p = ix86_bnd_prefixed_insn_p (current_output_insn); ++ ++ if (cfun->machine->function_return_type ++ != indirect_branch_thunk_inline) ++ { ++ bool need_thunk = (cfun->machine->function_return_type ++ == indirect_branch_thunk); ++ indirect_thunk_name (thunk_name, -1, need_bnd_p, true); ++ if (need_bnd_p) ++ { ++ indirect_thunk_bnd_needed |= need_thunk; ++ fprintf (asm_out_file, "\tbnd jmp\t%s\n", thunk_name); ++ } ++ else ++ { ++ indirect_thunk_needed |= need_thunk; ++ fprintf (asm_out_file, "\tjmp\t%s\n", thunk_name); ++ } ++ } ++ else ++ output_indirect_thunk (need_bnd_p, -1); ++ ++ return ""; ++ } ++ ++ if (!long_p || ix86_bnd_prefixed_insn_p (current_output_insn)) ++ return "%!ret"; ++ ++ return "rep%; ret"; ++} ++ + /* Output the assembly for a call instruction. */ + + const char * +@@ -42090,6 +42202,28 @@ ix86_handle_fndecl_attribute (tree *node, tree name, tree args, int, + } + } + ++ if (is_attribute_p ("function_return", name)) ++ { ++ tree cst = TREE_VALUE (args); ++ if (TREE_CODE (cst) != STRING_CST) ++ { ++ warning (OPT_Wattributes, ++ "%qE attribute requires a string constant argument", ++ name); ++ *no_add_attrs = true; ++ } ++ else if (strcmp (TREE_STRING_POINTER (cst), "keep") != 0 ++ && strcmp (TREE_STRING_POINTER (cst), "thunk") != 0 ++ && strcmp (TREE_STRING_POINTER (cst), "thunk-inline") != 0 ++ && strcmp (TREE_STRING_POINTER (cst), "thunk-extern") != 0) ++ { ++ warning (OPT_Wattributes, ++ "argument to %qE attribute is not " ++ "(keep|thunk|thunk-inline|thunk-extern)", name); ++ *no_add_attrs = true; ++ } ++ } ++ + return NULL_TREE; + } + +@@ -46400,6 +46534,8 @@ static const struct attribute_spec ix86_attribute_table[] = + ix86_handle_no_caller_saved_registers_attribute, false }, + { "indirect_branch", 1, 1, true, false, false, + ix86_handle_fndecl_attribute, false }, ++ { "function_return", 1, 1, true, false, false, ++ ix86_handle_fndecl_attribute, false }, + + /* End element. */ + { NULL, 0, 0, false, false, false, NULL, false } +diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h +index d8370ae..e7da790 100644 +--- a/gcc/config/i386/i386.h ++++ b/gcc/config/i386/i386.h +@@ -2616,6 +2616,9 @@ struct GTY(()) machine_function { + "indirect_jump" or "tablejump". */ + BOOL_BITFIELD has_local_indirect_jump : 1; + ++ /* How to generate function return. */ ++ ENUM_BITFIELD(indirect_branch) function_return_type : 3; ++ + /* If true, the current function is a function specified with + the "interrupt" or "no_caller_saved_registers" attribute. */ + BOOL_BITFIELD no_caller_saved_registers : 1; +diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md +index cd2e73c..d112bdb 100644 +--- a/gcc/config/i386/i386.md ++++ b/gcc/config/i386/i386.md +@@ -12315,7 +12315,7 @@ + (define_insn "simple_return_internal" + [(simple_return)] + "reload_completed" +- "%!ret" ++ "* return ix86_output_function_return (false);" + [(set_attr "length" "1") + (set_attr "atom_unit" "jeu") + (set_attr "length_immediate" "0") +@@ -12337,12 +12337,7 @@ + [(simple_return) + (unspec [(const_int 0)] UNSPEC_REP)] + "reload_completed" +-{ +- if (ix86_bnd_prefixed_insn_p (insn)) +- return "%!ret"; +- +- return "rep%; ret"; +-} ++ "* return ix86_output_function_return (true);" + [(set_attr "length" "2") + (set_attr "atom_unit" "jeu") + (set_attr "length_immediate" "0") +diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt +index c076d9c..b07388d 100644 +--- a/gcc/config/i386/i386.opt ++++ b/gcc/config/i386/i386.opt +@@ -932,9 +932,13 @@ mindirect-branch= + Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_indirect_branch) Init(indirect_branch_keep) + Convert indirect call and jump to call and return thunks. + ++mfunction-return= ++Target Report RejectNegative Joined Enum(indirect_branch) Var(ix86_function_return) Init(indirect_branch_keep) ++Convert function return to call and return thunk. ++ + Enum + Name(indirect_branch) Type(enum indirect_branch) +-Known indirect branch choices (for use with the -mindirect-branch= option): ++Known indirect branch choices (for use with the -mindirect-branch=/-mfunction-return= options): + + EnumValue + Enum(indirect_branch) String(keep) Value(indirect_branch_keep) +diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi +index 935381d..46e0a36 100644 +--- a/gcc/doc/extend.texi ++++ b/gcc/doc/extend.texi +@@ -5550,6 +5550,15 @@ call and jump to call and return thunk. @samp{thunk-inline} converts + indirect call and jump to inlined call and return thunk. + @samp{thunk-extern} converts indirect call and jump to external call + and return thunk provided in a separate object file. ++ ++@item function_return("@var{choice}") ++@cindex @code{function_return} function attribute, x86 ++On x86 targets, the @code{function_return} attribute causes the compiler ++to convert function return with @var{choice}. @samp{keep} keeps function ++return unmodified. @samp{thunk} converts function return to call and ++return thunk. @samp{thunk-inline} converts function return to inlined ++call and return thunk. @samp{thunk-extern} converts function return to ++external call and return thunk provided in a separate object file. + @end table + + On the x86, the inliner does not inline a +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 4979c8c..f3eb54b 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -1211,7 +1211,7 @@ See RS/6000 and PowerPC Options. + -mavx256-split-unaligned-load -mavx256-split-unaligned-store @gol + -malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol + -mmitigate-rop -mgeneral-regs-only @gol +--mindirect-branch=@var{choice}} ++-mindirect-branch=@var{choice} -mfunction-return==@var{choice}} + + @emph{x86 Windows Options} + @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol +@@ -25698,6 +25698,17 @@ to external call and return thunk provided in a separate object file. + You can control this behavior for a specific function by using the + function attribute @code{indirect_branch}. @xref{Function Attributes}. + ++@item -mfunction-return=@var{choice} ++@opindex -mfunction-return ++Convert function return with @var{choice}. The default is @samp{keep}, ++which keeps function return unmodified. @samp{thunk} converts function ++return to call and return thunk. @samp{thunk-inline} converts function ++return to inlined call and return thunk. @samp{thunk-extern} converts ++function return to external call and return thunk provided in a separate ++object file. You can control this behavior for a specific function by ++using the function attribute @code{function_return}. ++@xref{Function Attributes}. ++ + @end table + + These @samp{-m} switches are supported in addition to the above diff -uNr a/sys-devel/gcc/files/spectre-0003-mindirect-branch-register.patch b/sys-devel/gcc/files/spectre-0003-mindirect-branch-register.patch --- a/sys-devel/gcc/files/spectre-0003-mindirect-branch-register.patch false +++ b/sys-devel/gcc/files/spectre-0003-mindirect-branch-register.patch 802bdcaa3a8c6a386617d01c352ab69a4ca33bcf573dd20cdb245561e5fa1039e5d066099450cb6e3e51400ca09b0d07209ca2a39eb7cb77943d58268a972cd1 @@ -0,0 +1,340 @@ +From 86118fbdbafe6af54b2da467e1073c49e1742116 Mon Sep 17 00:00:00 2001 +From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Tue, 16 Jan 2018 11:17:49 +0000 +Subject: [PATCH] x86: Add -mindirect-branch-register + +Add -mindirect-branch-register to force indirect branch via register. +This is implemented by disabling patterns of indirect branch via memory, +similar to TARGET_X32. + +-mindirect-branch= and -mfunction-return= tests are updated with +-mno-indirect-branch-register to avoid false test failures when +-mindirect-branch-register is added to RUNTESTFLAGS for "make check". + +gcc/ + + Backport from mainline + 2018-01-14 H.J. Lu <hongjiu.lu@intel.com> + + * config/i386/constraints.md (Bs): Disallow memory operand for + -mindirect-branch-register. + (Bw): Likewise. + * config/i386/predicates.md (indirect_branch_operand): Likewise. + (GOT_memory_operand): Likewise. + (call_insn_operand): Likewise. + (sibcall_insn_operand): Likewise. + (GOT32_symbol_operand): Likewise. + * config/i386/i386.md (indirect_jump): Call convert_memory_address + for -mindirect-branch-register. + (tablejump): Likewise. + (*sibcall_memory): Likewise. + (*sibcall_value_memory): Likewise. + Disallow peepholes of indirect call and jump via memory for + -mindirect-branch-register. + (*call_pop): Replace m with Bw. + (*call_value_pop): Likewise. + (*sibcall_pop_memory): Replace m with Bs. + * config/i386/i386.opt (mindirect-branch-register): New option. + * doc/invoke.texi: Document -mindirect-branch-register option. + +i386: Rename to ix86_indirect_branch_register + +Rename the variable for -mindirect-branch-register to +ix86_indirect_branch_register to match the command-line option name. + + Backport from mainline + 2018-01-15 H.J. Lu <hongjiu.lu@intel.com> + + * config/i386/constraints.md (Bs): Replace + ix86_indirect_branch_thunk_register with + ix86_indirect_branch_register. + (Bw): Likewise. + * config/i386/i386.md (indirect_jump): Likewise. + (tablejump): Likewise. + (*sibcall_memory): Likewise. + (*sibcall_value_memory): Likewise. + Peepholes of indirect call and jump via memory: Likewise. + * config/i386/i386.opt: Likewise. + * config/i386/predicates.md (indirect_branch_operand): Likewise. + (GOT_memory_operand): Likewise. + (call_insn_operand): Likewise. + (sibcall_insn_operand): Likewise. + (GOT32_symbol_operand): Likewise. + +x86: Rewrite ix86_indirect_branch_register logic + +Rewrite ix86_indirect_branch_register logic with + +(and (not (match_test "ix86_indirect_branch_register")) + (original condition before r256662)) + + Backport from mainline + 2018-01-15 H.J. Lu <hongjiu.lu@intel.com> + + * config/i386/predicates.md (constant_call_address_operand): + Rewrite ix86_indirect_branch_register logic. + (sibcall_insn_operand): Likewise. + +Don't check ix86_indirect_branch_register for GOT operand + +Since GOT_memory_operand and GOT32_symbol_operand are simple pattern +matches, don't check ix86_indirect_branch_register here. If needed, +-mindirect-branch= will convert indirect branch via GOT slot to a call +and return thunk. + + Backport from mainline + 2018-01-15 H.J. Lu <hongjiu.lu@intel.com> + + * config/i386/constraints.md (Bs): Update + ix86_indirect_branch_register check. Don't check + ix86_indirect_branch_register with GOT_memory_operand. + (Bw): Likewise. + * config/i386/predicates.md (GOT_memory_operand): Don't check + ix86_indirect_branch_register here. + (GOT32_symbol_operand): Likewise. + +i386: Rewrite indirect_branch_operand logic + + Backport from mainline + 2018-01-15 H.J. Lu <hongjiu.lu@intel.com> + + * config/i386/predicates.md (indirect_branch_operand): Rewrite + ix86_indirect_branch_register logic. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256735 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + gcc/config/i386/constraints.md | 6 +- + gcc/config/i386/i386.md | 34 +++++++---- + gcc/config/i386/i386.opt | 4 ++ + gcc/config/i386/predicates.md | 21 ++++--- + gcc/doc/invoke.texi | 7 ++- + 49 files changed, 266 insertions(+), 63 deletions(-) + +diff --git a/gcc/config/i386/constraints.md b/gcc/config/i386/constraints.md +index 38d604f..a0a632a 100644 +--- a/gcc/config/i386/constraints.md ++++ b/gcc/config/i386/constraints.md +@@ -198,14 +198,16 @@ + + (define_constraint "Bs" + "@internal Sibcall memory operand." +- (ior (and (not (match_test "TARGET_X32")) ++ (ior (and (not (match_test "ix86_indirect_branch_register")) ++ (not (match_test "TARGET_X32")) + (match_operand 0 "sibcall_memory_operand")) + (and (match_test "TARGET_X32 && Pmode == DImode") + (match_operand 0 "GOT_memory_operand")))) + + (define_constraint "Bw" + "@internal Call memory operand." +- (ior (and (not (match_test "TARGET_X32")) ++ (ior (and (not (match_test "ix86_indirect_branch_register")) ++ (not (match_test "TARGET_X32")) + (match_operand 0 "memory_operand")) + (and (match_test "TARGET_X32 && Pmode == DImode") + (match_operand 0 "GOT_memory_operand")))) +diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md +index d112bdb..d074c2f 100644 +--- a/gcc/config/i386/i386.md ++++ b/gcc/config/i386/i386.md +@@ -11625,7 +11625,7 @@ + [(set (pc) (match_operand 0 "indirect_branch_operand"))] + "" + { +- if (TARGET_X32) ++ if (TARGET_X32 || ix86_indirect_branch_register) + operands[0] = convert_memory_address (word_mode, operands[0]); + cfun->machine->has_local_indirect_jump = true; + }) +@@ -11679,7 +11679,7 @@ + OPTAB_DIRECT); + } + +- if (TARGET_X32) ++ if (TARGET_X32 || ix86_indirect_branch_register) + operands[0] = convert_memory_address (word_mode, operands[0]); + cfun->machine->has_local_indirect_jump = true; + }) +@@ -11871,7 +11871,7 @@ + [(call (mem:QI (match_operand:W 0 "memory_operand" "m")) + (match_operand 1)) + (unspec [(const_int 0)] UNSPEC_PEEPSIB)] +- "!TARGET_X32" ++ "!TARGET_X32 && !ix86_indirect_branch_register" + "* return ix86_output_call_insn (insn, operands[0]);" + [(set_attr "type" "call")]) + +@@ -11880,7 +11880,9 @@ + (match_operand:W 1 "memory_operand")) + (call (mem:QI (match_dup 0)) + (match_operand 3))] +- "!TARGET_X32 && SIBLING_CALL_P (peep2_next_insn (1)) ++ "!TARGET_X32 ++ && !ix86_indirect_branch_register ++ && SIBLING_CALL_P (peep2_next_insn (1)) + && !reg_mentioned_p (operands[0], + CALL_INSN_FUNCTION_USAGE (peep2_next_insn (1)))" + [(parallel [(call (mem:QI (match_dup 1)) +@@ -11893,7 +11895,9 @@ + (unspec_volatile [(const_int 0)] UNSPECV_BLOCKAGE) + (call (mem:QI (match_dup 0)) + (match_operand 3))] +- "!TARGET_X32 && SIBLING_CALL_P (peep2_next_insn (2)) ++ "!TARGET_X32 ++ && !ix86_indirect_branch_register ++ && SIBLING_CALL_P (peep2_next_insn (2)) + && !reg_mentioned_p (operands[0], + CALL_INSN_FUNCTION_USAGE (peep2_next_insn (2)))" + [(unspec_volatile [(const_int 0)] UNSPECV_BLOCKAGE) +@@ -11915,7 +11919,7 @@ + }) + + (define_insn "*call_pop" +- [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lmBz")) ++ [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lBwBz")) + (match_operand 1)) + (set (reg:SI SP_REG) + (plus:SI (reg:SI SP_REG) +@@ -11935,7 +11939,7 @@ + [(set_attr "type" "call")]) + + (define_insn "*sibcall_pop_memory" +- [(call (mem:QI (match_operand:SI 0 "memory_operand" "m")) ++ [(call (mem:QI (match_operand:SI 0 "memory_operand" "Bs")) + (match_operand 1)) + (set (reg:SI SP_REG) + (plus:SI (reg:SI SP_REG) +@@ -11989,7 +11993,9 @@ + [(set (match_operand:W 0 "register_operand") + (match_operand:W 1 "memory_operand")) + (set (pc) (match_dup 0))] +- "!TARGET_X32 && peep2_reg_dead_p (2, operands[0])" ++ "!TARGET_X32 ++ && !ix86_indirect_branch_register ++ && peep2_reg_dead_p (2, operands[0])" + [(set (pc) (match_dup 1))]) + + ;; Call subroutine, returning value in operand 0 +@@ -12070,7 +12076,7 @@ + (call (mem:QI (match_operand:W 1 "memory_operand" "m")) + (match_operand 2))) + (unspec [(const_int 0)] UNSPEC_PEEPSIB)] +- "!TARGET_X32" ++ "!TARGET_X32 && !ix86_indirect_branch_register" + "* return ix86_output_call_insn (insn, operands[1]);" + [(set_attr "type" "callv")]) + +@@ -12080,7 +12086,9 @@ + (set (match_operand 2) + (call (mem:QI (match_dup 0)) + (match_operand 3)))] +- "!TARGET_X32 && SIBLING_CALL_P (peep2_next_insn (1)) ++ "!TARGET_X32 ++ && !ix86_indirect_branch_register ++ && SIBLING_CALL_P (peep2_next_insn (1)) + && !reg_mentioned_p (operands[0], + CALL_INSN_FUNCTION_USAGE (peep2_next_insn (1)))" + [(parallel [(set (match_dup 2) +@@ -12095,7 +12103,9 @@ + (set (match_operand 2) + (call (mem:QI (match_dup 0)) + (match_operand 3)))] +- "!TARGET_X32 && SIBLING_CALL_P (peep2_next_insn (2)) ++ "!TARGET_X32 ++ && !ix86_indirect_branch_register ++ && SIBLING_CALL_P (peep2_next_insn (2)) + && !reg_mentioned_p (operands[0], + CALL_INSN_FUNCTION_USAGE (peep2_next_insn (2)))" + [(unspec_volatile [(const_int 0)] UNSPECV_BLOCKAGE) +@@ -12120,7 +12130,7 @@ + + (define_insn "*call_value_pop" + [(set (match_operand 0) +- (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lmBz")) ++ (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lBwBz")) + (match_operand 2))) + (set (reg:SI SP_REG) + (plus:SI (reg:SI SP_REG) +diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt +index b07388d..b90da9f 100644 +--- a/gcc/config/i386/i386.opt ++++ b/gcc/config/i386/i386.opt +@@ -951,3 +951,7 @@ Enum(indirect_branch) String(thunk-inline) Value(indirect_branch_thunk_inline) + + EnumValue + Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern) ++ ++mindirect-branch-register ++Target Report Var(ix86_indirect_branch_register) Init(0) ++Force indirect call and jump via register. +diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md +index 2fc2c60..e4da309 100644 +--- a/gcc/config/i386/predicates.md ++++ b/gcc/config/i386/predicates.md +@@ -635,7 +635,8 @@ + ;; Test for a valid operand for indirect branch. + (define_predicate "indirect_branch_operand" + (ior (match_operand 0 "register_operand") +- (and (not (match_test "TARGET_X32")) ++ (and (not (match_test "ix86_indirect_branch_register")) ++ (not (match_test "TARGET_X32")) + (match_operand 0 "memory_operand")))) + + ;; Return true if OP is a memory operands that can be used in sibcalls. +@@ -678,20 +679,22 @@ + (ior (match_test "constant_call_address_operand + (op, mode == VOIDmode ? mode : Pmode)") + (match_operand 0 "call_register_no_elim_operand") +- (ior (and (not (match_test "TARGET_X32")) +- (match_operand 0 "memory_operand")) +- (and (match_test "TARGET_X32 && Pmode == DImode") +- (match_operand 0 "GOT_memory_operand"))))) ++ (and (not (match_test "ix86_indirect_branch_register")) ++ (ior (and (not (match_test "TARGET_X32")) ++ (match_operand 0 "memory_operand")) ++ (and (match_test "TARGET_X32 && Pmode == DImode") ++ (match_operand 0 "GOT_memory_operand")))))) + + ;; Similarly, but for tail calls, in which we cannot allow memory references. + (define_special_predicate "sibcall_insn_operand" + (ior (match_test "constant_call_address_operand + (op, mode == VOIDmode ? mode : Pmode)") + (match_operand 0 "register_no_elim_operand") +- (ior (and (not (match_test "TARGET_X32")) +- (match_operand 0 "sibcall_memory_operand")) +- (and (match_test "TARGET_X32 && Pmode == DImode") +- (match_operand 0 "GOT_memory_operand"))))) ++ (and (not (match_test "ix86_indirect_branch_register")) ++ (ior (and (not (match_test "TARGET_X32")) ++ (match_operand 0 "sibcall_memory_operand")) ++ (and (match_test "TARGET_X32 && Pmode == DImode") ++ (match_operand 0 "GOT_memory_operand")))))) + + ;; Return true if OP is a 32-bit GOT symbol operand. + (define_predicate "GOT32_symbol_operand" +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index f3eb54b..1e572b1 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -1211,7 +1211,8 @@ See RS/6000 and PowerPC Options. + -mavx256-split-unaligned-load -mavx256-split-unaligned-store @gol + -malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol + -mmitigate-rop -mgeneral-regs-only @gol +--mindirect-branch=@var{choice} -mfunction-return==@var{choice}} ++-mindirect-branch=@var{choice} -mfunction-return==@var{choice} @gol ++-mindirect-branch-register} + + @emph{x86 Windows Options} + @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol +@@ -25709,6 +25710,10 @@ object file. You can control this behavior for a specific function by + using the function attribute @code{function_return}. + @xref{Function Attributes}. + ++@item -mindirect-branch-register ++@opindex -mindirect-branch-register ++Force indirect call and jump via register. ++ + @end table + + These @samp{-m} switches are supported in addition to the above diff -uNr a/sys-devel/gcc/files/spectre-0004-v-register-modifier.patch b/sys-devel/gcc/files/spectre-0004-v-register-modifier.patch --- a/sys-devel/gcc/files/spectre-0004-v-register-modifier.patch false +++ b/sys-devel/gcc/files/spectre-0004-v-register-modifier.patch 1eb57ae9a9f62e28bc10bc622bab87877702d724078bf378f4e3bf46179ae4950cb0ca6bb0caf945c1214f2442258b7f1e31cdebf2d9cef0ef109c10442d0fad @@ -0,0 +1,128 @@ +From: "H dot J dot Lu" <hjl dot tools at gmail dot com> +To: gcc-patches at gcc dot gnu dot org +Subject: [PATCH 4/4] x86: Add 'V' register operand modifier +Date: Fri, 12 Jan 2018 05:15:49 -0800 + +Add 'V', a special modifier which prints the name of the full integer +register without '%'. For + +extern void (*func_p) (void); + +void +foo (void) +{ + asm ("call __x86_indirect_thunk_%V0" : : "a" (func_p)); +} + +it generates: + +foo: + movq func_p(%rip), %rax + call __x86_indirect_thunk_rax + ret + +gcc/ + + * config/i386/i386.c (print_reg): Print the name of the full + integer register without '%'. + (ix86_print_operand): Handle 'V'. + * doc/extend.texi: Document 'V' modifier. + +gcc/testsuite/ + + * gcc.target/i386/indirect-thunk-register-4.c: New test. +--- + gcc/config/i386/i386.c | 13 ++++++++++++- + gcc/doc/extend.texi | 3 +++ + gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c | 13 +++++++++++++ + 3 files changed, 28 insertions(+), 1 deletion(-) + create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c + +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c +index 9ffcb69d6d7..e69135d7191 100644 +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -17617,6 +17617,7 @@ put_condition_code (enum rtx_code code, machine_mode mode, bool reverse, + If CODE is 'h', pretend the reg is the 'high' byte register. + If CODE is 'y', print "st(0)" instead of "st", if the reg is stack op. + If CODE is 'd', duplicate the operand for AVX instruction. ++ If CODE is 'V', print naked full integer register name without %. + */ + + void +@@ -17627,7 +17628,7 @@ print_reg (rtx x, int code, FILE *file) + unsigned int regno; + bool duplicated; + +- if (ASSEMBLER_DIALECT == ASM_ATT) ++ if (ASSEMBLER_DIALECT == ASM_ATT && code != 'V') + putc ('%', file); + + if (x == pc_rtx) +@@ -17679,6 +17680,14 @@ print_reg (rtx x, int code, FILE *file) + return; + } + ++ if (code == 'V') ++ { ++ if (GENERAL_REGNO_P (regno)) ++ msize = GET_MODE_SIZE (word_mode); ++ else ++ error ("'V' modifier on non-integer register"); ++ } ++ + duplicated = code == 'd' && TARGET_AVX; + + switch (msize) +@@ -17798,6 +17807,7 @@ print_reg (rtx x, int code, FILE *file) + & -- print some in-use local-dynamic symbol name. + H -- print a memory address offset by 8; used for sse high-parts + Y -- print condition for XOP pcom* instruction. ++ V -- print naked full integer register name without %. + + -- print a branch hint as 'cs' or 'ds' prefix + ; -- print a semicolon (after prefixes due to bug in older gas). + ~ -- print "i" if TARGET_AVX2, "f" otherwise. +@@ -18021,6 +18031,7 @@ ix86_print_operand (FILE *file, rtx x, int code) + case 'X': + case 'P': + case 'p': ++ case 'V': + break; + + case 's': +diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi +index f120b2a1429..dce808f1eab 100644 +--- a/gcc/doc/extend.texi ++++ b/gcc/doc/extend.texi +@@ -9292,6 +9292,9 @@ The table below shows the list of supported modifiers and their effects. + @tab @code{2} + @end multitable + ++@code{V} is a special modifier which prints the name of the full integer ++register without @code{%}. ++ + @anchor{x86floatingpointasmoperands} + @subsubsection x86 Floating-Point @code{asm} Operands + +diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c +new file mode 100644 +index 00000000000..f0cd9b75be8 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-register-4.c +@@ -0,0 +1,13 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O2 -mindirect-branch=keep -fno-pic" } */ ++ ++extern void (*func_p) (void); ++ ++void ++foo (void) ++{ ++ asm("call __x86_indirect_thunk_%V0" : : "a" (func_p)); ++} ++ ++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_eax" { target ia32 } } } */ ++/* { dg-final { scan-assembler "call\[ \t\]*__x86_indirect_thunk_rax" { target { ! ia32 } } } } */ +-- +2.14.3 + diff -uNr a/sys-devel/gcc/files/spectre-0005-mcmodel-large.patch b/sys-devel/gcc/files/spectre-0005-mcmodel-large.patch --- a/sys-devel/gcc/files/spectre-0005-mcmodel-large.patch false +++ b/sys-devel/gcc/files/spectre-0005-mcmodel-large.patch b831fc6d4aa1576d9dfd1f57bee22a30718a8cfa7d6c9c4bc8602de79424b14e02f6e46b556a66deae46e99e315ac9298b36acd3dc32813000ebd3bfdfb251c8 @@ -0,0 +1,105 @@ +From 5d1c53c6fd593de2360c1a2ae44ebf5fa3c5263b Mon Sep 17 00:00:00 2001 +From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Tue, 16 Jan 2018 11:22:01 +0000 +Subject: [PATCH] x86: Disallow -mindirect-branch=/-mfunction-return= with + -mcmodel=large + +Since the thunk function may not be reachable in large code model, +-mcmodel=large is incompatible with -mindirect-branch=thunk, +-mindirect-branch=thunk-extern, -mfunction-return=thunk and +-mfunction-return=thunk-extern. Issue an error when they are used with +-mcmodel=large. + +gcc/ + + Backport from mainline + 2018-01-14 H.J. Lu <hongjiu.lu@intel.com> + + * config/i386/i386.c (ix86_set_indirect_branch_type): Disallow + -mcmodel=large with -mindirect-branch=thunk, + -mindirect-branch=thunk-extern, -mfunction-return=thunk and + -mfunction-return=thunk-extern. + * doc/invoke.texi: Document -mcmodel=large is incompatible with + -mindirect-branch=thunk, -mindirect-branch=thunk-extern, + -mfunction-return=thunk and -mfunction-return=thunk-extern. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256737 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + gcc/config/i386/i386.c | 26 ++++++++++++++++++++++ + gcc/doc/invoke.texi | 11 +++++++++ + 15 files changed, 156 insertions(+) + +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c +index 1bbdd0c..e758387 100644 +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -7187,6 +7187,19 @@ ix86_set_indirect_branch_type (tree fndecl) + } + else + cfun->machine->indirect_branch_type = ix86_indirect_branch; ++ ++ /* -mcmodel=large is not compatible with -mindirect-branch=thunk ++ nor -mindirect-branch=thunk-extern. */ ++ if ((ix86_cmodel == CM_LARGE || ix86_cmodel == CM_LARGE_PIC) ++ && ((cfun->machine->indirect_branch_type ++ == indirect_branch_thunk_extern) ++ || (cfun->machine->indirect_branch_type ++ == indirect_branch_thunk))) ++ error ("%<-mindirect-branch=%s%> and %<-mcmodel=large%> are not " ++ "compatible", ++ ((cfun->machine->indirect_branch_type ++ == indirect_branch_thunk_extern) ++ ? "thunk-extern" : "thunk")); + } + + if (cfun->machine->function_return_type == indirect_branch_unset) +@@ -7212,6 +7225,19 @@ ix86_set_indirect_branch_type (tree fndecl) + } + else + cfun->machine->function_return_type = ix86_function_return; ++ ++ /* -mcmodel=large is not compatible with -mfunction-return=thunk ++ nor -mfunction-return=thunk-extern. */ ++ if ((ix86_cmodel == CM_LARGE || ix86_cmodel == CM_LARGE_PIC) ++ && ((cfun->machine->function_return_type ++ == indirect_branch_thunk_extern) ++ || (cfun->machine->function_return_type ++ == indirect_branch_thunk))) ++ error ("%<-mfunction-return=%s%> and %<-mcmodel=large%> are not " ++ "compatible", ++ ((cfun->machine->function_return_type ++ == indirect_branch_thunk_extern) ++ ? "thunk-extern" : "thunk")); + } + } + +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 1e572b1..6f3c344 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -25699,6 +25699,11 @@ to external call and return thunk provided in a separate object file. + You can control this behavior for a specific function by using the + function attribute @code{indirect_branch}. @xref{Function Attributes}. + ++Note that @option{-mcmodel=large} is incompatible with ++@option{-mindirect-branch=thunk} nor ++@option{-mindirect-branch=thunk-extern} since the thunk function may ++not be reachable in large code model. ++ + @item -mfunction-return=@var{choice} + @opindex -mfunction-return + Convert function return with @var{choice}. The default is @samp{keep}, +@@ -25710,6 +25715,12 @@ object file. You can control this behavior for a specific function by + using the function attribute @code{function_return}. + @xref{Function Attributes}. + ++Note that @option{-mcmodel=large} is incompatible with ++@option{-mfunction-return=thunk} nor ++@option{-mfunction-return=thunk-extern} since the thunk function may ++not be reachable in large code model. ++ ++ + @item -mindirect-branch-register + @opindex -mindirect-branch-register + Force indirect call and jump via register. diff -uNr a/sys-devel/gcc/gcc-4.9.4-r100.ebuild b/sys-devel/gcc/gcc-4.9.4-r100.ebuild --- a/sys-devel/gcc/gcc-4.9.4-r100.ebuild false +++ b/sys-devel/gcc/gcc-4.9.4-r100.ebuild 18e82e09e0c7afd6220de4fd40c9ee64212ae780136e729b1b244d68c31884d614745e89ccbf3d6aac734cdb9d7b7281163c59837f77f9f0db2a3dabd07f6777 @@ -0,0 +1,66 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PATCH_VER="1.0" +UCLIBC_VER="1.0" + +# Hardened gcc 4 stuff +PIE_VER="0.6.4" +SPECS_VER="0.2.0" +SPECS_GCC_VER="4.4.3" +# arch/libc configurations known to be stable with {PIE,SSP}-by-default +PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64" +PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64" +SSP_STABLE="amd64 x86 mips ppc ppc64 arm" +# uclibc need tls and nptl support for SSP support +# uclibc need to be >= 0.9.33 +SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm" +PIE_MUSL_STABLE="amd64 arm ppc mips x86" +SSP_MUSL_STABLE="amd64 arm ppc mips" +#end Hardened stuff + +inherit eutils toolchain + +KEYWORDS="~amd64 ~arm ~mips ~x86" + +RDEPEND="" +DEPEND="${RDEPEND} + elibc_glibc? ( >=sys-libs/glibc-2.8 ) + >=${CATEGORY}/binutils-2.20" + +if [[ ${CATEGORY} != cross-* ]] ; then + PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" +fi + +src_prepare() { + if has_version '<sys-libs/glibc-2.12' ; then + ewarn "Your host glibc is too old; disabling automatic fortify." + ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315" + EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" + fi + + toolchain_src_prepare + + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then + cd "${S}" + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org + cp -r libstdc\+\+-v3/config/os/generic libstdc\+\+-v3/config/os/gnu-linux + cp libstdc++-v3/config/os/gnu-linux.org/arm-eabi-extra.ver libstdc++-v3/config/os/gnu-linux/ + mv libitm/config/linux/x86 libitm/config/linux/x86_glibc + cp -r libitm/config/generic libitm/config/linux/x86 + epatch "${FILESDIR}"/${PN}-4.9.3-musl-linker-path.patch + epatch "${FILESDIR}"/${PN}-4.9.3-secure-plt.patch + epatch "${FILESDIR}"/${PN}-4.9.3-musl-res_state.patch + epatch "${FILESDIR}"/${PN}-4.8.3-musl-fix-libc5-assumption.patch + epatch "${FILESDIR}"/${PN}-4.8.5-posix_memalign.patch + epatch "${FILESDIR}"/${PN}-4.9.3-tree-vect-data-refs-correctness.patch + epatch "${FILESDIR}"/${PN}-4.9.3-pr68470.patch + fi + + use vanilla && return 0 + #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch +} diff -uNr a/sys-devel/gcc/gcc-5.4.0-r4.ebuild b/sys-devel/gcc/gcc-5.4.0-r4.ebuild --- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild false +++ b/sys-devel/gcc/gcc-5.4.0-r4.ebuild d17b7802844235c9979064c515bcbbad20174e9f3585d154a3312fb07fa6b2e37b2033112f6a014ccf93615109c6c172476589166de00bad2b6dc25790db8703 @@ -0,0 +1,62 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PATCH_VER="1.8" +UCLIBC_VER="1.0" + +# Hardened gcc 4 stuff +PIE_VER="0.6.5" +SPECS_VER="0.2.0" +SPECS_GCC_VER="4.4.3" +# arch/libc configurations known to be stable with {PIE,SSP}-by-default +PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64" +PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64" +SSP_STABLE="amd64 x86 mips ppc ppc64 arm" +# uclibc need tls and nptl support for SSP support +# uclibc need to be >= 0.9.33 +SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm" +PIE_MUSL_STABLE="amd64 arm ppc mips x86" +SSP_MUSL_STABLE="amd64 arm ppc mips" +#end Hardened stuff + +inherit epatch toolchain + +KEYWORDS="amd64 arm ~mips ppc x86" + +RDEPEND="" +DEPEND="${RDEPEND} + elibc_glibc? ( >=sys-libs/glibc-2.8 ) + >=${CATEGORY}/binutils-2.20" + +if [[ ${CATEGORY} != cross-* ]] ; then + PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" +fi + +src_prepare() { + if has_version '<sys-libs/glibc-2.12' ; then + ewarn "Your host glibc is too old; disabling automatic fortify." + ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315" + EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" + fi + is_crosscompile && EPATCH_EXCLUDE+=" 05_all_gcc-spec-env.patch" + + toolchain_src_prepare + + # Upstream Patch + epatch "${FILESDIR}"/${PN}-4.9.3-tree-vect-data-refs-correctness.patch + epatch "${FILESDIR}"/${PN}-5.4.0-pr68470.patch + epatch "${FILESDIR}"/${PN}-5.4.0-pr70473.patch + epatch "${FILESDIR}"/${PN}-5.4.0-pr71696-CVE-2016-6131.patch + + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then + epatch "${FILESDIR}"/4.9.4/gthread.patch + epatch "${FILESDIR}"/4.9.4/boehm_gc.patch + epatch "${FILESDIR}"/4.9.4/posix_memalign.patch + epatch "${FILESDIR}"/5.4.0/cilkrts.patch + epatch "${FILESDIR}"/5.4.0/linker_path.patch + epatch "${FILESDIR}"/5.4.0/musl.patch + epatch "${FILESDIR}"/5.4.0/ppc-secure_plt.patch + fi +} diff -uNr a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml --- a/sys-devel/gcc/metadata.xml false +++ b/sys-devel/gcc/metadata.xml 47cd637d5a779ee777736bfb4d68cb36351a982a0cf1409c525eec10e6f0d398e23f98e893f7e05e732388e23cfa12bbf7c1cc20068615802271af2c123904b0 @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> + </maintainer> + <use> + <flag name="awt">Useful only when building GCJ, this enables Abstract Window Toolkit + (AWT) peer support on top of GTK+</flag> + <flag name="cilk">Support the Cilk Plus language (C/C++ based languages for parallel programming)</flag> + <flag name="fixed-point">Enable fixed-point arithmetic support for MIPS targets + in gcc (Warning: significantly increases compile time!)</flag> + <flag name="go">Build the GCC Go language frontend.</flag> + <flag name="graphite">Add support for the framework for loop + optimizations based on a polyhedral intermediate representation</flag> + <flag name="jit">Enable libgccjit so other applications can embed gcc for Just-In-Time compilation. + This will slow down the compiler a bit as it forces all of the toolchain to be shared libs.</flag> + <flag name="libssp">Build SSP support into a dedicated library rather than use the + code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag> + <flag name="mpx">Enable support for Intel Memory Protection Extensions (MPX)</flag> + <flag name="nopie">Disable PIE support (NOT FOR GENERAL USE)</flag> + <flag name="nossp">Disable SSP support (NOT FOR GENERAL USE)</flag> + <flag name="objc">Build support for the Objective C code language</flag> + <flag name="objc++">Build support for the Objective C++ language</flag> + <flag name="objc-gc">Build support for the Objective C code language Garbage + Collector</flag> + <flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag> + <flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag> + <flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag> + <flag name="ssp">Build packages with stack smashing protector on by default</flag> + <flag name="systemtap">enable systemtap static probe points</flag> + <flag name="vtv">Build support for virtual table verification (a C++ hardening feature)</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:gnu:gcc</remote-id> + <remote-id type="sourceforge">dgcc</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest --- a/sys-devel/gcc-config/Manifest false +++ b/sys-devel/gcc-config/Manifest 4459c69e40526d87840e5595f862e4023c19202b695d07ac82605bb71eb399827f5fd3cf6b07c024d6e829f19f98469bd43a0c16da8297f95b49728126b7ab63 @@ -0,0 +1,4 @@ +AUX gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch 1427 BLAKE2B 7b5625a4982c2c34065bff7227b117a55b81e8d9174c2a88e779806234a52b6d24a599bb81e51c70991858090bf94e7a10e92d7e932232f0cf1a718d894ade59 SHA512 f9ba9341aebbeabfd8fa283b9bf30ad6907398c44a2d6ff113a47b2599a90f5cb0da1947675c0a27881bf1ba8138979b0f4918cbc175c64d6e6f754d6e7d6b9c +DIST gcc-config-1.8.tar.xz 15020 BLAKE2B 97debbef946b0c14b4ecc0bc5b2217566b43f21318970b235b2919bd1e1ea41aff66aebb0ed73db2382f8312268327eb6844139bdeae7aba75771c699a5043df SHA512 3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826 +EBUILD gcc-config-1.8-r1.ebuild 1161 BLAKE2B db1db6716e17f201f125a9a758056cc14ce95eb90acb26805304525222022982ad2e67a47e879ea627a662063da899a07ed274dc2b22af8043ef0d36a11436c2 SHA512 57bab539041f364492082412524b643aaabb8fe1c40ec553429950a33b7578048a2b1395c1f586a9157c26eb87e528c53eba44de583f9232135a5a9cb4c47d69 +MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 diff -uNr a/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch b/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch --- a/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch false +++ b/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch 938d0d5e4aa0bb16127548d99081b733532731f264d016185dd9d34419f45c7b53d149f2afa01ae3143fe2cb3b510b37d5cf61e7adfbef47fd043b2c59600620 @@ -0,0 +1,47 @@ +--- gcc-config-1.8/gcc-config ++++ gcc-config-1.8/gcc-config +@@ -15,8 +15,9 @@ + trap ":" INT QUIT TSTP + + argv0=${0##*/} +-source /etc/init.d/functions.sh || { +- echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2 ++functions_script="/lib/gentoo/functions.sh" ++source ${functions_script} || { ++ echo "${argv0}: Could not source ${functions_script}!" 1>&2 + exit 1 + } + esyslog() { :; } + +From d45de09450ffb63b138bbb7f78cae43e1101e2ec Mon Sep 17 00:00:00 2001 +From: Ryan Hill <rhill@gentoo.org> +Date: Tue, 12 May 2015 22:09:28 -0600 +Subject: [PATCH] Ignore whitespace when diffing test results. + +The amount of whitespace output by ebegin/eend from gentoo-functions +is dynamic (seems to be dependent on terminal width). Since we can't +predict this we have to ignore all whitespace differences. + +URL: https://bugs.gentoo.org/547586 +Reported-by: tka <tka@kamph.org> +Signed-off-by: Ryan Hill <rhill@gentoo.org> +--- + tests/run_tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/run_tests b/tests/run_tests +index 2ff7d77..397d667 100755 +--- a/tests/run_tests ++++ b/tests/run_tests +@@ -44,7 +44,7 @@ cmp_log() { + args+=( -e "s|: line [0-9]*: |: |g" ) + sed "${args[@]}" "${exp}" > "${exp}.tmp" + sed "${args[@]}" "${log}" > "${log}.tmp" +- diff -u "${exp}.tmp" "${log}.tmp" > "${log}.diff" ++ diff -uw "${exp}.tmp" "${log}.tmp" > "${log}.diff" + ret=$? + rm "${exp}.tmp" + return ${ret} +-- +2.4.4 + diff -uNr a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild --- a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild false +++ b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild 2e37c6da83f24ee080b971788e0a80dc1ec70f6455d34cfb246f59c1710f0fda667e29ed795ce3a561b46b2956f0061f4da00655db2be9625198343ccc74c340 @@ -0,0 +1,51 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils unpacker toolchain-funcs multilib + +DESCRIPTION="utility to manage compilers" +HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" +SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND=">=sys-apps/gentoo-functions-0.10" + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.8-dont_source_functions_sh_from_etc_initd.patch" # 504118 +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PV="${PV}" \ + SUBLIBDIR="$(get_libdir)" \ + install +} + +pkg_postinst() { + # Scrub eselect-compiler remains + rm -f "${ROOT}"/etc/env.d/05compiler & + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + rm -f "${ROOT}"/usr/include/g++{,-v3} & + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done + + wait +} diff -uNr a/sys-devel/gcc-config/metadata.xml b/sys-devel/gcc-config/metadata.xml --- a/sys-devel/gcc-config/metadata.xml false +++ b/sys-devel/gcc-config/metadata.xml 5b0e15e61f051e1a13c1ac271d554a4fb7a7d8da760f4d0679d0af6ea0fe8e3187dfd05c859adbd61c4d2ce27344288f92ba6278b267f8e667da2f1fd192ec52 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest --- a/sys-devel/gettext/Manifest false +++ b/sys-devel/gettext/Manifest 8e82dae13f46c0fe22d1af52997dfb66c19f099151f5c64417f5b85b376a92a06f1e11f5179a814128244c20f418d35b375eb855eebaff06aa11a28aa9815ab1 @@ -0,0 +1,5 @@ +AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede596ca9d7d8587d9c883fa2fc54b8d1109210ac2b435b4709a16c2043cef6cc8d5448dc58adab74aa2e8ce834abdee51163d8c51 SHA512 7887d2fbf4b9d9677688e6d8d785b6c10c76bc330cb7b40da432e0a1ff0f7fc1355bf8f671041a37477baa6c8508b6e39f90ead468674febd62777506badc227 +AUX gettext-0.19.8.1-format-security.patch 3932 BLAKE2B 791b05e3c72792b290946c3347ec40374cb50a91648857cb0c2e380b8616d32be0958eb9b0f2bcd022049d8fc7d53ed3e9df824ca91621c31972f359c140bc1e SHA512 7e8149a3c1e09854bb2a6cbfbc4635567e45f2b7f1a555acf5ab723aead3ad1a3a9118002c353bf42a551b8be159640b597556731317d79efbffc2fc0d96dbb8 +DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 +EBUILD gettext-0.19.8.1.ebuild 3911 BLAKE2B 99130d03785b560e1743c17eb43b0d01aa64d2b4abf9f0572021b015c64710cfb8f5b56deea35a26816056a097723fa33adf9b4e81085e6245d85508bda6d84f SHA512 f0ef8c9c90911e420b715cb98acf9fe64297d544e0ba7aab2bdc37b02c641bb93cf288414cda17683e534e9b238ecf9fe7dfef4d606c37951998fa03009e16a3 +MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507 diff -uNr a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch --- a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch false +++ b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch d34f6138ca6107a543ac5742a7ff12090e92b473958c422b28d76420bb29ab10936f5ba8a0bcd1af02fc0f99e48d15c6ba95e4b46380e073ea45da946c4cc69a @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/564168 +Never build libintl since it's in dev-libs/libintl now. + +We can drop this if/when upstream fixes the configure flag handling: +https://savannah.gnu.org/bugs/?48233 + +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -20391,8 +20391,7 @@ $as_echo "$ac_res" >&6; } + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ +- && test "$PACKAGE" != gettext-runtime \ +- && test "$PACKAGE" != gettext-tools; }; then ++ }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -22746,8 +22746,7 @@ $as_echo "$ac_res" >&6; } + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ +- && test "$PACKAGE" != gettext-runtime \ +- && test "$PACKAGE" != gettext-tools; }; then ++ }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= diff -uNr a/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch b/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch --- a/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch false +++ b/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch 683bbd364c1ccb9179858bf1502ddc9b60b66fbf383ca88d5244f5c839e7f5793d321e31d127e7a3d37a273a3b4dae45158871ddaa4f6340471fa2a8a9d6a2bb @@ -0,0 +1,87 @@ +From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Sun, 19 Feb 2017 23:32:46 -0800 +Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues + +Fixed when compile with "-Wformat -Wformat-security -Werror=format-security": +| gettext-tools/gnulib-lib/libcroco/cr-statement.c: In function 'cr_statement_dump_charset': +| gettext-tools/gnulib-lib/libcroco/cr-statement.c:2661:17: error: format not a string literal and no format arguments [-Werror=format-security] +| fprintf (a_fp, str) ; + +And: +gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat=] + fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size); + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++----- + gettext-tools/gnulib-lib/libxml/timsort.h | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c +index 617520f..100104b 100644 +--- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c ++++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c +@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent) + g_return_if_fail (a_fp && a_this); + str = cr_statement_ruleset_to_string (a_this, a_indent); + if (str) { +- fprintf (a_fp, str); ++ fprintf (a_fp, "%s", str); + g_free (str); + str = NULL; + } +@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent) + str = cr_statement_charset_to_string (a_this, + a_indent) ; + if (str) { +- fprintf (a_fp, str) ; ++ fprintf (a_fp, "%s", str) ; + g_free (str) ; + str = NULL ; + } +@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent) + + str = cr_statement_at_page_rule_to_string (a_this, a_indent) ; + if (str) { +- fprintf (a_fp, str); ++ fprintf (a_fp, "%s", str); + g_free (str) ; + str = NULL ; + } +@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatement * a_this, + + str = cr_statement_media_rule_to_string (a_this, a_indent) ; + if (str) { +- fprintf (a_fp, str) ; ++ fprintf (a_fp, "%s", str) ; + g_free (str) ; + str = NULL ; + } +@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp, + + str = cr_statement_import_rule_to_string (a_this, a_indent) ; + if (str) { +- fprintf (a_fp, str) ; ++ fprintf (a_fp, "%s", str) ; + g_free (str) ; + str = NULL ; + } +diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h +index 795f272..443918a 100644 +--- a/gettext-tools/gnulib-lib/libxml/timsort.h ++++ b/gettext-tools/gnulib-lib/libxml/timsort.h +@@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size) + SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE)); + if (tempstore == NULL) + { +- fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size); ++ fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size); + exit(1); + } + store->storage = tempstore; +-- +2.10.2 + diff -uNr a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild --- a/sys-devel/gettext/gettext-0.19.8.1.ebuild false +++ b/sys-devel/gettext/gettext-0.19.8.1.ebuild 4bebc1eca420f11f52082a9830540ce4e256ece022813355b90f0b121b5e4ecdbc142aaf56c45e5a93df091611ece383dc43a9237c8cee2ece0e73009178f6ff @@ -0,0 +1,140 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Note: Keep version bumps in sync with dev-libs/libintl. + +EAPI="5" + +inherit epatch epunt-cxx ltprune mono-env libtool java-pkg-opt-2 multilib-minimal + +DESCRIPTION="GNU locale utilities" +HOMEPAGE="https://www.gnu.org/software/gettext/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +# Only libasprintf is under the LGPL (and libintl is in a sep package), +# so put that license behind USE=cxx. +LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs" + +# only runtime goes multilib +# Note: The version of libxml2 corresponds to the version bundled via gnulib. +# If the build detects too old of a system version, it will end up falling back +# to the bundled copy. #596918 +# Note: expat lacks a subslot because it is dynamically loaded at runtime. We +# would depend on older subslots if they were available (based on the ABIs that +# are explicitly handled), but expat doesn't currently use subslots. +DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.3:= + dev-libs/expat + acl? ( virtual/acl ) + ncurses? ( sys-libs/ncurses:0= ) + java? ( >=virtual/jdk-1.4:= )" +RDEPEND="${DEPEND} + !git? ( cvs? ( dev-vcs/cvs ) ) + git? ( dev-vcs/git ) + java? ( >=virtual/jre-1.4 )" +PDEPEND="emacs? ( app-emacs/po-mode )" + +MULTILIB_WRAPPED_HEADERS=( + # only installed for native ABI + /usr/include/gettext-po.h +) + +pkg_setup() { + mono-env_pkg_setup + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + java-pkg-opt-2_src_prepare + + epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 + epatch "${FILESDIR}"/${PN}-0.19.8.1-format-security.patch + + epunt_cxx + elibtoolize +} + +multilib_src_configure() { + local myconf=( + # switches common to runtime and top-level + --cache-file="${BUILD_DIR}"/config.cache + --docdir="\$(datarootdir)/doc/${PF}" + + # Emacs support is now in a separate package + --without-emacs + --without-lispdir + # glib depends on us so avoid circular deps + --with-included-glib + # libcroco depends on glib which ... ^^^ + --with-included-libcroco + # this will _disable_ libunistring (since it is not bundled), + # see bug #326477 + --with-included-libunistring + # Never build libintl since it's in dev-libs/libintl now. + --without-included-gettext + # Never build bundled copy of libxml2. + --without-included-libxml + + $(use_enable acl) + $(use_enable cxx c++) + $(use_enable cxx libasprintf) + $(use_with git) + $(usex git --without-cvs $(use_with cvs)) + $(use_enable java) + $(use_enable ncurses curses) + $(use_enable nls) + $(use_enable openmp) + $(use_enable static-libs static) + ) + + local ECONF_SOURCE=${S} + if ! multilib_is_native_abi ; then + # for non-native ABIs, we build runtime only + ECONF_SOURCE+=/gettext-runtime + fi + + econf "${myconf[@]}" +} + +multilib_src_install() { + default + + if multilib_is_native_abi ; then + dosym msgfmt /usr/bin/gmsgfmt #43435 + dobin gettext-tools/misc/gettextize + fi +} + +multilib_src_install_all() { + use nls || rm -r "${ED}"/usr/share/locale + use static-libs || prune_libtool_files --all + + rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias + + if use java ; then + java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar + rm -f "${ED}"/usr/share/${PN}/*.jar + rm -f "${ED}"/usr/share/${PN}/*.class + if use doc ; then + java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/javadoc2 + rm -rf "${ED}"/usr/share/doc/${PF}/javadoc2 + fi + fi + + if use doc ; then + dohtml "${ED}"/usr/share/doc/${PF}/*.html + else + rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} + fi + rm -f "${ED}"/usr/share/doc/${PF}/*.html + + dodoc AUTHORS ChangeLog NEWS README THANKS +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst +} diff -uNr a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml --- a/sys-devel/gettext/metadata.xml false +++ b/sys-devel/gettext/metadata.xml 82e9b0e1df32ba360df716c316145147d27dcc3954092fc06ef29686b9b4438025796e8652bb96528185ea758bad00aeac66fc3b6f471790de80322fd2d3d8a6 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="cvs"> + When running `autopoint`, use cvs to store the internal development files; + this requires cvs at runtime, but will be faster/smaller than raw archives + </flag> + <flag name="git"> + When running `autopoint`, use git to store the internal development files; + this requires git at runtime, but will be faster/smaller than raw archives + </flag> +</use> +</pkgmetadata> diff -uNr a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest --- a/sys-devel/gnuconfig/Manifest false +++ b/sys-devel/gnuconfig/Manifest a75805f00615368d4779ccba5ecbc7cc855f8384209e0dc70aff8256d7cca292d01dc90d9866ee690aa55b35480d2b66939b0050dc37e2597f8664ecb8cbf055 @@ -0,0 +1,5 @@ +AUX 99999999/0002-Add-x32-support-to-config.guess.patch 1315 BLAKE2B a0d88c06dcd6aacc93bc54b67cc7b6197ab3e58186a47cc6825a36eb898e4c0bfa50b38c3d8ca233583981ec2e7b9ab7a66d48507bd487d725ddd88182eb5a30 SHA512 e35aa9b56acc50bad8f560fb4def75c79bf8090e6595d5a66ec10f2a12ac1037dac9c0e5c1c4b66946dac26b97f845011952d1472625753294c295e82f67cb6a +AUX 99999999/0002-add-ps2-targets-to-config.sub.patch 1690 BLAKE2B 53d43da59ed0bcd390408333efcd07de1f1aabb9b4dfde8335949897535885cbbde3e623990737b833c47f6e948a64decfb6060395eaa935e8e5e0ac681605f4 SHA512 cb53feeaa937a72b3d64a45120890fdbb5c8eb93124da6528fcbbf03fff0d4f08d252fed1331d40de5cd34f09dc9e05d175e24fe097f274b141b73366f8cb0ad +DIST gnuconfig-20170101.tar.bz2 50152 BLAKE2B be36ec32461444e489c591aa5dff8540f6191cc21c69590bb48632e79b4ce41b1ca30b17d034c068cf79762a520447c0edc1b3a300b4225b25f8ed19fbf249e5 SHA512 a4d72b50f0c6ebae702b4d51aaeb459ac2b325f9f79ff6c464c1b92ecd7eb961b47b4fa0eb03894e80646846cff39a3e3b2d8ada6279e288e94846a12578b440 +EBUILD gnuconfig-20170101.ebuild 1552 BLAKE2B af79dc52309ea125f1e424d60ed04141fd94e36da24a9cd8f7d99582f67a588ed12b9c8f80f116c6b225af86fd0f39b41bec75802c144f72c26c1ba5115c63f8 SHA512 59d0cc38277e881eeb75dca77fa497a247edafee7488dd6cf08aec0e1839fbe3d651f38e79a905e59ab37e1a3650fb360f58d23fa01b6765a46265cd4015eedb +MISC metadata.xml 392 BLAKE2B f4a920a49c8060921ea7bc83a097d3a847970b7d655da81c68e13c7902850fd0cd8b442c9193b1936c8687b7a3fc79485fb2eb0523e6eb37e5b0f43f30cbbe29 SHA512 8b0ec5d0b1184ea7514dfd2ff09a1ceddad49150cf412816a5e966eec9857e25886b6c03bb14b38638f79dcca2a40326b8506e23d0d3d7e97b48d2234c5653e5 diff -uNr a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch b/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch --- a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch false +++ b/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch 46a881d8cf9d8ff871e9240a2e30cb7cc804d65ba0e9929fbccd9e6d41f748ee119867a1231a7ab7fe03f71e04741a2a3b7942bfc157aae75fa3fd1f910acdbe @@ -0,0 +1,44 @@ +From 8474d78c459f4ec8f8930094faeaacb2b77bf68f Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" <hongjiu.lu@intel.com> +Date: Fri, 20 Dec 2013 14:36:01 -0500 +Subject: [PATCH] Add x32 support to config.guess + +GCC on Linux/x86-64 may be configured for x32: + +https://sites.google.com/site/x32abi/ + +by default and the Linux/x32 target should be x86_64-VENDOR-linux-gnux32. +This patch adds x32 support to config.guess. OK to install? + +URL: http://gcc.gnu.org/ml/gcc-patches/2012-08/msg01083.html +--- + config.guess | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/config.guess b/config.guess +index fddac42..17a4f70 100755 +--- a/config.guess ++++ b/config.guess +@@ -1038,7 +1038,18 @@ EOF + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) +- echo ${UNAME_MACHINE}-pc-linux-${LIBC} ++ eval $set_cc_for_build ++ X86_64_ABI= ++ # If there is a compiler, see if it is configured for 32-bit objects. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_X32 >/dev/null ++ then ++ X86_64_ABI=x32 ++ fi ++ fi ++ echo ${UNAME_MACHINE}-pc-linux-${LIBC}${X86_64_ABI} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +-- +2.4.4 + diff -uNr a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch --- a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch false +++ b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch c19d9d2cf32bd4d10808582c11eacb03ffed1ad4e6d9005e421f92c277b7e9d6dde051ea8ab8e92839583f5a094dca5b34b703405db83fa167fffca6fc960fd5 @@ -0,0 +1,59 @@ +From 582f9caf95b3ccf36e6248be3b5b414546b0a03e Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Thu, 9 Oct 2008 15:51:35 -0400 +Subject: [PATCH] add ps2 targets to config.sub + +--- + config.sub | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/config.sub b/config.sub +index 88307c1..7ee2b4c 100755 +--- a/config.sub ++++ b/config.sub +@@ -258,7 +258,7 @@ case $basic_machine in + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ +- | d10v | d30v | dlx | dsp16xx \ ++ | d10v | d30v | dlx | dsp16xx | dvp \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ +@@ -823,6 +823,24 @@ case $basic_machine in + basic_machine=m68k-atari + os=-mint + ;; ++ mipsEE* | ee | ps2) ++ basic_machine=mips64r5900el-scei ++ case $os in ++ -linux*) ++ ;; ++ *) ++ os=-elf ++ ;; ++ esac ++ ;; ++ iop) ++ basic_machine=mipsel-scei ++ os=-irx ++ ;; ++ dvp) ++ basic_machine=dvp-scei ++ os=-elf ++ ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; +@@ -1389,7 +1407,7 @@ case $os in + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +-- +2.3.1 + diff -uNr a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild --- a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild false +++ b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild 05d51cd31a8da66bc9686682a14633e72c38903764c520ef3a247e71cb0dd64c8b3c2cf631da371ad257b56334bf47b2c7f852a37c5867e7891ee0d30144f599 @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils +if [[ ${PV} == "99999999" ]] ; then + EGIT_REPO_URI="git://git.savannah.gnu.org/config.git + http://git.savannah.gnu.org/r/config.git" + + inherit git-r3 +else + SRC_URI="mirror://gentoo/${P}.tar.bz2" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + S="${WORKDIR}" +fi + +DESCRIPTION="Updated config.sub and config.guess file from GNU" +HOMEPAGE="https://savannah.gnu.org/projects/config" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +maint_pkg_create() { + cd "${S}" + + local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog) + [[ ${#ver} != 8 ]] && die "invalid version '${ver}'" + + cp "${FILESDIR}"/${PV}/*.patch . || die + + local tar="${T}/gnuconfig-${ver}.tar.bz2" + tar -jcf ${tar} ./* || die "creating tar failed" + einfo "Packaged tar now available:" + einfo "$(du -b ${tar})" +} + +src_unpack() { + if [[ ${PV} == "99999999" ]] ; then + git-r3_src_unpack + maint_pkg_create + else + unpack ${A} + fi +} + +src_prepare() { + epatch "${S}"/*.patch + use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637 +} + +src_compile() { :;} + +src_test() { + emake check +} + +src_install() { + insinto /usr/share/${PN} + doins config.{sub,guess} || die + fperms +x /usr/share/${PN}/config.{sub,guess} + dodoc ChangeLog +} diff -uNr a/sys-devel/gnuconfig/metadata.xml b/sys-devel/gnuconfig/metadata.xml --- a/sys-devel/gnuconfig/metadata.xml false +++ b/sys-devel/gnuconfig/metadata.xml bfc1151aa2317de4b8f22f28ab5cc39ca90934138f7e9e79f539a2294e38a8701adc9bc669ee5ffbf581a7cb02cbfe807b6dd6116bdcf32a1b23c1b537cac064 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<longdescription lang="en"> +Updated config.{sub,guess} files from upstream cvs to properly detect various system types. +</longdescription> +</pkgmetadata> diff -uNr a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest --- a/sys-devel/libtool/Manifest false +++ b/sys-devel/libtool/Manifest b978a4b1d52b43f988267e9b841ee3134fc81617273016095435545c325e72c53bafb15072d6401e707d922edf29fb29cef254cf45eed62af04adfb73a0245c2 @@ -0,0 +1,17 @@ +AUX libtool-2.2.10-eprefix.patch 462 BLAKE2B d219aac1c2b68926a6c3c83bc85b51fe5e69cbbf76e3af096b024d649180f9cc4a025ceae14ada4ddb2b8836f669318a700b59811a4b44c91db82098099565bc SHA512 c9657a2726d0750241558337af57ac7d55afa4e74ac5eef411261394cbf7070b52876074367390ed5a2bbc09d9286ba200133ec6afd88a5fe5af08b8db04e189 +AUX libtool-2.2.6a-darwin-module-bundle.patch 1202 BLAKE2B dfc1de3f09ceb164f757700e12c514ab5846a1bac8eb55b63fd27a24118ebcae36a9f7619eed3d63e02a2d5aff23efd1252975822fa136f5fd860b1172283152 SHA512 aca1cfbab9b1c9508f7fac85b346865106ce1f63d69095cd5b13e02f8d3605f04cd1142e077f19e4f6f8174cb9a9f39823061e494dfafc4fe4589c4e11120353 +AUX libtool-2.4.3-use-linux-version-in-fbsd.patch 1124 BLAKE2B 69aad533a01e88a87ea73eade9e9c510ad2e72f0601839ff3872d7df854c186642f0a1ec0c0fc103369885588a6758f3050aca25cf577076ea512e5897d0a602 SHA512 6134fb39cf0e115a91cf69de175c9a088d405684139f8ba3dcf77f2c039e5f4603e2b70652f27bb59773aacb562560c1bcdbf439de1564bd19095d524b0ee5c7 +AUX libtool-2.4.6-darwin-use-linux-version.patch 493 BLAKE2B 39c0b2e630fec412a3dbb31ab93ba1686496c7f0939f1f737e0ca929aded9c3f0b1b47102cdebccced9f7ac6107c02f10d772df9802152da03eae5c4fdefd97e SHA512 5cce0c85a59fef8c3c605e72f3f4a8a16c0ee2da464643c67fcf675fedfcb227866938fb98b1379506616b4141cca5b29175d976402510987053bade4fc482f9 +AUX libtool-2.4.6-libtoolize-delay-help.patch 1591 BLAKE2B 0a2eef74ef726d71e425c5aa7d82018bf596db66baa5ea1e02db758d5bf74ade52edc482b1c4b62e7e986be20e73ae869818905954b0688c682fbad2ac1726f5 SHA512 19c160cc706081d63b65d6580fd8cb4d01e6a5e45652dd3c4fd83e71df5b765c355e861e257ab37489c2d4c78b4aa14bc94ad9718c91c90b467e4604f484b9c3 +AUX libtool-2.4.6-libtoolize-slow.patch 4659 BLAKE2B 79abc560d5e0654457a8ba26e0777bd91b4e15ad0b33e689709d31d12b6b28bed54285d3688d04a45bae4bb9c6c6d99862219335ab7cd2f7a3cdb5f237fc3f21 SHA512 a98333983a493b27f4188b83d75548abc63c1d50720a8720d47a1f88f231331de078a78440f0f0569e6aeb646b14f16db26a7eefd20fdac6fc7321b9428ddbfd +AUX libtool-2.4.6-link-fsanitize.patch 2364 BLAKE2B 97cbf349945c315000d694f5f156835078f079998d568ebfdd1a9a664300fcbcc1a785e34cec535ffa3ac4c902cc5095517f4f0b0b8575cd66d2dbd47251bc1c SHA512 567487334e4084b94f0431561213ac520a7871a0acb904b019204e728b750a8ab8155b88f0b5a90cefdd5f524130f9f3f9f0de34d8d9a2bd821bb8be6266cf69 +AUX libtool-2.4.6-link-fuse-ld.patch 2365 BLAKE2B 806e47a27b0c73bcf67d1d1cf00412eb0114cb71955bf3248eb9529b3c73a5730bcb4c0887e441cd72ec6c8111ade8e72d765b6e5d9586e643d37a8e155f6809 SHA512 273f9bef6dffc50f9773a8a91101d13ed2a13c72e077c4620f1e3da37b27271acb005fdcde7bcd9acc7cfcb1ee71ec2cb3eba3c9fcf262eb141e12f43fd06b6e +AUX libtool-2.4.6-link-specs.patch 2438 BLAKE2B 99dcefe58ea905e89d7169b926ed9d9f186c5603c84f262a1feff3a926a26aa839d205e47dacbfa87cadd118d8940ac58d60fba4a9ed19e019dfb838d1094c42 SHA512 349675e58a82227930859d7ced1f7bafc7b05f3d4d902e4bfec3f4f1337c7a724ff7d8f509da4212c74c6f4c07b7f3604a6c28070ca5091543a8c4616e0263c9 +AUX libtool-2.4.6-mint.patch 1672 BLAKE2B 0a7eee18610dd1126d058360f8fdadb190c6f3cb37c3c4bfc17617a06330fab5ad6f6dea7a027777d112ac19ea06586e42d907a0e8bb2a6f929188ffb34bc75a SHA512 a022703b39596ca5aafd27f463aee403c2d4565d3283c0ea20c259996c3d32056096536bbec079e3ed08b03618f9d5e46c0684db08c90477fe31e4219596e22b +AUX libtool-2.4.6-ppc64le.patch 3672 BLAKE2B 1c1f068f0f1ab8b8180a98412e6a3bb1e4cc84c3e9c8894b4a0a2f8e110ea7ce198fc02d07ba2f18023cf38696d8cfd46e9fae979d5ab30ace2c82b020493f34 SHA512 e9dc9fad5eebabcc65506dddabf3a917c73237485f2ad24765a20437404f654a8c04411755381c7c5d90c2ae13cabd5d89f9ad15839e2e1b9d43300d57adf178 +AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b2019cb63b4901b6de68f5efcfe9d42dbaafd7c40ea03f1b247cea8718ef92a51c1bd0ce429ec49665f05a61e26d25fa SHA512 037cf598c644d167de5fef9f4ecee6ccd573d2516f2f777eeaad94135ff05dd0775191d3e21cca397bb664bc0449a5db0b9ef0bbaa16e178762be9769c13c31e +AUX libtool-2.4.6-pthread_bootstrapped.patch 556 BLAKE2B a381e0a8d8c585f6f79cd2f15d473f4cd46dec0cf28657a4fa695efaad4bbfc963cc71fc5d8a4681a7a9f3e789b41c6e281329dae3117df2ec4c14a2cf5ca051 SHA512 22d7ba329f7e4c6a9b157f460e2076f1a08cd8f16fc68572c3f07b9ee10f8249855b2d7044be33710ce5ef1fecca3db351dd587001940cb834f9351f901df7fb +AUX libtool-2.4.6-sed-quote-speedup.patch 8262 BLAKE2B c9194732921aa28713c9e0019d5e9de7e1ad2d6a18059c0f7681b0d683bdf460bb8257381269e8193ead866f26af000a6bddfc7c56410f7fde94fbf32bdbe8af SHA512 d4a1ab01e1d6f3b05221bded3fc7c8204e686b1ac11dc00267a7a75a6759adfa8ac3d7041dc5710084031c7fe47f2deb88bc9c23e3502a944a97244942529927 +DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4 +EBUILD libtool-2.4.6-r3.ebuild 2586 BLAKE2B e9eafe307085043c84eced99cf201f3fbd9f5160d30ad570e600f28492058350a196537e795f779747fa2e34cec194667949ffd5c215d43d53ef4f5eb2251a28 SHA512 7b1282e9a158ba7ebebc332fcd22335863a32dad1af4721a68d6d3b01712821250ff4f19be9b246d2d04915605915c82b464e5e6f06da3445c6d592e23993fcc +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-devel/libtool/files/libtool-2.2.10-eprefix.patch b/sys-devel/libtool/files/libtool-2.2.10-eprefix.patch --- a/sys-devel/libtool/files/libtool-2.2.10-eprefix.patch false +++ b/sys-devel/libtool/files/libtool-2.2.10-eprefix.patch 816443604cc16cbed392704595c8dc07e1b09122435c00d328e9e20d0fc35184e33cc86aabb395cf096a99c3f40dc7fbc3f04fa05b3c08955165e8374a12ab62 @@ -0,0 +1,11 @@ +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -2087,7 +2087,7 @@ + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/$[[A-Za-z]]:$,\1,g'` ;; + esac +- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` ++ sys_lib_search_path_spec=`$ECHO "@GENTOO_PORTAGE_EPREFIX@/lib @GENTOO_PORTAGE_EPREFIX@/usr/lib $lt_search_path_spec" | $lt_NL2SP` + else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + fi]) diff -uNr a/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch b/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch --- a/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch false +++ b/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch a0b4477a6f6e87cb6818009797069b671903986ffba880ec6e309a206f5713f2df310e3685c45de29cfa8a8dcf159644f7c90f12e4e01296f1d3cabcec8bf500 @@ -0,0 +1,24 @@ +In Gentoo Prefix we go by Apple's convention to give modules the .bundle +extension. +http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html +(Above link was removed by Apple, the link below contains a copy: +http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, +in case it disappears also, the relevant quote: + +Bundle. Bundles are executable files that can be loaded at runtime by +other products. Plug-ins are implemented using bundles. The term bundle +in this context refers to the binary itself, not to a structured +hierarchy. Bundles have the .bundle extension; for example, +MyBundle.bundle.) + +--- libltdl/m4/libtool.m4 ++++ libltdl/m4/libtool.m4 +@@ -2271,7 +2271,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' diff -uNr a/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch b/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch --- a/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch false +++ b/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch 8b357137aa264281022f9c93f0e0db6f2ae9f7d55511bca6dcfa61b768c7cf9aa22b64acdf8f0365d51b1c77a5078e8d1973951ba1284ae0645b6c7444b16cae @@ -0,0 +1,38 @@ +Force linux-style versioning when generating shared libraries on +Gentoo/FreeBSD hosts only. + +Patch by Diego Elio Pettenò + +http://bugs.gentoo.org/109105 + +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -1375,7 +1375,14 @@ + *) objformat=elf ;; + esac + fi +- version_type=freebsd-$objformat ++ # Handle Gentoo/FreeBSD as it was Linux ++ case $host_vendor in ++ gentoo) ++ version_type=linux ;; ++ *) ++ version_type=freebsd-$objformat ;; ++ esac ++ + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +@@ -1386,6 +1392,12 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; ++ linux) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ need_lib_prefix=no ++ need_version=no ++ ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch b/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch --- a/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch 3e413c5c9e8d10658a3174719e428c152400a327f6f11637f161184722e825e5e30f211e40c27b67e7433e1ee5d08ecb331fbc2dd8002faa17e4cc58e8965e8a @@ -0,0 +1,13 @@ +* revert old 1.5 behaviour + +--- libtool-2.4.6/m4/libtool.m4 ++++ libtool-2.4.6/m4/libtool.m4 +@@ -2272,7 +2272,7 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' ++ library_names_spec='$libname$release$versuffix$shared_ext $libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch b/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch --- a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch 95931e735f6e2b21b341606190d5d2ad47e30bc9ff90069c90d6814da3194d1fa3dd20bd80943edd8a383ed8863f10a52becdd2efc4a43e6511fa903c35a89b9 @@ -0,0 +1,53 @@ +https://lists.gnu.org/archive/html/libtool-patches/2016-02/msg00002.html + +From 53419307d5b44e5b0cff80d76f88ea02f237b747 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 13 Feb 2016 03:32:20 -0500 +Subject: [PATCH] libtoolize: don't execute automake and autoconf on every + invocation. + +Same fix as applied to libtool in commit 408cfb9c5fa8a666917167ffb806cb +to delay use of automake/autoconf to when the --help option is actually +specified. + +* libtoolize.in (func_help): Override func_help() from +gl/build-aux/options-parser to only run automake --version and +autoconf --version when libtool --help is executed on the command +line. +--- + libtoolize.in | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/libtoolize.in b/libtoolize.in +index 3fe61ce..0d4af3d 100644 +--- a/libtoolize.in ++++ b/libtoolize.in +@@ -94,7 +94,12 @@ usage_message="Options: + " + + # Additional text appended to 'usage_message' in response to '--help'. +-long_help_message=$long_help_message" ++func_help () ++{ ++ $debug_cmd ++ ++ func_usage_message ++ $ECHO "$long_help_message + 'environment' show warnings about LIBTOOLIZE_OPTIONS content + 'file' show warnings about file copying and linking + +@@ -120,8 +125,9 @@ include the following information: + + Report bugs to <@PACKAGE_BUGREPORT@>. + GNU @PACKAGE@ home page: <@PACKAGE_URL@>. +-General help using GNU software: <http://www.gnu.org/gethelp/>. +-" ++General help using GNU software: <http://www.gnu.org/gethelp/>." ++ exit 0 ++} + + warning_categories='environment file' + +-- +2.6.2 + diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch b/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch --- a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch 7de69b639abe6b7e9f515b21f5e968b37297c2db0387f6ffee1645bc0cd7a8816133f7e1b378c4b7d26bf1257748a2a8a98b5abc4ea93ade624c948f4b4c9d8c @@ -0,0 +1,118 @@ +From 351a88feee66eda6ce33eb06acdebb8e9c6d6716 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <praiskup@redhat.com> +Date: Fri, 18 Sep 2015 23:17:07 +0200 +Subject: [PATCH] libtoolize: fix infinite recursion in m4 + +Some projects use this construct in configure.ac: + + m4_define([version], m4_include([version])) + pkg_version=version + +When the m4_include builtin is undefined (as was done in +libtoolize and extract-trace scripts), the call to this 'version' +macro enters an infinite recursion (until ENOMEM). So rather +re-define all potentially dangerous macros by empty strings, +suggested by Eric Blake. + +While we are on it, merge the macro-"blacklist" with similar list +implemented in gettext, except for 'm4_esyscmd'. It's kept +defined because we already trace AC_INIT macro for package +version, while it is often specified by +m4_esyscmd(git-version-gen). Similarly to m4_include, m4_esyscmd +might be opt-in-blacklisted in future. + +References: +http://lists.gnu.org/archive/html/libtool/2015-09/msg00000.html +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764580 + +* gl/build-aux/extract-trace (_G_mini): Redefine trace-breaking +macros to empty strings rather than undefining those. Use 'dnl' +for comments. +* bootstrap: Likewise, sync with extract-trace. +* NEWS: Document. +* NO-THANKS: Mention Hiroyuki Sato. + +Signed-off-by: Pavel Raiskup <praiskup@redhat.com> +--- + NEWS | 4 ++++ + NO-THANKS | 1 + + bootstrap | 42 +++++++++++++++++++++++++++--------------- + build-aux/extract-trace | 42 +++++++++++++++++++++++++++--------------- + 4 files changed, 59 insertions(+), 30 deletions(-) + +diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace +index 315a32a..c6abd21 100755 +--- a/build-aux/extract-trace ++++ b/build-aux/extract-trace +@@ -329,29 +329,41 @@ func_extract_trace () + # arguments to Autocof functions, but without following + # 'm4_s?include' files. + _G_mini=' +- # Initialisation. ++ dnl Initialisation. + m4_changequote([,]) + m4_define([m4_copy], [m4_define([$2], m4_defn([$1]))]) + m4_define([m4_rename], [m4_copy([$1], [$2])m4_undefine([$1])]) + +- # Disable these macros. +- m4_undefine([m4_dnl]) +- m4_undefine([m4_include]) +- m4_undefine([m4_m4exit]) +- m4_undefine([m4_m4wrap]) +- m4_undefine([m4_maketemp]) ++ dnl Replace macros which may abort m4 with a no-op variant. ++ m4_pushdef([m4_assert]) ++ m4_pushdef([m4_exit]) ++ m4_pushdef([m4_fatal]) ++ m4_pushdef([m4_m4exit]) + +- # Copy and rename macros not handled by "m4 --prefix". ++ dnl Replace macros that might break stderr of m4. ++ m4_pushdef([m4_errprint]) ++ m4_pushdef([m4_errprintn]) ++ m4_pushdef([m4_include]) ++ m4_pushdef([m4_warn]) ++ ++ dnl Avoid side-effects of tracing by extract-trace. ++ m4_pushdef([m4_maketemp]) ++ m4_pushdef([m4_mkstemp]) ++ ++ dnl TODO: reasons for this ++ m4_pushdef([m4_dnl]) ++ m4_pushdef([m4_m4wrap]) ++ ++ dnl Copy and rename macros not handled by "m4 --prefix". + m4_define([dnl], [m4_builtin([dnl])]) + m4_copy([m4_define], [m4_defun]) + m4_rename([m4_ifelse], [m4_if]) +- m4_ifdef([m4_mkstemp], [m4_undefine([m4_mkstemp])]) + m4_rename([m4_patsubst], [m4_bpatsubst]) + m4_rename([m4_regexp], [m4_bregexp]) + +- # "m4sugar.mini" - useful m4-time macros for dynamic arguments. +- # If we discover packages that need more m4 macros defined in +- # order to bootstrap correctly, add them here: ++ dnl "m4sugar.mini" - useful m4-time macros for dynamic arguments. ++ dnl If we discover packages that need more m4 macros defined in ++ dnl order to bootstrap correctly, add them here: + m4_define([m4_bmatch], + [m4_if([$#], 0, [], [$#], 1, [], [$#], 2, [$2], + [m4_if(m4_bregexp([$1], [$2]), -1, +@@ -362,11 +374,11 @@ func_extract_trace () + m4_define([m4_require], [$1]) + m4_define([m4_shift3], [m4_shift(m4shift(m4shift($@)))]) + +- # "autoconf.mini" - things from autoconf macros we care about. ++ dnl "autoconf.mini" - things from autoconf macros we care about. + m4_copy([m4_defun], [AC_DEFUN]) + +- # Dummy definitions for the macros we want to trace. +- # AM_INIT_AUTOMAKE at least produces no trace without this. ++ dnl Dummy definitions for the macros we want to trace. ++ dnl AM_INIT_AUTOMAKE at least produces no trace without this. + ' + + _G_save=$IFS +-- +2.6.2 + diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch b/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch --- a/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch e71fcc6da89a91e28a3c4de2c84683d11de80766fe6f6c358b75db62f2c98fc000703cc6d6ab2aad8418c2642aed011a941238d9422551fa483275c5ac237f12 @@ -0,0 +1,58 @@ +https://bugs.gentoo.org/573744 + +From a5c6466528c060cc4660ad0319c00740db0e42ba Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@macports.org> +Date: Sun, 18 Oct 2015 21:55:39 -0700 +Subject: [PATCH] libtool: fix GCC/clang linking with -fsanitize=* + +References: +https://lists.gnu.org/archive/html/libtool/2014-04/msg00026.html + +* build-aux/ltmain.in (func_mode_link): Pass -fsanitize=* to the +linker to allow trivial use of the clang address sanitizer. + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org> +Copyright-paperwork-exempt: Yes +--- + build-aux/ltmain.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +index 1cbe875..2a5aaad 100644 +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -5382,10 +5382,11 @@ func_mode_link () + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang ++ # -fsanitize=* Clang/GCC memory and address sanitizer + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ +- -specs=*) ++ -specs=*|-fsanitize=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" + +patch the generated file too to keep help2man from generating man pages +https://bugs.gentoo.org/556512 + +--- a/build-aux/ltmain.sh ++++ b/build-aux/ltmain.sh +@@ -5382,10 +5382,11 @@ func_mode_link () + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang ++ # -fsanitize=* Clang/GCC memory and address sanitizer + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ +- -specs=*) ++ -specs=*|-fsanitize=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" +-- +2.6.2 + diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch b/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch --- a/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch 6614f66e73002bf786257b47762db35cd518c95cffabf8379b18a82582867c5dd5d4a296926b38b117265e32a4e32561ba065a5960e2d6c6981e4449483ad4a8 @@ -0,0 +1,54 @@ +https://lists.gnu.org/archive/html/libtool-patches/2015-03/msg00000.html +https://lists.gnu.org/archive/html/libtool-patches/2016-02/msg00001.html + +From 2f258b87ce4415edede1b2a84a3a7dbcf44555c2 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 16 Mar 2015 18:17:31 -0400 +Subject: [PATCH] libtool: pass through -fuse-ld flags + +Starting with gcc-4.8, there's a -fuse-ld flag that can be used to select +between bfd & gold. Make sure we pass it through to the linking stage. + +* build-aux/ltmain.in (func_mode_link): Pass -fuse-ld=* flags through. +--- + build-aux/ltmain.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +index 2a5aaad..4c24d5d 100644 +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -5383,10 +5383,11 @@ func_mode_link () + # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer ++ # -fuse-ld=* Linker select flags for GCC + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ +- -specs=*|-fsanitize=*) ++ -specs=*|-fsanitize=*|-fuse-ld=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" + +patch the generated file too to keep help2man from generating man pages +https://bugs.gentoo.org/556512 + +--- a/build-aux/ltmain.sh ++++ b/build-aux/ltmain.sh +@@ -5383,10 +5383,11 @@ func_mode_link () + # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer ++ # -fuse-ld=* Linker select flags for GCC + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ +- -specs=*|-fsanitize=*) ++ -specs=*|-fsanitize=*|-fuse-ld=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" +-- +2.3.2 diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch b/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch --- a/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch 383dfbc56075b85260a20ce99759ee8a84652154a6ba4676ae7aacb8004ba838a23f96ca639974b1dad991bac3eb9f08202110dea35fc3730dd912c12b703122 @@ -0,0 +1,57 @@ +From 702a97fbb09bd7088a50f2b239016d1e32843c24 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <praiskup@redhat.com> +Date: Fri, 18 Sep 2015 10:36:43 +0200 +Subject: [PATCH] libtool: fix GCC linking with -specs=* + +References: +https://bugzilla.redhat.com/show_bug.cgi?id=985592 + +* build-aux/ltmain.in (func_mode_link): Pass -specs=* +to the linker, Fedora uses this option for hardening. + +Signed-off-by: Pavel Raiskup <praiskup@redhat.com> +--- + build-aux/ltmain.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +index d5cf07a..0c40da0 100644 +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -5360,10 +5360,12 @@ func_mode_link () + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization ++ # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) ++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ ++ -specs=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" + +patch the generated file too to keep help2man from generating man pages +https://bugs.gentoo.org/556512 + +--- a/build-aux/ltmain.sh ++++ b/build-aux/ltmain.sh +@@ -5360,10 +5360,12 @@ func_mode_link () + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization ++ # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) ++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ ++ -specs=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" +-- +2.6.2 + diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-mint.patch b/sys-devel/libtool/files/libtool-2.4.6-mint.patch --- a/sys-devel/libtool/files/libtool-2.4.6-mint.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-mint.patch 960aa8017d605ffea6b0d74c181c135c92eee99bb21d2ac7fe31926ae6d53d8ac75570169708f48e19674afe46a7450bb63f55998fd5ca26a0ab5eeaa4faea22 @@ -0,0 +1,49 @@ +Patch by Alan Hourihane + +http://bugs.gentoo.org/show_bug.cgi?id=266984 + +diff -ur libtool-2.2.6/configure libtool-2.2.6-mint/configure +--- libtool-2.2.6/configure 2008-09-07 17:52:50.000000000 +0000 ++++ libtool-2.2.6/configure 2009-04-21 08:49:27.000000000 +0000 +@@ -4986,6 +4986,11 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + ++ mint*) ++ # On MiNT this can take a long time and run out of memory. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. +diff -ur libtool-2.2.6/libltdl/configure libtool-2.2.6-mint/libltdl/configure +--- libtool-2.2.6/libltdl/configure 2008-09-07 17:53:05.000000000 +0000 ++++ libtool-2.2.6/libltdl/configure 2009-04-21 08:50:08.000000000 +0000 +@@ -4422,6 +4422,11 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + ++ mint*) ++ # On MiNT this can take a long time and run out of memory. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. +diff -ur libtool-2.2.6/libltdl/m4/libtool.m4 libtool-2.2.6-mint/libltdl/m4/libtool.m4 +--- libtool-2.2.6/m4/libtool.m4 2008-09-05 11:54:41.000000000 +0000 ++++ libtool-2.2.6/m4/libtool.m4 2009-04-21 08:50:26.000000000 +0000 +@@ -1527,6 +1527,11 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + ++ mint*) ++ # On MiNT this can take a long time and run out of memory. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch b/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch --- a/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch d312376a757657d43ff64965ea64570189f1536b59f2cdea05ba213c4da56f9ff28092cf0c58f29c0290ec36def4e7b14c41dd15e72be3f8023c50c867f39943 @@ -0,0 +1,111 @@ +From 020afd7d6410f73bc205206abe1b88b4890b83b1 Mon Sep 17 00:00:00 2001 +From: Leno Hou <lenohou@gmail.com> +Date: Sun, 24 Apr 2016 00:46:53 +0800 +Subject: [PATCH] [m4/libtool.m4] linker error for powerpc64le-unknown-linux-gnu + +Hi all, + + 1) As we might know, Gentoo has powerpc64le-unknown-linux-gnu compiler + +leno@localhost ~ $ powerpc64le-unknown-linux-gnu-gcc -v + +Using built-in specs. + +COLLECT_GCC=/usr/powerpc64le-unknown-linux-gnu/gcc-bin/5.3.0/powerpc64le-unknown-linux-gnu-gcc + +COLLECT_LTO_WRAPPER=/usr/libexec/gcc/powerpc64le-unknown-linux-gnu/5.3.0/lto-wrapper + +Target: powerpc64le-unknown-linux-gnu + +Configured with: +/var/tmp/portage/sys-devel/gcc-5.3.0/work/gcc-5.3.0/configure +--host=powerpc64le-unknown-linux-gnu --build=powerpc64le-unknown-linux-gnu +--prefix=/usr --bindir=/usr/powerpc64le-unknown-linux-gnu/gcc-bin/5.3.0 +--includedir=/usr/lib/gcc/powerpc64le-unknown-linux-gnu/5.3.0/include +--datadir=/usr/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0 +--mandir=/usr/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0/man +--infodir=/usr/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0/info +--with-gxx-include-dir=/usr/lib/gcc/powerpc64le-unknown-linux-gnu/5.3.0/include/g++-v5 +--with-python-dir=/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0/python +--enable-languages=c,c++,fortran --enable-obsolete --enable-secureplt +--disable-werror --with-system-zlib --enable-nls --without-included-gettext +--enable-checking=release --with-bugurl=https://bugs.gentoo.org/ +--with-pkgversion='Gentoo 5.3.0 p1.0, pie-0.6.5' --enable-libstdcxx-time +--enable-shared --enable-threads=posix --enable-__cxa_atexit +--enable-clocale=gnu --disable-multilib --enable-altivec +--disable-fixed-point --enable-targets=all --disable-libgcj +--enable-libgomp --disable-libmudflap --disable-libssp --disable-libcilkrts +--enable-lto --without-isl --enable-libsanitizer + +Thread model: posix + +gcc version 5.3.0 (Gentoo 5.3.0 p1.0, pie-0.6.5) + + 2) And the supported emulations + +leno@localhost ~ $ powerpc64le-unknown-linux-gnu-ld -V +GNU ld (Gentoo 2.25.1 p1.1) 2.25.1 + Supported emulations: + elf64lppc + elf32lppc + elf32lppclinux + elf32lppcsim + + 3) But when I set CHOST="powerpc64le-unkown-linux-gnu" in Gentoo and +execute aclocal, automake, libtoolize --copy --force, autoconf. When I +glance in the latest m4/libtool.m4 : + +if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in +... + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; +... + *64-bit*) + case $host in +... + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; +... + +seems linked to $LD='$LD-ld -m elf64ppc' and failed to compile packages. + + 4) Below is my workaround patch and works fine for this case. If this is +OK for you, Could this to be merged in upstream? Thanks + +URL: https://debbugs.gnu.org/23348 +URL: https://bugs.gentoo.org/581314 +--- + m4/libtool.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +index ee292aff5bca..758b6951ae07 100644 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -1417,10 +1417,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- powerpcle-*linux*) ++ powerpcle-*linux*|powerpc64le-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; +- powerpc-*linux*) ++ powerpc-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) +-- +2.11.1 + diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-pthread.patch b/sys-devel/libtool/files/libtool-2.4.6-pthread.patch --- a/sys-devel/libtool/files/libtool-2.4.6-pthread.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-pthread.patch aff96f7b346cc7aebee627d902c439ced2be213652d2b6ebe1d7b32784626a2cfbf10b5e97c3f5194c3b05fadf7330f0b24dbd3734de1490806775c06e2d1c20 @@ -0,0 +1,43 @@ +http://permalink.gmane.org/gmane.comp.gnu.libtool.patches/11704 +https://bugs.gentoo.org/650876 + +From: Pavel Raiskup <praiskup <at> redhat.com> +Subject: [PATCH] libtool: handle the -pthread{,s} options for g++ +Newsgroups: gmane.comp.gnu.libtool.patches +Date: Thursday 28th November 2013 14:18:05 UTC (over 4 years ago) + +As we are forced to pass -nostdlib to g++ for linking, this option +expectedly disables the effectiveness of passed -pthread flag - so +add the -lpthread explicitly to $deplibs to link correctly. + +References: +http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460 +https://bugzilla.redhat.com/show_bug.cgi?id=661333 +http://lists.gnu.org/archive/html/bug-libtool/2013-01/msg00018.htm + +* build-aux/ltmain.in (func_mode_link): Explicitly add -lpthread +flag into $deplibs when -pthread is passed (for g++ only). +--- + build-aux/ltmain.in | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +index fba05c1..f202b80 100644 +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -5113,6 +5113,16 @@ func_mode_link () + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac ++ ++ # As we are forced to pass -nostdlib to g++ during linking, the option ++ # -pthread{,s} is not in effect; add the -lpthread to $deplist ++ # explicitly to link correctly. ++ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then ++ case "$arg" in ++ -pthread*) func_append deplibs " -lpthread" ;; ++ esac ++ fi ++ + continue + ;; diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch b/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch --- a/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch a652a83246792ecd0c8c28664fc2d4305e3e252bd001ef4fc5522f9c6181921bd7c0cbf7c1c358a1998d0352904a3e35c2a054a81175d3eb664873e965fdd971 @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/650876 + +--- libtool-2.4.6/build-aux/ltmain.sh ++++ libtool-2.4.6/build-aux/ltmain.sh +@@ -7079,6 +7079,16 @@ + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac ++ ++ # As we are forced to pass -nostdlib to g++ during linking, the option ++ # -pthread{,s} is not in effect; add the -lpthread to $deplist ++ # explicitly to link correctly. ++ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then ++ case "$arg" in ++ -pthread*) func_append deplibs " -lpthread" ;; ++ esac ++ fi ++ + continue + ;; + diff -uNr a/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch b/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch --- a/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch false +++ b/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch fd0cebf86e76b8e0b8a5d9eba74bd29b30a0275c9669eb2833c2e8815a4771a1b203874b64448160c63986bb79e248f08be983fa9b1af790a057e3ec58672f95 @@ -0,0 +1,268 @@ +https://bugs.gentoo.org/542252 + +From 32f0df9835ac15ac17e04be57c368172c3ad1d19 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <praiskup@redhat.com> +Date: Sun, 4 Oct 2015 21:55:03 +0200 +Subject: [PATCH] libtool: mitigate the $sed_quote_subst slowdown + +When it is reasonably possible, use shell implementation for +quoting. + +References: +http://lists.gnu.org/archive/html/libtool/2015-03/msg00005.html +http://lists.gnu.org/archive/html/libtool/2015-02/msg00000.html +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20006 + +* gl/build-aux/funclib.sh (func_quote): New function that can be +used as substitution for '$SED $sed_quote_subst' call. +* build-aux/ltmain.in (func_emit_wrapper): Use func_quote instead +of '$SED $sed_quote_subst'. +(func_mode_link): Likewise. +* NEWS: Document. +* bootstrap: Sync with funclib.sh. +--- + NEWS | 3 +++ + bootstrap | 61 +++++++++++++++++++++++++++++++++++++++++++------ + build-aux/ltmain.in | 10 ++++---- + gl/build-aux/funclib.sh | 61 +++++++++++++++++++++++++++++++++++++++++++------ + 4 files changed, 117 insertions(+), 18 deletions(-) + +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +index 0c40da0..24acefd 100644 +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -3346,7 +3346,8 @@ else + if test \"\$libtool_execute_magic\" != \"$magic\"; then + file=\"\$0\"" + +- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` ++ func_quote "$ECHO" ++ qECHO=$func_quote_result + $ECHO "\ + + # A function that is used when there is no print builtin or printf. +@@ -8596,8 +8597,8 @@ EOF + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done +- relink_command="(cd `pwd`; $relink_command)" +- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` ++ func_quote "(cd `pwd`; $relink_command)" ++ relink_command=$func_quote_result + fi + + # Only actually do things if not in dry run mode. +@@ -8843,7 +8844,8 @@ EOF + done + # Quote the link command for shipping. + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" +- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` ++ func_quote "$relink_command" ++ relink_command=$func_quote_result + if test yes = "$hardcode_automatic"; then + relink_command= + fi +diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh +index 39d972e..47d8b95 100644 +--- a/build-aux/funclib.sh ++++ b/build-aux/funclib.sh +@@ -1,5 +1,5 @@ + # Set a version string for this script. +-scriptversion=2015-01-20.17; # UTC ++scriptversion=2015-10-04.22; # UTC + + # General shell script boiler plate, and helper functions. + # Written by Gary V. Vaughan, 2004 +@@ -1026,6 +1026,57 @@ func_relative_path () + } + + ++# func_quote ARG ++# -------------- ++# Aesthetically quote one ARG, store the result into $func_quote_result. Note ++# that we keep attention to performance here (so far O(N) complexity as long as ++# func_append is O(1)). ++func_quote () ++{ ++ $debug_cmd ++ ++ func_quote_result=$1 ++ ++ case $func_quote_result in ++ *[\\\`\"\$]*) ++ case $func_quote_result in ++ *[\[\*\?]*) ++ func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"` ++ return 0 ++ ;; ++ esac ++ ++ func_quote_old_IFS=$IFS ++ for _G_char in '\' '`' '"' '$' ++ do ++ # STATE($1) PREV($2) SEPARATOR($3) ++ set start "" "" ++ func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy ++ IFS=$_G_char ++ for _G_part in $func_quote_result ++ do ++ case $1 in ++ quote) ++ func_append func_quote_result "$3$2" ++ set quote "$_G_part" "\\$_G_char" ++ ;; ++ start) ++ set first "" "" ++ func_quote_result= ++ ;; ++ first) ++ set quote "$_G_part" "" ++ ;; ++ esac ++ done ++ IFS=$func_quote_old_IFS ++ done ++ ;; ++ *) ;; ++ esac ++} ++ ++ + # func_quote_for_eval ARG... + # -------------------------- + # Aesthetically quote ARGs to be evaled later. +@@ -1042,12 +1093,8 @@ func_quote_for_eval () + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do +- case $1 in +- *[\\\`\"\$]*) +- _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; +- *) +- _G_unquoted_arg=$1 ;; +- esac ++ func_quote "$1" ++ _G_unquoted_arg=$func_quote_result + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + +patch the generated file too to keep help2man from generating man pages +https://bugs.gentoo.org/556512 + +--- a/build-aux/ltmain.sh ++++ b/build-aux/ltmain.sh +@@ -1,5 +1,5 @@ + # Set a version string for this script. +-scriptversion=2015-01-20.17; # UTC ++scriptversion=2015-10-04.22; # UTC + + # General shell script boiler plate, and helper functions. + # Written by Gary V. Vaughan, 2004 +@@ -1026,6 +1026,57 @@ func_relative_path () + } + + ++# func_quote ARG ++# -------------- ++# Aesthetically quote one ARG, store the result into $func_quote_result. Note ++# that we keep attention to performance here (so far O(N) complexity as long as ++# func_append is O(1)). ++func_quote () ++{ ++ $debug_cmd ++ ++ func_quote_result=$1 ++ ++ case $func_quote_result in ++ *[\\\`\"\$]*) ++ case $func_quote_result in ++ *[\[\*\?]*) ++ func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"` ++ return 0 ++ ;; ++ esac ++ ++ func_quote_old_IFS=$IFS ++ for _G_char in '\' '`' '"' '$' ++ do ++ # STATE($1) PREV($2) SEPARATOR($3) ++ set start "" "" ++ func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy ++ IFS=$_G_char ++ for _G_part in $func_quote_result ++ do ++ case $1 in ++ quote) ++ func_append func_quote_result "$3$2" ++ set quote "$_G_part" "\\$_G_char" ++ ;; ++ start) ++ set first "" "" ++ func_quote_result= ++ ;; ++ first) ++ set quote "$_G_part" "" ++ ;; ++ esac ++ done ++ IFS=$func_quote_old_IFS ++ done ++ ;; ++ *) ;; ++ esac ++} ++ ++ + # func_quote_for_eval ARG... + # -------------------------- + # Aesthetically quote ARGs to be evaled later. +@@ -1042,12 +1093,8 @@ func_quote_for_eval () + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do +- case $1 in +- *[\\\`\"\$]*) +- _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; +- *) +- _G_unquoted_arg=$1 ;; +- esac ++ func_quote "$1" ++ _G_unquoted_arg=$func_quote_result + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else +@@ -3346,7 +3346,8 @@ else + if test \"\$libtool_execute_magic\" != \"$magic\"; then + file=\"\$0\"" + +- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` ++ func_quote "$ECHO" ++ qECHO=$func_quote_result + $ECHO "\ + + # A function that is used when there is no print builtin or printf. +@@ -8596,8 +8597,8 @@ EOF + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done +- relink_command="(cd `pwd`; $relink_command)" +- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` ++ func_quote "(cd `pwd`; $relink_command)" ++ relink_command=$func_quote_result + fi + + # Only actually do things if not in dry run mode. +@@ -8843,7 +8844,8 @@ EOF + done + # Quote the link command for shipping. + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" +- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` ++ func_quote "$relink_command" ++ relink_command=$func_quote_result + if test yes = "$hardcode_automatic"; then + relink_command= + fi +-- +2.6.2 + diff -uNr a/sys-devel/libtool/libtool-2.4.6-r3.ebuild b/sys-devel/libtool/libtool-2.4.6-r3.ebuild --- a/sys-devel/libtool/libtool-2.4.6-r3.ebuild false +++ b/sys-devel/libtool/libtool-2.4.6-r3.ebuild 213918d80cd34b9059d86ed536ea2ac114aae4c913b428ac76d9c648b4f804e6dfbe22b8d67d4ae0ce89a4fb33a54abe240a7abbd3f7a88f30911c040e60ab5b @@ -0,0 +1,94 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +LIBTOOLIZE="true" #225559 +WANT_LIBTOOL="none" +inherit autotools epatch epunt-cxx multilib unpacker + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git + http://git.savannah.gnu.org/r/${PN}.git" + inherit git-r3 +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +fi + +DESCRIPTION="A shared library tool for developers" +HOMEPAGE="https://www.gnu.org/software/libtool/" + +LICENSE="GPL-2" +SLOT="2" +IUSE="vanilla" + +# Pull in libltdl directly until we convert packages to the new dep. +RDEPEND="sys-devel/gnuconfig + >=sys-devel/autoconf-2.69 + >=sys-devel/automake-1.13 + dev-libs/libltdl:0 + !<sys-apps/sandbox-2.10-r4" +DEPEND="${RDEPEND} + app-arch/xz-utils" +[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man" + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-r3_src_unpack + cd "${S}" + ./bootstrap || die + else + unpacker_src_unpack + fi +} + +src_prepare() { + use vanilla && return 0 + + epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105 + epatch "${FILESDIR}"/${P}-link-specs.patch + epatch "${FILESDIR}"/${P}-link-fsanitize.patch #573744 + epatch "${FILESDIR}"/${P}-link-fuse-ld.patch + epatch "${FILESDIR}"/${P}-libtoolize-slow.patch + epatch "${FILESDIR}"/${P}-libtoolize-delay-help.patch + epatch "${FILESDIR}"/${P}-sed-quote-speedup.patch #542252 + epatch "${FILESDIR}"/${P}-ppc64le.patch #581314 + pushd libltdl >/dev/null + AT_NOELIBTOOLIZE=yes eautoreconf + popd >/dev/null + AT_NOELIBTOOLIZE=yes eautoreconf + epunt_cxx + + # Make sure timestamps don't trigger a rebuild of man pages. #556512 + if [[ ${PV} != "9999" ]] ; then + touch doc/*.1 + export HELP2MAN=false + fi +} + +src_configure() { + # the libtool script uses bash code in it and at configure time, tries + # to find a bash shell. if /bin/sh is bash, it uses that. this can + # cause problems for people who switch /bin/sh on the fly to other + # shells, so just force libtool to use /bin/bash all the time. + export CONFIG_SHELL=/bin/bash + + # Do not bother hardcoding the full path to sed. Just rely on $PATH. #574550 + export ac_cv_path_SED=$(basename "$(type -P sed)") + + ECONF_SOURCE=${S} econf --disable-ltdl-install +} + +src_test() { + emake check +} + +src_install() { + default + + local x + while read -d $'\0' -r x ; do + ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die + done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0) +} diff -uNr a/sys-devel/libtool/metadata.xml b/sys-devel/libtool/metadata.xml --- a/sys-devel/libtool/metadata.xml false +++ b/sys-devel/libtool/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest --- a/sys-devel/m4/Manifest false +++ b/sys-devel/m4/Manifest 712410522f73623774ebc57666c55ad39a1ff9244347214ef699ca50fdb21ec406eef8d9257f0a12f64fa1830ce2a3643adf5e889db0546e0aaf98cec8cb487b @@ -0,0 +1,5 @@ +AUX m4-1.4.17-posix_spawn.patch 3302 BLAKE2B fe00346f2f180fe70ef867376d9a3f0da632d83aeee21aa524642ec061e6c1e37538c37d266a32aea63c6a8f776ee3bc85fd82f447704c1e73965132f528030a SHA512 82f6f1960a290265f1a7a3c868a780fa0816194c26ed5fc8337e35983021798c55db7c75fccf979a7dcc73253d1864cbf2de89a906fc6bf8458a524e2c4604c8 +AUX m4-1.4.18-darwin17-printf-n.patch 1386 BLAKE2B e5b1e4750b21b4efc0e62f2447a3f40dd037e28b5fe833d3ddf87fe853ee8885e34c5720b7b00f08242131df9996d36f4a954571ed21d067ca0dfeae69961e09 SHA512 4ad476e538c85ee41280461269dd8acabdbdb9cd2e0e2e49ea43bc14eb370e17282c504403a7c2914d886adf703bcc3b95991724bed90dc014a66cb861a70faf +DIST m4-1.4.17.tar.xz 1149088 BLAKE2B ccba6a1cd80de241bc2e755addbf4876b00ab776e0a3c85691998e3e84e8a091d57d8c3e9b43a115e52e416450de791662a54ca8e64e1603a166029164f140ce SHA512 406e6e97c3f5c5f3c8055bac748d4fe8c2e861d97e84ab6d840a2caa7df04f523cc662d6d51f6afae7d6c219d03693c7ae0c1e669a80246a3ceb5e8342b82389 +EBUILD m4-1.4.17.ebuild 1631 BLAKE2B 31ad1805e4ea0fdc1ad1d958efe5825447b4f4336c1fc21af7f07f9cf806bdc585eb35779f38bd8f6a7abaea98e5ee3e5505569208f020b83a8514d699dfddd1 SHA512 f4765e8b754c263d445007ac503250b157e6d28754dffc857a954a9c8fea20ec6fd73485887453a7892a738b49b8cc70e6dd994ec3671d742281565a419ca0b5 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch b/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch --- a/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch false +++ b/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch e853fb8d7b1f0f4016d53ea90b6f41aa3d8c2966da1abde135698395136d94e333b85553f58bce4a330d6c7942549ff5ea45414d3d90e9e0a972bf38732dfb42 @@ -0,0 +1,111 @@ +This fixes the search for posix_spawn() to use AC_SEARCH_LIBS which +is needed for uClibc which puts the function in librt [1]. The fix +is in gnulib commit d6eab2e [2], but we can't just apply that patch +and autoreconf because that means we must depend on autotools.eclass +and this leads to a circular dependency. So we have to patch +configure directlly. + +[1] https://bugs.gentoo.org/show_bug.cgi?id=580688 +[2] http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=d6eab2e70fc5ccc82a73e5c988b76a229e4cd3d5 +[3] https://bugs.gentoo.org/show_bug.cgi?id=581086 + +Signed-off-by: Anthony G. Basile <blueness@gentoo.org> + +diff -Naur m4-1.4.17.orig/configure m4-1.4.17/configure +--- m4-1.4.17.orig/configure 2013-09-22 06:38:28.000000000 +0000 ++++ m4-1.4.17/configure 2016-04-25 22:27:12.774118561 +0000 +@@ -808,6 +808,7 @@ + GNULIB_SIGNAL_H_SIGPIPE + GNULIB_RAISE + GNULIB_PTHREAD_SIGMASK ++LIB_POSIX_SPAWN + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE +@@ -3590,7 +3591,6 @@ + as_fn_append ac_func_list " mkstemp" + as_fn_append ac_func_list " nl_langinfo" + as_fn_append ac_func_list " pipe2" +-as_fn_append ac_func_list " posix_spawn" + gl_printf_safe=yes + as_fn_append ac_func_list " isblank" + as_fn_append ac_func_list " iswctype" +@@ -15877,8 +15881,78 @@ + + + ++ LIB_POSIX_SPAWN= ++ ++ gl_saved_libs=$LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing posix_spawn" >&5 ++$as_echo_n "checking for library containing posix_spawn... " >&6; } ++if ${ac_cv_search_posix_spawn+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char posix_spawn (); ++int ++main () ++{ ++return posix_spawn (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' rt; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_posix_spawn=$ac_res ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if ${ac_cv_search_posix_spawn+:} false; then : ++ break ++fi ++done ++if ${ac_cv_search_posix_spawn+:} false; then : ++ ++else ++ ac_cv_search_posix_spawn=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_posix_spawn" >&5 ++$as_echo "$ac_cv_search_posix_spawn" >&6; } ++ac_res=$ac_cv_search_posix_spawn ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ test "$ac_cv_search_posix_spawn" = "none required" || ++ LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn ++fi ++ ++ for ac_func in posix_spawn ++do : ++ ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn" ++if test "x$ac_cv_func_posix_spawn" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_POSIX_SPAWN 1 ++_ACEOF + ++fi ++done + ++ LIBS=$gl_saved_libs + + if test $ac_cv_func_posix_spawn != yes; then + HAVE_POSIX_SPAWN=0 diff -uNr a/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch b/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch --- a/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch false +++ b/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch a9d90ab1a556d3ef8d05b70ab1640fba3f63343da86d2388b92bc8dd51a7b016546093db3b6a002078c40d40172a2faffa83e4c79593f41cb52dc8c06a6b2699 @@ -0,0 +1,30 @@ +http://lists.gnu.org/archive/html/bug-gnulib/2017-07/txtmumXtpD69v.txt + +extract of only the relevant hunk to avoid irrelevant conflicts + +From c41f233c4c38e84023a16339782ee306f03e7f59 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <address@hidden> +Date: Fri, 7 Jul 2017 14:10:20 -0700 +Subject: [PATCH] vasnprintf: port to macOS 10.13 + +Problem reported by comex in: +http://lists.gnu.org/archive/html/bug-gnulib/2017-07/msg00056.html +* lib/vasnprintf.c (VASNPRINTF): Donât use %n on macOS. + +diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c +index 9c2af0e..fecaf27 100644 +--- a/lib/vasnprintf.c ++++ b/lib/vasnprintf.c +@@ -4869,7 +4869,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) ++# if ! (((__GLIBC__ > 2 \ ++ || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ ++ && !defined __UCLIBC__) \ ++ || (defined __APPLE__ && defined __MACH__) \ ++ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + fbp[1] = '%'; + fbp[2] = 'n'; + fbp[3] = '\0'; diff -uNr a/sys-devel/m4/m4-1.4.17.ebuild b/sys-devel/m4/m4-1.4.17.ebuild --- a/sys-devel/m4/m4-1.4.17.ebuild false +++ b/sys-devel/m4/m4-1.4.17.ebuild daa8cc581928612cb96284ed6d86698a6be039f7c0c7c1862ecc470e42237cef61e123aa5fa41c61922a11666edfb7fb00edce086417abb88f646e7c1690069e @@ -0,0 +1,54 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils + +DESCRIPTION="GNU macro processor" +HOMEPAGE="https://www.gnu.org/software/m4/m4.html" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" + +# remember: cannot dep on autoconf since it needs us +DEPEND="app-arch/xz-utils" +RDEPEND="" + +src_prepare() { + epatch "${FILESDIR}"/${P}-posix_spawn.patch #580688, 581086 + + # Disable gnulib build test that has no impact on the source. + # Re-enable w/next version bump (and gnulib is updated). #554728 + [[ ${PV} != "1.4.17" ]] && die "re-enable test #554728" + echo 'exit 0' > tests/test-update-copyright.sh || die +} + +src_configure() { + # Disable automagic dependency over libsigsegv; see bug #278026 + export ac_cv_libsigsegv=no + + local myconf="" + [[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g" + econf --enable-changeword ${myconf} +} + +src_test() { + [[ -d /none ]] && die "m4 tests will fail with /none/" #244396 + emake check +} + +src_install() { + default + # autoconf-2.60 for instance, first checks gm4, then m4. If we don't have + # gm4, it might find gm4 from outside the prefix on for instance Darwin + use prefix && dosym /usr/bin/m4 /usr/bin/gm4 + if use examples ; then + docinto examples + dodoc examples/* + rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile* + fi +} diff -uNr a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml --- a/sys-devel/m4/metadata.xml false +++ b/sys-devel/m4/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/make/Manifest b/sys-devel/make/Manifest --- a/sys-devel/make/Manifest false +++ b/sys-devel/make/Manifest cbf91fe7ab7f0fdf877e38644148216632b225c3459729ab0820cf42e72d6578f817cf60e6689e845d06824b74ee5a2c57a6b23e81213de7bc633945760c524b @@ -0,0 +1,10 @@ +AUX make-3.82-darwin-library_search-dylib.patch 386 BLAKE2B 4341e38aa89d08442dde331a7640b95771fb2cad824a32642c8b6bfbcffe609ae1af189d3e49c2eb529cfcbe10e137b9dc34cee3d7aecc8995c9a4459817bc8a SHA512 abd63b6a6d0b3bf77c5f26f0f711d148dd47964564d17562d9714272ff37700afffad50d77d5921c47b1f3eb705112b854ad15933740751071d2579123f9f259 +AUX make-4.1-fix_null_returns_from_ttyname.patch 1888 BLAKE2B 2aee82af5c6d2f8b5fb1d45be2708b6c0f5632236a0be948f16e1e59bd6619145913d4920c8428907479ae29fbc105663f9bbcbd3951ba60b8cead5793b34f65 SHA512 47eb22909be25618fbc120fe5b844207989135101ada960c69557f898b2345c52a25fc329945324cd968f19fc3835330d939cf4ec2faf5ccf5c54e20dc02a1da +AUX make-4.2-default-cxx.patch 269 BLAKE2B 6bbadfe43e3494c7dbd423edc5caf1eba1b6c3bb8f3b2f04368ccbe5c03f248a2692ba1b2299b966bd630c94e2b66674c079eaafa9b3b3c54bd163e75ac53f9f SHA512 b9c6254c8111111d9986de617023fad1673a8992d5a8b2e1e5ce32a92f5e4d064e1a9677b44f1d647a54ddd1c62782eccfd2d71ddc8d41baee141f65bdc894fe +AUX make-4.2.1-glob-internals.patch 1752 BLAKE2B 97616f18dcc30dbda296942d7dfa5b1a70c65e6d0c24314c5ae6b30102b81ff5ca0114f9c2a2fa777173204bf5bb0ea9b793317d2d7f7d44ae734e9174c6f361 SHA512 79b5454fa2f1e976611ecf5de99e764d4c9a85917d3d97ce424cd56b0954430f3e31fd2254a30320469f0b30c464734e3633b89d8374b3e4b8d182a342325ab1 +AUX make-4.2.1-glob-v2.patch 1073 BLAKE2B bcced0694ed0206394d750452cec2c0ee8356fd8b779b9ee4d6fbf0d3dd736a0465b0f12a1629508669efb7c4ffe1d17f1aeb9b925d86e9e75a5b90119ddd5c9 SHA512 2f19578979cc5af622d6571e4d9c97e5567acd4036076e9c426a8d4505b6da191cf9b6edb1cecc0aff14efce52d3062c21d10a36d569743acdfc660007f928f4 +AUX make-4.2.1-guile-2.2.patch 11401 BLAKE2B 0bd3c4d813d0205eb2a204f4819fcad3f188bd3a2656e9883643561c82cbf2a58aa22cae46429094856aea76e0396529df3c39aa37f6f69ea9fbc2379e686a62 SHA512 c1c827f1f6400a973fee87d143061c0635b1d37c6aa25b0d1c92a83dc535aff1edf515d92006d029575e10b4199be4ac290a01a8ab433c71e075852274a8ae43 +AUX make-4.2.1-perl526.patch 655 BLAKE2B 98bc8bf7ec5bcdb0d726b046ae58cebada8e360087da4c212da19a4cda622c5bbc1c00782802589aee3142a62c3b8a2df18cfa8bc98c523e2eb65aaa29398a6d SHA512 3817f6efed5fbcd2bb9d1747bea4af5a197ef4aa552ab79accee5139d25241956eca669edd19eff32df2a51fee666b6bc398fb6277b1f92f6175eca2d2228d6e +DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 +EBUILD make-4.2.1.ebuild 1332 BLAKE2B ab744c309f5028fea543a233361ed9841470bac7995e8a28f917eff6b75f62f75f927172a73653d61b7fab316d673d05f0c5b43e70b2f3694b0bb2bea8adcf86 SHA512 53acda59b308a096c8ccb6e571437f2745d6e9ad734780798d2df8b4693e93f2c3fc50646de6c6c5d5c0a9bee6a313c33ae1eb56713166ddfb6f3b4f7e003cb4 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch --- a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch false +++ b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch 093270c998f73b5ce83dd883069e3cedbe14beda671e9fc58f8ca418235c634f84374aea6386ed72e1aaeede376c1aaed9c0b555f21d694eb30b588243cd5e0f @@ -0,0 +1,17 @@ +Fixed default libpatttern on Darwin, imported from prefix overlay. +Got merged upstream: +https://savannah.gnu.org/bugs/?37197 +--- a/default.c ++++ b/default.c +@@ -509,7 +509,11 @@ + #ifdef __MSDOS__ + ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", + #else ++#ifdef __APPLE__ ++ ".LIBPATTERNS", "lib%.dylib lib%.a", ++#else + ".LIBPATTERNS", "lib%.so lib%.a", ++#endif + #endif + #endif + diff -uNr a/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch b/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch --- a/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch false +++ b/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch e241a0126edcb536a7a592d4ad251a0f450031cdc563cefb1f7edbc6fc306e2a87bb8a218b549c7eec4db93391b93c634484b5fc486cfabf2d4c966f1a588ea8 @@ -0,0 +1,53 @@ +From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001 +From: Paul Smith <psmith@gnu.org> +Date: Mon, 20 Oct 2014 05:54:56 +0000 +Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname(). + +--- +diff --git a/main.c b/main.c +index b2d169c..0cdb8a8 100644 +--- a/main.c ++++ b/main.c +@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp) + #ifdef HAVE_ISATTY + if (isatty (fileno (stdout))) + if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT"))) +- define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)), +- o_default, 0)->export = v_export; +- ++ { ++ const char *tty = TTYNAME (fileno (stdout)); ++ define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME, ++ o_default, 0)->export = v_export; ++ } + if (isatty (fileno (stderr))) + if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR"))) +- define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)), +- o_default, 0)->export = v_export; ++ { ++ const char *tty = TTYNAME (fileno (stderr)); ++ define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME, ++ o_default, 0)->export = v_export; ++ } + #endif + + /* Reset in case the switches changed our minds. */ +diff --git a/makeint.h b/makeint.h +index 6223936..2009f41 100644 +--- a/makeint.h ++++ b/makeint.h +@@ -436,10 +436,11 @@ extern struct rlimit stack_limit; + /* The number of bytes needed to represent the largest integer as a string. */ + #define INTSTR_LENGTH CSTRLEN ("18446744073709551616") + ++#define DEFAULT_TTYNAME "true" + #ifdef HAVE_TTYNAME + # define TTYNAME(_f) ttyname (_f) + #else +-# define TTYNAME(_f) "true" ++# define TTYNAME(_f) DEFAULT_TTYNAME + #endif + + +-- +cgit v0.9.0.2 diff -uNr a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch --- a/sys-devel/make/files/make-4.2-default-cxx.patch false +++ b/sys-devel/make/files/make-4.2-default-cxx.patch 6825e329f8c67ac06f8c6b14601abfd6856b8670f0010d4428361b4fca1fdcaca2073903387c8248d3c6fd6e8a74210fed79ac1af2142cb1f64610e5b259cc83 @@ -0,0 +1,13 @@ +diff --git a/default.c b/default.c +index 3d865c7..e8b3ed6 100644 +--- a/default.c ++++ b/default.c +@@ -530,7 +530,7 @@ static const char *default_variables[] = + "OBJC", "gcc", + #else + "CC", "cc", +- "CXX", "g++", ++ "CXX", "c++", + "OBJC", "cc", + #endif + diff -uNr a/sys-devel/make/files/make-4.2.1-glob-internals.patch b/sys-devel/make/files/make-4.2.1-glob-internals.patch --- a/sys-devel/make/files/make-4.2.1-glob-internals.patch false +++ b/sys-devel/make/files/make-4.2.1-glob-internals.patch 968f236a8677ebacc19d773f4402670eecb11e5ceb594816ce40015611e113b5f2c49e445890a9e5848d818e97f704c2ab2f4212b1e3c483e826e8e11d141206 @@ -0,0 +1,67 @@ +From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Sun, 24 Sep 2017 09:12:58 -0400 +Subject: [PATCH] glob: Do not assume glibc glob internals. + +It has been proposed that glibc glob start using gl_lstat, +which the API allows it to do. GNU 'make' should not get in +the way of this. See: +https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html + +* dir.c (local_lstat): New function, like local_stat. +(dir_setup_glob): Use it to initialize gl_lstat too, as the API +requires. +--- + dir.c | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) + +diff --git a/dir.c b/dir.c +index adbb8a9..c343e4c 100644 +--- a/dir.c ++++ b/dir.c +@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) + } + #endif + ++/* Similarly for lstat. */ ++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) ++# ifndef VMS ++# ifndef HAVE_SYS_STAT_H ++int lstat (const char *path, struct stat *sbuf); ++# endif ++# else ++ /* We are done with the fake lstat. Go back to the real lstat */ ++# ifdef lstat ++# undef lstat ++# endif ++# endif ++# define local_lstat lstat ++#elif defined(WINDOWS32) ++/* Windows doesn't support lstat(). */ ++# define local_lstat local_stat ++#else ++static int ++local_lstat (const char *path, struct stat *buf) ++{ ++ int e; ++ EINTRLOOP (e, lstat (path, buf)); ++ return e; ++} ++#endif ++ + void + dir_setup_glob (glob_t *gl) + { + gl->gl_opendir = open_dirstream; + gl->gl_readdir = read_dirstream; + gl->gl_closedir = free; ++ gl->gl_lstat = local_lstat; + gl->gl_stat = local_stat; +- /* We don't bother setting gl_lstat, since glob never calls it. +- The slot is only there for compatibility with 4.4 BSD. */ + } + + void +-- +2.16.1 + diff -uNr a/sys-devel/make/files/make-4.2.1-glob-v2.patch b/sys-devel/make/files/make-4.2.1-glob-v2.patch --- a/sys-devel/make/files/make-4.2.1-glob-v2.patch false +++ b/sys-devel/make/files/make-4.2.1-glob-v2.patch f9c7a7076afa088c0be26beae9c3fa2b9396e834df60fe4db8a88e3d0a58392791ee695cee823e51063e525e2f87e59c9777758972aa84d29ebdf66b268ed095 @@ -0,0 +1,30 @@ +http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4 + +--- make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 ++++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 +@@ -11481,10 +11481,9 @@ + #include <glob.h> + #include <fnmatch.h> + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include <gnu-versions.h> +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif +--- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 ++++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 +@@ -399,10 +399,9 @@ + #include <glob.h> + #include <fnmatch.h> + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include <gnu-versions.h> +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif], diff -uNr a/sys-devel/make/files/make-4.2.1-guile-2.2.patch b/sys-devel/make/files/make-4.2.1-guile-2.2.patch --- a/sys-devel/make/files/make-4.2.1-guile-2.2.patch false +++ b/sys-devel/make/files/make-4.2.1-guile-2.2.patch d29d6c355d6a9283024c0dd0eab417db8192a0b5e154c01dc539062d811e458c832d0883098b633220400f5b0b875b1fec59f6387b15cd31764e158fef355c35 @@ -0,0 +1,320 @@ +https://git.savannah.gnu.org/cgit/make.git/commit/?id=fbf71ec25a5986d9003ac16ee9e23675feac9053 +https://bugs.gentoo.org/650608 + +--- make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 ++++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 +@@ -9694,6 +9694,15 @@ + + # See if the user wants to add (or not) GNU Guile support + ++# Check whether --with-guile was given. ++if test "${with_guile+set}" = set; then : ++ withval=$with_guile; ++fi ++ ++ ++# Annoyingly, each version of Guile comes with it's own PC file so we have to ++# specify them as individual packages. Ugh. ++ + + + +@@ -9814,75 +9823,25 @@ + fi + fi + +-# Check whether --with-guile was given. +-if test "${with_guile+set}" = set; then : +- withval=$with_guile; +-fi +- +- +-# For some strange reason, at least on Ubuntu, each version of Guile +-# comes with it's own PC file so we have to specify them as individual +-# packages. Ugh. + if test "x$with_guile" != xno; then : +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 +-$as_echo_n "checking for GUILE... " >&6; } +- +-if test -n "$GUILE_CFLAGS"; then +- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-2.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GUILE_LIBS"; then +- pkg_cv_GUILE_LIBS="$GUILE_LIBS" +- elif test -n "$PKG_CONFIG"; then ++ guile_versions="2.2 2.0 1.8" ++ guile_version=no ++ have_guile=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU Guile" >&5 ++$as_echo_n "checking for GNU Guile... " >&6; } ++ for v in $guile_versions; do + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-2.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$v\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "guile-$v") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes ++ guile_version=$v; have_guile=yes; break + fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.0" 2>&1` +- else +- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.0" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GUILE_PKG_ERRORS" >&5 +- ++ done ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $guile_version" >&5 ++$as_echo "$guile_version" >&6; } ++ if test "$have_guile" = yes; then + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 +@@ -9892,12 +9851,12 @@ + pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$guile_version\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "guile-$guile_version") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-1.8" 2>/dev/null` ++ pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-$guile_version" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -9909,12 +9868,12 @@ + pkg_cv_GUILE_LIBS="$GUILE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$guile_version\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "guile-$guile_version") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-1.8" 2>/dev/null` ++ pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-$guile_version" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -9935,113 +9894,50 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-1.8" 2>&1` ++ GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-$guile_version" 2>&1` + else +- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-1.8" 2>&1` ++ GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-$guile_version" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GUILE_PKG_ERRORS" >&5 + +- have_guile=no +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- have_guile=no +-else +- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS +- GUILE_LIBS=$pkg_cv_GUILE_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- have_guile=yes +-fi +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } ++ as_fn_error $? "Package requirements (guile-$guile_version) were not met: + +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 +-$as_echo_n "checking for GUILE... " >&6; } ++$GUILE_PKG_ERRORS + +-if test -n "$GUILE_CFLAGS"; then +- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-1.8" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GUILE_LIBS"; then +- pkg_cv_GUILE_LIBS="$GUILE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-1.8" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-1.8" 2>&1` +- else +- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-1.8" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GUILE_PKG_ERRORS" >&5 ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + +- have_guile=no ++Alternatively, you may set the environment variables GUILE_CFLAGS ++and GUILE_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- have_guile=no +-else +- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS +- GUILE_LIBS=$pkg_cv_GUILE_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- have_guile=yes +-fi ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GUILE_CFLAGS ++and GUILE_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } + else + GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS + GUILE_LIBS=$pkg_cv_GUILE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- have_guile=yes +-fi + + fi + +-if test "$have_guile" = yes; then : +- + $as_echo "#define HAVE_GUILE 1" >>confdefs.h + ++ fi ++ + fi + + if test "$have_guile" = yes; then +--- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 ++++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 +@@ -160,22 +160,28 @@ + AC_FUNC_CLOSEDIR_VOID + + # See if the user wants to add (or not) GNU Guile support +-PKG_PROG_PKG_CONFIG + AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile], + [Support GNU Guile for embedded scripting])]) + +-# For some strange reason, at least on Ubuntu, each version of Guile +-# comes with it's own PC file so we have to specify them as individual +-# packages. Ugh. ++# Annoyingly, each version of Guile comes with it's own PC file so we have to ++# specify them as individual packages. Ugh. ++PKG_PROG_PKG_CONFIG ++ + AS_IF([test "x$with_guile" != xno], +-[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], +- [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes], +- [have_guile=no])]) ++[ guile_versions="2.2 2.0 1.8" ++ guile_version=no ++ have_guile=no ++ AC_MSG_CHECKING([for GNU Guile]) ++ for v in $guile_versions; do ++ PKG_CHECK_EXISTS([guile-$v], [guile_version=$v; have_guile=yes; break], []) ++ done ++ AC_MSG_RESULT([$guile_version]) ++ if test "$have_guile" = yes; then ++ PKG_CHECK_MODULES(GUILE, [guile-$guile_version]) ++ AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support]) ++ fi + ]) + +-AS_IF([test "$have_guile" = yes], +- [AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])]) +- + AM_CONDITIONAL([HAVE_GUILE], [test "$have_guile" = yes]) + + AC_FUNC_GETLOADAVG diff -uNr a/sys-devel/make/files/make-4.2.1-perl526.patch b/sys-devel/make/files/make-4.2.1-perl526.patch --- a/sys-devel/make/files/make-4.2.1-perl526.patch false +++ b/sys-devel/make/files/make-4.2.1-perl526.patch 9e416b96c152d2434da5c9b5adcdc0199ca17aba6468b96f971e75a00e42004e73498e5ae8fc4d84fc2d47b4bdced681ab282ecf3a41a2b0abce506a738d4a25 @@ -0,0 +1,26 @@ +From d9d4e06084a4c7da480bd49a3487aadf6ba77b54 Mon Sep 17 00:00:00 2001 +From: Enrique Olaizola <enrique_olaizola16@hotmail.com> +Date: Sat, 27 May 2017 14:24:33 -0400 +Subject: [PATCH] * tests/run_make_tests.pl: [SV 50902] Find Perl modules + +--- + tests/run_make_tests.pl | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl +index a74417a..a844094 100644 +--- a/tests/run_make_tests.pl ++++ b/tests/run_make_tests.pl +@@ -64,6 +64,9 @@ if ($^O eq 'VMS') + $CMD_rmfile = 'delete_file -no_ask'; + } + ++use FindBin; ++use lib "$FindBin::Bin"; ++ + require "test_driver.pl"; + require "config-flags.pm"; + +-- +2.16.1 + diff -uNr a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild --- a/sys-devel/make/make-4.2.1.ebuild false +++ b/sys-devel/make/make-4.2.1.ebuild 0eb826b4746aca1b054f1e79702661ab708eeaf68c42f49fc6b2b2eaae39ed35c1a237843da99b94f66e5d5c6ec93cb270353902591ae3d33f8e2a4553205eb6 @@ -0,0 +1,50 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit flag-o-matic eutils + +DESCRIPTION="Standard tool to compile source trees" +HOMEPAGE="https://www.gnu.org/software/make/make.html" +SRC_URI="mirror://gnu//make/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="guile nls static" + +CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )" +DEPEND="${CDEPEND} + nls? ( sys-devel/gettext )" +RDEPEND="${CDEPEND} + nls? ( virtual/libintl )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch + "${FILESDIR}"/${PN}-4.2.1-perl526.patch +) + +src_prepare() { + epatch "${PATCHES[@]}" + epatch_user +} + +src_configure() { + use static && append-ldflags -static + econf \ + --program-prefix=g \ + $(use_with guile) \ + $(use_enable nls) +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS NEWS README* + if [[ ${USERLAND} == "GNU" ]] ; then + # we install everywhere as 'gmake' but on GNU systems, + # symlink 'make' to 'gmake' + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 + fi +} diff -uNr a/sys-devel/make/metadata.xml b/sys-devel/make/metadata.xml --- a/sys-devel/make/metadata.xml false +++ b/sys-devel/make/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest --- a/sys-devel/patch/Manifest false +++ b/sys-devel/patch/Manifest c2eb008e922af21e7830e8c7957319d68f97733150ab856b360f5d7e9dac912ebff95bf20d76f104a698d080424633f8910a083ca8438b9933f7220e1d48d9c9 @@ -0,0 +1,4 @@ +AUX patch-2.7.6-fix-test-suite.patch 2610 BLAKE2B e750283b85f0cb9d52324f28b8a03087980e8a61b16c3465914eeca65a3b800d8946a10c4dd0ab08b18c1cbc37810e55fb5c35314082a8c11e383b7d50d1bd3f SHA512 7ced1f9b937bf62131654d8a25c8d2a3f3cfe5fa8961e2e000542cce68061b10895bc0001ded898b9a43608af1f9c07903dc5c2f0a41662470d97188ed682115 +DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd +EBUILD patch-2.7.6-r1.ebuild 997 BLAKE2B 197e49254bbe881c02991ab5c1647f1445629079b242b84c5717f1255accc7ed15e85b8e2e514ba48dd89e5a86b51f791c6e323c9e615459d474f859f433cb77 SHA512 a96d34e7e6ac6fbfbf2bb742ec523f2810d605bd9b65cfc31658c4362ba46a4b31ffe46ab81184ef8f177f2bdbdaf99c532e7d7e0a3ffb635dc74d7b0906c5df +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch --- a/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch false +++ b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch 2fdba47919785d73390d2fcf4ab1e4bf3b65407f3aea3dea61222c1909ffc4b91091ce2925d7c70636c9d84f9cd1e61ad679765fc1ab8e88a0716a29648d2854 @@ -0,0 +1,120 @@ +http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f6bc5b14bd193859851d15a049bafb1007acd288 +http://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c228c70b49db72e5 + +--- a/tests/crlf-handling ++++ b/tests/crlf-handling +@@ -14,7 +14,7 @@ use_local_patch + use_tmpdir + + lf2crlf() { +- while read l; do echo -e "$l\r"; done ++ while read l; do printf "%s\r\n" "$l"; done + } + + echo 1 > a +--- a/tests/git-cleanup ++++ b/tests/git-cleanup +@@ -36,8 +36,8 @@ BAD PATCH + EOF + + echo 1 > f +-echo -n '' > g +-echo -n '' > h ++printf '' > g ++printf '' > h + + check 'patch -f -i 1.diff || echo status: $?' <<EOF + patching file f +--- a/tests/merge ++++ b/tests/merge +@@ -30,30 +30,28 @@ x2() { + while test $# -gt 0 && test "$1" != -- ; do + echo "$1" + shift +- done > a.sed +- echo "$body" | sed -f a.sed > b ++ done > b.sed ++ echo "$body" | sed -f b.sed > b + shift + while test $# -gt 0 ; do + echo "$1" + shift +- done > b.sed +- echo "$body" | sed -f b.sed > c +- rm -f a.sed b.sed ++ done > c.sed ++ echo "$body" | sed -f c.sed > c ++ rm -f b.sed c.sed + output=`diff -u a b | patch $ARGS -f c` + status=$? + echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d' + cat c +- test $status == 0 || echo "Status: $status" ++ test $status = 0 || echo "Status: $status" + } + + x() { +- ARGS="$ARGS --merge" x2 "$@" ++ ARGS="--merge" x2 "$@" + echo +- ARGS="$ARGS --merge=diff3" x2 "$@" ++ ARGS="--merge=diff3" x2 "$@" + } + +-unset ARGS +- + # ============================================================== + + check 'x 3' <<EOF +--- a/tests/test-lib.sh ++++ b/tests/test-lib.sh +@@ -41,7 +41,7 @@ use_local_patch() { + + eval 'patch() { + if test -n "$GDB" ; then +- echo -e "\n" >&3 ++ printf "\n\n" >&3 + gdbserver localhost:53153 $PATCH "$@" 2>&3 + else + $PATCH "$@" +@@ -113,22 +113,15 @@ cleanup() { + exit $status + } + +-if test -z "`echo -n`"; then +- if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then +- eval ' +- _start_test() { +- echo -n "[${BASH_LINENO[2]}] $* -- " +- }' +- else +- eval ' +- _start_test() { +- echo -n "* $* -- " +- }' +- fi ++if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then ++ eval ' ++ _start_test() { ++ printf "[${BASH_LINENO[2]}] %s -- " "$*" ++ }' + else + eval ' + _start_test() { +- echo "* $*" ++ printf "* %s -- " "$*" + }' + fi + +--- a/tests/merge ++++ b/tests/merge +@@ -32,7 +32,7 @@ x2() { + shift + done > b.sed + echo "$body" | sed -f b.sed > b +- shift ++ test $# -eq 0 || shift + while test $# -gt 0 ; do + echo "$1" + shift +-- diff -uNr a/sys-devel/patch/metadata.xml b/sys-devel/patch/metadata.xml --- a/sys-devel/patch/metadata.xml false +++ b/sys-devel/patch/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild --- a/sys-devel/patch/patch-2.7.6-r1.ebuild false +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild 6279b64ba5e20485a1f98d3dc68c77b5d76cd4dbba08a4ff879691d22fd3268f3ac8e29750ecdf51015e1af9bb35c415d95a728d8c999f3c624d38b5c07c333e @@ -0,0 +1,33 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic + +DESCRIPTION="Utility to apply diffs to files" +HOMEPAGE="https://www.gnu.org/software/patch/patch.html" +SRC_URI="mirror://gnu/patch/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static test xattr" + +RDEPEND="xattr? ( sys-apps/attr )" +DEPEND="${RDEPEND} + test? ( sys-apps/ed )" + +PATCHES=( "${FILESDIR}"/${P}-fix-test-suite.patch ) + +src_configure() { + use static && append-ldflags -static + + local myeconfargs=( + $(use_enable xattr) + --program-prefix="$(use userland_BSD && echo g)" + ) + # Do not let $ED mess up the search for `ed` 470210. + ac_cv_path_ED=$(type -P ed) \ + econf "${myeconfargs[@]}" +} diff -uNr a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest --- a/sys-fs/e2fsprogs/Manifest false +++ b/sys-fs/e2fsprogs/Manifest bc6eaf9b4b9d79c3c4a21c608999cde1ad6649d9bf7a8ea6e347698791c77ebb320e1cea3acccbb5a4ed4c2d90c5b47492e00fa2d7f76ded6d1710727722fd3c @@ -0,0 +1,10 @@ +AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e8304f5958b034697ac52f4c40b0225c9c404ca7b9fe5bd3f130d9ebf8faf38815050d945524d3c SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef +AUX e2fsprogs-1.40-fbsd.patch 352 BLAKE2B efef09c11bdf6ebeb89819dfefec241919afa17ddee65610332bcd3edbacad4fa501def1d224de39fd6a9979a35e63699b0a2d5e9a2242517122339b68edf6af SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146 +AUX e2fsprogs-1.41.8-makefile.patch 317 BLAKE2B 89f393fd0b09e853158707aa6ec7f803c8938138666459df6a2bbc1cc5e86ac107db67b40ffbd7b12694de8eb22863b6c910b6e192f42e07939c0206b248e627 SHA512 dbd738affe910d3812ca4d969a6d4295b09abc413cab23f29dcbd0c1e82eefa095a61a377c494dd9b7e1d189d4edadc469dbf2d1a1068c11dd5fc8311bd83f8f +AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507 +AUX fsck_ext2fs.8 3802 BLAKE2B 379ef7974e29c654e4a69caa64c3703eecf375d63557915bdbfe23c8c0ca67cc9a13792988ba8c0b18bb4ae0819d220102f034499200fd20951e004d34273311 SHA512 639af16c7881bdfca55a9cd39623d3eeb9ae0ca93f8e65321c69ab1b2591cb17cdd0cfc21d27c20b8cc65bd295cccf23e47f740fffb91f4cf17e32959bb166d0 +AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa0722a0a3163885561bf06f0fdb73b4cf8c9cfc5bd0dc0c6ee0a7fb340a2416ce34555eff22f71a4 SHA512 1cac2963c0e85dd6a111bfe2a00f2b4f65c17a05bf0039cec073d4109ad4b0efee8905cff1a25098e0693f367db300054d92598a85dfbe8e5db7ff6419534af6 +DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc +DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b +EBUILD e2fsprogs-1.43.9.ebuild 3819 BLAKE2B ee75fb0c5ebf29b3b0c5b02727aaa37871dc1e198290ff8720a9869f77b3e1eb7f73245d5010552a5453b672588db82f14d21bb36db32d6f9266afe16ce67321 SHA512 4201cf4befb19415acc970cdaabfcf6e575e1a0ee773877d5ac418f337c21b39dd253e938784535748a417aba2ace3b37e8055fa8c87581906cde721b442701c +MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905 diff -uNr a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild false +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild be29fabd91d27e272a050c1d89c3d63a2c02c394e3b7d392f3a9358164b2bb1bd832e12c89c807a4b3e6ea34aa7deaa0026b1e5b791db71191dec9bbaaf37818 @@ -0,0 +1,137 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +case ${PV} in +*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; +*) UP_PV=${PV} ;; +esac + +inherit eutils flag-o-matic multilib toolchain-funcs + +DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz + mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz + elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" +IUSE="fuse nls static-libs elibc_FreeBSD" + +RDEPEND="~sys-libs/${PN}-libs-${PV} + >=sys-apps/util-linux-2.16 + fuse? ( sys-fs/fuse:0 ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/pkgconfig + sys-apps/texinfo" + +S="${WORKDIR}/${P%_pre*}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.41.8-makefile.patch + "${FILESDIR}"/${PN}-1.40-fbsd.patch + "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 + + # Upstream patches (can usually removed with next version bump) +) + +src_prepare() { + if [[ ${CHOST} == *-mint* ]] ; then + PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) + fi + + default + + # blargh ... trick e2fsprogs into using e2fsprogs-libs + rm -rf doc + sed -i -r \ + -e 's:@LIBINTL@:@LTLIBINTL@:' \ + -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ + -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ + MCONFIG.in || die "muck libs" #122368 + sed -i -r \ + -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ + Makefile.in || die "remove subdirs" + ln -s $(which mk_cmds) lib/ss/ || die + + # Avoid rebuild + echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h +} + +src_configure() { + # Keep the package from doing silly things #261411 + export VARTEXFONTS="${T}/fonts" + + # needs open64() prototypes and friends + append-cppflags -D_GNU_SOURCE + + local myeconfargs=( + --with-root-prefix="${EPREFIX}/" + --enable-symlink-install + $(tc-is-static-only || echo --enable-elf-shlibs) + $(tc-has-tls || echo --disable-tls) + --without-included-gettext + $(use_enable fuse fuse2fs) + $(use_enable nls) + --disable-libblkid + --disable-libuuid + --disable-fsck + --disable-uuidd + ) + ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}" + if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then + eerror "INTL sanity check failed, aborting build." + eerror "Please post your ${S}/config.log file as an" + eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" + die "Preventing included intl cruft from building" + fi +} + +src_compile() { + emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds + + # Build the FreeBSD helper + if use elibc_FreeBSD ; then + cp "${FILESDIR}"/fsck_ext2fs.c . + emake V=1 fsck_ext2fs + fi +} + +src_install() { + # need to set root_libdir= manually as any --libdir options in the + # econf above (i.e. multilib) will screw up the default #276465 + emake \ + STRIP=: \ + root_libdir="${EPREFIX}/usr/$(get_libdir)" \ + DESTDIR="${D}" \ + install install-libs + dodoc README RELEASE-NOTES + + insinto /etc + doins "${FILESDIR}"/e2fsck.conf + + # Move shared libraries to /lib/, install static libraries to + # /usr/lib/, and install linker scripts to /usr/lib/. + gen_usr_ldscript -a e2p ext2fs + # configure doesn't have an option to disable static libs :/ + if ! use static-libs ; then + find "${D}" -name '*.a' -delete || die + fi + + if use elibc_FreeBSD ; then + # Install helpers for us + into / + dosbin "${S}"/fsck_ext2fs + doman "${FILESDIR}"/fsck_ext2fs.8 + + # filefrag is linux only + rm \ + "${ED%/}"/usr/sbin/filefrag \ + "${ED%/}"/usr/share/man/man8/filefrag.8 || die + fi +} diff -uNr a/sys-fs/e2fsprogs/files/e2fsck.conf b/sys-fs/e2fsprogs/files/e2fsck.conf --- a/sys-fs/e2fsprogs/files/e2fsck.conf false +++ b/sys-fs/e2fsprogs/files/e2fsck.conf a132b85112a4bdd598ac88179ad9b10dd00a54827869b22ed6cf5908b363c47a054685591311e57c6b1110256e1ae859f30145347c1415aa5bb7d63787e672a2 @@ -0,0 +1,6 @@ +# See the e2fsck.conf man page for more info + +[options] + +# allow fsck to run sanely at any point in time #142850 +buggy_init_scripts = yes diff -uNr a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch false +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch be05e5fcfb82a7937373dda2c2e63f7b3ea44cb6bdcc6c21dcbeda92ddc35f50f57de779bf4661797996f5b7c0be9183206720ed3867a7841337135dbf5663d1 @@ -0,0 +1,11 @@ +--- a/lib/ext2fs/ext2_fs.h ++++ b/lib/ext2fs/ext2_fs.h +@@ -414,7 +414,7 @@ + + #define i_size_high i_dir_acl + +-#if defined(__KERNEL__) || defined(__linux__) ++#if defined(__KERNEL__) || defined(__linux__) || defined(__FreeBSD__) + #define i_reserved1 osd1.linux1.l_i_reserved1 + #define i_frag osd2.linux2.l_i_frag + #define i_fsize osd2.linux2.l_i_fsize diff -uNr a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch false +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch 1077e5d690ec53133c3ff5710d240d7c01d6896b38c9f29a540ad2e3e3977d2fb8894bb5cea5eabc7c70fbc39680191abb11cdd001579eaa88aec25508b8c246 @@ -0,0 +1,10 @@ +--- e2fsprogs-1.41.5/Makefile.in ++++ e2fsprogs-1.41.5/Makefile.in +@@ -281,6 +66,7 @@ + uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs + + install-libs: install-libs-recursive ++install-libs-recursive: | install-shlibs-libs-recursive + + uninstall-libs: uninstall-libs-recursive + diff -uNr a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch false +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch 09b482bd7d18e011d8b537888659184bbd547f546a30dfa68cba9cbe1bcba6bc6cc74859a09b8f71ce49193a7f9e87c60e8a36e25e5c2f7980adad15fa631892 @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/516854 + +--- e2fsprogs-1.42.13/configure ++++ e2fsprogs-1.42.13/configure +@@ -1315,6 +1315,8 @@ + if test $cross_compiling = no; then + BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H" + BUILD_LDFLAGS="$LDFLAGS" ++else ++ BUILD_CFLAGS="$INCLUDES" + fi + + diff -uNr a/sys-fs/e2fsprogs/files/fsck_ext2fs.8 b/sys-fs/e2fsprogs/files/fsck_ext2fs.8 --- a/sys-fs/e2fsprogs/files/fsck_ext2fs.8 false +++ b/sys-fs/e2fsprogs/files/fsck_ext2fs.8 8a87630da7c3d068a5ab4b6fe3cd30c2c5e18ab23d7e9a8088f624c89bff04bbc47cb31e80891cf9716495db7a61f669788ef55478708bc8648b27d69cf5e1d8 @@ -0,0 +1,96 @@ +.TH fsck_ext2fs 8 2006-07-02 "Matthias Andree" "FreeBSD Ports" +.\" +.\" fsck_ext2fs.8 - manual page for fsck_ext2fs wrapper +.\" +.\" (C) Copyright 2006 by Matthias Andree <matthias.andree@gmx.de> +.\" +.\" License: This file may be redistributed in accordance with the terms +.\" of the GNU General Public License v2. +.\" +.\" Upstream $Id: fsck_ext2fs.8,v 1.3 2006/07/02 11:45:21 emma Exp $ +.\" $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.8,v 1.1 2006/07/04 15:47:51 leeym Exp $ +.\" +.SH NAME +.B fsck_ext2fs +\- compatibility wrapper for e2fsck +.SH SYNOPSIS +.P +.B fsck_ext2fs +[\fB\-Fpfnyv\fR] [\fB\-b\fR \fIblock\fR] +.SH DESCRIPTION +.P +\fBfsck_ext2fs\fR maps the traditional FreeBSD \fBfsck_ffs\fR options to +options with the same functionality for \fBe2fsck,\fR runs \fBe2fsck\fR +and then maps its exit status to values that FreeBSD understands. +\fBe2fsck\fR is a utility to check and repair ext2 and ext3 file +systems. + +.SH OPTIONS +.IP \fB\-F\fR +(check foreground mode required) Immediately exits with status 1 to tell +\fBfsck\fR that ext2fs cannot be checked in the background. \fBfsck\fR +usually runs \fBfsck_*\fR programs twice, first with \fB\-F\fR to find +out if they can do background checking, then either immediately without +\fB\-F\fR for foreground checking or deferred in the background with +\fB\-B\fR. +.IP \fB\-p\fR +(preen mode) This option suppresses adding the \fB\-f\fR option (unless +\fB\-f\fR is also given) and adds the \fB\-p\fR option to the +\fBe2fsck\fR command line. This causes \fBe2fsck\fR to automatically fix +any filesystem problems that can safely be fixed without operator +intervention. Without this option given, \fBe2fsck\fR will be run with +the \fB\-f\fR option to force a check, since interactive scan and repair +mode is the default on FreeBSD, but not on Linux where \fBe2fsck\fR +comes from. +.IP \fB\-f\fR +(force check) This option forces the check of a clean file system while +preening and is passed to \fBe2fsck\fR verbatim. +.IP \fB\-n\fR +("no" mode) This option causes the file system to be opened in read-only +mode and assume "no" as answer to all questions. This is the only way to +safely run \fBfsck\fR on a mounted ext2 or ext3 file system. This option +is passed to \fBe2fsck\fR verbatim. +.IP \fB\-y\fR +("yes" mode) This option is passed verbatim to \fBe2fsck\fR and causes +it to assume "yes" as answer to all questions. This allows the +non-interactive use of e2fsck but is rather aggressive. Use with care. +.IP \fB\-v\fR +(verbose output) This option is passed verbatim to \fBe2fsck\fR and +causes it to verbosely report its progress. +.IP "\fB\-b\fR \fIblock\fR" +(use alternate super block) This option is passed verbatim to +\fBe2fsck\fR and selects an alternate super block, for use when the +primary super block has been damaged. Please see the \fBe2fsck\fR(8) +manual page for details. + +.SH EXIT STATUS +If errors remain after \fBe2fsck\fR, an invalid option or too many +options have been specified, \fBe2fsck\fR was killed with a signal or +the \fIfork\fB system call failed, \fBfsck_ext2fs\fR exits with status +EXIT_FAILURE (usually 1). If \fBe2fsck\fR cannot be started, exits with +status 127. If the file system is clean after \fBe2fsck\fR operation, +exits with status EXIT_SUCCESS (0). + +.SH NOTES +.P +This utility is merely meant as an adaptor so that \fBe2fsck\fR can be +run during the boot process, it does not support all options that +\fBe2fsck\fR offers. If you need one of its advanced options, please run +\fBe2fsck\fR directly. + +.SH FILES +.TP +.I /sbin/e2fsck +is the location of the \fBe2fsck\fR program to run. + +.SH AUTHOR +.P +Matthias Andree <matthias.andree@gmx.de> wrote the program and this +manual page. +.SH CONFORMING TO +The FreeBSD 6.1 command line interface for \fBfsck_ufs\fR(8). +.SH SEE ALSO +.BR fsck (8), +.BR e2fsck (8) +and +.BR fsck_ufs (8). diff -uNr a/sys-fs/e2fsprogs/files/fsck_ext2fs.c b/sys-fs/e2fsprogs/files/fsck_ext2fs.c --- a/sys-fs/e2fsprogs/files/fsck_ext2fs.c false +++ b/sys-fs/e2fsprogs/files/fsck_ext2fs.c be19e6896f047d534d194488cfcba9ea5cfaced66e2ec930e1b4ab9513c7714b8c1b01085e5e8f2880dae1439be9ddc98721ba2177cdb3155ad5b00b4531ce2e @@ -0,0 +1,147 @@ +/* + * fsck_ext2fs - wrapper for e2fsck on FreeBSD + * Copyright (C) 2004,2006 Matthias Andree <matthias.andree@gmx.de> + * redistributable in accordance with the + * GNU General Public License v2 + * + * $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.c,v 1.5 2006/07/04 15:47:51 leeym Exp $ + * + * Upstream: $Id: fsck_ext2fs.c,v 1.6 2006/07/02 11:37:49 emma Exp $ + * + * format: gindent -kr + */ + +#include <sys/types.h> +#include <unistd.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <sys/wait.h> +#include <sys/time.h> +#include <sys/resource.h> +#include <errno.h> + +__attribute__ ((noreturn)) +static int die(const char *tag) +{ + perror(tag); + exit(EXIT_FAILURE); +} + +int main(int argc, char **argv) +{ + int ch, i = 1, force = 0, status, verbose = 0, t; + long block = 0; + enum { normal, preen, yes, no } mode = normal; + char *cmd[256]; + pid_t pid; + + cmd[0] = "/sbin/e2fsck"; + while ((ch = getopt(argc, argv, "BFpfnyb:v")) != -1) { + switch (ch) { + case 'p': + mode = preen; + break; + case 'f': + force = 1; + break; + case 'n': + mode = no; + break; + case 'y': + mode = yes; + break; + case 'b': + block = atol(optarg); + break; + case 'v': + verbose++; + break; + case 'F': + /* e2fsck does not support background checking, + * hence exit with nonzero status to force + * the foreground check. */ + exit(1); + case 'B': + default: + fprintf(stderr, "%s: unknown option -%c\n", + argv[0], optopt); + exit(EXIT_FAILURE); + } + } + + if (force) + cmd[i++] = "-f"; + + switch (mode) { + case normal: + /* FreeBSD needs -f to force a check only in context + * with -p -- so map normal to force to match + * expectations */ + if (!force) + cmd[i++] = "-f"; + break; + case yes: + cmd[i++] = "-y"; + break; + case no: + cmd[i++] = "-n"; + break; + case preen: + cmd[i++] = "-p"; + break; + } + + if (block) { + static char b[30]; + + sprintf(b, "-b %ld", block); + cmd[i++] = b; + } + + /* silently limit verbose to 15 so we don't overflow the cmd array */ + if (verbose > 15) + verbose = 15; + + for (t = verbose; t > 1; t--) + cmd[i++] = "-v"; + + while (optind < argc) { + cmd[i++] = argv[optind++]; + /* sanity check so we don't overflow the cmd buffer */ + if (i+1 == sizeof(cmd)/sizeof(cmd[0])) { + errno = E2BIG; + die(argv[0]); + } + } + + cmd[i++] = 0; + + if (verbose) { + for (i=0; cmd[i]; i++) + fputs(cmd[i], stderr), + fputc(' ', stderr); + fputc('\n', stderr); + } + + pid = fork(); + switch (pid) { + case -1: + /* error */ + die("fork"); + break; + case 0: + /* child */ + (void) execv(cmd[0], cmd); + perror("execve"); + _exit(127); + default: + /* parent */ + if (pid != waitpid(pid, &status, 0)) + die("waitpid"); + if (WIFSIGNALED(status) + || (WIFEXITED(status) && WEXITSTATUS(status) >= 4)) + exit(EXIT_FAILURE); + } + exit(EXIT_SUCCESS); +} diff -uNr a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml --- a/sys-fs/e2fsprogs/metadata.xml false +++ b/sys-fs/e2fsprogs/metadata.xml 578a132483f1ecb1aa5a03e8146fe76dc3b0404a2ce5efee57ab51075551770dde30437c4d42415f7ac1d051171b9a0e228af8a5dc1e6f4167e33318321da2c3 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name='fuse'>Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag> +</use> +<upstream> + <remote-id type="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id> + <remote-id type="sourceforge">e2fsprogs</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest --- a/sys-fs/eudev/Manifest false +++ b/sys-fs/eudev/Manifest d8d7b63286fde1dea03f0de2f829068256473df0d732efa259d1eb24e5d95159ed8d3063bc5579e1381c886306f3dee99ac6c9b780535b8bac4220e4630d64d5 @@ -0,0 +1,6 @@ +AUX 40-gentoo.rules 365 BLAKE2B ac97d87870286b489804d319bbc7ee6fdbc480d0cf811d422b25cc3466542f34e849c3c6aac29f55ad1fbcfebeb943b8782e146f803a0a945f65893300c83806 SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b +AUX eudev-include-sysmacros-header.patch 4516 BLAKE2B 2c02cece2f2dfc48cff03696a04c854649c44caf30af3d77bae45ce29c3f8cee1d1bbfbe4194eef71f46fbd00c8e23d40f7be3a04ea3ae386ba6654f0256e4ce SHA512 29633fca7e348ef7e69fae7f0fc47a2155b20956dd396205c06032d356ea58269f5ce8e0277ed36aa7108385d0e244a311b53b9490c418c9180986e4742d623f +AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 +DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c +EBUILD eudev-3.2.5.ebuild 7188 BLAKE2B d2361c8fe050393e2e5a72a6cc1a3a8b511b3fb544a8b3546bab49923806bb77e15d7fb98774a15c4eb66766e3fe77076da063695f4bd94ae7abb954b9cdcff1 SHA512 df1a850655f16c12736fd023205ca6d78522afb55f15ffb7732bb4d4e2621c4a777f8bcc263b004775670566cd758ce9f395b245d0618303afae235a43e6c4a2 +MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79 diff -uNr a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild --- a/sys-fs/eudev/eudev-3.2.5.ebuild false +++ b/sys-fs/eudev/eudev-3.2.5.ebuild 2ebc0189485f5432d8a39bd839b67969c7a6310c35c15d57ff9d248b52f6a982f20f13aa689233eacff1115d72b8edc5131cd2f82036163cb61a6c419d348e22 @@ -0,0 +1,236 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +KV_min=2.6.39 + +inherit autotools linux-info multilib multilib-minimal user + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/gentoo/eudev.git" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://github.com/gentoo/eudev" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test" + +COMMON_DEPEND=">=sys-apps/util-linux-2.20 + introspection? ( >=dev-libs/gobject-introspection-1.38 ) + kmod? ( >=sys-apps/kmod-16 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) + !<sys-libs/glibc-2.11 + !sys-apps/gentoo-systemd-integration + !sys-apps/systemd" +DEPEND="${COMMON_DEPEND} + dev-util/gperf + virtual/os-headers + virtual/pkgconfig + >=sys-devel/make-3.82-r4 + >=sys-kernel/linux-headers-${KV_min} + >=dev-util/intltool-0.50 + test? ( app-text/tree dev-lang/perl )" + +RDEPEND="${COMMON_DEPEND} + !<sys-fs/lvm2-2.02.103 + !<sec-policy/selinux-base-2.20120725-r10 + !sys-fs/udev + !sys-apps/systemd" + +PDEPEND=">=sys-fs/udev-init-scripts-26 + hwdb? ( >=sys-apps/hwids-20140304[udev] )" + +# The multilib-build.eclass doesn't handle situation where the installed headers +# are different in ABIs. In this case, we install libgudev headers in native +# ABI but not for non-native ABI. +multilib_check_headers() { :; } + +pkg_pretend() { + ewarn + ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality," + ewarn "as described in the URL below:" + ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + ewarn + ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing" + ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable" + ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules" + ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules" + ewarn +} + +pkg_setup() { + CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX" + linux-info_pkg_setup + get_running_version + + # These are required kernel options, but we don't error out on them + # because you can build under one kernel and run under another. + if kernel_is lt ${KV_min//./ }; then + ewarn + ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}." + ewarn "Make sure to run udev under kernel version ${KV_min} or above." + ewarn + fi +} + +src_prepare() { + # change rules back to group uucp instead of dialout for now + sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \ + || die "failed to change group dialout to uucp" + + eapply_user + eautoreconf +} + +multilib_src_configure() { + tc-export CC #463846 + export cc_cv_CFLAGS__flto=no #502950 + + # Keep sorted by ./configure --help and only pass --disable flags + # when *required* to avoid external deps or unnecessary compile + local econf_args + econf_args=( + ac_cv_search_cap_init= + ac_cv_header_sys_capability_h=yes + DBUS_CFLAGS=' ' + DBUS_LIBS=' ' + --with-rootprefix= + --with-rootrundir=/run + --libdir="${EPREFIX}"/usr/$(get_libdir) + --with-rootlibexecdir="${EPREFIX}"/lib/udev + --enable-split-usr + --enable-manpages + --disable-hwdb + --exec-prefix="${EPREFIX}" + ) + + # Only build libudev for non-native_abi, and only install it to libdir, + # that means all options only apply to native_abi + if multilib_is_native_abi; then + econf_args+=( + --with-rootlibdir="${EPREFIX}"/$(get_libdir) + $(use_enable introspection) + $(use_enable kmod) + $(use_enable static-libs static) + $(use_enable selinux) + $(use_enable rule-generator) + ) + else + econf_args+=( + --disable-static + --disable-introspection + --disable-kmod + --disable-selinux + --disable-rule-generator + ) + fi + ECONF_SOURCE="${S}" econf "${econf_args[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + emake + else + emake -C src/shared + emake -C src/libudev + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + emake DESTDIR="${D}" install + else + emake -C src/libudev DESTDIR="${D}" install + fi +} + +multilib_src_test() { + # make sandbox get out of the way + # these are safe because there is a fake root filesystem put in place, + # but sandbox seems to evaluate the paths of the test i/o instead of the + # paths of the actual i/o that results. + # also only test for native abi + if multilib_is_native_abi; then + addread /sys + addwrite /dev + addwrite /run + default_src_test + fi +} + +multilib_src_install_all() { + find "${D}" -name '*.la' -delete || die + + insinto /lib/udev/rules.d + doins "${FILESDIR}"/40-gentoo.rules + + use rule-generator && doinitd "${FILESDIR}"/udev-postmount +} + +pkg_postinst() { + mkdir -p "${EROOT}"run + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${EROOT}"dev/loop 2>/dev/null + if [[ -d ${EROOT}dev/loop ]]; then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 + # https://bugs.gentoo.org/246847 + # https://bugs.gentoo.org/514174 + enewgroup input + + # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, + # process it as a list. We only care about the zero case (new install) or the case where + # the same version is being re-emerged. If there is a second version, allow it to abort. + local rv rvres=doitnew + for rv in ${REPLACING_VERSIONS} ; do + if [[ ${rvres} == doit* ]]; then + if [[ ${rv%-r*} == ${PV} ]]; then + rvres=doit + else + rvres=${rv} + fi + fi + done + + if use hwdb && has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT%/}" + + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + # reload database after it has be rebuilt, but only if we are not upgrading + # also pass if we are -9999 since who knows what hwdb related changes there might be + if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then + udevadm control --reload + fi + fi + if [[ ${rvres} != doitnew ]]; then + ewarn + ewarn "You need to restart eudev as soon as possible to make the" + ewarn "upgrade go into effect:" + ewarn "\t/etc/init.d/udev --nodeps restart" + fi + + if use rule-generator && \ + [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then + ewarn + ewarn "Please add the udev-postmount init script to your default runlevel" + ewarn "to ensure the legacy rule-generator functionality works as reliably" + ewarn "as possible." + ewarn "\trc-update add udev-postmount default" + fi + + elog + elog "For more information on eudev on Gentoo, writing udev rules, and" + elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev" +} diff -uNr a/sys-fs/eudev/files/40-gentoo.rules b/sys-fs/eudev/files/40-gentoo.rules --- a/sys-fs/eudev/files/40-gentoo.rules false +++ b/sys-fs/eudev/files/40-gentoo.rules 3aee316270bc417b324c2fec97d378f054a3bfd099d2285d56c89f3e8b17c21481e87d0637b55a5a64c376f888e7f7bb6ffbb7a0bdfa36dd6513085b3e2fbd87 @@ -0,0 +1,10 @@ +# do not edit this file, it will be overwritten on update + +# Propably unrequired, check how it is with OSS/OSS4, then remove +SUBSYSTEM=="snd", GROUP="audio" + +# Gentoo specific usb group +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" + +# Keep this for Linux 2.6.32 support wrt #457868 +SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666" diff -uNr a/sys-fs/eudev/files/eudev-include-sysmacros-header.patch b/sys-fs/eudev/files/eudev-include-sysmacros-header.patch --- a/sys-fs/eudev/files/eudev-include-sysmacros-header.patch false +++ b/sys-fs/eudev/files/eudev-include-sysmacros-header.patch a85577dc36a01880ddb953faccea9c2fc0f46b62281c2cdf7a8fc12a03fe711f7062d80aa299026dcaaad197ac247d1e2a726a5360cd28c257529c8297b9ac82 @@ -0,0 +1,121 @@ +diff -ruPN eudev-3.1.5.old/src/cdrom_id/cdrom_id.c eudev-3.1.5/src/cdrom_id/cdrom_id.c +--- eudev-3.1.5.old/src/cdrom_id/cdrom_id.c 2015-09-11 14:54:26.000000000 -0400 ++++ eudev-3.1.5/src/cdrom_id/cdrom_id.c 2017-10-11 21:45:10.929671748 -0400 +@@ -37,6 +37,7 @@ + #include <sys/time.h> + #include <sys/ioctl.h> + #include <linux/cdrom.h> ++#include <sys/sysmacros.h> + + #include "libudev.h" + #include "libudev-private.h" +diff -ruPN eudev-3.1.5.old/src/libudev/libudev-device.c eudev-3.1.5/src/libudev/libudev-device.c +--- eudev-3.1.5.old/src/libudev/libudev-device.c 2015-10-12 18:22:14.000000000 -0400 ++++ eudev-3.1.5/src/libudev/libudev-device.c 2017-10-11 21:44:42.774672156 -0400 +@@ -32,6 +32,7 @@ + #include <sys/ioctl.h> + #include <sys/socket.h> + #include <linux/sockios.h> ++#include <sys/sysmacros.h> + + #include "libudev.h" + #include "libudev-private.h" +diff -ruPN eudev-3.1.5.old/src/libudev/libudev-device-private.c eudev-3.1.5/src/libudev/libudev-device-private.c +--- eudev-3.1.5.old/src/libudev/libudev-device-private.c 2015-09-11 14:54:26.000000000 -0400 ++++ eudev-3.1.5/src/libudev/libudev-device-private.c 2017-10-11 21:44:39.445672204 -0400 +@@ -25,6 +25,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + + #include "libudev.h" + #include "libudev-private.h" +diff -ruPN eudev-3.1.5.old/src/libudev/libudev-enumerate.c eudev-3.1.5/src/libudev/libudev-enumerate.c +--- eudev-3.1.5.old/src/libudev/libudev-enumerate.c 2015-09-11 14:54:26.000000000 -0400 ++++ eudev-3.1.5/src/libudev/libudev-enumerate.c 2017-10-11 21:44:36.279672250 -0400 +@@ -28,6 +28,7 @@ + #include <stdbool.h> + #include <sys/stat.h> + #include <sys/param.h> ++#include <sys/sysmacros.h> + + #include "libudev.h" + #include "libudev-private.h" +diff -ruPN eudev-3.1.5.old/src/scsi_id/scsi_serial.c eudev-3.1.5/src/scsi_id/scsi_serial.c +--- eudev-3.1.5.old/src/scsi_id/scsi_serial.c 2015-09-11 14:54:26.000000000 -0400 ++++ eudev-3.1.5/src/scsi_id/scsi_serial.c 2017-10-11 21:45:20.195671614 -0400 +@@ -36,6 +36,7 @@ + #include <scsi/sg.h> + #include <linux/types.h> + #include <linux/bsg.h> ++#include <sys/sysmacros.h> + + #include "libudev.h" + #include "libudev-private.h" +diff -ruPN eudev-3.1.5.old/src/udev/udevadm-info.c eudev-3.1.5/src/udev/udevadm-info.c +--- eudev-3.1.5.old/src/udev/udevadm-info.c 2015-09-11 14:54:26.000000000 -0400 ++++ eudev-3.1.5/src/udev/udevadm-info.c 2017-10-11 21:44:33.032672297 -0400 +@@ -28,6 +28,7 @@ + #include <fcntl.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + + #include "udev.h" + #include "udev-util.h" +diff -ruPN eudev-3.1.5.old/src/udev/udevd.c eudev-3.1.5/src/udev/udevd.c +--- eudev-3.1.5.old/src/udev/udevd.c 2015-10-12 18:22:14.000000000 -0400 ++++ eudev-3.1.5/src/udev/udevd.c 2017-10-11 21:44:59.791671910 -0400 +@@ -45,6 +45,7 @@ + #include <sys/ioctl.h> + #include <sys/inotify.h> + #include <sys/utsname.h> ++#include <sys/sysmacros.h> + + #include "udev.h" + #include "udev-util.h" +diff -ruPN eudev-3.1.5.old/src/udev/udev-event.c eudev-3.1.5/src/udev/udev-event.c +--- eudev-3.1.5.old/src/udev/udev-event.c 2015-10-12 18:22:14.000000000 -0400 ++++ eudev-3.1.5/src/udev/udev-event.c 2017-10-11 21:44:29.652672346 -0400 +@@ -33,6 +33,7 @@ + #include <sys/socket.h> + #include <sys/signalfd.h> + #include <linux/sockios.h> ++#include <sys/sysmacros.h> + + #include "udev.h" + +diff -ruPN eudev-3.1.5.old/src/udev/udev-node.c eudev-3.1.5/src/udev/udev-node.c +--- eudev-3.1.5.old/src/udev/udev-node.c 2015-09-11 14:54:26.000000000 -0400 ++++ eudev-3.1.5/src/udev/udev-node.c 2017-10-11 21:44:25.864672401 -0400 +@@ -28,6 +28,7 @@ + #include <sys/time.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + + #include "udev.h" + #include "smack-util.h" +diff -ruPN eudev-3.1.5.old/src/udev/udev-rules.c eudev-3.1.5/src/udev/udev-rules.c +--- eudev-3.1.5.old/src/udev/udev-rules.c 2015-10-12 18:22:14.000000000 -0400 ++++ eudev-3.1.5/src/udev/udev-rules.c 2017-10-11 21:44:21.611672463 -0400 +@@ -28,6 +28,7 @@ + #include <dirent.h> + #include <fnmatch.h> + #include <time.h> ++#include <sys/sysmacros.h> + + #include "udev.h" + #include "path-util.h" +diff -ruPN eudev-3.1.5.old/test/test-libudev.c eudev-3.1.5/test/test-libudev.c +--- eudev-3.1.5.old/test/test-libudev.c 2015-09-11 14:54:26.000000000 -0400 ++++ eudev-3.1.5/test/test-libudev.c 2017-10-11 21:45:27.782671504 -0400 +@@ -27,6 +27,7 @@ + #include <getopt.h> + #include <fcntl.h> + #include <sys/epoll.h> ++#include <sys/sysmacros.h> + + #include "libudev.h" + #include "udev-util.h" diff -uNr a/sys-fs/eudev/files/udev-postmount b/sys-fs/eudev/files/udev-postmount --- a/sys-fs/eudev/files/udev-postmount false +++ b/sys-fs/eudev/files/udev-postmount 26f6376d54166441018ae89b25d96659cb5e28789a09bb0fd08b7cf64b8a676dbfb9ff4671a87e8dd86a3c38e78facfd015b69020ba43e2a4e5408765b946421 @@ -0,0 +1,55 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() +{ + need localmount + keyword -vserver -lxc +} + +dir_writeable() +{ + touch "$1"/.test.$$ 2>/dev/null && rm "$1"/.test.$$ +} + +# store persistent-rules that got created while booting +# when / was still read-only +store_persistent_rules() +{ + # create /etc/udev/rules.d if it does not exist and /etc/udev is writable + [ -d /etc/udev/rules.d ] || \ + dir_writeable /etc/udev && \ + mkdir -p /etc/udev/rules.d + + # only continue if rules-directory is writable + dir_writeable /etc/udev/rules.d || return 0 + + local file dest + for file in /run/udev/tmp-rules--*; do + dest=${file##*tmp-rules--} + [ "$dest" = '*' ] && break + type=${dest##70-persistent-} + type=${type%%.rules} + ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d" + cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file" + eend $? "Failed moving persistent rules!" + done +} + +start() +{ + # check if this system uses udev + [ -d /run/udev ] || return 0 + + # store persistent-rules that got created while booting + # when / was still read-only + store_persistent_rules +} + +stop() +{ + return 0 +} + +# vim:ts=4 diff -uNr a/sys-fs/eudev/metadata.xml b/sys-fs/eudev/metadata.xml --- a/sys-fs/eudev/metadata.xml false +++ b/sys-fs/eudev/metadata.xml 338b656f30a1873f28b0411ed78dd3a2c70792c25b52c9c71ac2cc10e01ff0302bb046ebd3a33c2a3c2ecaf2021a4bbc2b1c615cb8607d7ff30827905782f038 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>eudev@gentoo.org</email> + </maintainer> + <use> + <flag name="blkid">enable blkid support</flag> + <flag name="efi">enable EFI support</flag> + <flag name="hwdb">read vendor/device string database and add it to udev database</flag> + <flag name="kmod">enable module loading through libkmod</flag> + <flag name="smack">enable SMACK security model</flag> + <flag name="rule-generator">install legacy rule generator rules and support scripts - note + that the functionality within was dropped from sys-fs/udev as it is not stable in + all cases; use at your own risk</flag> + </use> + <upstream> + <remote-id type="github">gentoo/eudev</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest --- a/sys-fs/udev-init-scripts/Manifest false +++ b/sys-fs/udev-init-scripts/Manifest 7f5cd8ed21c528cb9cb1a01b86c309612d5d3248e75a27c32ff0209e014e0af0c3497a807fcbf6552c39499bc24e7847b1597fc7c9c16a5c46c6d18a95925ea1 @@ -0,0 +1,3 @@ +DIST udev-init-scripts-32.tar.gz 3661 BLAKE2B 11736f1e6c44bf032571008e907f97d5c64afafa7fe7fcd4fa5f398fce1fa6698adc66c933a0a451adde31c44fc09339129d6352cc2fd0389fecee8d34c095f6 SHA512 da6291ae5c2aa1e8e41656fbe2ed6700e46360809119c0f8a26bf6c3f23f05c861b2c2943b55e47140462049474725e96105e68b204f3d931050409f34d19699 +EBUILD udev-init-scripts-32.ebuild 1317 BLAKE2B 6a8f10e6a1ee079ab8e5579daf2681c01d1f87c4addf3077fc124fd80ea31dc304a3ce48bf9183e69e40aca0168a97e0e9a9ba2cf9873aaea57b7c58e8560ed6 SHA512 f80100629857b7d9ac50d4c83478a99c1624d67743bec8875ec53e3d344968817a38f8b791086c466d523cc05221b076921a57ac671f421d2b206246415889e0 +MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df diff -uNr a/sys-fs/udev-init-scripts/metadata.xml b/sys-fs/udev-init-scripts/metadata.xml --- a/sys-fs/udev-init-scripts/metadata.xml false +++ b/sys-fs/udev-init-scripts/metadata.xml 8fc7955b77bbdfca6e4b28f6060c7f4850c1b7778c3cd4c15b6132a2efada8844e4c6b0029665e01da45dcd82d7bcb3379f552b0134a587c2caccc453543a6cc @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>udev-bugs@gentoo.org</email> + </maintainer> +</pkgmetadata> diff -uNr a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild --- a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild false +++ b/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild 3a613b208531c731098a3a55b3f8f9128e98399731212cc0ff3b766314c775c7bae3d3d6d024cd21a629e0c5e822d0db72089e9e59dab61aaa4d5831e34037f9 @@ -0,0 +1,44 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [ "${PV}" = "9999" ]; then + EGIT_REPO_URI="git://anongit.gentoo.org/proj/udev-gentoo-scripts.git" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" +fi + +DESCRIPTION="udev startup scripts for openrc" +HOMEPAGE="https://www.gentoo.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RESTRICT="test" + +DEPEND="" +RDEPEND=">=virtual/udev-217 + !<sys-apps/openrc-0.14" + +pkg_postinst() { + # Add udev and udev-trigger to the sysinit runlevel automatically. + for f in udev udev-trigger; do + if [[ -x ${ROOT%/}/etc/init.d/${f} && + -d ${ROOT%/}/etc/runlevels/sysinit && + ! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then + ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f} + ewarn "Adding ${f} to the sysinit runlevel" + fi + done + + if ! has_version "sys-fs/eudev[rule-generator]" && \ + [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then + ewarn "The udev-postmount service has been removed because the reasons for" + ewarn "its existance have been removed upstream." + ewarn "Please remove it from your runlevels." + fi +} diff -uNr a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest --- a/sys-kernel/genkernel/Manifest false +++ b/sys-kernel/genkernel/Manifest fec4bd7209459af9cde31f162146ea4ea806d1f2432ad84f7eea4c5b3a07941233babb0d103facbed0e37b01095053cd0c05a13ba20dedfd6b2108ed403609d3 @@ -0,0 +1,16 @@ +AUX genkernel-3.4.52.4-crc32c.patch 4981 BLAKE2B e376f504c73ce6fc8b858c05dc36bd45cf82b404d063ea970c64520026a6108d6ac1f806fc81e9943f3a8df3f552236538415622580c914ef06dc9f4c5109d62 SHA512 9ce34b979c855ff69e70891ea568b9d0b9eb26bc209e6ee96fb58687f62bf1c3a8398489d1dde98988790f7e0976fb5ce8dad64a77323ab2e1906d0173bc2861 +AUX genkernel-3.4.52.4-grub-mkconfig.patch 689 BLAKE2B ea390e063b88b6a63fd647e245dc5da7300794c978ed1242193168b95c83338764ec331b1264cb0b0d328904b5145be1f8536ddfad2f6b2b2934175e7b865395 SHA512 f69191e003ee950d8031dd41dffa7724c22535f2b8f7344452150cc171452c9cba171a989aa00d3183993e56c21aeee62ac1b47517c2f2f04d739a109ffefbb3 +AUX genkernel-3.4.52.4-system-map.patch 1498 BLAKE2B 283a0f821e33cadf792428457b22a51c48e07ec5388ce7c3e0fb35e7d4d34b27ab57f2a9ceba85e40d9f74795c19c0721e1d82eb354230c5c310237ee21972a5 SHA512 a2c7fb83e34f75f2ceab182d355616f3ee7e9b524596ea10f69ce1f87f1e21e693f42838650b3a919670182e5f36a6b94475f4d4ebc65e7494cdaa87933f29b9 +AUX genkernel.bash 2438 BLAKE2B 31f1eaa826ab12bba07a2dc45b3394e14ceba9bc98b3f0ce609ca48a9306f2aec507787d457abdee18f4a83ea868de787cc6f9bd085298c396ecab6da14df9c3 SHA512 2bfe23606f919577bb2d174ffe18cd00fbb4ce642fb8860b319e059745d46ff8459b99374159f78af9f3aebb0a352a74ccd74c3be581980f5e298293b96e983d +AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665 +DIST LVM2.2.02.88.tgz 1029151 BLAKE2B e3ce91b6c43155a66b79cf25da3973abb19decde3acc37d28daf80d14b1bd574f7d31fbcee4b397f0a146b2e221599079e521d0ac21932ff58b7c9d4fdf93501 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b +DIST busybox-1.20.2.tar.bz2 2186738 BLAKE2B 3efa01ee81a9f3af0ccbcf28b1a24e817a28012d27a27c714b3f13fe4a73200af66fb93dcd9adc65de3e3abb26757939ff3d3ba620af08101c27c5f3550e7501 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd +DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e +DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd +DIST genkernel-3.4.52.4.tar.xz 284064 BLAKE2B bc9c37f4bc7ab6c5eb8b4a0fe964843cf2554806d2dedd22feb2c9eae4935d9c432c8608916dece5b48cdd5dbf30aaa04fac6e279392f63c6854c2fbef956b1a SHA512 2dcdf2acb19c868ea7bfd5a0f9c7c3b179ac0f9f31b74306641dd8a1e8b076f5122e60a96c006e20f634e9e540d51723ef94bf91d8e28217dbb2159ff4d896dc +DIST gnupg-1.4.11.tar.bz2 3407075 BLAKE2B 85d35d2e4da65d54add1010ea0486b943b328785e28c4efcaa2b65daafd53410a355d1df79ae45c5f7767d2eb7ff1f0b9637f417e65b084d2c760a281abd317a SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae +DIST mdadm-3.1.5.tar.bz2 292709 BLAKE2B a21fb41c6fd9f332e358339537cffd520788140976bf37fece072ee15eb512b1455e3a927abca0a4315e59659d3d114e407bb98a0ca8e6e559e1d1b83be4abbf SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d +DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 +DIST unionfs-fuse-0.24.tar.bz2 30381 BLAKE2B c3886d7b0cbd4ac62712d7d94bf9544481200e4354539b29770a88974ea3298b0f594cecfc6f7accff3595004ad1453075b947a2633b5300a3684fedba4995e5 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd +EBUILD genkernel-3.4.52.4-r3.ebuild 4657 BLAKE2B 844d4ab6dbd01f444300e815b4994e3b12f52e43108c5e8083ca22fc246a18007253bf5720fc5e862abcf6db67b8522f008df122fca1f5f95e926310f55e3cd5 SHA512 ec6b039f9ec2001ad240b183bdb695a61ef35636b14a673f6452febf755ea9b178d0a05dcf24da37510b15fad4aab59d0ae4a4cecf5965db41660a07668ddd94 +MISC metadata.xml 637 BLAKE2B 8498132ea1773f537d7f463fb420e9b7c80f24e6a8e3eefbb88bc942707d37d3c7a0e8a80cbbace2c8068411d06f8a1923efbc23e80e6fa87fa06766af1a6627 SHA512 10753c6db20c7e5d2c805d309aa69945f66d27287bbb240626baa2179263b5cf0e703c589f1951aecc2ed1e7e8259097434cc4e7f36d9dff8e1c6d8f50b684db diff -uNr a/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch --- a/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch false +++ b/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch 9e702352cf3ef08adfa69ab3876264c5ed6bf851bf98bc460554acd50d6369ed5aac6724002740458ceecfdf667205d8f0c2c3ee3ad4acccca7c749b5c279e06 @@ -0,0 +1,130 @@ +modules_load: add crc32c + +commit 7308d72c3280da22cd94337b0eb248cdc53cb842 upstream. + +Bug: https://bugs.gentoo.org/655110 + +--- a/arch/alpha/modules_load ++++ b/arch/alpha/modules_load +@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/arm/modules_load ++++ b/arch/arm/modules_load +@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/ia64/modules_load ++++ b/arch/ia64/modules_load +@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" ++ ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/mips/modules_load ++++ b/arch/mips/modules_load +@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/parisc/modules_load ++++ b/arch/parisc/modules_load +@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/parisc64/modules_load ++++ b/arch/parisc64/modules_load +@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" ++ ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/ppc/modules_load ++++ b/arch/ppc/modules_load +@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/ppc64/modules_load ++++ b/arch/ppc64/modules_load +@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" ++ ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/s390/modules_load ++++ b/arch/s390/modules_load +@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/sparc/modules_load ++++ b/arch/sparc/modules_load +@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/sparc64/modules_load ++++ b/arch/sparc64/modules_load +@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" ++ ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/um/modules_load ++++ b/arch/um/modules_load +@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + # Filesystems + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + ++# Crypto ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" +--- a/arch/x86/modules_load ++++ b/arch/x86/modules_load +@@ -29,4 +29,4 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + + # Crypto +-MODULES_CRYPTO="sha256_generic cbc aes_generic aes_586 aesni-intel xts" ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic aes_586 aesni-intel xts" +--- a/arch/x86_64/modules_load ++++ b/arch/x86_64/modules_load +@@ -28,4 +28,4 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + + # Crypto +-MODULES_CRYPTO="sha256_generic cbc aes_generic aes-x86_64 aesni-intel xts" ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic aes-x86_64 aesni-intel xts" +--- a/defaults/modules_load ++++ b/defaults/modules_load +@@ -28,4 +28,4 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd xhci-hcd x + MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + + # Crypto +-MODULES_CRYPTO="sha256_generic cbc aes_generic xts" ++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" diff -uNr a/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch --- a/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch false +++ b/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch 567f289cf0a94e5f3b6ea9a54941c416dab146ff41f754a0549d975df302113af5d052a944f9c4a325a0fdba36669b4c772a5756eac7b44a79e25090ace89907 @@ -0,0 +1,17 @@ +diff --git a/gen_bootloader.sh b/gen_bootloader.sh +index 4bbd303..fdca749 100755 +--- a/gen_bootloader.sh ++++ b/gen_bootloader.sh +@@ -49,8 +49,10 @@ set_bootloader_grub2() { + fi + + print_info 1 "You can customize Grub2 parameters in /etc/default/grub." +- print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..." +- grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || gen_die "grub2-mkconfig failed" ++ print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..." ++ grub-mkconfig -o "${GRUB_CONF}" 2> /dev/null || ++ grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || ++ gen_die "grub-mkconfig failed" + [ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}" + } + diff -uNr a/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch --- a/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch false +++ b/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch f2bbc088d8942374cefe08ff408d78fb503c7b13d895c0298cc91e5c8e1aba2cc012e01f5122d3baa747456a7abf3a8c117c31a17d658c8ff4c2a7a311fc9844 @@ -0,0 +1,38 @@ +From 4fb8318037a8ea12f54b7c711d702b432113f233 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sun, 27 Mar 2016 02:04:41 -0400 +Subject: [PATCH] adjust System.map die check for #570822 + +Builds with newer genkernel have been failing in catalyst like so: +* ERROR: Could not copy System.map from kerncache for the kernel package! + +The code that added it seems to have been meant to check the minkernpackage/ +subdir where the file was renamed instead of the current subdir. Change the +check to simplify verify the mv didn't fail instead of duplicating the file +name entirely. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + gen_package.sh | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/gen_package.sh b/gen_package.sh +index 9dd166b..b08ff03 100755 +--- a/gen_package.sh ++++ b/gen_package.sh +@@ -45,11 +45,8 @@ gen_minkernpackage() { + if [ "${KERNCACHE}" != "" ] + then + /bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV} +- mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} +- if [ ! -f System.map-${KNAME}-${ARCH}-${KV} ] +- then ++ mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} || + gen_die 'Could not copy System.map from kerncache for the kernel package!' +- fi + else + cp "${KERNEL_OUTPUTDIR}/System.map" "${TEMP}/minkernpackage/System.map-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!'; + fi +-- +2.7.4 + diff -uNr a/sys-kernel/genkernel/files/genkernel.bash b/sys-kernel/genkernel/files/genkernel.bash --- a/sys-kernel/genkernel/files/genkernel.bash false +++ b/sys-kernel/genkernel/files/genkernel.bash 96113391f35f784a6dd82035b185a79ae081e8d806752bf04f1635ccba898bec28c8ed412ce739b67529b43f0a02c79b8701ed08c934561f657d68a922a6eeed @@ -0,0 +1,73 @@ +# genkernel (8) completion +# Copyright 2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Written by Aron Griffis <agriffis@gentoo.org> + +_genkernel() +{ + declare cur prev genkernel_help actions params + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + + # extract initial list of params/actions from genkernel --help + genkernel_help=$(command genkernel --help) + actions=( $(<<<"$genkernel_help" sed -n \ + '/^Available Actions:/,/^$/s/^[[:space:]]\+$[^[:space:]]\+$.*/\1/p') ) + params=( $(<<<"$genkernel_help" egrep -oe '--[^[:space:]]{2,}') ) + + # attempt to complete the current parameter based on the list + COMPREPLY=($(compgen -W "${params[*]/=*/=} ${actions[*]}" -- "$cur")) + + # if we don't have a rhs to complete + if [[ ${#COMPREPLY[@]} -gt 1 ]]; then + return + elif [[ ${#COMPREPLY[@]} -eq 0 && $cur != --*=* ]]; then + return + elif [[ ${#COMPREPLY[@]} -eq 1 && $COMPREPLY != --*= ]]; then + # using nospace completion, add an explicit space + COMPREPLY="${COMPREPLY} " + return + fi + + # we have a unique lhs and need to complete the rhs + declare args lhs rhs + if [[ ${#COMPREPLY[@]} -eq 1 ]]; then + lhs=$COMPREPLY + else + lhs=${cur%%=*}= + rhs=${cur#*=} + fi + + # genkernel's help gives clues as to what belongs on the rhs. + # extract the clue for the current parameter + args=" ${params[*]} " + args="${args##* $lhs}" + args="${args%% *}" + + # generate a list of completions for the argument; this replaces args with + # an array of results + args=( $(case $args in + ('<0-5>') compgen -W "$(echo {1..5})" -- "$rhs" ;; + ('<outfile>'|'<file>') compgen -A file -o plusdirs -- "$rhs" ;; + ('<dir>') compgen -A directory -S / -- "$rhs" ;; + ('<tbz2>') compgen -G '*.tbz2' -G '*.tar.bz2' -o plusdirs -- "$rhs" ;; + (*) compgen -o bashdefault -- "$rhs" ;; # punt + esac) ) + + # we're using nospace completion to prevent spaces after paths that aren't + # "done" yet. So do some hacking to the args to add spaces after + # non-directories. + declare slash=/ + args=( "${args[@]/%/ }" ) # add space to all + args=( "${args[@]/%$slash /$slash}" ) # remove space from dirs + + # recreate COMPREPLY + if [[ $cur == "$lhs"* ]]; then + COMPREPLY=( "${args[@]}" ) + elif [[ ${#args[@]} -gt 0 ]]; then + COMPREPLY=( "${args[@]/#/$lhs}" ) + fi +} + +complete -o nospace -F _genkernel genkernel diff -uNr a/sys-kernel/genkernel/files/initramfs.mounts b/sys-kernel/genkernel/files/initramfs.mounts --- a/sys-kernel/genkernel/files/initramfs.mounts false +++ b/sys-kernel/genkernel/files/initramfs.mounts aeddefb577b3bdd7c9d48b515697ce6bb5c8434a25f7a517bec657c7fc359818bf0e31c387cefccebbb370913a2f2e3c6f729b9172d51f2947c01391356eeaa0 @@ -0,0 +1,23 @@ +# This specifies which mounts from your fstab should be mounted before +# switching to the real root. If this file is missing, genkernel's code will +# default to just "/usr", which will suffice on most systems with a seperate +# /usr mount. +# +# If you have a complex configuration with a bindmount or symlink at /usr, or +# need some other mountpoints at boot, you should update this file such that +# /usr and anything else needed will be available after the switch into the +# real root. +# +# The lines without comments in this file are used as exact matches against the +# second column of your /etc/fstab and the device, fstype and mount options are +# taken from that line in fstab. If no line matches, the line from this file +# will be ignored. +# + +/usr + +# If you had some need of these: +#/usr/local +#/opt +#/var +#/home diff -uNr a/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild --- a/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild false +++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild e25853f074b022b2a574993f15eeabce3aa570faa54d71c432ed8a28da81f71ef22efc0e7a362a3fc3de742aa15315cf2fbceb0f03d6ddb54b3494ab9e0cd7c9 @@ -0,0 +1,157 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# genkernel-9999 -> latest Git branch "master" +# genkernel-VERSION -> normal genkernel release + +EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12 + +inherit bash-completion-r1 epatch + +VERSION_BUSYBOX='1.20.2' +VERSION_DMRAID='1.0.0.rc16-3' +VERSION_MDADM='3.1.5' +VERSION_FUSE='2.8.6' +VERSION_ISCSI='2.0-872' +VERSION_LVM='2.02.88' +VERSION_UNIONFS_FUSE='0.24' +VERSION_GPG='1.4.11' + +RH_HOME="ftp://sourceware.org/pub" +DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src" +BB_HOME="https://busybox.net/downloads" + +COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2 + ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2 + mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2 + ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz + ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz + ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2 + http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz + mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz + mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz + http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 + mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 + mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2" + +if [[ ${PV} == 9999* ]] +then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" + inherit git-r3 + S="${WORKDIR}/${P}" + SRC_URI="${COMMON_URI}" +else + SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz + ${COMMON_URI}" + KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" +fi + +DESCRIPTION="Gentoo automatic kernel building scripts" +HOMEPAGE="https://www.gentoo.org" + +LICENSE="GPL-2" +SLOT="0" +RESTRICT="" +IUSE="cryptsetup ibm selinux" + +DEPEND="sys-fs/e2fsprogs + selinux? ( sys-libs/libselinux )" +RDEPEND="${DEPEND} + cryptsetup? ( sys-fs/cryptsetup ) + app-arch/cpio + >=app-misc/pax-utils-0.2.1 + !<sys-apps/openrc-0.9.9" +# pax-utils is used for lddtree + +if [[ ${PV} == 9999* ]]; then + DEPEND="${DEPEND} app-text/asciidoc" +fi + +pkg_pretend() { + if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then + ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)." + ewarn "Please set flag 'cryptsetup' for this very package if you would like" + ewarn "to have genkernel create an initramfs with LUKS support." + ewarn "Sorry for the inconvenience." + echo + fi +} + +src_prepare() { + if [[ ${PV} == 9999* ]] ; then + einfo "Producing ChangeLog from Git history..." + pushd "${S}/.git" >/dev/null || die + git log > "${S}"/ChangeLog || die + popd >/dev/null || die + fi + if use selinux ; then + sed -i 's/###//g' "${S}"/gen_compile.sh || die + fi + + # Update software.sh + sed -i \ + -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \ + -e "s:VERSION_MDADM:$VERSION_MDADM:" \ + -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \ + -e "s:VERSION_FUSE:$VERSION_FUSE:" \ + -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \ + -e "s:VERSION_LVM:$VERSION_LVM:" \ + -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \ + -e "s:VERSION_GPG:$VERSION_GPG:" \ + "${S}"/defaults/software.sh \ + || die "Could not adjust versions" + + epatch "${FILESDIR}"/${P}-system-map.patch #570822 + epatch "${FILESDIR}"/${P}-grub-mkconfig.patch #591200 + epatch "${FILESDIR}"/${P}-crc32c.patch #655110 + epatch_user +} + +src_compile() { + if [[ ${PV} == 9999* ]]; then + emake + fi +} + +src_install() { + insinto /etc + doins "${S}"/genkernel.conf + + doman genkernel.8 + dodoc AUTHORS ChangeLog README TODO + dobin genkernel + rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf + + if use ibm ; then + cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die + else + cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die + fi + insinto /usr/share/genkernel + doins -r "${S}"/* + + newbashcomp "${FILESDIR}"/genkernel.bash "${PN}" + insinto /etc + doins "${FILESDIR}"/initramfs.mounts + + cd "${DISTDIR}" + insinto /usr/share/genkernel/distfiles + doins ${A/${P}.tar.xz/} +} + +pkg_postinst() { + echo + elog 'Documentation is available in the genkernel manual page' + elog 'as well as the following URL:' + echo + elog 'https://wiki.gentoo.org/wiki/Genkernel' + echo + ewarn "This package is known to not work with reiser4. If you are running" + ewarn "reiser4 and have a problem, do not file a bug. We know it does not" + ewarn "work and we don't plan on fixing it since reiser4 is the one that is" + ewarn "broken in this regard. Try using a sane filesystem like ext4." + echo + ewarn "The LUKS support has changed from versions prior to 3.4.4. Now," + ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah." + echo +} diff -uNr a/sys-kernel/genkernel/metadata.xml b/sys-kernel/genkernel/metadata.xml --- a/sys-kernel/genkernel/metadata.xml false +++ b/sys-kernel/genkernel/metadata.xml 798806ae5542e39cbf7a42dc462cb4c86a079f015a47e2acd547f374decbc7547486c230fc15b9f2ae9db5df19034ead6a8b632e70bb7b3788e73588a22b0f0c @@ -0,0 +1,19 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>genkernel@gentoo.org</email> + </maintainer> + <use> + <flag name="cryptsetup">Enable support for Luks disk encryption using <pkg>sys-fs/cryptsetup</pkg></flag> + <flag name="firmware">Prefer system firmware <pkg>sys-kernel/linux-firmware</pkg> over local copy.</flag> + </use> +  + <upstream> + <remote-id type="sourceforge">fuse</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest --- a/sys-kernel/gentoo-sources/Manifest false +++ b/sys-kernel/gentoo-sources/Manifest f9ec9ba92fb07258703b50d67b851390eda5ea3088ba9ccef9585cee4d433a382ac4dcf543660ce3d5d45dd8641bf541ffe4037485a820bd56b5d48df1d24fff @@ -0,0 +1,6 @@ +DIST genpatches-4.9-98.base.tar.xz 1905108 BLAKE2B ce390d21113a94d44489155fd554cc83a2496b6a035492993c8fc144a3fc77633649de58bf98d10c03c02d3d4ebec3f9e7a7329f56c89e34b842d61824196490 SHA512 ed71478b4c44fda51349e09f9ca805f519a1873d2fb1de88cbc7ee806ad2117a5809f0eae3a2ccb71ec51652422a8a1754298edf0dabd0064aa87b1a833f518d +DIST genpatches-4.9-98.experimental.tar.xz 106408 BLAKE2B 27dea027500bf5c2230db2d693875748c1bd021cd3898aebefe041eedfe8a7e39339939810e6a5f48e872403ed3aa4857693545d15f79ff52afde20faa48b2d7 SHA512 e3f76f33094b2bbf0f8cdfa90560a45d20d8341bfa426e18d777ec02ba0e959d99f683f63172588f0dfbb7034d70d70d5d123ecc3cfe50255ef9f4550015550d +DIST genpatches-4.9-98.extras.tar.xz 17348 BLAKE2B 03b455ea225eb4c99f1c263ed694de45674e2242c00776462a412e8a49fc826cf26630564857207b7944d5b5ff3f8955a3bd0a7ae3a33bc59bc06bd3f0c064f6 SHA512 6bba9882f346577fd685de2172e12708fc757f86efdba63d33d805710e00bf4eacb537968a548528a20d50f5a726516050e0e4e0170d3db652bddbaac9d3f23a +DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a +EBUILD gentoo-sources-4.9.95.ebuild 738 BLAKE2B d2daa641001c04dce2298a3737d6a97d3a53957bc7d78690321a90cbf13f83cf9991f974fa4e2a0c058c18e60f840b9796e19be504719bf717362b4a9106717e SHA512 9b3a3725f3845bdcd3853eb7ea37de374c38987c537f7e4c3d4010669a8688d6983e6e83e407e70b07ca69da5002d8388445369c99df90bf531d6acafebc4cae +MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b diff -uNr a/sys-kernel/gentoo-sources/gentoo-sources-4.9.95.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.95.ebuild --- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.95.ebuild false +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.95.ebuild e909e8e01fc72e37b04d82d10ecde8cd171d692f8b4a18b44bf56970ef95feaa3d911113912a6384abd3648e341bcf76456186f452072963bbfb26bd2bedea2a @@ -0,0 +1,28 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="98" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff -uNr a/sys-kernel/gentoo-sources/metadata.xml b/sys-kernel/gentoo-sources/metadata.xml --- a/sys-kernel/gentoo-sources/metadata.xml false +++ b/sys-kernel/gentoo-sources/metadata.xml 0b7e4d4f1301d6ebe92d48afb9369ab65d9b1ab20b9575c44dc967db54c5a35cf82a5b76926e1b1a04ccb424554f318a6527812dbc3d59d0d97534cf3b5701ac @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>kernel@gentoo.org</email> + <name>Gentoo Kernel Project</name> +</maintainer> +<use> + <flag name="experimental">Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".</flag> +</use> +<upstream> + <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest --- a/sys-kernel/linux-headers/Manifest false +++ b/sys-kernel/linux-headers/Manifest 66bacefc5d39c5cf1df81aa71dcc11a215d9fad1809334d9c85eda02aaf74b6b92f49cdcbefcb3229ffaa3b0131e840a3b3fa8f2d4bbde1e7bf2c28d35560589 @@ -0,0 +1,8 @@ +AUX libc-4.15-portability.patch 6046 BLAKE2B 8979efbe72ab8ba87f01baddb36f317c6c432ace27887bc2bbd5b7f9a6edce14d8cd320619a19b83c009540c6729b38ff1f38656a13c820755a1466abbcee0fa SHA512 8f0bc03e0b28df59e80a2bb8739d712afac9e605333b8f4f1fa39c89cee0278594b5293d12bd5f82a58c778d46625620d642b2f4a191f20876202443902271d3 +AUX libc-4.16-portability.patch 5864 BLAKE2B bc34b947879aef2ce34d7ac583a40fea1503c3b49d0c4bf2632cb03a2cd733d1ad4ea6ceb2e9bbeeb22f29994e677245e2035dc1fd0faa380516e4220b5fe550 SHA512 784d85024d705a698ce5ce63efdf9de3aa36c82f5ba00fd1ec09719e42b6e87e4bee394cd7ca73b177fee33d1af5026d56b339e6e036a988bdb3218c2901a86e +AUX libc-4.3-portability.patch 3908 BLAKE2B c55c15cfcdd667cb72fc700f4701b47e4c0a9afaf1df35f7f2701079a521d7f0e1d5457c407bce7676ac5b04b7a8628090e52421ecb255ba6558b9042dab32c2 SHA512 7b577f7b0a489274685fc9af9234cd6fd00a033342e62c38601b3e663798b1af8e053f7df2a6d78fadcbf2e582ca25bfcc45259f01bc08c46d3d846a2b397eb3 +AUX libc-4.8-portability.patch 6471 BLAKE2B 3b7ad519c69bd779de574a62b35ce6fda44260b7e6e3e342084ae3b6ce598f774030484e05dd0be19dc265189fd7698444e2557b1dfd6ac09457ac4ddad26554 SHA512 9ca54f7f3f00ce5764f7c943e53fd19a824e6c8160c91344cee550b70e3752d9128fa0eb45a82a7b8063faffbb23f4f4bb223044b3ffbdb2d514f3abe2d4ff9e +DIST gentoo-headers-4.13-1.tar.xz 4096 BLAKE2B a0506c6aec14d8d710863cc3f7b5ce6cc067af245cc96dbf83f10f02ba83d580f900c9cf8b09b496370d580a9b9cd935738d8b4b0cb987836490894fba01cf23 SHA512 14236185c8810b88d94ff0533fe59e84599c2d4e5c7507c37cb458b6728eed69b581df7f8654d5323454ec359e93490c4dcbbb1ee58a66f2586047c93f0f1aa6 +DIST gentoo-headers-base-4.13.tar.xz 7951980 BLAKE2B 8b3b5d9152455b08bf06c275a69168f8a2418584058e23f784d3ab956d72b100b89d398bfeb351d8faa8285cd9ae8942726099ce9aa3fd94b8e0e92b8de1c217 SHA512 3b528e18199d43db3f51c8fb9a5a4c67b9317ea7e9b9fd82fe2cb4d704bbc1253f2af64dc79377ee8ec26511d0893409e3dddbb9a6ae11e8bb7f4ca4d8d3ac9a +EBUILD linux-headers-4.13.ebuild 1485 BLAKE2B 8f43d5788d7f28e997414a130f06b047c6ca51d684681ddd52db9269c814c7f8009f173734c00753b5ab32296f378ece161ec26f419c6a04720e5aa2b5664a65 SHA512 9ae11836502eea835de84865f9157cf4922ee6c513aa1ce9fc0dda476d43ee1592407e3121e55576d125899f99488d40de7e3c7728d91e8dacc007ba27fc6cb9 +MISC metadata.xml 344 BLAKE2B 383045f9629523bb66545a2e141c51056a1dffcc7cb084b251efd9da73253dbd4be8beebc659d65dbe2faf7852207db39feadac2ab07dff140db1c7f8dbf992a SHA512 4dfc3a4130e5ae01c17510c693c4f2bd81fb019cf003e866c7f359213b58c6e36ed59699d6a458464e1dabd73c8f4a24eada8ced06d7ac513ec3553c0179f164 diff -uNr a/sys-kernel/linux-headers/files/libc-4.15-portability.patch b/sys-kernel/linux-headers/files/libc-4.15-portability.patch --- a/sys-kernel/linux-headers/files/libc-4.15-portability.patch false +++ b/sys-kernel/linux-headers/files/libc-4.15-portability.patch bfd1df30a5eac5e76bed4942af8022a23072643994444501ee0c8f8ea04a079bb32ff526e517372d1a6a518a134fc47111ecebcded7ed0fded3e9996a1aa74ee @@ -0,0 +1,165 @@ +diff -Naur gentoo-headers-base-4.15.orig/include/uapi/linux/kernel.h gentoo-headers-base-4.15/include/uapi/linux/kernel.h +--- gentoo-headers-base-4.15.orig/include/uapi/linux/kernel.h 2018-01-29 21:22:19.000000000 -0800 ++++ gentoo-headers-base-4.15/include/uapi/linux/kernel.h 2018-01-30 13:05:03.399378810 -0800 +@@ -2,7 +2,9 @@ + #ifndef _UAPI_LINUX_KERNEL_H + #define _UAPI_LINUX_KERNEL_H + ++#ifdef __GLIBC__ + #include <linux/sysinfo.h> ++#endif + + /* + * 'kernel.h' contains some often-used function prototypes etc +diff -Naur gentoo-headers-base-4.15.orig/include/uapi/linux/libc-compat.h gentoo-headers-base-4.15/include/uapi/linux/libc-compat.h +--- gentoo-headers-base-4.15.orig/include/uapi/linux/libc-compat.h 2018-01-29 21:22:19.000000000 -0800 ++++ gentoo-headers-base-4.15/include/uapi/linux/libc-compat.h 2018-01-30 13:14:11.470368995 -0800 +@@ -49,47 +49,57 @@ + #ifndef _UAPI_LIBC_COMPAT_H + #define _UAPI_LIBC_COMPAT_H + +-/* We have included glibc headers... */ +-#if defined(__GLIBC__) ++/* We're used from userspace... */ ++#if !defined(__KERNEL__) + +-/* Coordinate with glibc net/if.h header. */ ++/* Coordinate with libc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + + #define __UAPI_DEF_IF_IFCONF 0 + #define __UAPI_DEF_IF_IFMAP 0 + #define __UAPI_DEF_IF_IFNAMSIZ 0 + #define __UAPI_DEF_IF_IFREQ 0 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++#if !defined(__GLIBC__) ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++#else + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ ++#endif /* !defined(__GLIBC__) */ + + #else /* _NET_IF_H */ + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + + #define __UAPI_DEF_IF_IFCONF 1 + #define __UAPI_DEF_IF_IFMAP 1 + #define __UAPI_DEF_IF_IFNAMSIZ 1 + #define __UAPI_DEF_IF_IFREQ 1 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + + #endif /* _NET_IF_H */ + +-/* Coordinate with glibc netinet/in.h header. */ ++/* Coordinate with libc netinet/if_ether.h */ ++#ifdef _NETINET_IF_ETHER_H ++#define __UAPI_DEF_ETHHDR 0 ++#else ++/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */ ++#define __UAPI_DEF_ETHHDR 1 ++#endif /* _NETINET_IF_ETHER_H */ ++ ++/* Coordinate with libc netinet/in.h header. */ + #if defined(_NETINET_IN_H) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + #define __UAPI_DEF_IN_ADDR 0 + #define __UAPI_DEF_IN_IPPROTO 0 +@@ -99,15 +109,7 @@ + #define __UAPI_DEF_IN_CLASS 0 + + #define __UAPI_DEF_IN6_ADDR 0 +-/* The exception is the in6_addr macros which must be defined +- * if the glibc code didn't define them. This guard matches +- * the guard in glibc/inet/netinet/in.h which defines the +- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ +-#if defined(__USE_MISC) || defined (__USE_GNU) + #define __UAPI_DEF_IN6_ADDR_ALT 0 +-#else +-#define __UAPI_DEF_IN6_ADDR_ALT 1 +-#endif + #define __UAPI_DEF_SOCKADDR_IN6 0 + #define __UAPI_DEF_IPV6_MREQ 0 + #define __UAPI_DEF_IPPROTO_V6 0 +@@ -118,7 +120,7 @@ + #else + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + #define __UAPI_DEF_IN_ADDR 1 + #define __UAPI_DEF_IN_IPPROTO 1 +@@ -128,7 +130,7 @@ + #define __UAPI_DEF_IN_CLASS 1 + + #define __UAPI_DEF_IN6_ADDR 1 +-/* We unconditionally define the in6_addr macros and glibc must ++/* We unconditionally define the in6_addr macros and libc must + * coordinate. */ + #define __UAPI_DEF_IN6_ADDR_ALT 1 + #define __UAPI_DEF_SOCKADDR_IN6 1 +@@ -170,7 +172,7 @@ + * or we are being included in the kernel, then define everything + * that we need. Check for previous __UAPI_* definitions to give + * unsupported C libraries a way to opt out of any kernel definition. */ +-#else /* !defined(__GLIBC__) */ ++#else /* defined(__KERNEL) */ + + /* Definitions for if.h */ + #ifndef __UAPI_DEF_IF_IFCONF +@@ -185,15 +187,20 @@ + #ifndef __UAPI_DEF_IF_IFREQ + #define __UAPI_DEF_IF_IFREQ 1 + #endif +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 + #endif +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + #endif + ++/* Definitions for if_ether.h */ ++/* allow libcs like musl to deactivate this, glibc does not implement this. */ ++#ifndef __UAPI_DEF_ETHHDR ++#define __UAPI_DEF_ETHHDR 1 ++#endif ++ + /* Definitions for in.h */ + #ifndef __UAPI_DEF_IN_ADDR + #define __UAPI_DEF_IN_ADDR 1 +@@ -262,12 +269,6 @@ + #define __UAPI_DEF_XATTR 1 + #endif + +-#endif /* __GLIBC__ */ +- +-/* Definitions for if_ether.h */ +-/* allow libcs like musl to deactivate this, glibc does not implement this. */ +-#ifndef __UAPI_DEF_ETHHDR +-#define __UAPI_DEF_ETHHDR 1 +-#endif ++#endif /* defined(__KERNEL__) */ + + #endif /* _UAPI_LIBC_COMPAT_H */ diff -uNr a/sys-kernel/linux-headers/files/libc-4.16-portability.patch b/sys-kernel/linux-headers/files/libc-4.16-portability.patch --- a/sys-kernel/linux-headers/files/libc-4.16-portability.patch false +++ b/sys-kernel/linux-headers/files/libc-4.16-portability.patch 63ab7dc94d03b4a48190fa06be45d2650001ab6e91b8d1b9b25f4f436a9c8d81b16a941b547d3c4865d788cdbf4c7a78b71f409ce1646cee3d54a8db8776795d @@ -0,0 +1,159 @@ +diff -Naur gentoo-headers-base-4.16.orig/include/uapi/linux/kernel.h gentoo-headers-base-4.16/include/uapi/linux/kernel.h +--- gentoo-headers-base-4.16.orig/include/uapi/linux/kernel.h 2018-04-04 23:45:32.000000000 -0700 ++++ gentoo-headers-base-4.16/include/uapi/linux/kernel.h 2018-04-08 17:51:18.477168271 -0700 +@@ -2,7 +2,9 @@ + #ifndef _UAPI_LINUX_KERNEL_H + #define _UAPI_LINUX_KERNEL_H + ++#ifdef __GLIBC__ + #include <linux/sysinfo.h> ++#endif + + /* + * 'kernel.h' contains some often-used function prototypes etc +diff -Naur gentoo-headers-base-4.16.orig/include/uapi/linux/libc-compat.h gentoo-headers-base-4.16/include/uapi/linux/libc-compat.h +--- gentoo-headers-base-4.16.orig/include/uapi/linux/libc-compat.h 2018-04-04 23:45:32.000000000 -0700 ++++ gentoo-headers-base-4.16/include/uapi/linux/libc-compat.h 2018-04-08 17:53:43.004162639 -0700 +@@ -49,47 +49,57 @@ + #ifndef _UAPI_LIBC_COMPAT_H + #define _UAPI_LIBC_COMPAT_H + +-/* We have included glibc headers... */ +-#if defined(__GLIBC__) ++/* We're used from userspace... */ ++#if !defined(__KERNEL__) + +-/* Coordinate with glibc net/if.h header. */ ++/* Coordinate with libc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + + #define __UAPI_DEF_IF_IFCONF 0 + #define __UAPI_DEF_IF_IFMAP 0 + #define __UAPI_DEF_IF_IFNAMSIZ 0 + #define __UAPI_DEF_IF_IFREQ 0 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++#if !defined(__GLIBC__) ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++#else + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ ++#endif /* !defined(__GLIBC__) */ + + #else /* _NET_IF_H */ + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + + #define __UAPI_DEF_IF_IFCONF 1 + #define __UAPI_DEF_IF_IFMAP 1 + #define __UAPI_DEF_IF_IFNAMSIZ 1 + #define __UAPI_DEF_IF_IFREQ 1 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + + #endif /* _NET_IF_H */ + +-/* Coordinate with glibc netinet/in.h header. */ ++/* Coordinate with libc netinet/if_ether.h */ ++#ifdef _NETINET_IF_ETHER_H ++#define __UAPI_DEF_ETHHDR 0 ++#else ++/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */ ++#define __UAPI_DEF_ETHHDR 1 ++#endif /* _NETINET_IF_ETHER_H */ ++ ++/* Coordinate with libc netinet/in.h header. */ + #if defined(_NETINET_IN_H) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + #define __UAPI_DEF_IN_ADDR 0 + #define __UAPI_DEF_IN_IPPROTO 0 +@@ -99,15 +109,7 @@ + #define __UAPI_DEF_IN_CLASS 0 + + #define __UAPI_DEF_IN6_ADDR 0 +-/* The exception is the in6_addr macros which must be defined +- * if the glibc code didn't define them. This guard matches +- * the guard in glibc/inet/netinet/in.h which defines the +- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ +-#if defined(__USE_MISC) || defined (__USE_GNU) + #define __UAPI_DEF_IN6_ADDR_ALT 0 +-#else +-#define __UAPI_DEF_IN6_ADDR_ALT 1 +-#endif + #define __UAPI_DEF_SOCKADDR_IN6 0 + #define __UAPI_DEF_IPV6_MREQ 0 + #define __UAPI_DEF_IPPROTO_V6 0 +@@ -118,7 +120,7 @@ + #else + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + #define __UAPI_DEF_IN_ADDR 1 + #define __UAPI_DEF_IN_IPPROTO 1 +@@ -128,7 +130,7 @@ + #define __UAPI_DEF_IN_CLASS 1 + + #define __UAPI_DEF_IN6_ADDR 1 +-/* We unconditionally define the in6_addr macros and glibc must ++/* We unconditionally define the in6_addr macros and libc must + * coordinate. */ + #define __UAPI_DEF_IN6_ADDR_ALT 1 + #define __UAPI_DEF_SOCKADDR_IN6 1 +@@ -170,7 +172,7 @@ + * or we are being included in the kernel, then define everything + * that we need. Check for previous __UAPI_* definitions to give + * unsupported C libraries a way to opt out of any kernel definition. */ +-#else /* !defined(__GLIBC__) */ ++#else /* defined(__KERNEL) */ + + /* Definitions for if.h */ + #ifndef __UAPI_DEF_IF_IFCONF +@@ -185,15 +187,20 @@ + #ifndef __UAPI_DEF_IF_IFREQ + #define __UAPI_DEF_IF_IFREQ 1 + #endif +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 + #endif +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + #endif + ++/* Definitions for if_ether.h */ ++/* allow libcs like musl to deactivate this, glibc does not implement this. */ ++#ifndef __UAPI_DEF_ETHHDR ++#define __UAPI_DEF_ETHHDR 1 ++#endif ++ + /* Definitions for in.h */ + #ifndef __UAPI_DEF_IN_ADDR + #define __UAPI_DEF_IN_ADDR 1 +@@ -262,6 +269,6 @@ + #define __UAPI_DEF_XATTR 1 + #endif + +-#endif /* __GLIBC__ */ ++#endif /* defined(__KERNEL__) */ + + #endif /* _UAPI_LIBC_COMPAT_H */ diff -uNr a/sys-kernel/linux-headers/files/libc-4.3-portability.patch b/sys-kernel/linux-headers/files/libc-4.3-portability.patch --- a/sys-kernel/linux-headers/files/libc-4.3-portability.patch false +++ b/sys-kernel/linux-headers/files/libc-4.3-portability.patch aea87c9c9a97c84d63f19ae9f59434386c4162cef3e2e50e54db785aa7addfde551dbe6164e7c43270efd8f432f7d090acf05a87fd4bd9c21179a71af5377266 @@ -0,0 +1,120 @@ +diff -urN a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h +--- a/include/uapi/linux/if_ether.h 2015-11-02 12:36:00.000000000 -0600 ++++ b/include/uapi/linux/if_ether.h 2015-11-06 21:07:36.109409947 -0600 +@@ -22,6 +22,7 @@ + #define _UAPI_LINUX_IF_ETHER_H + + #include <linux/types.h> ++#include <linux/libc-compat.h> + + /* + * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble +@@ -134,12 +135,12 @@ + /* + * This is an Ethernet frame header. + */ +- ++#if __UAPI_DEF_ETHHDR + struct ethhdr { + unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ + unsigned char h_source[ETH_ALEN]; /* source ether addr */ + __be16 h_proto; /* packet type ID field */ + } __attribute__((packed)); +- ++#endif + + #endif /* _UAPI_LINUX_IF_ETHER_H */ +diff -urN a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h +--- a/include/uapi/linux/kernel.h 2015-11-02 12:36:00.000000000 -0600 ++++ b/include/uapi/linux/kernel.h 2015-11-06 20:59:38.595400307 -0600 +@@ -1,7 +1,9 @@ + #ifndef _UAPI_LINUX_KERNEL_H + #define _UAPI_LINUX_KERNEL_H + ++#ifdef __GLIBC__ + #include <linux/sysinfo.h> ++#endif + + /* + * 'kernel.h' contains some often-used function prototypes etc +diff -urN a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h +--- a/include/uapi/linux/libc-compat.h 2015-11-02 12:36:00.000000000 -0600 ++++ b/include/uapi/linux/libc-compat.h 2015-11-06 21:09:14.645411936 -0600 +@@ -48,13 +48,18 @@ + #ifndef _UAPI_LIBC_COMPAT_H + #define _UAPI_LIBC_COMPAT_H + +-/* We have included glibc headers... */ +-#if defined(__GLIBC__) ++#ifndef __KERNEL__ /* we're used from userspace */ + +-/* Coordinate with glibc netinet/in.h header. */ ++#ifdef _NETINET_IF_ETHER_H /* musl */ ++#define __UAPI_DEF_ETHHDR 0 ++#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ ++#define __UAPI_DEF_ETHHDR 1 ++#endif ++ ++/* Coordinate with libc netinet/in.h header. */ + #if defined(_NETINET_IN_H) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + #define __UAPI_DEF_IN_ADDR 0 + #define __UAPI_DEF_IN_IPPROTO 0 +@@ -64,15 +69,7 @@ + #define __UAPI_DEF_IN_CLASS 0 + + #define __UAPI_DEF_IN6_ADDR 0 +-/* The exception is the in6_addr macros which must be defined +- * if the glibc code didn't define them. This guard matches +- * the guard in glibc/inet/netinet/in.h which defines the +- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ +-#if defined(__USE_MISC) || defined (__USE_GNU) + #define __UAPI_DEF_IN6_ADDR_ALT 0 +-#else +-#define __UAPI_DEF_IN6_ADDR_ALT 1 +-#endif + #define __UAPI_DEF_SOCKADDR_IN6 0 + #define __UAPI_DEF_IPV6_MREQ 0 + #define __UAPI_DEF_IPPROTO_V6 0 +@@ -80,10 +77,10 @@ + #define __UAPI_DEF_IN6_PKTINFO 0 + #define __UAPI_DEF_IP6_MTUINFO 0 + +-#else ++#else /* defined(_NETINET_IN_H) */ + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + #define __UAPI_DEF_IN_ADDR 1 + #define __UAPI_DEF_IN_IPPROTO 1 +@@ -93,7 +90,7 @@ + #define __UAPI_DEF_IN_CLASS 1 + + #define __UAPI_DEF_IN6_ADDR 1 +-/* We unconditionally define the in6_addr macros and glibc must ++/* We unconditionally define the in6_addr macros and libc must + * coordinate. */ + #define __UAPI_DEF_IN6_ADDR_ALT 1 + #define __UAPI_DEF_SOCKADDR_IN6 1 +@@ -115,7 +112,7 @@ + /* If we did not see any headers from any supported C libraries, + * or we are being included in the kernel, then define everything + * that we need. */ +-#else /* !defined(__GLIBC__) */ ++#else /* __KERNEL__ */ + + /* Definitions for in.h */ + #define __UAPI_DEF_IN_ADDR 1 +@@ -138,6 +135,6 @@ + /* Definitions for xattr.h */ + #define __UAPI_DEF_XATTR 1 + +-#endif /* __GLIBC__ */ ++#endif /* __KERNEL__ */ + + #endif /* _UAPI_LIBC_COMPAT_H */ diff -uNr a/sys-kernel/linux-headers/files/libc-4.8-portability.patch b/sys-kernel/linux-headers/files/libc-4.8-portability.patch --- a/sys-kernel/linux-headers/files/libc-4.8-portability.patch false +++ b/sys-kernel/linux-headers/files/libc-4.8-portability.patch 41b67cfa5ff582fe82a46c386331b24609baf614dd7c70a105c50dcb0536cf60c98f3299761e7b22181ed6cc56683e7c6fbd399a29390896b792b194c7723249 @@ -0,0 +1,176 @@ +diff -Naur gentoo-headers-base-4.8.orig/include/uapi/linux/if_ether.h gentoo-headers-base-4.8/include/uapi/linux/if_ether.h +--- gentoo-headers-base-4.8.orig/include/uapi/linux/if_ether.h 2016-11-10 14:47:20.000000000 -0800 ++++ gentoo-headers-base-4.8/include/uapi/linux/if_ether.h 2016-11-11 16:50:19.820253766 -0800 +@@ -22,6 +22,7 @@ + #define _UAPI_LINUX_IF_ETHER_H + + #include <linux/types.h> ++#include <linux/libc-compat.h> + + /* + * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble +@@ -138,11 +139,13 @@ + * This is an Ethernet frame header. + */ + ++#if __UAPI_DEF_ETHHDR + struct ethhdr { + unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ + unsigned char h_source[ETH_ALEN]; /* source ether addr */ + __be16 h_proto; /* packet type ID field */ + } __attribute__((packed)); ++#endif + + + #endif /* _UAPI_LINUX_IF_ETHER_H */ +diff -Naur gentoo-headers-base-4.8.orig/include/uapi/linux/kernel.h gentoo-headers-base-4.8/include/uapi/linux/kernel.h +--- gentoo-headers-base-4.8.orig/include/uapi/linux/kernel.h 2016-11-10 14:47:20.000000000 -0800 ++++ gentoo-headers-base-4.8/include/uapi/linux/kernel.h 2016-11-11 16:50:48.052507106 -0800 +@@ -1,7 +1,9 @@ + #ifndef _UAPI_LINUX_KERNEL_H + #define _UAPI_LINUX_KERNEL_H + ++#ifdef __GLIBC__ + #include <linux/sysinfo.h> ++#endif + + /* + * 'kernel.h' contains some often-used function prototypes etc +diff -Naur gentoo-headers-base-4.8.orig/include/uapi/linux/libc-compat.h gentoo-headers-base-4.8/include/uapi/linux/libc-compat.h +--- gentoo-headers-base-4.8.orig/include/uapi/linux/libc-compat.h 2016-11-10 14:47:20.000000000 -0800 ++++ gentoo-headers-base-4.8/include/uapi/linux/libc-compat.h 2016-11-11 17:01:06.673559738 -0800 +@@ -48,47 +48,57 @@ + #ifndef _UAPI_LIBC_COMPAT_H + #define _UAPI_LIBC_COMPAT_H + +-/* We have included glibc headers... */ +-#if defined(__GLIBC__) ++/* We're used from userspace... */ ++#if !defined(__KERNEL__) + +-/* Coordinate with glibc net/if.h header. */ ++/* Coordinate with libc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + + #define __UAPI_DEF_IF_IFCONF 0 + #define __UAPI_DEF_IF_IFMAP 0 + #define __UAPI_DEF_IF_IFNAMSIZ 0 + #define __UAPI_DEF_IF_IFREQ 0 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++#if !defined(__GLIBC__) ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++#else + #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ ++#endif /* !defined(__GLIBC__) */ + + #else /* _NET_IF_H */ + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + + #define __UAPI_DEF_IF_IFCONF 1 + #define __UAPI_DEF_IF_IFMAP 1 + #define __UAPI_DEF_IF_IFNAMSIZ 1 + #define __UAPI_DEF_IF_IFREQ 1 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + + #endif /* _NET_IF_H */ + +-/* Coordinate with glibc netinet/in.h header. */ ++/* Coordinate with libc netinet/if_ether.h */ ++#ifdef _NETINET_IF_ETHER_H ++#define __UAPI_DEF_ETHHDR 0 ++#else ++/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */ ++#define __UAPI_DEF_ETHHDR 1 ++#endif /* _NETINET_IF_ETHER_H */ ++ ++/* Coordinate with libc netinet/in.h header. */ + #if defined(_NETINET_IN_H) + +-/* GLIBC headers included first so don't define anything ++/* libc headers included first so don't define anything + * that would already be defined. */ + #define __UAPI_DEF_IN_ADDR 0 + #define __UAPI_DEF_IN_IPPROTO 0 +@@ -98,15 +108,7 @@ + #define __UAPI_DEF_IN_CLASS 0 + + #define __UAPI_DEF_IN6_ADDR 0 +-/* The exception is the in6_addr macros which must be defined +- * if the glibc code didn't define them. This guard matches +- * the guard in glibc/inet/netinet/in.h which defines the +- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ +-#if defined(__USE_MISC) || defined (__USE_GNU) + #define __UAPI_DEF_IN6_ADDR_ALT 0 +-#else +-#define __UAPI_DEF_IN6_ADDR_ALT 1 +-#endif + #define __UAPI_DEF_SOCKADDR_IN6 0 + #define __UAPI_DEF_IPV6_MREQ 0 + #define __UAPI_DEF_IPPROTO_V6 0 +@@ -117,7 +119,7 @@ + #else + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + #define __UAPI_DEF_IN_ADDR 1 + #define __UAPI_DEF_IN_IPPROTO 1 +@@ -127,7 +129,7 @@ + #define __UAPI_DEF_IN_CLASS 1 + + #define __UAPI_DEF_IN6_ADDR 1 +-/* We unconditionally define the in6_addr macros and glibc must ++/* We unconditionally define the in6_addr macros and libc must + * coordinate. */ + #define __UAPI_DEF_IN6_ADDR_ALT 1 + #define __UAPI_DEF_SOCKADDR_IN6 1 +@@ -168,18 +170,20 @@ + /* If we did not see any headers from any supported C libraries, + * or we are being included in the kernel, then define everything + * that we need. */ +-#else /* !defined(__GLIBC__) */ ++#else /* defined(__KERNEL__) */ + + /* Definitions for if.h */ + #define __UAPI_DEF_IF_IFCONF 1 + #define __UAPI_DEF_IF_IFMAP 1 + #define __UAPI_DEF_IF_IFNAMSIZ 1 + #define __UAPI_DEF_IF_IFREQ 1 +-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 +-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ ++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ + #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 + ++/* Definitions for if/ether.h */ ++#define __UAPI_DEF_ETHHDR 1 ++ + /* Definitions for in.h */ + #define __UAPI_DEF_IN_ADDR 1 + #define __UAPI_DEF_IN_IPPROTO 1 +@@ -208,6 +212,6 @@ + /* Definitions for xattr.h */ + #define __UAPI_DEF_XATTR 1 + +-#endif /* __GLIBC__ */ ++#endif /* defined(__KERNEL__) */ + + #endif /* _UAPI_LIBC_COMPAT_H */ diff -uNr a/sys-kernel/linux-headers/linux-headers-4.13.ebuild b/sys-kernel/linux-headers/linux-headers-4.13.ebuild --- a/sys-kernel/linux-headers/linux-headers-4.13.ebuild false +++ b/sys-kernel/linux-headers/linux-headers-4.13.ebuild 76a8a4c3a818d876d32bf822d7927142993cb5176b6ceb16f5cfa58a1cdf85bc413374fa3647911614511776dd129f6694bcbd0a734632224ca310b87f446f72 @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +ETYPE="headers" +H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa" +inherit kernel-2 +detect_version + +PATCH_VER="1" +SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz + ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}" + +KEYWORDS="amd64 arm ~mips ppc x86" + +DEPEND="app-arch/xz-utils + dev-lang/perl" +RDEPEND="!!media-sound/alsa-headers" + +S=${WORKDIR}/gentoo-headers-base-${PV} + +src_unpack() { + unpack ${A} +} + +src_prepare() { + [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV} + epatch "${FILESDIR}"/libc-4.8-portability.patch +} + +src_install() { + kernel-2_src_install + + # hrm, build system sucks + find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete + find "${ED}" -depth -type d -delete 2>/dev/null +} + +src_test() { + # Make sure no uapi/ include paths are used by accident. + egrep -r \ + -e '# *include.*["<]uapi/' \ + "${D}" && die "#include uapi/xxx detected" + + einfo "Possible unescaped attribute/type usage" + egrep -r \ + -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ + -e '\<([us](8|16|32|64))\>' \ + . + + einfo "Missing linux/types.h include" + egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h + + emake ARCH=$(tc-arch-kernel) headers_check +} diff -uNr a/sys-kernel/linux-headers/metadata.xml b/sys-kernel/linux-headers/metadata.xml --- a/sys-kernel/linux-headers/metadata.xml false +++ b/sys-kernel/linux-headers/metadata.xml 45baba7c35674279e96b817c51e80c19d04be73af6d3f78c7d523babc5e508d15d6b8c8c44fd2ed3a4231b5611e63b6ea68d013dd12b63e2fe9c86187d2f6613 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> +</maintainer> +<upstream> + <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest --- a/sys-libs/cracklib/Manifest false +++ b/sys-libs/cracklib/Manifest 35afbddbbf3dd05be0a7d17aaaff271a55cc9d0065ace67d4abdf0ce4e83a975fd0c5d39d56da7237497e9e39b9dc153197e0497a48e987773062561458fdd63 @@ -0,0 +1,5 @@ +AUX cracklib-2.9.6-CVE-2016-6318.patch 3288 BLAKE2B ed213c5d5228ded6ceed088bed2bfe462f6102bb1414dbdd5e61f1cb4bdfd50902e072c0e35222d6e913bb61e87a4c25102aebb82661c9c6668d7caea6ae158c SHA512 232f632034fb602ea464885cd9f07aa30a3feb04bd231e7c2f2854f47493e027d87910454c089dc2c567aa01f6882bed7ee2a86d929fa36178746cf2a7dbf346 +AUX cracklib-2.9.6-fix-long-word-bufferoverflow.patch 1614 BLAKE2B 01add5ae4241f0200e8b3e35c376f176c137c8ab9a75e4364e4fd285ac85d1b2e59327eb34bb21f29e0b638199cf4f9c9603b8e747d52e62978fd392b13ce89d SHA512 e4a2f9f467d3f0ce8acd4c9ea6ca19787dca6bd2bfaa80ddbf9ec1214a5e2b519c088b07760349adac9bd6805a4b512c015181863d679643cc12c68104c29a6d +DIST cracklib-2.9.6.tar.gz 642402 BLAKE2B 4d7a0d12d1e7101c82d03f76e073407481078747c283fe3251f947542017fff03fbc5e98505c6a7a8987a2bbcea99dab558c15b1eb8fd16755859ce5a4440ed2 SHA512 2b09672e5b412d670e7ed911ebf0c0023fe2901ea05c9c02eefb7a58a13cddbc27a65d75bb20be9f8cebf4c90a9a56dfe1a3b656dff62b1d6048f5376e671786 +EBUILD cracklib-2.9.6-r1.ebuild 2586 BLAKE2B 470c7a72a6e09e0157a9e2771bd5aaddf31cdd2ffa53bbf98ed06199791264ebcb4ebf4c0d0880ca7c5c25b0c23f886dfb3ce3492bbd2853847b92d1506654aa SHA512 0154faa441e253340b73b681ca939cc63bb3a3e6fc165f94593da6036478bd3b849557ac53f6b260028d4627414b269434d7bbb3f5dc1e5bccb149abf10add2c +MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1 diff -uNr a/sys-libs/cracklib/cracklib-2.9.6-r1.ebuild b/sys-libs/cracklib/cracklib-2.9.6-r1.ebuild --- a/sys-libs/cracklib/cracklib-2.9.6-r1.ebuild false +++ b/sys-libs/cracklib/cracklib-2.9.6-r1.ebuild e29bd33197a03bbe47474f2fae96fd64f567037882d7cc14c43bbd243cbc84fb792c9b5437285744a19e7090fe05a8bd8a0c574907c468005147c0d531b8e27a @@ -0,0 +1,105 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +DISTUTILS_OPTIONAL=1 + +inherit eutils distutils-r1 libtool multilib-minimal toolchain-funcs + +MY_P=${P/_} +DESCRIPTION="Password Checking Library" +HOMEPAGE="https://github.com/cracklib/cracklib/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" +IUSE="nls python static-libs zlib" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="python? ( ${PYTHON_DEPS} ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + )" + +S=${WORKDIR}/${MY_P} + +do_python() { + multilib_is_native_abi || return 0 + use python || return 0 + pushd python > /dev/null || die + distutils-r1_src_${EBUILD_PHASE} + popd > /dev/null +} + +pkg_setup() { + # workaround #195017 + if has unmerge-orphans ${FEATURES} && has_version "<${CATEGORY}/${PN}-2.8.10" ; then + eerror "Upgrade path is broken with FEATURES=unmerge-orphans" + eerror "Please run: FEATURES=-unmerge-orphans emerge cracklib" + die "Please run: FEATURES=-unmerge-orphans emerge cracklib" + fi +} + +src_prepare() { + epatch "${FILESDIR}"/cracklib-2.9.6-CVE-2016-6318.patch + epatch "${FILESDIR}"/cracklib-2.9.6-fix-long-word-bufferoverflow.patch + + elibtoolize #269003 + do_python +} + +multilib_src_configure() { + export ac_cv_header_zlib_h=$(usex zlib) + export ac_cv_search_gzopen=$(usex zlib -lz no) + # use /usr/lib so that the dictionary is shared between ABIs + ECONF_SOURCE=${S} \ + econf \ + --with-default-dict='/usr/lib/cracklib_dict' \ + --without-python \ + $(use_enable nls) \ + $(use_enable static-libs static) +} + +multilib_src_compile() { + default + do_python +} + +multilib_src_test() { + # Make sure we load the freshly built library + LD_LIBRARY_PATH="${BUILD_DIR}/lib/.libs" do_python +} + +python_test() { + ${EPYTHON} -m unittest test_cracklib || die "Tests fail with ${EPYTHON}" +} + +multilib_src_install() { + default + # move shared libs to / + gen_usr_ldscript -a crack + + do_python +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files + rm -r "${ED}"/usr/share/cracklib + + insinto /usr/share/dict + doins dicts/cracklib-small || die +} + +pkg_postinst() { + if [[ ${ROOT} == "/" ]] ; then + ebegin "Regenerating cracklib dictionary" + create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null + eend $? + fi +} diff -uNr a/sys-libs/cracklib/files/cracklib-2.9.6-CVE-2016-6318.patch b/sys-libs/cracklib/files/cracklib-2.9.6-CVE-2016-6318.patch --- a/sys-libs/cracklib/files/cracklib-2.9.6-CVE-2016-6318.patch false +++ b/sys-libs/cracklib/files/cracklib-2.9.6-CVE-2016-6318.patch 8e71da79c2bf26434d8e542d605137793cbfe23ef6b86c6e938e10ad0935cdea6fbec56fa2daef185018073cc2f1389d11b1d0984b27940650e8b2c68438cc54 @@ -0,0 +1,108 @@ +From 47e5dec521ab6243c9b249dd65b93d232d90d6b1 Mon Sep 17 00:00:00 2001 +From: Jan Dittberner <jan@dittberner.info> +Date: Thu, 25 Aug 2016 17:13:49 +0200 +Subject: [PATCH] Apply patch to fix CVE-2016-6318 + +This patch fixes an issue with a stack-based buffer overflow whne +parsing large GECOS field. See +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6318 and +https://security-tracker.debian.org/tracker/CVE-2016-6318 for more +information. +--- + src/NEWS | 1 + + src/lib/fascist.c | 57 ++++++++++++++++++++++++++++++++----------------------- + 2 files changed, 34 insertions(+), 24 deletions(-) + +diff --git a/src/NEWS b/src/NEWS +index 26abeee..361a207 100644 +--- a/src/NEWS ++++ b/src/NEWS +@@ -1,3 +1,4 @@ ++v2.9.x apply patch to fix CVE-2016-6318 Stack-based buffer overflow when parsing large GECOS field + v2.9.6 updates to cracklib-words to add a bunch of other dictionary lists + migration to github + patch to add some particularly bad cases to the cracklib small dictionary (Matthew Miller) +diff --git a/src/lib/fascist.c b/src/lib/fascist.c +index a996509..d4deb15 100644 +--- a/src/lib/fascist.c ++++ b/src/lib/fascist.c +@@ -502,7 +502,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos) + char gbuffer[STRINGSIZE]; + char tbuffer[STRINGSIZE]; + char *uwords[STRINGSIZE]; +- char longbuffer[STRINGSIZE * 2]; ++ char longbuffer[STRINGSIZE]; + + if (gecos == NULL) + gecos = ""; +@@ -583,38 +583,47 @@ FascistGecosUser(char *password, const char *user, const char *gecos) + { + for (i = 0; i < j; i++) + { +- strcpy(longbuffer, uwords[i]); +- strcat(longbuffer, uwords[j]); +- +- if (GTry(longbuffer, password)) ++ if (strlen(uwords[i]) + strlen(uwords[j]) < STRINGSIZE) + { +- return _("it is derived from your password entry"); +- } ++ strcpy(longbuffer, uwords[i]); ++ strcat(longbuffer, uwords[j]); + +- strcpy(longbuffer, uwords[j]); +- strcat(longbuffer, uwords[i]); ++ if (GTry(longbuffer, password)) ++ { ++ return _("it is derived from your password entry"); ++ } + +- if (GTry(longbuffer, password)) +- { +- return _("it's derived from your password entry"); +- } ++ strcpy(longbuffer, uwords[j]); ++ strcat(longbuffer, uwords[i]); + +- longbuffer[0] = uwords[i][0]; +- longbuffer[1] = '\0'; +- strcat(longbuffer, uwords[j]); ++ if (GTry(longbuffer, password)) ++ { ++ return _("it's derived from your password entry"); ++ } ++ } + +- if (GTry(longbuffer, password)) ++ if (strlen(uwords[j]) < STRINGSIZE - 1) + { +- return _("it is derivable from your password entry"); ++ longbuffer[0] = uwords[i][0]; ++ longbuffer[1] = '\0'; ++ strcat(longbuffer, uwords[j]); ++ ++ if (GTry(longbuffer, password)) ++ { ++ return _("it is derivable from your password entry"); ++ } + } + +- longbuffer[0] = uwords[j][0]; +- longbuffer[1] = '\0'; +- strcat(longbuffer, uwords[i]); +- +- if (GTry(longbuffer, password)) ++ if (strlen(uwords[i]) < STRINGSIZE - 1) + { +- return _("it's derivable from your password entry"); ++ longbuffer[0] = uwords[j][0]; ++ longbuffer[1] = '\0'; ++ strcat(longbuffer, uwords[i]); ++ ++ if (GTry(longbuffer, password)) ++ { ++ return _("it's derivable from your password entry"); ++ } + } + } + } diff -uNr a/sys-libs/cracklib/files/cracklib-2.9.6-fix-long-word-bufferoverflow.patch b/sys-libs/cracklib/files/cracklib-2.9.6-fix-long-word-bufferoverflow.patch --- a/sys-libs/cracklib/files/cracklib-2.9.6-fix-long-word-bufferoverflow.patch false +++ b/sys-libs/cracklib/files/cracklib-2.9.6-fix-long-word-bufferoverflow.patch 2f866a011cbf2e3e65f5901764ba9876768ade91fdf8df9621ff3b474530d96f51f6a4947b159965864bd3ee1a7715d22e7fafb2262aa90c61712f3b6047a6ca @@ -0,0 +1,43 @@ +From 33d7fa4585247cd2247a1ffa032ad245836c6edb Mon Sep 17 00:00:00 2001 +From: Jan Dittberner <jan@dittberner.info> +Date: Thu, 25 Aug 2016 17:17:53 +0200 +Subject: [PATCH] Fix a buffer overflow processing long words + +A buffer overflow processing long words has been discovered. This commit +applies the patch from +https://build.opensuse.org/package/view_file/Base:System/cracklib/0004-overflow-processing-long-words.patch +by Howard Guo. + +See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835386 and +http://www.openwall.com/lists/oss-security/2016/08/23/8 +--- + src/NEWS | 1 + + src/lib/rules.c | 5 ++--- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/NEWS b/src/NEWS +index 361a207..f1df3b0 100644 +--- a/src/NEWS ++++ b/src/NEWS +@@ -1,4 +1,5 @@ + v2.9.x apply patch to fix CVE-2016-6318 Stack-based buffer overflow when parsing large GECOS field ++ fix a buffer overflow processing long words + v2.9.6 updates to cracklib-words to add a bunch of other dictionary lists + migration to github + patch to add some particularly bad cases to the cracklib small dictionary (Matthew Miller) +diff --git a/src/lib/rules.c b/src/lib/rules.c +index d193cc0..3a2aa46 100644 +--- a/src/lib/rules.c ++++ b/src/lib/rules.c +@@ -434,9 +434,8 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ + { + int limit; + register char *ptr; +- static char area[STRINGSIZE]; +- char area2[STRINGSIZE]; +- area[0] = '\0'; ++ static char area[STRINGSIZE * 2] = {0}; ++ char area2[STRINGSIZE * 2] = {0}; + strcpy(area, input); + + for (ptr = control; *ptr; ptr++) diff -uNr a/sys-libs/cracklib/metadata.xml b/sys-libs/cracklib/metadata.xml --- a/sys-libs/cracklib/metadata.xml false +++ b/sys-libs/cracklib/metadata.xml c2e6eadbb1a172b76210cac65b24f79809b3099f3914c87a10846513ab0dc4c7704180cfb098353b78e925706bcf1c85cde72397e20de6aba6fe4a6a631e039d @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<upstream> + <remote-id type="sourceforge">cracklib</remote-id> + <remote-id type="github">cracklib/cracklib</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest --- a/sys-libs/e2fsprogs-libs/Manifest false +++ b/sys-libs/e2fsprogs-libs/Manifest 308a104aae077148c1dc4633bac392fd070e739515d972ac7f67347705e975d4746a9f439e9ea351c518d526f5a5fc253bb5ec5528eafc898cfd6d44a4e907a2 @@ -0,0 +1,4 @@ +AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b1cf94854dabb4bfefd0d44d7605cbca6353b27730dcc37ed65c1d4b35f2b7e5386a607056f7397afbf4e3dadc57efb0e3172a94287f5b7 SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3 +DIST e2fsprogs-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a38dca2d69765d7e9edef184c5b478fb0aa860fb0338a41e9d2d47c55780b0e44450efbe2528110403a77696af9e0c9d7c SHA512 c4b78000ace629a7e6f12d7c63f5ff36885bc7ba69a22654f95fd384bb347f0f28ba544644b40cdcbf14ec211e724901fbe44cc2b730f2dafba77632b3e2d0b1 +EBUILD e2fsprogs-libs-1.43.9.ebuild 1870 BLAKE2B 12c6ab507a80ac818ac54375b227011a26578bcaf72d037e681b54f2da59cc4c4a72d1d785b146b07b039a951dbdadf8db9e6bd05b9139491cad23b8a0b4f447 SHA512 5f208078d15d25507804ce5d140b0c125fd01fb51ba4bc8556e8dc381688e508a3b91006dda9eb88496de392fc974cf9596a22d19e9e5987d6948d6ea0ff65b1 +MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71 diff -uNr a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild false +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild 5f99ff073ccd6e565e31e314e0a9f5466f9007982ce1387466d8526090dfb97e389088a53bb666c194717104d02f81501735c20885bf610871eca4aacfe4938c @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +case ${PV} in +*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; +*) UP_PV=${PV} ;; +esac + +inherit toolchain-funcs eutils multilib-minimal + +DESCRIPTION="e2fsprogs libraries (common error and subsystem)" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz + mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris" +IUSE="nls static-libs" + +RDEPEND="!sys-libs/com_err + !sys-libs/ss + !<sys-fs/e2fsprogs-1.41.8" +DEPEND="nls? ( sys-devel/gettext ) + virtual/pkgconfig" + +S="${WORKDIR}/${P%_pre*}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 +) + +src_prepare() { + printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613 + default +} + +multilib_src_configure() { + local myconf=( + $(tc-is-static-only || echo --enable-elf-shlibs) + $(tc-has-tls || echo --disable-tls) + $(use_enable nls) + ) + # we use blkid/uuid from util-linux now + if use kernel_linux ; then + export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes + myconf+=( --disable-lib{blkid,uuid} ) + fi + ac_cv_path_LDCONFIG=: \ + ECONF_SOURCE="${S}" \ + CC="$(tc-getCC)" \ + BUILD_CC="$(tc-getBUILD_CC)" \ + BUILD_LD="$(tc-getBUILD_LD)" \ + econf "${myconf[@]}" +} + +multilib_src_compile() { + emake V=1 +} + +multilib_src_install() { + emake V=1 STRIP=: DESTDIR="${D}" install || die + gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') + # configure doesn't have an option to disable static libs :/ + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi +} diff -uNr a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch --- a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch false +++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch d1b5e70683ab8477744b6b575659391314e160f0ab11e3977c7c943a88e6c87e1a678aa03f25efde727033a9c106f615d55dd46f567c597196b7c503e21d65f5 @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/516854 + +--- e2fsprogs-libs-1.42.13/configure ++++ e2fsprogs-libs-1.42.13/configure +@@ -1315,6 +1315,8 @@ + if test $cross_compiling = no; then + BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H" + BUILD_LDFLAGS="$LDFLAGS" ++else ++ BUILD_CFLAGS="$INCLUDES" + fi + + diff -uNr a/sys-libs/e2fsprogs-libs/metadata.xml b/sys-libs/e2fsprogs-libs/metadata.xml --- a/sys-libs/e2fsprogs-libs/metadata.xml false +++ b/sys-libs/e2fsprogs-libs/metadata.xml 3194b050527448f2b5abafcccd5ebc9d4091c139614965f5b6d538a6108de19612009da109feeb8fc3dfe327a36b52f8f672eedd2776545741eef70512621bfe @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<upstream> + <remote-id type="sourceforge">e2fsprogs</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest --- a/sys-libs/gdbm/Manifest false +++ b/sys-libs/gdbm/Manifest 9f95a3c5f3c7e25e061cc4a5b40aa47d81ae95daca04b7aa0ab98c15639febb8a2ac77c86376a5643893b86c9b40b95b76766cac3a1c18bb92c3b9ca00a99db2 @@ -0,0 +1,6 @@ +AUX gdbm-1.13-fix-a-typo-in-gdbm.h.patch 657 BLAKE2B af19808507b00d941a51756bbc2a48686aad60c0a19626d4b3f549b948254629857eb7ce9a692d790fdf42877de2d6072455b1825347cf9d557e45239088c989 SHA512 bb31f6043184f02f9b0735d8827d09de77367bac489296805a963c01963a70c60dea8efb4a4a00c254019bf438f0c54159b3097c276185367f0064fe119544a1 +AUX gdbm-1.13-fix-build-with-enable-gdbm-export.patch 1568 BLAKE2B 65a841191f362ca94d0b7d1b9df042b5f6b75aaf560aceaa702c8a11e9fa9430deb106aac6a50b211b07c66f9457732ca164352a62fc244fd4e3f2862c69265c SHA512 8bd5308a95abb7df3dd8edc63eba5c8830a6f4aa47066ac644cf5ec19767bcd97618834c598fbc1603093a8e1516b4ef325afe2a68b001d5353d2e4247d562a2 +DIST gdbm-1.13.tar.gz 891987 BLAKE2B f73cb89aeed140a584c5a8bce9c2324cc39a7647ee288364af66fbe1c1cd8662e53f7cb82a208e795a6d27adc048018153671d964ecad518407eb888283e17c5 SHA512 fdb777f5b415b0578ea46b4a6fc70151a04a3568e2f2c8c0219ccad8c0d34abb773d80d5d7a06462ad1a3d6c1f3b5b7ab25f9de4f43ccf05c58db05f9a2906ad +DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7 +EBUILD gdbm-1.13-r2.ebuild 1880 BLAKE2B 93488b07da9e466dfd1ba72283a73285ad99400af89edd57e3f1af0f17a797cadbe819dd7eae9bee06cbbc85f7381460c1caa7d8a3c3e2ce194c492fea8092f4 SHA512 4ff430d01e7f803c4783cb143da5b988533331fe40887870142aa11501ec1a1d12bda68021ca888dfd19019ee8b85f1275da9c290faf4ba5156c26ebff767af6 +MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41 diff -uNr a/sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch b/sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch --- a/sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch false +++ b/sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch 34ddef49f09dcb17e33a189565cdffb11e17677be11cad6230c77ca0db8f21ffee09f944d14b0be87c1c2845ce765ee0a9be72fc88c6ef17fa005840d8d03af8 @@ -0,0 +1,21 @@ +From 1e0b3f4556f88013a2268bb2ef0c8d4bfaa40f90 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org.ua> +Date: Fri, 14 Apr 2017 07:48:35 +0000 +Subject: Fix a typo + +--- +diff --git a/src/gdbm.h.in b/src/gdbm.h.in +index e9b7b1b..de0d2b9 100644 +--- a/src/gdbm.h.in ++++ b/src/gdbm.h.in +@@ -224,7 +224,7 @@ extern int gdbm_copy_meta (GDBM_FILE dst, GDBM_FILE src); + # define _GDBM_MAX_ERRNO GDBM_DIR_OVERFLOW + + /* This one was never used and will be removed in the future */ +-# define GDBM_UNKNOWN_UPDATE GDBM_ERR_UNKNOWN_ERROR ++# define GDBM_UNKNOWN_UPDATE GDBM_UNKNOWN_ERROR + + typedef int gdbm_error; + extern gdbm_error gdbm_errno; +-- +cgit v0.9.0.3 diff -uNr a/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch b/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch --- a/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch false +++ b/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch 8390d07a3c4eca08d156f15de8c98c78bed0e85b605d933478ed71d9bda17c377e404e05b88e563a2947f42f424f2f1ec70946211539ec7e6bd1904af767dd23 @@ -0,0 +1,57 @@ +From 272713d611c55effeaf1d2b45fbb2c69d70e4c74 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org> +Date: Sat, 23 Dec 2017 21:27:20 +0000 +Subject: Fix build with --enable-gdbm-export + +* THANKS: Add Jakub Bogusz +* export/export.c: Define GDBM_EXPORT_18 prior to +including gdbmexp.c +* src/gdbmexp.c [GDBM_EXPORT_18]: Define GDBM_SET_ERRNO and +GDBM_ASSERT_CONSISTENCY. +--- +diff --git a/THANKS b/THANKS +index 70cb40f..feb1f87 100644 +--- a/THANKS ++++ b/THANKS +@@ -5,6 +5,7 @@ suggesting various improvements or submitting actual code. Here is a list + of these people. Help us keep it complete and exempt of errors. + + Bill Jones <rj7252@att.com> ++Jakub Bogusz <qboosh@pld-linux.org> + Matthew Burgess <matthew@linuxfromscratch.org> + Tanaka Akira <akr@fsij.org> +-Thomas Klausner <tk@giga.or.at> +\ No newline at end of file ++Thomas Klausner <tk@giga.or.at> +diff --git a/export/export.c b/export/export.c +index 39e05d1..ede4858 100644 +--- a/export/export.c ++++ b/export/export.c +@@ -24,6 +24,7 @@ + #include <gdbm.h> + + /* Pull in gdbm_export() */ ++#define GDBM_EXPORT_18 + #include "gdbmexp.c" + + void +diff --git a/src/gdbmexp.c b/src/gdbmexp.c +index 457f638..dc46c50 100644 +--- a/src/gdbmexp.c ++++ b/src/gdbmexp.c +@@ -21,8 +21,13 @@ + # include "autoconf.h" + # include <arpa/inet.h> + ++#ifdef GDBM_EXPORT_18 ++# define GDBM_SET_ERRNO(dbf, ec, fatal) gdbm_errno = ec ++# define GDBM_ASSERT_CONSISTENCY(dbf, val) ++#else + # include "gdbmdefs.h" + # include "gdbm.h" ++#endif + + int + gdbm_export_to_file (GDBM_FILE dbf, FILE *fp) +-- +cgit v0.9.0.3 diff -uNr a/sys-libs/gdbm/gdbm-1.13-r2.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild --- a/sys-libs/gdbm/gdbm-1.13-r2.ebuild false +++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild a35946f43f0c402d1f7ac43c151d54472b8b70de63941ecfa475c4afe508817b630e85ab1317bedb50a8ae57bfd418896aa3613cd2aaad0bea9d844e6b0c7500 @@ -0,0 +1,71 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic multilib multilib-minimal + +EX_P="${PN}-1.8.3" +DESCRIPTION="Standard GNU database libraries" +HOMEPAGE="https://www.gnu.org/software/gdbm/" +SRC_URI="mirror://gnu/gdbm/${P}.tar.gz + exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )" + +LICENSE="GPL-3" +SLOT="0/1.13" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+berkdb exporter nls +readline static-libs" + +DEPEND=" + readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/gdbm-1.13-fix-a-typo-in-gdbm.h.patch + "${FILESDIR}"/gdbm-1.13-fix-build-with-enable-gdbm-export.patch +) + +EX_S="${WORKDIR}/${EX_P}" + +src_prepare() { + default + + eautoreconf +} + +multilib_src_configure() { + # gdbm doesn't appear to use either of these libraries + export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no + + if multilib_is_native_abi && use exporter ; then + pushd "${EX_S}" >/dev/null + append-lfs-flags + econf --disable-shared + popd >/dev/null + fi + + local myeconfargs=( + --includedir="${EPREFIX}"/usr/include/gdbm + --with-gdbm183-libdir="${EX_S}/.libs" + --with-gdbm183-includedir="${EX_S}" + $(use_enable berkdb libgdbm-compat) + $(multilib_native_use_enable exporter gdbm-export) + $(use_enable nls) + $(use_enable static-libs static) + $(use_with readline) + ) + ECONF_SOURCE=${S} econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + use exporter && emake -C "${EX_S}" libgdbm.la + emake +} + +multilib_src_install_all() { + einstalldocs + + use static-libs || find "${ED}" -name '*.la' -delete + mv "${ED%/}"/usr/include/gdbm/gdbm.h "${ED%/}"/usr/include/ || die +} diff -uNr a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml --- a/sys-libs/gdbm/metadata.xml false +++ b/sys-libs/gdbm/metadata.xml 4f0e974f917f0931a8e9a77a7ec71b941becd5f789f41447c92513a9745042d58f55e393d2a2f69499d891d2a6421b7b45448d8ef3ccf42140de9fcf21847352 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="berkdb">enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag> + <flag name="exporter">enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag> +</use> +</pkgmetadata> diff -uNr a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest --- a/sys-libs/libcap/Manifest false +++ b/sys-libs/libcap/Manifest a56db4d02ac5496a85b29b5a63569eab420d7b4dacf69a6be506b8c56e1004b402fe5c5655ef318a894b7e7a0d2c5922ce14ba0590f553aa5b9c0aa1c0e2ce8b @@ -0,0 +1,11 @@ +AUX libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch 840 BLAKE2B 9d6059a08b40f8ebbb3d21205a7c2427e2d64693e8539e5c372be96cd11ae889af4f6e1302273950427191749c986dd0b8f072cf112134b55708970ca312f1bc SHA512 59936147919f3a8959d87831583df96ab3e1883e58b746f6542cc6430434d2a93c07e79ff7e9fdf9698626aa42e60c6c57981025e46923be76ff2d65720d606c +AUX libcap-2.21-include.patch 290 BLAKE2B 466e517a394219d0a0b04b4e92e977679372fae31ee0e8467c29815626de70d85123e0ff38725b6305478301d2558f631695c2ca07310c2fc4cce6f6e5b1b849 SHA512 6f4867c64121e1294824a2dc1ac02578c9900cd051aea41d0920f1f65e162e3acec86a42f7e4fa6ee1dff08554fe25bd740951e9dc8a11bf79471229f268cffd +AUX libcap-2.22-no-perl.patch 2360 BLAKE2B f9ef0549a8f2f1f08f3b93e9a4234d8d0188780dc134c4b56cc83b5ca94453f96e10a384de3d9dd24dbab3758376145e96b28ac3c0e04a9e1b46cc0c4f20b0cc SHA512 8c49d829cbae15f28ded70b96bc0715819b13183136d90b64b7b6bfbd85c262f0161d89450579e9b58961c724b34816919d111f839e3f5a7a68427ffe441881d +AUX libcap-2.24-build-system-fixes.patch 4943 BLAKE2B 5f66815f52b69171794225784e69025037f08796a0bd25ac46bd93477d3e2f471d9e52a53910f45f82f31853abb4dc62cfa03503bbcf7e32e3946745f3f01b7f SHA512 84283f0652f87a8c1f598413d03e8f3aeeb140b322519051df1873933d6d3ac738757e1c7c91ea6efc51548d224149b84d6a1fab0301a655eb609b183bc9e7ba +AUX libcap-2.24-setcap-errno.patch 1491 BLAKE2B 19a3422b560eb21957f10f512902aeff6cf5b832354a41a4ff24c497bc2189b06197063a26fa089864d573fc6cd6f0f42c0207b627053985fce9417543adfccb SHA512 367037d6c42d07c359e9ee397cbc7431ea05c3d34deea93db1473394decb9f61a2c9de186652fc3a12fb615406ec1a2f4d76eb63c4410c6a2b5f435ece5b05ef +AUX libcap-2.25-build-system-fixes.patch 4705 BLAKE2B be3c05b5c798411cc03458c1ce71956ddf2996db71d349e6733a082ec90b264d6a24aa6abaff4b44a65502dc9cd49fe749f11d2fc41fa45879fa0cb6bde2b6ef SHA512 c99df67dfdceefeea3c3033a38e94a93cd7a9c4ed6e74f42c3b7198d66deee4b5d4aa91c540a48b12749ce3285c0ac3f11d0ecc33b913c3f0169578ae28745da +AUX libcap-2.25-gperf.patch 620 BLAKE2B c870cd0d093df2e8f7498adc4d9b23f101089d80906eeba948982b599469c209e4dc4076efee04b37978b4226c3281ace2ee6ce751c27ee6719456657ebcdeda SHA512 1fd325160ebcf96f8a8f58e7f453241d15d2c968752cc050b52871536840f8ebbbfe1fa2bd03c19f86859e9739eb0059d30f157d2fa3a076da4a895fc32182e6 +AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389 +DIST libcap-2.24.tar.xz 63412 BLAKE2B 9edab6e606f64dcb06eb75160775340ff5ab92a7f5d98957c682d6510aa510a21f6c796af64dfef0090d9c035b94903d86b360635977e55549e51e25b8fa167e SHA512 c062bab936d651a50efa66dcfa51ab3ce4b0881195d23bb32142b5c8044d30e0e2152f3497844ce90c04f909aeffe2d41203efff41972e38758dcca7b653884b +EBUILD libcap-2.24-r2.ebuild 1865 BLAKE2B aa257346d0da204ae26fd2f702681e9d207dbd36d72648f049c25c6611262c82ecc0f4580406a361bd20cfa391b49bb8f487f1481c0795018b6d30ed08aa6f6a SHA512 2d0fceabd4131ca6cafd7b2f2d8f27be7cd2a4bc4a0dd7614d0f7212cb3959e4e80705c6431d106542901384be51f4ad57f5c3a14ef06c1ded163b16835cbbc1 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/sys-libs/libcap/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch --- a/sys-libs/libcap/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch false +++ b/sys-libs/libcap/files/libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch f23f976a387f022a6f50b50edc806ad8aeec9169337fdbaf9645573236a472436e68a31cb179d4238a435353c3ba526cc53b26cf1e43afec6a13aee2fb9f1c9a @@ -0,0 +1,29 @@ +From f2020ee4ee4b2f245637c77e81d62ab6d1db3c6c Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Tue, 25 Jan 2011 15:52:31 -0500 +Subject: [PATCH] ignore RAISE_SETFCAP install failures + +While the new RAISE_SETFCAP feature is nifty, its failure to run (often +due to the fs not supporting it) shouldn't impair the default install. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + progs/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/progs/Makefile b/progs/Makefile +index c261f57..9e1a84d 100644 +--- a/progs/Makefile ++++ b/progs/Makefile +@@ -30,7 +30,7 @@ install: all + install -m 0755 $$p $(SBINDIR) ; \ + done + ifeq ($(RAISE_SETFCAP),yes) +- $(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap ++ -$(SBINDIR)/setcap cap_setfcap=i $(SBINDIR)/setcap + endif + + clean: +-- +1.7.4.rc2 + diff -uNr a/sys-libs/libcap/files/libcap-2.21-include.patch b/sys-libs/libcap/files/libcap-2.21-include.patch --- a/sys-libs/libcap/files/libcap-2.21-include.patch false +++ b/sys-libs/libcap/files/libcap-2.21-include.patch 2a3b8e533be5499de9e38423f8c1ea300d20976b0d475a00278ccf259240204a5e37c2cc8233390c1c8dfd37998cd4402ab20dbe29d0adcc85321f3bce8884d8 @@ -0,0 +1,10 @@ +--- libcap/libcap.h.org 2011-06-15 07:25:58.912480899 +0200 ++++ libcap/libcap.h 2011-06-15 07:26:16.421329661 +0200 +@@ -13,6 +13,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/capability.h> ++#include <sys/prctl.h> /* prctl() */ + + #ifndef __u8 + #define __u8 unsigned char diff -uNr a/sys-libs/libcap/files/libcap-2.22-no-perl.patch b/sys-libs/libcap/files/libcap-2.22-no-perl.patch --- a/sys-libs/libcap/files/libcap-2.22-no-perl.patch false +++ b/sys-libs/libcap/files/libcap-2.22-no-perl.patch f5ea0b5fbab6e611032e5d3929c8ce06adb1f489e5e2ead4b651f67a851da9cd7c051b0027135fe4c10ea26ae9d10ca6c82877031a096277a14d685f58d058cf @@ -0,0 +1,54 @@ +From fdd0f3b207785711663f48e0dd3414d90d1f2e86 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 12 Nov 2011 14:24:08 -0500 +Subject: [PATCH] use awk/sed instead of perl for creating header files + +More systems should have awk/sed than perl. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + libcap/Makefile | 20 ++++++++++++++++---- + 1 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/libcap/Makefile b/libcap/Makefile +index 4762c60..68845e0 100644 +--- a/libcap/Makefile ++++ b/libcap/Makefile +@@ -24,6 +24,8 @@ OBJS=$(addsuffix .o, $(FILES)) + MINLIBNAME=$(MAJLIBNAME).$(MINOR) + GPERF_OUTPUT = _caps_output.gperf + CFLAGS += -fPIC ++AWK = awk ++SED = sed + + all: $(MINLIBNAME) $(STALIBNAME) + +@@ -39,11 +41,21 @@ cap_names.h: _makenames + ./_makenames > cap_names.h + + $(GPERF_OUTPUT): cap_names.list.h +- perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@ ++ (printf "%b" "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; \ ++ $(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \ ++ gperf \ ++ --ignore-case \ ++ --language=ANSI-C \ ++ --readonly \ ++ --null-strings \ ++ --global-table \ ++ --hash-function-name=__cap_hash_name \ ++ --lookup-function-name="__cap_lookup_name" \ ++ -c -t -m20 $(INDENT) > $@ + +-cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h +- @echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h" +- perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(KERNEL_HEADERS)/linux/capability.h | fgrep -v 0x > $@ ++cap_names.list.h: $(KERNEL_HEADERS)/linux/capability.h Makefile ++ @echo "=> making $@ from $<" ++ $(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $< > $@ + + $(STALIBNAME): $(OBJS) + $(AR) rcs $@ $^ +-- +1.7.6.1 + diff -uNr a/sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch --- a/sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch false +++ b/sys-libs/libcap/files/libcap-2.24-build-system-fixes.patch 3f3daabe2c3bb4c62eaec3457c875ca54550a3b6e47511e8e85bfe346baf3c6dc5d7ee4fc7bfd944915502eb94ca3c7d694661682aa01df33b78947a260f60a3 @@ -0,0 +1,163 @@ +From 0485ff3e7f62a331aa4f1e8ec4c2fdcee400e324 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sun, 16 Nov 2008 09:10:31 -0500 +Subject: [PATCH] build system fixes + +This touches up the homebrewed build system to work much better "out of the +box" for people. Specifically: + - allow toolchain vars to be set via environment + - CC / BUILD_CC / AR / RANLIB + - CFLAGS / CPPFLAGS / LDFLAGS + - split CPPFLAGS out of CFLAGS + - break -fPIC out of global CFLAGS and only use where needed + - use LDLIBS for libraries, not LDFLAGS + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + Make.Rules | 26 ++++++++++++++------------ + libcap/Makefile | 11 ++++++----- + pam_cap/Makefile | 8 +++++--- + progs/Makefile | 2 +- + 4 files changed, 26 insertions(+), 21 deletions(-) + +diff --git a/Make.Rules b/Make.Rules +index 18b7cf7..5364c46 100644 +--- a/Make.Rules ++++ b/Make.Rules +@@ -45,27 +45,29 @@ MINOR=24 + + # Compilation specifics + +-KERNEL_HEADERS := $(topdir)/libcap/include/uapi +-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include +- +-CC := gcc +-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-BUILD_CC := $(CC) +-BUILD_CFLAGS := $(CFLAGS) $(IPATH) +-AR := ar +-RANLIB := ranlib ++CC ?= gcc ++CFLAGS ?= -O2 ++BUILD_CC ?= $(CC) ++BUILD_CFLAGS ?= $(CFLAGS) ++AR ?= ar ++RANLIB ?= ranlib + DEBUG = -g #-DDEBUG + WARNINGS=-Wall -Wwrite-strings \ + -Wpointer-arith -Wcast-qual -Wcast-align \ + -Wstrict-prototypes -Wmissing-prototypes \ + -Wnested-externs -Winline -Wshadow + LD=$(CC) -Wl,-x -shared +-LDFLAGS := #-g ++LDFLAGS ?= #-g + +-SYSTEM_HEADERS = /usr/include ++KERNEL_HEADERS = $(topdir)/libcap/include/uapi ++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include ++LIBCAP_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CPPFLAGS += $(LIBCAP_CPPFLAGS) ++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) + INCS=$(topdir)/libcap/include/sys/capability.h + LDFLAGS += -L$(topdir)/libcap +-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) ++CPPFLAGS += -Dlinux ++CFLAGS += $(WARNINGS) $(DEBUG) + PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) + INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) + DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) +diff --git a/libcap/Makefile b/libcap/Makefile +index 0ccd2e7..6b446ea 100644 +--- a/libcap/Makefile ++++ b/libcap/Makefile +@@ -16,7 +16,7 @@ FILES=cap_alloc cap_proc cap_extint cap_flag cap_text + # no support). + ifeq ($(LIBATTR),yes) + FILES += cap_file +-LDFLAGS += -lattr ++LDLIBS += -lattr + DEPS = -lattr + endif + +@@ -25,6 +25,7 @@ OBJS=$(addsuffix .o, $(FILES)) + MAJLIBNAME=$(LIBNAME).$(VERSION) + MINLIBNAME=$(MAJLIBNAME).$(MINOR) + GPERF_OUTPUT = _caps_output.gperf ++CFLAGS += -fPIC + + all: $(MINLIBNAME) $(STALIBNAME) libcap.pc + +@@ -43,7 +44,7 @@ libcap.pc: libcap.pc.in + $< >$@ + + _makenames: _makenames.c cap_names.list.h +- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ ++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ + + cap_names.h: _makenames + ./_makenames > cap_names.h +@@ -60,15 +61,15 @@ $(STALIBNAME): $(OBJS) + $(RANLIB) $@ + + $(MINLIBNAME): $(OBJS) +- $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ ++ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ $(LDLIBS) + ln -sf $(MINLIBNAME) $(MAJLIBNAME) + ln -sf $(MAJLIBNAME) $(LIBNAME) + + %.o: %.c $(INCLS) +- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) +- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ + + install: all + mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys +diff --git a/pam_cap/Makefile b/pam_cap/Makefile +index cc32fb6..6f07b6b 100644 +--- a/pam_cap/Makefile ++++ b/pam_cap/Makefile +@@ -9,6 +9,8 @@ include ../Make.Rules + # written (and you know why it fails), email me and explain why. Thanks! + LDLIBS += -L../libcap -lcap + ++CFLAGS += -fPIC ++ + all: pam_cap.so + $(MAKE) testcompile + +@@ -17,13 +19,13 @@ install: all + install -m 0755 pam_cap.so $(FAKEROOT)$(LIBDIR)/security + + pam_cap.so: pam_cap.o +- $(LD) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) ++ $(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) + + pam_cap.o: pam_cap.c +- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + testcompile: test.c pam_cap.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) + + clean: + rm -f *.o *.so testcompile *~ +diff --git a/progs/Makefile b/progs/Makefile +index 778149e..8f4e2e6 100644 +--- a/progs/Makefile ++++ b/progs/Makefile +@@ -22,7 +22,7 @@ $(BUILD): %: %.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) + + %.o: %.c $(INCS) +- $(CC) $(IPATH) $(CFLAGS) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + install: all + mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) +-- +2.4.1 + diff -uNr a/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch b/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch --- a/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch false +++ b/sys-libs/libcap/files/libcap-2.24-setcap-errno.patch 426da353b7c4abfaf5b5a2b10f0e4120500d0a5aa29433e911a78011f9f99313cb0291bef803fad0d4541a11ad9ad00504ffe7fbb6e925dd010435dbb7bfd76b @@ -0,0 +1,45 @@ +From 62b190c09d5652c58679dffd7f09e4aceb4c7daa Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 13 Jul 2015 01:59:14 -0400 +Subject: [PATCH] setcap: fix errno display + +The commit 056ffb0bd25d91ffbcb83c521fc4d3d9904ec4d4 broke the display of +the final error message because it would do more operations that would +clobber errno. Example: +(libcap-2.22) sudo setcap cap_ipc_lock=ep /proc/filesystems | head -1 +Failed to set capabilities on file `/proc/filesystems' (Operation not supported) +(libcap-2.23) sudo setcap cap_ipc_lock=ep /proc/filesystems | head -1 +Failed to set capabilities on file `/proc/filesystems' (Invalid argument) + +Save the original errno value and use that for the final display instead. + +URL: https://bugs.gentoo.org/551672 +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + progs/setcap.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/progs/setcap.c b/progs/setcap.c +index 83090ae..7304343 100644 +--- a/progs/setcap.c ++++ b/progs/setcap.c +@@ -171,6 +171,7 @@ int main(int argc, char **argv) + retval = cap_set_file(*++argv, cap_d); + if (retval != 0) { + int explained = 0; ++ int oerrno = errno; + #ifdef linux + cap_value_t cap; + cap_flag_value_t per_state; +@@ -193,7 +194,7 @@ int main(int argc, char **argv) + + fprintf(stderr, + "Failed to set capabilities on file `%s' (%s)\n", +- argv[0], strerror(errno)); ++ argv[0], strerror(oerrno)); + if (!explained) { + usage(); + } +-- +2.4.4 + diff -uNr a/sys-libs/libcap/files/libcap-2.25-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.25-build-system-fixes.patch --- a/sys-libs/libcap/files/libcap-2.25-build-system-fixes.patch false +++ b/sys-libs/libcap/files/libcap-2.25-build-system-fixes.patch 799e74a584f51f4112c46c0492d8586ed430f3d1630277c632cdc7d974732a5e5a322a7721e6a8372bc3fc722a1622a93ee5f5f67496d9e29a6925de5d69b511 @@ -0,0 +1,153 @@ +From d5a0c023a7f3deefd471d7b97ef4fa40ed374645 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Wed, 10 Feb 2016 09:47:27 +0100 +Subject: [PATCH] build system fixes + +This touches up the homebrewed build system to work much better "out of the +box" for people. Specifically: + - allow toolchain vars to be set via environment + - CC / BUILD_CC / AR / RANLIB + - CFLAGS / CPPFLAGS / LDFLAGS + - split CPPFLAGS out of CFLAGS + - break -fPIC out of global CFLAGS and only use where needed + - use LDLIBS for libraries, not LDFLAGS + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> + +Forward ported from libcap-2.24 to libcap-2.25 + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + Make.Rules | 26 ++++++++++++++------------ + libcap/Makefile | 7 ++++--- + pam_cap/Makefile | 8 +++++--- + progs/Makefile | 2 +- + 4 files changed, 24 insertions(+), 19 deletions(-) + +diff --git a/Make.Rules b/Make.Rules +index 8347b26..d7196ef 100644 +--- a/Make.Rules ++++ b/Make.Rules +@@ -45,28 +45,30 @@ MINOR=25 + + # Compilation specifics + +-KERNEL_HEADERS := $(topdir)/libcap/include/uapi +-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include +- +-CC := gcc +-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-BUILD_CC := $(CC) +-BUILD_CFLAGS := $(CFLAGS) $(IPATH) +-AR := ar +-RANLIB := ranlib ++CC ?= gcc ++CFLAGS ?= -O2 ++BUILD_CC ?= $(CC) ++BUILD_CFLAGS ?= $(CFLAGS) ++AR ?= ar ++RANLIB ?= ranlib + DEBUG = -g #-DDEBUG + WARNINGS=-Wall -Wwrite-strings \ + -Wpointer-arith -Wcast-qual -Wcast-align \ + -Wstrict-prototypes -Wmissing-prototypes \ + -Wnested-externs -Winline -Wshadow + LD=$(CC) -Wl,-x -shared +-LDFLAGS := #-g ++LDFLAGS ?= #-g + BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) + +-SYSTEM_HEADERS = /usr/include ++KERNEL_HEADERS = $(topdir)/libcap/include/uapi ++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include ++LIBCAP_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CPPFLAGS += $(LIBCAP_CPPFLAGS) ++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) + INCS=$(topdir)/libcap/include/sys/capability.h + LDFLAGS += -L$(topdir)/libcap +-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) ++CPPFLAGS += -Dlinux ++CFLAGS += $(WARNINGS) $(DEBUG) + PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) + INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) + DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) +diff --git a/libcap/Makefile b/libcap/Makefile +index d189777..b99740f 100644 +--- a/libcap/Makefile ++++ b/libcap/Makefile +@@ -17,6 +17,7 @@ OBJS=$(addsuffix .o, $(FILES)) + MAJLIBNAME=$(LIBNAME).$(VERSION) + MINLIBNAME=$(MAJLIBNAME).$(MINOR) + GPERF_OUTPUT = _caps_output.gperf ++CFLAGS += -fPIC + + all: $(MINLIBNAME) $(STALIBNAME) libcap.pc + +@@ -35,7 +36,7 @@ libcap.pc: libcap.pc.in + $< >$@ + + _makenames: _makenames.c cap_names.list.h +- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ ++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ + + cap_names.h: _makenames + ./_makenames > cap_names.h +@@ -57,10 +58,10 @@ $(MINLIBNAME): $(OBJS) + ln -sf $(MAJLIBNAME) $(LIBNAME) + + %.o: %.c $(INCLS) +- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) +- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ + + install: all + mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys +diff --git a/pam_cap/Makefile b/pam_cap/Makefile +index cc32fb6..6f07b6b 100644 +--- a/pam_cap/Makefile ++++ b/pam_cap/Makefile +@@ -9,6 +9,8 @@ include ../Make.Rules + # written (and you know why it fails), email me and explain why. Thanks! + LDLIBS += -L../libcap -lcap + ++CFLAGS += -fPIC ++ + all: pam_cap.so + $(MAKE) testcompile + +@@ -17,13 +19,13 @@ install: all + install -m 0755 pam_cap.so $(FAKEROOT)$(LIBDIR)/security + + pam_cap.so: pam_cap.o +- $(LD) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) ++ $(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) + + pam_cap.o: pam_cap.c +- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + testcompile: test.c pam_cap.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) + + clean: + rm -f *.o *.so testcompile *~ +diff --git a/progs/Makefile b/progs/Makefile +index c094a24..b9f0d3f 100644 +--- a/progs/Makefile ++++ b/progs/Makefile +@@ -19,7 +19,7 @@ $(BUILD): %: %.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) + + %.o: %.c $(INCS) +- $(CC) $(IPATH) $(CFLAGS) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + install: all + mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) +-- +2.7.1 + diff -uNr a/sys-libs/libcap/files/libcap-2.25-gperf.patch b/sys-libs/libcap/files/libcap-2.25-gperf.patch --- a/sys-libs/libcap/files/libcap-2.25-gperf.patch false +++ b/sys-libs/libcap/files/libcap-2.25-gperf.patch a4176eab73b20040ddcfd2020dd1bab899706faff62431ba7561e405324c8571874c7c59338a9b158d08011b26de013f35b0286dc1b36d911b0126796e5fc751 @@ -0,0 +1,20 @@ +update gperf call to work with gperf-3.1 + +https://bugs.gentoo.org/604802 + +--- a/libcap/Makefile ++++ b/libcap/Makefile +@@ -44,11 +44,12 @@ + ./_makenames > cap_names.h + + $(GPERF_OUTPUT): cap_names.list.h +- (printf "%b" "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; \ ++ (printf "%b" "struct __cap_token_s { const char *name; int index; };\n%%\n"; \ + $(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \ + gperf \ + --ignore-case \ + --language=ANSI-C \ ++ --includes \ + --readonly \ + --null-strings \ + --global-table \ diff -uNr a/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch --- a/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch false +++ b/sys-libs/libcap/files/libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 3b772dec824c18824efc923166045816e91723fcaade42d90b22d3e64517195601d07c3f63beefef4f913aa7656c514c3cba562a23122da1d6b4ff2297d55d4f @@ -0,0 +1,33 @@ +From 8dfcdcfdcb9c462a05566aa8d3c6eca871f0ddbf Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Wed, 10 Feb 2016 09:52:45 +0100 +Subject: [PATCH] ignore RAISE_SETFCAP install failures + +While the new RAISE_SETFCAP feature is nifty, its failure to run (often +due to the fs not supporting it) shouldn't impair the default install. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> + +Forward ported from libcap-2.20 to libcap-2.25 + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + progs/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/progs/Makefile b/progs/Makefile +index c094a24..4a6db38 100644 +--- a/progs/Makefile ++++ b/progs/Makefile +@@ -27,7 +27,7 @@ install: all + install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \ + done + ifeq ($(RAISE_SETFCAP),yes) +- $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap ++ -$(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap + endif + + clean: +-- +2.7.1 + diff -uNr a/sys-libs/libcap/libcap-2.24-r2.ebuild b/sys-libs/libcap/libcap-2.24-r2.ebuild --- a/sys-libs/libcap/libcap-2.24-r2.ebuild false +++ b/sys-libs/libcap/libcap-2.24-r2.ebuild 5979fb31f0b5aa2d54c1e17f0689d02a4a0e50a41bef5733e54cf787068cc53c7493da4dba6c487dc6c310fa7fdf55e9e6d79eb38a98460e28b19ff49b06366c @@ -0,0 +1,73 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +inherit eutils multilib multilib-minimal toolchain-funcs pam + +DESCRIPTION="POSIX 1003.1e capabilities" +HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html" +SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" + +# it's available under either of the licenses +LICENSE="|| ( GPL-2 BSD )" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +IUSE="pam static-libs" + +RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] + pam? ( virtual/pam )" +DEPEND="${RDEPEND} + sys-kernel/linux-headers" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.24-build-system-fixes.patch + epatch "${FILESDIR}"/${PN}-2.22-no-perl.patch + epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.patch + epatch "${FILESDIR}"/${PN}-2.21-include.patch + epatch "${FILESDIR}"/${PN}-2.24-setcap-errno.patch #551672 + + multilib_copy_sources +} + +multilib_src_configure() { + local pam + if multilib_is_native_abi && use pam; then + pam=yes + else + pam=no + fi + + sed -i \ + -e "/^PAM_CAP/s:=.*:=${pam}:" \ + -e '/^DYNAMIC/s:=.*:=yes:' \ + -e '/^lib_prefix=/s:=.*:=$(prefix):' \ + -e "/^lib=/s:=.*:=$(get_libdir):" \ + Make.Rules +} + +multilib_src_compile() { + tc-export AR CC RANLIB + local BUILD_CC + tc-export_build_env BUILD_CC + + default +} + +multilib_src_install() { + # no configure, needs explicit install line #444724#c3 + emake install DESTDIR="${ED}" + + gen_usr_ldscript -a cap + use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a + + rm -rf "${ED}"/usr/$(get_libdir)/security + if multilib_is_native_abi && use pam; then + dopammod pam_cap/pam_cap.so + dopamsecurity '' pam_cap/capability.conf + fi +} + +multilib_src_install_all() { + dodoc CHANGELOG README doc/capability.notes +} diff -uNr a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml --- a/sys-libs/libcap/metadata.xml false +++ b/sys-libs/libcap/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest --- a/sys-libs/libseccomp/Manifest false +++ b/sys-libs/libseccomp/Manifest 033955c63f58282aec285775aeb442f9fc5545a130c49d1c41f533c7e3da5e20eab0fb5dda615461bf380afb93622de55295058859fb52760214e5c8772c1d62 @@ -0,0 +1,3 @@ +DIST libseccomp-2.3.3.tar.gz 564546 BLAKE2B b5249379baf07ab2fef8a8659a30c9e87cbf05f99c38a07c1516948d2ede27d505f6670426f46422d2a927d7bfe97a33d8f871899ae9c30a26fbd10fba609df8 SHA512 845c7e0e916b5f5ad74da446ceff3250148b745c909185f6d5059e807d1b42fa6b74f356cce2a396bff0d4c7a3120e7cdad98d490a97d549327c7693fe1918be +EBUILD libseccomp-2.3.3.ebuild 982 BLAKE2B f5a1f4462fbe1e13ef6ee163321f07a9bcf95c2e036cae566a9c8d0b58ab0c0ae94ef7afa15306e186422ef3e6aeb89b06904b6f1b02e1b8ddef1efe50018a4f SHA512 9408bfa714e3b81ffbf0b9e76b87dcce1d003c5068e649f67833bbbe4671786f1bf66b50e7317ca2bb333eb906a08f8c8d43e509c0851a68ef63176aed82873a +MISC metadata.xml 305 BLAKE2B d660c00d553100c2dc8deb364d56acdef4771051f3d876a63e7264a501653ba539840ccab398e834428990f3c22accca16a34a9d64f433f5258656c5085a3dae SHA512 5b35970c91056a844e76bfd8e3040f58d38784390fd7fcbd881bfd3eb11e7c4c01c16cf4e320f19aaca494c715037b142e3ceddf6a28b1f272b7b01b95cf3ff0 diff -uNr a/sys-libs/libseccomp/libseccomp-2.3.3.ebuild b/sys-libs/libseccomp/libseccomp-2.3.3.ebuild --- a/sys-libs/libseccomp/libseccomp-2.3.3.ebuild false +++ b/sys-libs/libseccomp/libseccomp-2.3.3.ebuild 3193e1da21b89eb7dd93e964bd0a1de87684af724b703427d5611c37ada219a0a09220f2e26b5b46f82328cbf30d255e7a19768640e2d9c6174ff91f5b3af4da @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# TODO: Add python support. + +EAPI="5" + +inherit eutils multilib-minimal + +DESCRIPTION="high level interface to Linux seccomp filter" +HOMEPAGE="https://github.com/seccomp/libseccomp" +SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="-* amd64 ~arm arm64 ~mips ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux" +IUSE="static-libs" + +# We need newer kernel headers; we don't keep strict control of the exact +# version here, just be safe and pull in the latest stable ones. #551248 +DEPEND=">=sys-kernel/linux-headers-4.3" + +src_prepare() { + sed -i \ + -e '/_LDFLAGS/s:-static::' \ + tools/Makefile.in || die +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + $(use_enable static-libs static) \ + --disable-python +} + +multilib_src_install_all() { + find "${ED}" -name libseccomp.la -delete + einstalldocs +} diff -uNr a/sys-libs/libseccomp/metadata.xml b/sys-libs/libseccomp/metadata.xml --- a/sys-libs/libseccomp/metadata.xml false +++ b/sys-libs/libseccomp/metadata.xml a2499a8fc82378c8b0d1804fbb4444eb778438398b6923ecb7190ba9c57d78c4a03d5afda944b1758c4dfc5c70e6e0bb4b30eeb286d766fc9a9f7c5f046085d0 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +  + <upstream> + <remote-id type="github">seccomp/libseccomp</remote-id> + <remote-id type="sourceforge">libseccomp</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest --- a/sys-libs/musl/Manifest false +++ b/sys-libs/musl/Manifest c6b810343a960a85e72f6b7bd63a240931e2d82ab93030a8e38bf111152af78561d1b9bf249a8a61dcaa03d41adceb0dd85b8ac3c29c893f9ecfae17248e428f @@ -0,0 +1,7 @@ +AUX ldconfig.in 2552 BLAKE2B c94f9900e8582d707519171c4b61079c801b60c555677b1740b04adbdec9645578b9a8fc91f11413072568f316c795e46a332970f3d2dde5272b0c49a5d60a78 SHA512 59f1b57361196363d3f127366764f05d26c23dbe3d3dbcdba9bd3c8ca26a671fd713b96d31c509d22805c57ada2b596d979a3f5795bcf0a4d3ac7d168f3bf377 +DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d +DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2 +DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf +DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5 +EBUILD musl-1.1.19.ebuild 3046 BLAKE2B dd3ec79934c99b2bbe10d34d6efabe818fc1e94320fd44779a1ad6394e16bac0ac077742cab1c7ceaf554ab74d9825386d63cae95814ec564e5f92636fb52fcf SHA512 6bc48fad1aea48f7cc153cb82ee0cb1b08bc396f66ef6731fcf5e668e58a4154d2f404ed197b6be6c26449f71bd3479c0f52ccb51984ff9af45d04cbf4c47f1c +MISC metadata.xml 452 BLAKE2B f6d26f456e1a1005b0103c6921d59504dcacddfaf9ec3c788f6f626df670ec7e979a8a66626d7de24d0b850651bf095610c191d520b67915a701bf8564189fc4 SHA512 676d8122179a5cb56e0b9c7aeb7f0aec8c19b5d7b604a19c9ee01aeca837a74cc4284e87cc743d0eaf527f0c79afdfeb1f238c204a8a6c1c5590b2718bbc9b03 diff -uNr a/sys-libs/musl/files/ldconfig.in b/sys-libs/musl/files/ldconfig.in --- a/sys-libs/musl/files/ldconfig.in false +++ b/sys-libs/musl/files/ldconfig.in 0244052938b54c9892bae4aa2d5a6466649b6c25fe8348c37b3850db020e27f7ba7aab9544754ff7dc4d91f5ad3b814d8e040f5fa32dc2812a979a3c264ad59b @@ -0,0 +1,144 @@ +#!/bin/bash -e +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +ROOT="/" + +LDSO_CONF="/etc/ld.so.conf" +if [[ ! -e $LDSO_CONF ]]; then + echo "$LDSO_CONF not found" >&2 + exit 1 +fi + +LDSO_CONF_DIR=$(dirname $LDSO_CONF) + +VERBOSE=0 + +UPDATE_LINKS=1 + +get_options() { + while getopts "vnNXf:C:r:p" opt "$@"; do + case $opt in + v) + echo "ldconfig for musl in Gentoo" + VERBOSE=1 + ;; + r) + ROOT=$OPTARG + ;; + f) + LDSO_CONF=$OPTARG + ;; + X) + UPDATE_LINKS=0 + ;; + \?) + echo "Invalid option: -$opt" >&2 + exit 1 + ;; + n|N|C|p) + echo "Unimplemented option: -$opt" >&2 + exit 1 + ;; + esac + done + + if [[ $UPDATE_LINKS == 1 ]]; then + echo "Updating links is not implemented." + fi +} + + +repeated() { + local l=$1 + local drs="${@:2}" + for m in $drs; do + [[ $m == $l ]] && return 0 + done + return 1 +} + +expand() { + # We are assuming the ld.so.conf's 'include' is not recursive + local f line l + local glob="$LDSO_CONF_DIR/$1" + local drs="${@:2} " + + for f in $glob; do + [[ ! -f $f ]] && continue + while read line; do + line=${line%%#*} + line=${line//:/ } + line=${line//,/ } + for l in $line; do + #We must add this whether or not the directory exists + repeated $l $drs && continue + drs+=" $l " + done + done < $f + done + + echo $drs +} + +read_ldso_conf() { + local drs=" " + + while read line; do + # Sanitize the line - see ldconfig(8) for delimiters + # Note: bash read turns tabs into spaces and read already + # delimits on newlines with the default $IFS + line=${line%%#*} # Remove comments + line=${line//:/ } # Change colon delimiter to space + line=${line//,/ } # Change comma delimiter to space + + next=0 + for l in $line; do + if [[ $next == 1 ]]; then + next=0 + drs=$(expand $l $drs) + elif [[ $l == "include" ]]; then + next=1 + else + # glibc's ldconfig silently skips non directories + if [[ -d $l ]]; then + repeated $l $drs && continue + drs+=" $l " + fi + fi + done + done < $1 + + echo $drs +} + +sanitize() { + local drs=$@ + + repeated "/lib" $drs || drs="/lib $drs" + repeated "/usr/lib" $drs || drs="/usr/lib $drs" + + echo $drs +} + +get_options "$@" +drs=$(read_ldso_conf "$LDSO_CONF") +drs=$(sanitize $drs) + +ARCH=@@ARCH@@ +LDSO_PATH="/lib/ld-musl-${ARCH}.so.1" +if [[ ! -e $LDSO_PATH ]]; then + echo "$LDSO_PATH not found" >&2 + exit 1 +fi + +LDSO_ARCH=$(basename $LDSO_PATH) +LDSO_NAME=${LDSO_ARCH%.so.1} +ETC_LDSO_PATH=/etc/${LDSO_NAME}.path + +X=$(mktemp -p /tmp ${LDSO_NAME}.XXXXXX) +for d in $drs; do + echo $d >> $X +done +chmod 644 $X +mv $X $ETC_LDSO_PATH diff -uNr a/sys-libs/musl/metadata.xml b/sys-libs/musl/metadata.xml --- a/sys-libs/musl/metadata.xml false +++ b/sys-libs/musl/metadata.xml dc4f52307e7b555a789b64c6e972efdd6c53033508f6d65f9504e66ff81025ac11b9518fc3191e0425f84dbcca2d15287f0e7dcd2343de7e4c484d2f7f15e3c3 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>blueness@gentoo.org</email> + <name>Anthony G. Basile</name> + </maintainer> + <maintainer type="person"> + <email>lu_zero@gentoo.org</email> + </maintainer> +<maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> + </maintainer> +</pkgmetadata> diff -uNr a/sys-libs/musl/musl-1.1.19.ebuild b/sys-libs/musl/musl-1.1.19.ebuild --- a/sys-libs/musl/musl-1.1.19.ebuild false +++ b/sys-libs/musl/musl-1.1.19.ebuild 146f587ce97a9dfc2b9a89abaedd040434095fed23a2668d197940aea116beef78c5d0a9e8fbfb9ede9de4278235a783d9b7814693bc66c73770a22263255ae9 @@ -0,0 +1,118 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils flag-o-matic multilib toolchain-funcs +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.musl-libc.org/musl" + inherit git-r3 + SRC_URI=" + https://dev.gentoo.org/~blueness/musl-misc/getconf.c + https://dev.gentoo.org/~blueness/musl-misc/getent.c + https://dev.gentoo.org/~blueness/musl-misc/iconv.c" + KEYWORDS="" +else + SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz + https://dev.gentoo.org/~blueness/musl-misc/getconf.c + https://dev.gentoo.org/~blueness/musl-misc/getent.c + https://dev.gentoo.org/~blueness/musl-misc/iconv.c" + KEYWORDS="-* amd64 arm ~mips ppc x86" +fi + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" +HOMEPAGE="http://www.musl-libc.org/" +LICENSE="MIT LGPL-2 GPL-2" +SLOT="0" +IUSE="headers-only" + +QA_SONAME="/usr/lib/libc.so" +QA_DT_NEEDED="/usr/lib/libc.so" + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +just_headers() { + use headers-only && is_crosscompile +} + +pkg_setup() { + if [ ${CTARGET} == ${CHOST} ] ; then + case ${CHOST} in + *-musl*) ;; + *) die "Use sys-devel/crossdev to build a musl toolchain" ;; + esac + fi +} + +src_configure() { + tc-getCC ${CTARGET} + just_headers && export CC=true + + local sysroot + is_crosscompile && sysroot=/usr/${CTARGET} + ./configure \ + --target=${CTARGET} \ + --prefix=${sysroot}/usr \ + --syslibdir=${sysroot}/lib \ + --disable-gcc-wrapper || die +} + +src_compile() { + emake obj/include/bits/alltypes.h + just_headers && return 0 + + emake + if [[ ${CATEGORY} != cross-* ]] ; then + $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die + $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die + $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die + fi +} + +src_install() { + local target="install" + just_headers && target="install-headers" + emake DESTDIR="${D}" ${target} + just_headers && return 0 + + # musl provides ldd via a sym link to its ld.so + local sysroot + is_crosscompile && sysroot=/usr/${CTARGET} + local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) + dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd + + if [[ ${CATEGORY} != cross-* ]] ; then + local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc ($.*$)$/\1/p') + [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die + cp "${FILESDIR}"/ldconfig.in "${T}" || die + sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die + into / + dosbin "${T}"/ldconfig + into /usr + dobin "${T}"/getconf + dobin "${T}"/getent + dobin "${T}"/iconv + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die + doenvd "${T}"/00musl || die + fi +} + +pkg_postinst() { + is_crosscompile && return 0 + + [ "${ROOT}" != "/" ] && return 0 + + ldconfig || die + # reload init ... + /sbin/telinit U 2>/dev/null +} diff -uNr a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest --- a/sys-libs/ncurses/Manifest false +++ b/sys-libs/ncurses/Manifest ec45a80be819e302ee096d06db7444550235acde1079dfde98813f9b1bf1439eb6954c33f53088c9ad687d8664bc10a249156a04f81e34b49220019716f97422 @@ -0,0 +1,16 @@ +AUX ncurses-5.7-nongnu.patch 361 BLAKE2B 9260be98295203137327e37a15480bf96742ec5a62a693af04e929ba7ac8528e2810b267960d7cde5b20e8ee72bb447e34a681b567e74d5e4e9325a3613292c1 SHA512 818a3ac1c68c1a11f23471195a32793c5546c5b37a724989cc58f3fad50fd3c8608762efc5d72e986f3c77ccdfbb72f27224f64ef415a96d71924a9f1d3b1b5f +AUX ncurses-5.8-gfbsd.patch 695 BLAKE2B 0a7e27a1e7327cee5eafc34e702742b544d59960de52e316753eeffd5eac5efbdcd7fca910fe31b5a7e8b2aa4e4d8095db6f91fd3fc974244ffd3531d44074b9 SHA512 d4c375107415b7eaf5f8e04b697ef16998855b5f1d745766a14a7e9523d12b24d0841e6559217eccf62535f54e0d240eabaa3da1571964f1bb150b0c0cd102a2 +AUX ncurses-5.9-fix-clang-build.patch 1291 BLAKE2B a0fdd4eced0f52ae8368c02e5de66be4aa3ed7a021d6842c982c5ad293f258face7632b42cba51f9194fcdb5479717ca92b3802f5291d15795387b99d11aae10 SHA512 d911441e2e2e2a752236f1eee42955b43ffabe37e47c337a86562c3708aca1fc2650ce77fe5aa6197eb8e9a67958a4b4db8f4344d22fe15868e25b933b175bb1 +AUX ncurses-5.9-gcc-5.patch 1367 BLAKE2B ecbf3c307e5543c4f32a4db54f0e7c97ef0e5f68ebef9a974265e4f002a4789f5e3629a68eb455e45f6cc43f7b05a9eb6db6675dc0c9b83d61785fc10d67fb4b SHA512 200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c +AUX ncurses-5.9-no-I-usr-include.patch 1431 BLAKE2B 1dcc533936ba22fcb07a3ad4252391becb57aec0878304254236148c9d022ebf4d7d698c97e9f199baf83995e4de72ff7979539dae1a4222dbadeab93d643bf4 SHA512 a58aec17e4c2edb3f8ed3f414ec6a89afe9f5fcc7cea898774a1fd7e7e892f9b66b1c2bdc74381dd5e8c9cf6968ad922406974f9ece8b38095b29e32d3ff0805 +AUX ncurses-5.9-pkg-config.patch 1022 BLAKE2B dcaa045919e22eb174cb7c155ef05fa7c2c29d64eb586947f2afb243a13dfdc503460452be0f8075bc91b166d5b7f12ea34b39234d0832ef6bd432496932719f SHA512 a5578a4a6c2a334a77084da21d61d4a9edd7b82f027d7f54ed7be194ace5076fe86dc51ada916388feeb970255bf3bfbb09cd33072b1ef21de0dbaa5ee45fdf6 +AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 BLAKE2B b88b028246c4177cac148837063b8dd76fa8dc215cb47ace2dd58b38eb8547273ac29930e2fe1c209bc8047462fe1319ac253955af445674410e21e8fe1c39b9 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131 +AUX ncurses-6.0-cppflags-cross.patch 1240 BLAKE2B 56fbe4810c28e089a8ceb8fa8c983df744d40573b4fc2488d3f26f40ed77aba2d15da2a006e56217216740e26a295c9ab9c4be78df201514040376a986cf1b30 SHA512 db333b400ad23110bff80d86eca39e5656870caa06083b6d7098503fe34a46e387d207b135bf9aa9a0a1f2eca2a9b094f1d189ea8f8a17caaec4fc14b819fcc4 +AUX ncurses-6.0-gfbsd.patch 687 BLAKE2B 74ba99be6040287480e09e07c459651375ff1ce9473121e68f70f2cc42e6355f7aca1adf58e02e9d05c41af4f92985f03f2be985cc04d90b7dffc54287a6df93 SHA512 706425317e02448a31cdf1d66695292cb17b4cb174008218b0fe9e86ff4367fca5a80ad5eb017e06ad57f9bd75524e38c543618b5eeb6161c5baef15cb8d55ec +AUX ncurses-6.0-pkg-config.patch 386 BLAKE2B 27a61878d45aa781291e18a2e18b8e861dd88f523083a54032511ceea2784b5020c500d0d277fe448381a969989d896ca32c46af35ad29f35dace97511dda9eb SHA512 8065f50a1d0b2ccd8c8d9b5b6bcf10b07351e2f5e51c17a825057235a63459839771ea249aac7fa50e09c7bacde5179a92f3efe587cf3cf6697ec663faf6caf3 +AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb70967705cc0460fb87cb3897d0e86678b065bc365573859d1cb96ac4209e61a4c43a84cd0cc3b86680e965e3bf404271354ef SHA512 5601446d34421453fb8ed0e7172b4a5230ab4f10a6ded27e6dc52f82f121cb0af510dfc8f60d9ba0d3b9a1d90a8a832c38e24256e394d8ffccbbf12a109e2da4 +AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6 +AUX ncurses-6.1-st07_terminfo_typo.patch 563 BLAKE2B e28c682c752e8e075691045217d14f88e5a1c5805c014e9b6ccc1d19179cc60dd04dea418a6d9d6302140a89c1977e47b6d9385c7192fdac6a26c9d2e2a33f69 SHA512 a81faa2c9450179324ba56c8cbf3bc5104fbfb2bb9108dfcd93a63fb3ce88c25cb5ab130a2e015816a1a2efa42c2fb3fb3b4b381517d45804efad997a36c8508 +DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee +EBUILD ncurses-6.1-r2.ebuild 8759 BLAKE2B ad912ccb6b18f7432163afc4ef0e2a6a8ae86efd1ce2f738c209eac8309bb84907cf067fab68d6fdaddabe44b3da22e513beec88b43981fe2435bcd608fb11a2 SHA512 f6e6614f583f51dfba0532c2ec229457a1625a77ab84f73c1ad0356bcce0e33463e99e0dd6a90c35d0e13f98fa603cb93c420944e4666c4c94a61ce2a21f3456 +MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef diff -uNr a/sys-libs/ncurses/files/ncurses-5.7-nongnu.patch b/sys-libs/ncurses/files/ncurses-5.7-nongnu.patch --- a/sys-libs/ncurses/files/ncurses-5.7-nongnu.patch false +++ b/sys-libs/ncurses/files/ncurses-5.7-nongnu.patch aebc3e7f599c4f542dd78445b0db798a831e901db3721aabe5c118350bc00c62b7c9b0dfa0e88d0f1f91550ca329bf5a80d35f7a7bbd09b544a2dc123c79559b @@ -0,0 +1,11 @@ +--- ncurses-5.7/ncurses/curses.priv.h ++++ ncurses-5.7/ncurses/curses.priv.h +@@ -1452,6 +1452,8 @@ extern NCURSES_EXPORT(void) _nc_expanded + + /* charable.c */ + #if USE_WIDEC_SUPPORT ++#include <wchar.h> ++ + extern NCURSES_EXPORT(bool) _nc_is_charable(wchar_t); + extern NCURSES_EXPORT(int) _nc_to_char(wint_t); + extern NCURSES_EXPORT(wint_t) _nc_to_widechar(int); diff -uNr a/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch b/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch --- a/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch false +++ b/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch b6948ec3134a5b559fb7882cb5d22c336fe678d77ab5eb3c3366ed50eaf9dda7af611a736baa3d4623e322d0d7fc05d27e42e17bc6a7f1c0e48d71c16c4beaa9 @@ -0,0 +1,24 @@ +we'll hijack the freebsd* case that comes later + +--- ncurses-5.6/aclocal.m4 ++++ ncurses-5.6/aclocal.m4 +@@ -3806,7 +3806,7 @@ + fi + cf_cv_rm_so_locs=yes + ;; +- linux*|gnu*|k*bsd*-gnu) #(vi ++ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +--- ncurses-5.6/configure ++++ ncurses-5.6/configure +@@ -3806,7 +3806,7 @@ + fi + cf_cv_rm_so_locs=yes + ;; +- linux*|gnu*|k*bsd*-gnu) #(vi ++ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" diff -uNr a/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch b/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch --- a/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch false +++ b/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch 1a2b1a94c952c24cdb7aafc800bd37b255291a6092b54267b113ec02598399dd34fef98e9de3edc382ffbc75d8433551b3803c3047800c8b4649387766ea174e @@ -0,0 +1,44 @@ +diff --git a/ncurses-5.9/c++/cursesf.h b/ncurses-5.9/c++/cursesf.h +index 70a30c3..db38063 100644 +--- a/ncurses-5.9/c++/cursesf.h ++++ b/ncurses-5.9/c++/cursesf.h +@@ -677,7 +677,7 @@ protected: + } + + public: +- NCursesUserForm (NCursesFormField Fields[], ++ NCursesUserForm (NCursesFormField* Fields[], + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE, + bool autoDelete_Fields=FALSE) +@@ -686,7 +686,7 @@ public: + set_user (const_cast<void *>(p_UserData)); + }; + +- NCursesUserForm (NCursesFormField Fields[], ++ NCursesUserForm (NCursesFormField* Fields[], + int nlines, + int ncols, + int begin_y = 0, +diff --git a/ncurses-5.9/c++/cursesm.h b/ncurses-5.9/c++/cursesm.h +index d9c2273..2d5b79a 100644 +--- a/ncurses-5.9/c++/cursesm.h ++++ b/ncurses-5.9/c++/cursesm.h +@@ -635,7 +635,7 @@ protected: + } + + public: +- NCursesUserMenu (NCursesMenuItem Items[], ++ NCursesUserMenu (NCursesMenuItem* Items[], + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE, + bool autoDelete_Items=FALSE) +@@ -644,7 +644,7 @@ public: + set_user (const_cast<void *>(p_UserData)); + }; + +- NCursesUserMenu (NCursesMenuItem Items[], ++ NCursesUserMenu (NCursesMenuItem* Items[], + int nlines, + int ncols, + int begin_y = 0, diff -uNr a/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch b/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch --- a/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch false +++ b/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch 30729aa67368e352ae669325793f4ac4e0df2363348b574e9cc48ff94a29c7cf9921f19965faf7aab8891c0ba691d2419df753df2151dd881bb24d4acafdc366 @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/545114 + +extracted from the upstream change (which had many unrelated commits in one) + +From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001 +From: "Thomas E. Dickey" <dickey@invisible-island.net> +Date: Sun, 7 Dec 2014 03:10:09 +0000 +Subject: [PATCH] ncurses 5.9 - patch 20141206 + ++ modify MKlib_gen.sh to work around change in development version of + gcc introduced here: + https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html + https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html + (reports by Marcus Shawcroft, Maohui Lei). + +diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh +index d8cc3c9..b91398c 100755 +--- a/ncurses/base/MKlib_gen.sh ++++ b/ncurses/base/MKlib_gen.sh +@@ -474,11 +474,22 @@ sed -n -f $ED1 \ + -e 's/gen_$//' \ + -e 's/ / /g' >>$TMP + ++cat >$ED1 <<EOF ++s/ / /g ++s/^ // ++s/ $// ++s/P_NCURSES_BOOL/NCURSES_BOOL/g ++EOF ++ ++# A patch discussed here: ++# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html ++# introduces spurious #line markers. Work around that by ignoring the system's ++# attempt to define "bool" and using our own symbol here. ++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 ++cat $ED2 >$TMP ++ + $preprocessor $TMP 2>/dev/null \ +-| sed \ +- -e 's/ / /g' \ +- -e 's/^ //' \ +- -e 's/_Bool/NCURSES_BOOL/g' \ ++| sed -f $ED1 \ + | $AWK -f $AW2 \ + | sed -f $ED3 \ + | sed \ diff -uNr a/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch b/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch --- a/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch false +++ b/sys-libs/ncurses/files/ncurses-5.9-no-I-usr-include.patch 7594cd19b74724a84201495c3f4d11b525d52bd0ca0f4e3311f17359c1e2f82226acfe68b2577a06b92c08f8d99ed9a29444c2647bc64cbfdddd45f5162bbfff @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/522586 + +delete the -I$includedir paths that get added to CPPFLAGS. these are never +needed when building natively or cross-compiling and really get in the way +in both cases (upgrades/cross-compiling/etc...). + +extracted from the upstream change: +http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=9ee3995474454b7d956885e0fe5c8cac2ae25d42#patch5 + +--- a/configure ++++ b/configure +@@ -18596,33 +18596,11 @@ CPPFLAGS="$CPPFLAGS -I. -I../include" + if test "$srcdir" != "."; then + CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include" + fi +-if test "$GCC" != yes; then +- CPPFLAGS="$CPPFLAGS -I\${includedir}" +-elif test "$includedir" != "/usr/include"; then +- if test "$includedir" = '${prefix}/include' ; then +- if test $prefix != /usr ; then +- CPPFLAGS="$CPPFLAGS -I\${includedir}" +- fi +- else +- CPPFLAGS="$CPPFLAGS -I\${includedir}" +- fi +-fi + + ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS" + if test "$srcdir" != "."; then + ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS" + fi +-if test "$GCC" != yes; then +- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" +-elif test "$includedir" != "/usr/include"; then +- if test "$includedir" = '${prefix}/include' ; then +- if test $prefix != /usr ; then +- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" +- fi +- else +- ACPPFLAGS="$ACPPFLAGS -I\${includedir}" +- fi +-fi + + ### Build up pieces for makefile rules + echo "$as_me:18628: checking default library suffix" >&5 diff -uNr a/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch b/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch --- a/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch false +++ b/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch 20d96f183bac856e5400eb0cfaa4dffd6d12893d243bdedefcf39a8131a3711bd8af5b1711982f738a776dfe6f87adc134d9a619ca732d8bfa870b48354dbae5 @@ -0,0 +1,26 @@ +disable the $PATH search for the PKG_CONFIG tool. it isn't needed and just +gets in the way when setting to a value that might not yet exist. + +disable the existence test for the PKG_CONFIG_LIBDIR dir. it breaks when you +cross-compile for an ABI that doesn't exist in the root dir (--build). + +--- a/configure ++++ b/configure +@@ -3582,7 +3582,7 @@ fi + esac + + test -z "$PKG_CONFIG" && PKG_CONFIG=none +-if test "$PKG_CONFIG" != none ; then ++if false ; then + + if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +@@ -3626,7 +3626,7 @@ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C + PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig + fi + PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` +- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then ++ if test -n "$PKG_CONFIG_LIBDIR" ; then + + # Check whether --enable-pc-files or --disable-pc-files was given. + if test "${enable_pc_files+set}" = set; then diff -uNr a/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch b/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch --- a/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch false +++ b/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch bcb4c69c48da92419ad4334530e30bbf6e916014a969b92fbf0bcf55de0ad9551ca7b1886e1cceda09a069ba881d34fbb50332b1fbc687b85ec00cb5cac9dcff @@ -0,0 +1,191 @@ +Add rxvt-unicode terminfo, required by rxvt-unicode to function properly. + +Providing this in ncurses makes it widely available, much better than having to +install rxvt-unicode everywhere. + +http://bugs.gentoo.org/show_bug.cgi?id=192083 + +This patch uses the updated rxvt-unicode-9.15 terminfo +which includes 256 color support and fixes Gentoo bug 383871 + +http://bugs.gentoo.org/show_bug.cgi?id=383871 + +--- misc/terminfo.src ++++ misc/terminfo.src +@@ -4208,6 +4208,176 @@ + rxvt-16color|xterm with 16 colors like aixterm, + ncv#32, use=ibm+16color, use=rxvt, + ++# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997 ++# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997 ++# Updated: Marc Lehmann <schmorp@schmorp.de>, 17 Feb 2005 ++# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences ++rxvt-unicode|rxvt-unicode terminal (X Window System), ++ am, ++ bce, ++ eo, ++ km, ++ msgr, ++ xenl, ++ hs, ++ cols#80, ++ it#8, ++ lines#24, ++ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, ++ bel=^G, ++ blink=\E[5m, ++ bold=\E[1m, ++ civis=\E[?25l, ++ clear=\E[H\E[2J, ++ cnorm=\E[?25h, ++ cr=^M, ++ csr=\E[%i%p1%d;%p2%dr, ++ cub=\E[%p1%dD, ++ cub1=^H, ++ cud=\E[%p1%dB, ++ cud1=^J, ++ cuf=\E[%p1%dC, ++ cuf1=\E[C, ++ cup=\E[%i%p1%d;%p2%dH, ++ cuu=\E[%p1%dA, ++ cuu1=\E[A, ++ cvvis=\E[?25h, ++ dch=\E[%p1%dP, ++ dch1=\E[P, ++ dl=\E[%p1%dM, ++ dl1=\E[M, ++ ed=\E[J, ++ el=\E[K, ++ el1=\E[1K, ++ flash=\E[?5h$<20/>\E[?5l, ++ home=\E[H, ++ hpa=\E[%i%p1%dG, ++ ht=^I, ++ hts=\EH, ++ ich=\E[%p1%d@, ++ ich1=\E[@, ++ il=\E[%p1%dL, ++ il1=\E[L, ++ ind=^J, ++ is1=\E[\041p, ++ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, ++ kDC=\E[3$, ++ kIC=\E[2$, ++ kEND=\E[8$, ++ kHOM=\E[7$, ++ kLFT=\E[d, ++ kNXT=\E[6$, ++ kPRV=\E[5$, ++ kRIT=\E[c, ++ kbs=\177, ++ ka1=\EOw, ++ ka3=\EOy, ++ kb2=\EOu, ++ kc1=\EOq, ++ kc3=\EOs, ++ kcbt=\E[Z, ++ kcub1=\E[D, ++ kcud1=\E[B, ++ kcuf1=\E[C, ++ kcuu1=\E[A, ++ kdch1=\E[3~, ++ kel=\E[8\^, ++ kend=\E[8~, ++ kent=\EOM, ++ kf1=\E[11~, ++ kf10=\E[21~, ++ kf11=\E[23~, ++ kf12=\E[24~, ++ kf13=\E[25~, ++ kf14=\E[26~, ++ kf15=\E[28~, ++ kf16=\E[29~, ++ kf17=\E[31~, ++ kf18=\E[32~, ++ kf19=\E[33~, ++ kf2=\E[12~, ++ kf20=\E[34~, ++ kf3=\E[13~, ++ kf4=\E[14~, ++ kf5=\E[15~, ++ kf6=\E[17~, ++ kf7=\E[18~, ++ kf8=\E[19~, ++ kf9=\E[20~, ++ kfnd=\E[1~, ++ khome=\E[7~, ++ kich1=\E[2~, ++ kmous=\E[M, ++ knp=\E[6~, ++ kpp=\E[5~, ++ kslt=\E[4~, ++ rc=\E8, ++ rev=\E[7m, ++ ri=\EM, ++ rmso=\E[27m, ++ rmul=\E[24m, ++ rs1=\Ec, ++ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, ++ sgr0=\E[m\E(B, ++ enacs=, ++ smacs=\E(0, ++ rmacs=\E(B, ++ smso=\E[7m, ++ smul=\E[4m, ++ tbc=\E[3g, ++ vpa=\E[%i%p1%dd, ++ colors#88, ++ pairs#7744, ++ btns#5, ++ lm#0, ++ ccc, ++ npc, ++ mc5i, ++ ncv#0, ++ mir, ++ xon, ++ bw, ++ ech=\E[%p1%dX, ++ mc0=\E[i, ++ mc4=\E[4i, ++ mc5=\E[5i, ++ sitm=\E[3m, ++ ritm=\E[23m, ++ smam=\E[?7h, ++ rmam=\E[?7l, ++ smir=\E[4h, ++ rmir=\E[4l, ++ smcup=\E[?1049h, ++ rmcup=\E[r\E[?1049l, ++ smkx=\E=, ++ rmkx=\E>, ++ indn=\E[%p1%dS, ++ rin=\E[%p1%dT, ++ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, ++ op=\E[39;49m, ++ setaf=\E[38;5;%p1%dm, ++ setab=\E[48;5;%p1%dm, ++ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, ++ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, ++ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, ++ sc=\E7, ++ s0ds=\E(B, ++ s1ds=\E(0, ++ s2ds=\E*B, ++ s3ds=\E+B, ++ u6=\E[%i%d;%dR, ++ u7=\E[6n, ++ u8=\E[?1;2c, ++ u9=\E[c, ++ tsl=\E]2;, ++ fsl=\007, ++ dsl=\E]2;\007, ++ ++rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), ++ colors#256, ++ pairs#32767, ++ use=rxvt-unicode, ++ + # mrxvt 0.5.4 + # + # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff -uNr a/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch b/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch --- a/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch false +++ b/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch 69b62f0990c376be66b6bd11fbc4aec2295370fd696ad720cf507281d4c3682c88220e5dca99a93d3bb9ba3b0616e3326c0d7dca743a2c38ac1eb144278b2c5e @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/601426 +https://lists.gnu.org/archive/html/bug-ncurses/2015-02/msg00012.html + +From: John Vogel +Subject: [PATCH] c++ binding missed when cross compiling +Date: Mon, 16 Feb 2015 01:01:48 -0500 + +The configure script hard codes the include dir to the prefix'ed include dir, +when checking if c++ compiler works. This breaks the compiler's built-in search +path. I've included two patches. The first works on the configure.in file, which +requires your autoconf stuff to test and I'm not ready to meddle with at the +moment. The other works directly on the configure file. I've tested the second +one; it should mirror what the first patch tries to achieve and works for me. + +--- a/configure ++++ b/configure +@@ -2938,10 +2938,6 @@ + echo "$as_me:2938: checking if $CXX works" >&5 + echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 + +- save_CPPFLAGS="$CPPFLAGS" +- eval cf_includedir=${includedir} +- CPPFLAGS="$CPPFLAGS -I${cf_includedir}" +- + cat >conftest.$ac_ext <<_ACEOF + #line 2946 "configure" + #include "confdefs.h" +@@ -2978,7 +2974,6 @@ + cf_cxx_works=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- CPPFLAGS="$save_CPPFLAGS" + + echo "$as_me:2983: result: $cf_cxx_works" >&5 + echo "${ECHO_T}$cf_cxx_works" >&6 diff -uNr a/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch b/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch --- a/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch false +++ b/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch 554d309e50628f05a3b9d339315ef76b6acafddc9e8e451cd58458c53f4e8bd60dd8ed4afd3ed8bf0393465df69eb1eabdbe563da8e5b3368fac7b577a3cbdde @@ -0,0 +1,24 @@ +we'll hijack the freebsd* case that comes later + +--- ncurses-6.0/aclocal.m4 ++++ ncurses-6.0/aclocal.m4 +@@ -5711,7 +5711,7 @@ + fi + cf_cv_rm_so_locs=yes + ;; +- (linux*|gnu*|k*bsd*-gnu) ++ (linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +--- ncurses-6.0/configure ++++ ncurses-6.0/configure +@@ -6188,7 +6188,7 @@ + fi + cf_cv_rm_so_locs=yes + ;; +- (linux*|gnu*|k*bsd*-gnu) ++ (linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" diff -uNr a/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch b/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch --- a/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch false +++ b/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch e79b6b7057eb166a8815b8a753d287c64ffb70bca47701d39f16f6931da90f9eaeef9e8291c1edfccbcdafec6f827e2372499862cd8521046da45c127d544493 @@ -0,0 +1,14 @@ +disable the $PATH search for the PKG_CONFIG tool. it isn't needed and just +gets in the way when setting to a value that might not yet exist. + +--- ncurses-6.0/configure ++++ ncurses-6.0/configure +@@ -3533,7 +3533,7 @@ + esac + + test -z "$PKG_CONFIG" && PKG_CONFIG=none +-if test "$PKG_CONFIG" != none ; then ++if false ; then + + if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" diff -uNr a/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch b/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch --- a/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch false +++ b/sys-libs/ncurses/files/ncurses-6.0-rxvt-unicode-9.15.patch ff9c6db308ce1d91fb5fb5e44db8bdb6271174a16ea6af2a7e89f98c3d19dbc3ce99cb97daa5b1263c7169b483d77cb9dffcfa62f1025f16efa8caf6b1c42f1e @@ -0,0 +1,191 @@ +Add rxvt-unicode terminfo, required by rxvt-unicode to function properly. + +Providing this in ncurses makes it widely available, much better than having to +install rxvt-unicode everywhere. + +http://bugs.gentoo.org/show_bug.cgi?id=192083 + +This patch uses the updated rxvt-unicode-9.15 terminfo +which includes 256 color support and fixes Gentoo bug 383871 + +http://bugs.gentoo.org/show_bug.cgi?id=383871 + +--- ncurses-6.0/misc/terminfo.src ++++ ncurses-6.0/misc/terminfo.src +@@ -5214,6 +5214,176 @@ + rxvt-16color|rxvt with 16 colors like aixterm, + ncv#32, use=ibm+16color, use=rxvt, + ++# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997 ++# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997 ++# Updated: Marc Lehmann <schmorp@schmorp.de>, 17 Feb 2005 ++# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences ++rxvt-unicode|rxvt-unicode terminal (X Window System), ++ am, ++ bce, ++ eo, ++ km, ++ msgr, ++ xenl, ++ hs, ++ cols#80, ++ it#8, ++ lines#24, ++ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, ++ bel=^G, ++ blink=\E[5m, ++ bold=\E[1m, ++ civis=\E[?25l, ++ clear=\E[H\E[2J, ++ cnorm=\E[?25h, ++ cr=^M, ++ csr=\E[%i%p1%d;%p2%dr, ++ cub=\E[%p1%dD, ++ cub1=^H, ++ cud=\E[%p1%dB, ++ cud1=^J, ++ cuf=\E[%p1%dC, ++ cuf1=\E[C, ++ cup=\E[%i%p1%d;%p2%dH, ++ cuu=\E[%p1%dA, ++ cuu1=\E[A, ++ cvvis=\E[?25h, ++ dch=\E[%p1%dP, ++ dch1=\E[P, ++ dl=\E[%p1%dM, ++ dl1=\E[M, ++ ed=\E[J, ++ el=\E[K, ++ el1=\E[1K, ++ flash=\E[?5h$<20/>\E[?5l, ++ home=\E[H, ++ hpa=\E[%i%p1%dG, ++ ht=^I, ++ hts=\EH, ++ ich=\E[%p1%d@, ++ ich1=\E[@, ++ il=\E[%p1%dL, ++ il1=\E[L, ++ ind=^J, ++ is1=\E[\041p, ++ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, ++ kDC=\E[3$, ++ kIC=\E[2$, ++ kEND=\E[8$, ++ kHOM=\E[7$, ++ kLFT=\E[d, ++ kNXT=\E[6$, ++ kPRV=\E[5$, ++ kRIT=\E[c, ++ kbs=\177, ++ ka1=\EOw, ++ ka3=\EOy, ++ kb2=\EOu, ++ kc1=\EOq, ++ kc3=\EOs, ++ kcbt=\E[Z, ++ kcub1=\E[D, ++ kcud1=\E[B, ++ kcuf1=\E[C, ++ kcuu1=\E[A, ++ kdch1=\E[3~, ++ kel=\E[8\^, ++ kend=\E[8~, ++ kent=\EOM, ++ kf1=\E[11~, ++ kf10=\E[21~, ++ kf11=\E[23~, ++ kf12=\E[24~, ++ kf13=\E[25~, ++ kf14=\E[26~, ++ kf15=\E[28~, ++ kf16=\E[29~, ++ kf17=\E[31~, ++ kf18=\E[32~, ++ kf19=\E[33~, ++ kf2=\E[12~, ++ kf20=\E[34~, ++ kf3=\E[13~, ++ kf4=\E[14~, ++ kf5=\E[15~, ++ kf6=\E[17~, ++ kf7=\E[18~, ++ kf8=\E[19~, ++ kf9=\E[20~, ++ kfnd=\E[1~, ++ khome=\E[7~, ++ kich1=\E[2~, ++ kmous=\E[M, ++ knp=\E[6~, ++ kpp=\E[5~, ++ kslt=\E[4~, ++ rc=\E8, ++ rev=\E[7m, ++ ri=\EM, ++ rmso=\E[27m, ++ rmul=\E[24m, ++ rs1=\Ec, ++ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, ++ sgr0=\E[m\E(B, ++ enacs=, ++ smacs=\E(0, ++ rmacs=\E(B, ++ smso=\E[7m, ++ smul=\E[4m, ++ tbc=\E[3g, ++ vpa=\E[%i%p1%dd, ++ colors#88, ++ pairs#7744, ++ btns#5, ++ lm#0, ++ ccc, ++ npc, ++ mc5i, ++ ncv#0, ++ mir, ++ xon, ++ bw, ++ ech=\E[%p1%dX, ++ mc0=\E[i, ++ mc4=\E[4i, ++ mc5=\E[5i, ++ sitm=\E[3m, ++ ritm=\E[23m, ++ smam=\E[?7h, ++ rmam=\E[?7l, ++ smir=\E[4h, ++ rmir=\E[4l, ++ smcup=\E[?1049h, ++ rmcup=\E[r\E[?1049l, ++ smkx=\E=, ++ rmkx=\E>, ++ indn=\E[%p1%dS, ++ rin=\E[%p1%dT, ++ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, ++ op=\E[39;49m, ++ setaf=\E[38;5;%p1%dm, ++ setab=\E[48;5;%p1%dm, ++ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, ++ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, ++ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, ++ sc=\E7, ++ s0ds=\E(B, ++ s1ds=\E(0, ++ s2ds=\E*B, ++ s3ds=\E+B, ++ u6=\E[%i%d;%dR, ++ u7=\E[6n, ++ u8=\E[?1;2c, ++ u9=\E[c, ++ tsl=\E]2;, ++ fsl=\007, ++ dsl=\E]2;\007, ++ ++rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), ++ colors#256, ++ pairs#32767, ++ use=rxvt-unicode, ++ + #### MRXVT + # mrxvt 0.5.4 + # diff -uNr a/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch b/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch --- a/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch false +++ b/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch 77e8bd33e5bb39052fe9e0ca3a9144479a253c180a883768872823874e2d5072d12feb48b89445a68b68cf80df2c905c5ae44f2e044e2a68e5e1672b9a7e19bd @@ -0,0 +1,15 @@ +always include ticlib even when progs are disabled + +https://bugs.gentoo.org/557360 + +--- a/configure ++++ b/configure +@@ -21312,7 +21312,7 @@ echo "$as_me:21311: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +-if test "x$cf_with_progs" = xyes || test "$with_ticlib" != no || test "$with_termcap" != no; then ++if true; then + LIB_SUBSETS="${LIB_SUBSETS}ticlib" + if test "$with_ticlib" != no ; then + LIB_SUBSETS="${LIB_SUBSETS} " diff -uNr a/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch b/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch --- a/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch false +++ b/sys-libs/ncurses/files/ncurses-6.1-st07_terminfo_typo.patch 0db73d999a9bbd843735976c5d036acd610fdf350ee2ad1699672ea7f457770ca881a04de1e19bb1e2dca220e2a1a6649dbecf61b5222b6cc95853ad5356872e @@ -0,0 +1,14 @@ +https://github.com/tmux/tmux/issues/1264 +https://bugs.gentoo.org/651494 + +--- ncurses-6.1/misc/terminfo.src ++++ ncurses-6.1/misc/terminfo.src +@@ -6260,7 +6260,7 @@ + %=%t3%e%p1%d%;m, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| + %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, +- Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, ++ Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, + kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~, + kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~, + kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A, diff -uNr a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml --- a/sys-libs/ncurses/metadata.xml false +++ b/sys-libs/ncurses/metadata.xml 039fab2574a797ca8d094e5370a3c28ab9a90363cccd9f9b8091725398f4fb343fdc2668043a0b5435f08f9c654cc36fcd891aba13eb2c97e062faae7bc14ae6 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="ada">Add bindings for the ADA programming language</flag> + <flag name="tinfo"> + Build curses library (libncurses) sep from the low-level terminfo + library (libtinfo) -- usually needed only for binary packages -- but + it is binary compatible in either mode + </flag> + <flag name="trace">Enable test trace() support in ncurses calls</flag> +</use> +</pkgmetadata> diff -uNr a/sys-libs/ncurses/ncurses-6.1-r2.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild --- a/sys-libs/ncurses/ncurses-6.1-r2.ebuild false +++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild f80ec15b25bdaf8a24a0d85a8ff06fa0d18ae885e3480382f5f3b73365657d23988b4e20fff66267abbb042646377660320bfc3720a5b0b30d1a928b279866ff @@ -0,0 +1,295 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic toolchain-funcs multilib-minimal + +MY_PV=${PV:0:3} +PV_SNAP=${PV:4} +MY_P=${PN}-${MY_PV} +DESCRIPTION="console display library" +HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" +SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" + +LICENSE="MIT" +# The subslot reflects the SONAME. +SLOT="0/6" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" + +DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" +# berkdb? ( sys-libs/db )" +# Block the older ncurses that installed all files w/SLOT=5. #557472 +RDEPEND="${DEPEND} + !<=sys-libs/ncurses-5.9-r4:5 + !<sys-libs/slang-2.3.2_pre23 + !<x11-terms/rxvt-unicode-9.06-r3 + !<x11-terms/st-0.6-r1" + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}/${PN}-6.0-gfbsd.patch" + "${FILESDIR}/${PN}-5.7-nongnu.patch" + "${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871 + "${FILESDIR}/${PN}-6.0-pkg-config.patch" + "${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114 + "${FILESDIR}/${PN}-6.0-ticlib.patch" #557360 + "${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426 + "${FILESDIR}/${PN}-6.1-st07_terminfo_typo.patch" #651494 +) + +src_prepare() { + [[ -n ${PV_SNAP} ]] && eapply "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh + default +} + +src_configure() { + unset TERMINFO #115036 + tc-export_build_env BUILD_{CC,CPP} + BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 + + # Build the various variants of ncurses -- narrow, wide, and threaded. #510440 + # Order matters here -- we want unicode/thread versions to come last so that the + # binaries in /usr/bin support both wide and narrow. + # The naming is also important as we use these directly with filenames and when + # checking configure flags. + NCURSES_TARGETS=( + ncurses + $(usex unicode 'ncursesw' '') + $(usex threads 'ncursest' '') + $(use unicode && usex threads 'ncursestw' '') + ) + + # When installing ncurses, we have to use a compatible version of tic. + # This comes up when cross-compiling, doing multilib builds, upgrading, + # or installing for the first time. Build a local copy of tic whenever + # the host version isn't available. #249363 #557598 + if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then + local lbuildflags="-static" + + # some toolchains don't quite support static linking + local dbuildflags="-Wl,-rpath,${WORKDIR}/lib" + case ${CHOST} in + *-darwin*) dbuildflags= ;; + *-aix*) dbuildflags= ;; + esac + echo "int main() {}" | \ + $(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \ + || lbuildflags="${dbuildflags}" + + # We can't re-use the multilib BUILD_DIR because we run outside of it. + BUILD_DIR="${WORKDIR}" \ + CHOST=${CBUILD} \ + CFLAGS=${BUILD_CFLAGS} \ + CXXFLAGS=${BUILD_CXXFLAGS} \ + CPPFLAGS=${BUILD_CPPFLAGS} \ + LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \ + do_configure cross --without-shared --with-normal + fi + multilib-minimal_src_configure +} + +multilib_src_configure() { + local t + for t in "${NCURSES_TARGETS[@]}" ; do + do_configure "${t}" + done +} + +do_configure() { + local target=$1 + shift + + mkdir "${BUILD_DIR}/${target}" || die + cd "${BUILD_DIR}/${target}" || die + + local conf=( + # We need the basic terminfo files in /etc, bug #37026. We will + # add '--with-terminfo-dirs' and then populate /etc/terminfo in + # src_install() ... + --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" + + # Disabled until #245417 is sorted out. + #$(use_with berkdb hashed-db) + + # Enable installation of .pc files. + --enable-pc-files + # This path is used to control where the .pc files are installed. + --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" + + # Now the rest of the various standard flags. + --with-shared + --without-hashed-db + $(use_with ada) + $(use_with cxx) + $(use_with cxx cxx-binding) + --with-cxx-shared + $(use_with debug) + $(use_with profile) + # The configure script uses ldd to parse the linked output which + # is flaky for cross-compiling/multilib/ldd versions/etc... + $(use_with gpm gpm libgpm.so.1) + # Required for building on mingw-w64, and possibly other windows + # platforms, bug #639670 + $(use_enable kernel_Winnt term-driver) + --disable-termcap + --enable-symlinks + --with-rcs-ids + --with-manpage-format=normal + --enable-const + --enable-colorfgbg + --enable-hard-tabs + --enable-echo + $(use_enable !ada warnings) + $(use_with debug assertions) + $(use_enable !debug leaks) + $(use_with debug expanded) + $(use_with !debug macros) + $(multilib_native_with progs) + $(use_with test tests) + $(use_with trace) + $(use_with tinfo termlib) + --disable-stripping + ) + + if [[ ${target} == ncurses*w ]] ; then + conf+=( --enable-widec ) + else + conf+=( --disable-widec ) + fi + if [[ ${target} == ncursest* ]] ; then + conf+=( --with-{pthread,reentrant} ) + else + conf+=( --without-{pthread,reentrant} ) + fi + # Make sure each variant goes in a unique location. + if [[ ${target} == "ncurses" ]] ; then + # "ncurses" variant goes into "${EPREFIX}"/usr/include + # It is needed on Prefix because the configure script appends + # "ncurses" to "${prefix}/include" if "${prefix}" is not /usr. + conf+=( --enable-overwrite ) + else + conf+=( --includedir="${EPREFIX}"/usr/include/${target} ) + fi + # See comments in src_configure. + if [[ ${target} != "cross" ]] ; then + local cross_path="${WORKDIR}/cross" + [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" + fi + + # Force bash until upstream rebuilds the configure script with a newer + # version of autotools. #545532 + CONFIG_SHELL=${EPREFIX}/bin/bash \ + ECONF_SOURCE="${S}" \ + econf "${conf[@]}" "$@" +} + +src_compile() { + # See comments in src_configure. + if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then + BUILD_DIR="${WORKDIR}" \ + do_compile cross -C progs tic + fi + + multilib-minimal_src_compile +} + +multilib_src_compile() { + local t + for t in "${NCURSES_TARGETS[@]}" ; do + do_compile "${t}" + done +} + +do_compile() { + local target=$1 + shift + + cd "${BUILD_DIR}/${target}" || die + + # A little hack to fix parallel builds ... they break when + # generating sources so if we generate the sources first (in + # non-parallel), we can then build the rest of the package + # in parallel. This is not really a perf hit since the source + # generation is quite small. + emake -j1 sources + # For some reason, sources depends on pc-files which depends on + # compiled libraries which depends on sources which ... + # Manually delete the pc-files file so the install step will + # create the .pc files we want. + rm -f misc/pc-files || die + emake "$@" +} + +multilib_src_install() { + local target + for target in "${NCURSES_TARGETS[@]}" ; do + emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install + done + + # Move main libraries into /. + if multilib_is_native_abi ; then + gen_usr_ldscript -a \ + "${NCURSES_TARGETS[@]}" \ + $(use tinfo && usex unicode 'tinfow' '') \ + $(usev tinfo) + fi + if ! tc-is-static-only ; then + # Provide a link for -lcurses. + ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die + fi + # don't delete '*.dll.a', needed for linking #631468 + if ! use static-libs; then + find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die + fi + + # Build fails to create this ... + dosym ../share/terminfo /usr/$(get_libdir)/terminfo +} + +multilib_src_install_all() { +# if ! use berkdb ; then + # We need the basic terminfo files in /etc, bug #37026 + einfo "Installing basic terminfo files in /etc..." + local x + for x in ansi console dumb linux rxvt rxvt-unicode screen{,-256color} vt{52,100,102,200,220} \ + xterm xterm-{,256}color + do + local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) + local basedir=$(basename $(dirname "${termfile}")) + + if [[ -n ${termfile} ]] ; then + dodir /etc/terminfo/${basedir} + mv ${termfile} "${ED}"/etc/terminfo/${basedir}/ + dosym ../../../../etc/terminfo/${basedir}/${x} \ + /usr/share/terminfo/${basedir}/${x} + fi + done +# fi + + echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses + doenvd "${T}"/50ncurses + + use minimal && rm -r "${ED}"/usr/share/terminfo* + # Because ncurses5-config --terminfo returns the directory we keep it + keepdir /usr/share/terminfo #245374 + + cd "${S}" || die + dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc + if use doc ; then + docinto html + dodoc -r doc/html/ + fi +} + +pkg_preinst() { + preserve_old_lib /$(get_libdir)/libncurses.so.5 + use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5 +} + +pkg_postinst() { + preserve_old_lib_notify /$(get_libdir)/libncurses.so.5 + use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 +} diff -uNr a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest --- a/sys-libs/pam/Manifest false +++ b/sys-libs/pam/Manifest 37b219dd5f931f30564a967072a76027d58194936c6c132f376f18673fec4006254103b90109c078fb700a316577695a08890e1c059194e30044a08bb0b79b8c @@ -0,0 +1,7 @@ +AUX pam-1.2.1-fix-compat.patch 402 BLAKE2B 2b9961039a07854295977e54bd83532c6a8e89f5e3ad5c66be72382cc14d1f65fcf22ae11ea672f2b11ca6390eab651ced0a59dd923d3c223a6917ab21f3e2b5 SHA512 1178ead83fdc872a626576c620876d013cbeb6199edb704c8d91cb906b9aabc1dd02e11a27a792cb87179554dcaf3080d04478317e03cf34cea23bf42b65fe2f +AUX pam-1.2.1-innetgr.patch 1662 BLAKE2B a64f529e82579b4318a3c7274ef77f97f83fd40f81f1a08801dfc82b1088ec567d65d40172afdac7b78065ced965f7784fd6201587564572276cb6cbe179a2af SHA512 ca32ecdacfc5b8f1482031203b616932b646a008b02080315ea2589af5962180d4ff4339c27fe9f6a878a89f47fb69429f4ac75d67b0e70ad7765a4db1dc74d9 +AUX pam-1.2.1-no-strndupa.patch 1452 BLAKE2B f5609404e7815802e057753a6d4d919692997d7c32ef7028135bc10704e8631f4d8c993592eb2a3419336094910121db185c8b88ad27c8f558df3ada4c034fb7 SHA512 967eb6d636fc5421ceea1ddd79de61d367cdd17b260ad3ad75da2e1af4ca87305f57776344ab53b23d1ec81d4d8b74874a0a05f68b70c54ba62f7ec23ad40a99 +DIST Linux-PAM-1.2.0-docs.tar.bz2 490586 BLAKE2B 1b4b6a7a2988f3f3e9f74edab9a47136b2d93e0cc969e983e3d9a16b73a952b2a44836b14ccd6df7c391037bcb0ecd168606308486c7752066a993de9b15e57f SHA512 028b7f9d6b0a5cf38f063e0f82ac3d0955e1e41d77c9f3fc803363d9ea710d71366e0a91f31b418cac397bb6639442de908fa00f02cd94cf612496d1b43c7e4c +DIST Linux-PAM-1.2.1.tar.bz2 1279523 BLAKE2B 246f3742bcf1c6dc0fe0c3d203ec6262c59093b75170d1a376a6080540d638551bed2d7f6f193bb583c34f8fbc742d904dfc3e6f1776dc4479914485c6ce15d4 SHA512 4572aa1eaf5a1312410c74b5ed055b2592c5efe2bb82f59981da4e9e93555ad40aee3a89f446d9dc6c6af79efc04c33f739f66db9edc07e02479475a14e426da +EBUILD pam-1.2.1-r2.ebuild 6630 BLAKE2B c18ad1287d512474e535a613fcadaa3514fb7d14b76069428f3efa100488035793843bf076c3fc9a909633b47a815353c963bfdac4f1ab44635c5256f4a85ad8 SHA512 c942f2fb8d8349bd0da37d7472baeacc2e2315afe28424ca43667a016b1e288281e9af9d6c65343878139aac50b6491e0a3f9ed879cda943705a3da94ae572cf +MISC metadata.xml 1135 BLAKE2B 60f9755133a79fbab65834d70360b430c2e0ec097647d640ddbec0b74ee86fbba65eed8600c49386aa01d1a78d55dc3b47f58a97eb62572d2fabd6b18eb7868d SHA512 de2a617918085c4e6a7a1976447ed2c0bcdb8eb257d28351e095b29ea219382ce8964206ba0fcdefe9b69db9ab17a52556371cfbee3ed4d5c5293c8d21738d55 diff -uNr a/sys-libs/pam/files/pam-1.2.1-fix-compat.patch b/sys-libs/pam/files/pam-1.2.1-fix-compat.patch --- a/sys-libs/pam/files/pam-1.2.1-fix-compat.patch false +++ b/sys-libs/pam/files/pam-1.2.1-fix-compat.patch 93c36b0215ea4bf7cda7855a13e6cd6e2f1c253d65e581c0047fadb175cc04a50efa1d67f648c1c97736d4a3546256cff2d1decf43f49afbd74f0feda0a45cb2 @@ -0,0 +1,21 @@ +--- a/modules/pam_lastlog/pam_lastlog.c ++++ b/modules/pam_lastlog/pam_lastlog.c +@@ -10,6 +10,7 @@ + + #include "config.h" + ++#include <paths.h> + #include <fcntl.h> + #include <time.h> + #include <errno.h> +@@ -48,6 +49,10 @@ + + #ifndef _PATH_BTMP + # define _PATH_BTMP "/var/log/btmp" ++#endif ++ ++#ifndef __GLIBC__ ++#define logwtmp(args...) + #endif + + /* XXX - time before ignoring lock. Is 1 sec enough? */ diff -uNr a/sys-libs/pam/files/pam-1.2.1-innetgr.patch b/sys-libs/pam/files/pam-1.2.1-innetgr.patch --- a/sys-libs/pam/files/pam-1.2.1-innetgr.patch false +++ b/sys-libs/pam/files/pam-1.2.1-innetgr.patch 8ffa78087d46af15e2340788b27e72b9fcce64530e1a851a9af7b6accdce863f124ef9304eb626590fe6d9201db1ab12a8023ffe9d4833c6740f3d9ce461fea9 @@ -0,0 +1,54 @@ +--- Linux-PAM-1.1.3.orig/modules/pam_group/pam_group.c ++++ Linux-PAM-1.1.3/modules/pam_group/pam_group.c +@@ -658,10 +658,13 @@ + continue; + } + /* If buffer starts with @, we are using netgroups */ ++#ifdef HAVE_INNETGR + if (buffer[0] == '@') + good &= innetgr (&buffer[1], NULL, user, NULL); + /* otherwise, if the buffer starts with %, it's a UNIX group */ +- else if (buffer[0] == '%') ++ else ++#endif ++ if (buffer[0] == '%') + good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]); + else + good &= logic_field(pamh,user, buffer, count, is_same); +--- Linux-PAM-1.1.3.orig/modules/pam_succeed_if/pam_succeed_if.c ++++ Linux-PAM-1.1.3/modules/pam_succeed_if/pam_succeed_if.c +@@ -233,16 +233,20 @@ + static int + evaluate_innetgr(const char *host, const char *user, const char *group) + { ++#ifdef HAVE_INNETGR + if (innetgr(group, host, user, NULL) == 1) + return PAM_SUCCESS; ++#endif + return PAM_AUTH_ERR; + } + /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */ + static int + evaluate_notinnetgr(const char *host, const char *user, const char *group) + { ++#ifdef HAVE_INNETGR + if (innetgr(group, host, user, NULL) == 0) + return PAM_SUCCESS; ++#endif + return PAM_AUTH_ERR; + } + +--- Linux-PAM-1.1.3.orig/modules/pam_time/pam_time.c ++++ Linux-PAM-1.1.3/modules/pam_time/pam_time.c +@@ -554,9 +554,11 @@ + continue; + } + /* If buffer starts with @, we are using netgroups */ ++#ifdef HAVE_INNETGR + if (buffer[0] == '@') + good &= innetgr (&buffer[1], NULL, user, NULL); + else ++#endif + good &= logic_field(pamh, user, buffer, count, is_same); + D(("with user: %s", good ? "passes":"fails" )); + diff -uNr a/sys-libs/pam/files/pam-1.2.1-no-strndupa.patch b/sys-libs/pam/files/pam-1.2.1-no-strndupa.patch --- a/sys-libs/pam/files/pam-1.2.1-no-strndupa.patch false +++ b/sys-libs/pam/files/pam-1.2.1-no-strndupa.patch 69f5d7280e4a7a05d4b901629423b101447c964d368fe8ca679326ba2fe650de74f14427912f0e31d6e715816bb90db03c01d37abbe8aa0c17c04247e9e75b22 @@ -0,0 +1,46 @@ +From fa534c4a66f5fab7a9c5f9de76c81625e0b64068 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou <yszhou4tech@gmail.com> +Date: Thu, 23 Jul 2015 20:47:29 +0800 +Subject: [PATCH 9/9] pam_exec: fix build when strndupa() is not available. + + * /modules/pam_exec/pam_exec.c: use strncpy() and local array instead + of strndupa() + +Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> +--- + modules/pam_exec/pam_exec.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c +index 17ba6ca..d5ccfeb 100644 +--- a/modules/pam_exec/pam_exec.c ++++ b/modules/pam_exec/pam_exec.c +@@ -102,6 +102,7 @@ call_exec (const char *pam_type, pam_handle_t *pamh, + int use_stdout = 0; + int optargc; + const char *logfile = NULL; ++ char *_authtok[PAM_MAX_RESP_SIZE]; + const char *authtok = NULL; + pid_t pid; + int fds[2]; +@@ -178,11 +179,15 @@ call_exec (const char *pam_type, pam_handle_t *pamh, + } + + pam_set_item (pamh, PAM_AUTHTOK, resp); +- authtok = strndupa (resp, PAM_MAX_RESP_SIZE); ++ _authtok[PAM_MAX_RESP_SIZE-1] = '\0'; ++ authtok = strncpy(_authtok, resp, PAM_MAX_RESP_SIZE-1); + _pam_drop (resp); + } + else +- authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE); ++ { ++ _authtok[PAM_MAX_RESP_SIZE-1] = '\0'; ++ authtok = strncpy(_authtok, void_pass, PAM_MAX_RESP_SIZE-1); ++ } + + if (pipe(fds) != 0) + { +-- +1.7.10.4 + diff -uNr a/sys-libs/pam/metadata.xml b/sys-libs/pam/metadata.xml --- a/sys-libs/pam/metadata.xml false +++ b/sys-libs/pam/metadata.xml caddb95755b2a5a26487bdaa2d2859f24bf3a15ff1c8a6ec0761f2681f498cdd536c18c693155fc1080dc61874d26bc16732fe9de8c78d2c621112dbfe2d2395 @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>pam-bugs@gentoo.org</email> + </maintainer> + <use> + <flag name="berkdb"> + Build the pam_userdb module, that allows to authenticate users + against a Berkeley DB file. Please note that enabling this USE + flag will create a PAM module that links to the Berkeley DB (as + provided by <pkg>sys-libs/db</pkg>) installed in /usr/lib and + will thus not work for boot-critical services authentication. + </flag> + + <flag name="cracklib"> + Build the pam_cracklib module, that allows to verify the chosen + passwords' strength through the use of + <pkg>sys-libs/cracklib</pkg>. Please note that simply enabling + the USE flag on this package will not make use of pam_cracklib + by default, you should also enable it in + <pkg>sys-auth/pambase</pkg> as well as update your configuration + files. + </flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:kernel:linux-pam</remote-id> + </upstream> +</pkgmetadata> diff -uNr a/sys-libs/pam/pam-1.2.1-r2.ebuild b/sys-libs/pam/pam-1.2.1-r2.ebuild --- a/sys-libs/pam/pam-1.2.1-r2.ebuild false +++ b/sys-libs/pam/pam-1.2.1-r2.ebuild 056d4ead7d56fbeebbb2ba81ea16d51c4d39a822bd7d8f5f923fc0093538222137c7abe8073d5671c2f20d963174bed91f4fe963c4da155c2d2cfe1e50794fc2 @@ -0,0 +1,214 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use fcaps + +MY_PN="Linux-PAM" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)" +HOMEPAGE="http://www.linux-pam.org/ https://fedorahosted.org/linux-pam/" +SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2 + http://www.linux-pam.org/documentation/${MY_PN}-1.2.0-docs.tar.bz2" + +LICENSE="|| ( BSD GPL-2 )" +SLOT="0" +KEYWORDS="amd64 arm ia64 ~mips ppc sh sparc x86" +IUSE="audit berkdb +cracklib debug nis nls +pie selinux test" + +RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) + cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] ) + audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) + nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )" + +DEPEND="${RDEPEND} + >=sys-devel/libtool-2 + >=sys-devel/flex-2.5.39-r1[${MULTILIB_USEDEP}] + nls? ( sys-devel/gettext ) + nis? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )" +PDEPEND="sys-auth/pambase" + +RDEPEND="${RDEPEND} + !<sys-apps/openrc-0.11.8 + !sys-auth/openpam + !sys-auth/pam_userdb + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" + +S="${WORKDIR}/${MY_P}" + +check_old_modules() { + local retval="0" + + if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then + eerror "" + eerror "Your current setup is using the pam_stack module." + eerror "This module is deprecated and no longer supported, and since version" + eerror "0.99 is no longer installed, nor provided by any other package." + eerror "The package will be built (to allow binary package builds), but will" + eerror "not be installed." + eerror "Please replace pam_stack usage with proper include directive usage," + eerror "following the PAM Upgrade guide at the following URL" + eerror " https://wiki.gentoo.org/wiki/Project:PAM/Upgrade_to_0.99" + eerror "" + + retval=1 + fi + + if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; then + eerror "" + eerror "Your current setup is using one or more of the following modules," + eerror "that are not built or supported anymore:" + eerror "pam_pwdb, pam_console" + eerror "If you are in real need for these modules, please contact the maintainers" + eerror "of PAM through https://bugs.gentoo.org/ providing information about its" + eerror "use cases." + eerror "Please also make sure to read the PAM Upgrade guide at the following URL:" + eerror " https://wiki.gentoo.org/wiki/Project:PAM/Upgrade_to_0.99" + eerror "" + + retval=1 + fi + + return ${retval} +} + +pkg_pretend() { + # do not error out, this is just a warning, one could build a binpkg + # with old modules enabled. + check_old_modules +} + +src_unpack() { + # Upstream didn't release a new doc tarball (since nothing changed?). + unpack ${MY_PN}-1.2.0-docs.tar.bz2 + # Update timestamps to avoid regenerating at build time. #569338 + find -type f -exec touch -r "${T}" {} + || die + mv Linux-PAM-1.2.{0,1} || die + unpack ${MY_P}.tar.bz2 +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.1-fix-compat.patch + epatch "${FILESDIR}"/${PN}-1.2.1-innetgr.patch + epatch "${FILESDIR}"/${PN}-1.2.1-no-strndupa.patch + + # disable insecure modules (musl-libc doesn't implement the functions anyway) + use elibc_musl && sed -e 's/pam_rhosts//g' -i modules/Makefile.am modules/Makefile.in + elibtoolize +} + +multilib_src_configure() { + # Do not let user's BROWSER setting mess us up. #549684 + unset BROWSER + + # Disable automatic detection of libxcrypt; we _don't_ want the + # user to link libxcrypt in by default, since we won't track the + # dependency and allow to break PAM this way. + export ac_cv_header_xcrypt_h=no + + # Disable automatic detection of libcrypt + use elibc_musl && export ac_cv_search_crypt=no + + local myconf=( + --docdir='$(datarootdir)'/doc/${PF} + --htmldir='$(docdir)/html' + --libdir='$(prefix)'/$(get_libdir) + --enable-securedir="${EPREFIX}"/$(get_libdir)/security + --enable-isadir='.' #464016 + $(use_enable nls) + $(use_enable selinux) + $(use_enable cracklib) + $(use_enable audit) + $(use_enable debug) + $(use_enable berkdb db) + $(use_enable nis) + $(use_enable pie) + --with-db-uniquename=-$(db_findver sys-libs/db) + --disable-prelude + --disable-regenerate-docu + ) + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" +} + +multilib_src_compile() { + emake sepermitlockdir="${EPREFIX}/run/sepermit" +} + +multilib_src_install() { + emake DESTDIR="${D}" install \ + sepermitlockdir="${EPREFIX}/run/sepermit" + + local prefix + if multilib_is_native_abi; then + prefix= + gen_usr_ldscript -a pam pamc pam_misc + else + prefix=/usr + fi + + # create extra symlinks just in case something depends on them... + local lib + for lib in pam pamc pam_misc; do + if ! [[ -f "${ED}"${prefix}/$(get_libdir)/lib${lib}$(get_libname) ]]; then + dosym lib${lib}$(get_libname 0) ${prefix}/$(get_libdir)/lib${lib}$(get_libname) + fi + done +} + +DOCS=( CHANGELOG ChangeLog README AUTHORS Copyright NEWS ) + +multilib_src_install_all() { + einstalldocs + prune_libtool_files --all + + docinto modules + local dir + for dir in modules/pam_*; do + newdoc "${dir}"/README README."$(basename "${dir}")" + done + + if use selinux; then + dodir /usr/lib/tmpfiles.d + cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF +d /run/sepermit 0755 root root +EOF + fi +} + +pkg_preinst() { + check_old_modules || die "deprecated PAM modules still used" +} + +pkg_postinst() { + ewarn "Some software with pre-loaded PAM libraries might experience" + ewarn "warnings or failures related to missing symbols and/or versions" + ewarn "after any update. While unfortunate this is a limit of the" + ewarn "implementation of PAM and the software, and it requires you to" + ewarn "restart the software manually after the update." + ewarn "" + ewarn "You can get a list of such software running a command like" + ewarn " lsof / | egrep -i 'del.*libpam\\.so'" + ewarn "" + ewarn "Alternatively, simply reboot your system." + if [[ -x "${EROOT}"/var/log/tallylog ]] ; then + elog "" + elog "Because of a bug present up to version 1.1.1-r2, you have" + elog "an executable /var/log/tallylog file. You can safely" + elog "correct it by running the command" + elog " chmod -x /var/log/tallylog" + elog "" + fi + + # The pam_unix module needs to check the password of the user which requires + # read access to /etc/shadow only. + fcaps cap_dac_override sbin/unix_chkpwd +} diff -uNr a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest --- a/sys-libs/readline/Manifest false +++ b/sys-libs/readline/Manifest 5b2e090eb4d3346c9e99793981854501275804db89fee586fdf5c27539af8af8d1674cd19890c73e46adef1a5f793071c829dad268c6804be3ef22632dbaea81 @@ -0,0 +1,13 @@ +AUX readline-5.0-no_rpath.patch 367 BLAKE2B a39663c6222f604acf0ea0a5b6e4a4c99097257727644d2e8b814377b0f9472a6cdba8ed6edacc61629a39458fb5905bb873474e72dd44ab3e7e78b330f451c5 SHA512 ce4a03fe5b60a1e785f35b6717c5e267a815e8fd1a1d59e527aa88f35709c457c1d7c505c34f63f0d32f8f1633eb66661e05e151e218ae5b74cec1d9ddc4ab92 +AUX readline-6.2-rlfe-tgoto.patch 379 BLAKE2B 363dee5501fa9449eeee0647f1ae65106e28ad06af16c8aefe372a081eb5cd62b01a7cf2109ce5b3fc6577b6056f3a0206e3cc53f22d0a69f4d273930e3e2ab6 SHA512 1d2c3aafc949d92fdf6abbee60a60c80f0327f81694d5d8f3a166f1c24d37346caca3e72c9971106b96b2758a9a01269346954fe20bc381eb9da2e6a2737fc3c +AUX readline-6.3-fix-long-prompt-vi-search.patch 736 BLAKE2B 1439a22ce82d51dd7cfb4bd1436475dce1d566fb2cc592e8161400e62e2790eff4a21c0634ef99f5da75efb21583514b90d47bb574b97374239fbd7ebb13fde8 SHA512 ad5bb44ba00f6f5e355b95078209e2e51f8d8ba9a924d00ef6aa3286e09c15fe0024efa0817f9e6d86b7aecb73150fcd69d0051a0f7fb37475921478f62ce0e0 +AUX readline-6.3-read-eof.patch 1913 BLAKE2B 85cbba295d21de00af7cfa361d7976aabfb1110d860256224138a1844288f869f5225c296800aba5f637c892a988f834dddf184d06d308ae3da94cccb00ee5c4 SHA512 99728e35d64b466e2bea570412eec719c70841d205a5190c0000bcae55cf3ac2d659ae18e57b4c332525261d83e160054800cd89f4009ce3c76d1c3b4ac27223 +AUX readline-7.0-headers.patch 550 BLAKE2B 82949940cda6d042923b3dde777fbd66643d80f4c2fd984eb11ef7f0fb48776ba8938d1c8be23087b328ce9b3ad0acd668f5bb4f0bda77b4a992119688a37191 SHA512 fec3d20e1581f35609a9d9f9ee1f48df8f9aa781e1a2cdcde2edf7d149624b5770867feb65a7ba142276d95a3133b768f5589e8041049aa0cf30068d0637b938 +AUX readline-7.0-mingw.patch 4464 BLAKE2B 00ca79f7ee128a78d76c3e0adcb8b51f6d3027718cc3a7b2b11660cd4aa9c61b4da15c893c9ad0595becf2c393c0d9e7597b5a772085bfc82974568c30f5b381 SHA512 f416f265c51f4cb05467c29c29abcaabf40ae29d66bb5d3288d35403ccc26903f2a22afef43382e39d7b13ba62732082c60d8f8d10abf7cf7955ee50fc23531b +AUX readline-7.0-missing-echo-proto.patch 466 BLAKE2B 251660f1321a36231774d5f03fea971a047688918a8f6498e019cadca43314097aee89ef8a96b104a5382ba0baa1037d500143f4d66e881da76d23f9385faaa9 SHA512 a8458bf62c73f79b980f375b98b33a6fbef59dec28386cd5266e4742a9cf70673e567f999d5682e538a2a47388d6f123d8a4fe4cfe34f19c28d4dafd93a9e10a +DIST readline-7.0.tar.gz 2910016 BLAKE2B 679b8aa7ce003017b729e6d8d4cb69d0f991578441a3e69005090079e61f6aa48b7ad4d0b1f34b6041528cf33254a1bf3ddb05b60db53a06e443d7922d49d0d4 SHA512 18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870 +DIST readline70-001 1777 BLAKE2B ab217bd9d27f30351397db2b745cb33ac7e0ce18bbc00112bb87570da0f62ee0e8d182395c97e4ecc21af51e7e1e580ba48076de1095c556f0744475e4019821 SHA512 4402186905af8cd42c609d640c2e13b9ad61c7778e5a3fd2c2d9da301f0deab05b04d7836f31527262f44f406517823dbb18cb07f2c73931186c806b494699ec +DIST readline70-002 2953 BLAKE2B 47d729b1babe904855fe5d4f780a5b2153a743def527479c3cb82759cdee5bb4260be722e1050be680f5c0dd6dec8ca25c4c1ff557415abae6b3fac2bd481f0b SHA512 13d1489578508d4d2c3a1618024198a709dbce74a6bbf0f6d7ec67d2419c55bfec9f0ca9de0ed93f129d21d5c3a94307ccdc49408455bbb301c5e3a772b03185 +DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b0544325439307d2b4053cbeca8d2f008104bee181ae5d9405d702e6d3bcf26379c4d46e269906474c8544367b780 SHA512 eaf962a1480eb3870519017b81ecc5cef171e4c41fcf8c17da61ccbfd0379ed6bca85c17b03e2207ae4d51509f33fd010294c75f4bd0433a52118015d4160385 +EBUILD readline-7.0_p3.ebuild 4608 BLAKE2B 1ed5d3f18bccf2cb7a31b1bda207857b25b97120aa45acbf811dc2a4d145de6721e034fa328bf997b66ffd31a8c50d2b014bcde7f46497371818dd725b95cde9 SHA512 d39f238dde1be98a58a6271b75605cc08993d4488f202d4e4733c64a02ad0dcfdeadffaef459e6cc400abd986ab9e68236643d76985dc1c4d7014b7f4b4db377 +MISC metadata.xml 394 BLAKE2B e4fee9daaa3d2c66a9425c988c855768ddb74af714f9e259fad1e3a470ab10af041ec8ca82d106fd967317e555a492b35723d60fa913ffac200212af14ca5ae1 SHA512 e27930a59d80535721eda0d3c481b1d13a66915c6d9552d960c9ac788f3dcdb0ef3fc411803a36cc98441ebbb8a4e0c1086bc2bda01511549fbf2921a7017784 diff -uNr a/sys-libs/readline/files/readline-5.0-no_rpath.patch b/sys-libs/readline/files/readline-5.0-no_rpath.patch --- a/sys-libs/readline/files/readline-5.0-no_rpath.patch false +++ b/sys-libs/readline/files/readline-5.0-no_rpath.patch 1fe96d59e5b887a9a1a5ac6f5bd9e74ac8b762c31dcee2d13ab6c86e7377fe835a2ef8083e5cf5ace0e7a4430dce5ee51561c7554169478a4ccc43ebfb3eda32 @@ -0,0 +1,13 @@ +ripped from Fedora + +--- a/support/shobj-conf ++++ b/support/shobj-conf +@@ -102,7 +102,7 @@ + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' + +- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' ++ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' + SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' + ;; + diff -uNr a/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch b/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch --- a/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch false +++ b/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch f4596ed3f9f3deb1cceccb114e2a9b085b147774ad5124cdc86d228ba16dfa8299f7789869c3c4213893accafb8a9b065be464dc02e3ee3bf4a82b3955ba5431 @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/385091 + +https://lists.gnu.org/archive/html/bug-readline/2011-10/msg00000.html + +--- a/examples/rlfe/configure ++++ b/examples/rlfe/configure +@@ -4062,6 +4062,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + ++extern char *tgoto(char *, int, int); + main() + { + exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); diff -uNr a/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch b/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch --- a/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch false +++ b/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch 16df1f7cdbc595232c32a8edd6d4021fffc89501232ada13e7b83b5a2d637db3fb8fb88586933f144edd84e07c2dca05b3624ab0f0062d0339c745dc611fa27b @@ -0,0 +1,26 @@ +https://lists.gnu.org/archive/html/bug-bash/2014-08/msg00082.html + +From 2774192e93991e3d85ccc37c714aa018e442af6d Mon Sep 17 00:00:00 2001 +From: Dylan Cali <calid1984@gmail.com> +Date: Sat, 23 Aug 2014 02:26:05 -0500 +Subject: [PATCH] fix vi search prompt bug for long prompts + +--- + display.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/display.c b/display.c +index 4df1f73..e575b16 100644 +--- a/display.c ++++ b/display.c +@@ -2259,7 +2259,7 @@ rl_message (va_alist) + va_start (args); + format = va_arg (args, char *); + #endif +- vsnprintf (msg_buf, msg_bufsiz - 1, format, args); ++ vsnprintf (msg_buf, msg_bufsiz, format, args); + } + #else + vsprintf (msg_buf, format, args); +-- +1.7.10.4 diff -uNr a/sys-libs/readline/files/readline-6.3-read-eof.patch b/sys-libs/readline/files/readline-6.3-read-eof.patch --- a/sys-libs/readline/files/readline-6.3-read-eof.patch false +++ b/sys-libs/readline/files/readline-6.3-read-eof.patch a6fb8f2179ea96c2cc4f435df711c36d0df569af85066d299c2687604855c4061bfa6184308956f838f8b4e3a42efe89f14866e6bfdb1e690524aeffe937a431 @@ -0,0 +1,54 @@ +http://lists.gnu.org/archive/html/bug-bash/2014-12/msg00152.html + +*** ../bash-4.3-patched/lib/readline/readline.c 2014-10-01 13:08:28.000000000 -0400 +--- lib/readline/readline.c 2014-12-20 22:37:28.000000000 -0500 +*************** +*** 580,592 **** + } + +! /* EOF typed to a non-blank line is a <NL>. If we want to change this, +! to force any existing line to be ignored when read(2) reads EOF, +! for example, this is the place to change. */ + if (c == EOF && rl_end) +! c = NEWLINE; + + /* The character _rl_eof_char typed to blank line, and not as the +! previous character is interpreted as EOF. */ +! if (((c == _rl_eof_char && lastc != c) || c == EOF) && !rl_end) + { + #if defined (READLINE_CALLBACKS) +--- 587,620 ---- + } + +! /* EOF typed to a non-blank line is ^D the first time, EOF the second +! time in a row. This won't return any partial line read from the tty. +! If we want to change this, to force any existing line to be returned +! when read(2) reads EOF, for example, this is the place to change. */ + if (c == EOF && rl_end) +! { +! if (RL_SIG_RECEIVED ()) +! { +! RL_CHECK_SIGNALS (); +! if (rl_signal_event_hook) +! (*rl_signal_event_hook) (); /* XXX */ +! } +! +! /* XXX - reading two consecutive EOFs returns EOF */ +! if (RL_ISSTATE (RL_STATE_TERMPREPPED)) +! { +! if (lastc == _rl_eof_char || lastc == EOF) +! rl_end = 0; +! else +! c = _rl_eof_char; +! } +! else +! c = NEWLINE; +! } + + /* The character _rl_eof_char typed to blank line, and not as the +! previous character is interpreted as EOF. This doesn't work when +! READLINE_CALLBACKS is defined, so hitting a series of ^Ds will +! erase all the chars on the line and then return EOF. */ +! if (((c == _rl_eof_char && lastc != c) || c == EOF) && rl_end == 0) + { + #if defined (READLINE_CALLBACKS) diff -uNr a/sys-libs/readline/files/readline-7.0-headers.patch b/sys-libs/readline/files/readline-7.0-headers.patch --- a/sys-libs/readline/files/readline-7.0-headers.patch false +++ b/sys-libs/readline/files/readline-7.0-headers.patch 8fb099121ee457b550d20f500b155fd39c941ee82d69f061e31470e5db64fb5a58854703b31ab2541283f76aaa900d27887cb7a89c43b15d389972b63fb1760a @@ -0,0 +1,24 @@ +From 4bc0aa68aff12a59628dd3c99a53360a9aa1ce93 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Thu, 11 Aug 2016 17:49:27 +0800 +Subject: [PATCH] include ctype.h for isdigit usage + +--- + lib/readline/histexpand.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/readline/histexpand.c b/lib/readline/histexpand.c +index 46a99aa62e30..13248db83048 100644 +--- a/histexpand.c ++++ b/histexpand.c +@@ -26,6 +26,7 @@ + #endif + + #include <stdio.h> ++#include <ctype.h> + + #if defined (HAVE_STDLIB_H) + # include <stdlib.h> +-- +2.9.0 + diff -uNr a/sys-libs/readline/files/readline-7.0-mingw.patch b/sys-libs/readline/files/readline-7.0-mingw.patch --- a/sys-libs/readline/files/readline-7.0-mingw.patch false +++ b/sys-libs/readline/files/readline-7.0-mingw.patch cb10cbcc6e1ed806714fbd0ea235b4ce81fe6704ba5c937b96e362447b4655b1debf9d6d6c6f4d0e765851949f896d617cab9c9ed4fc5cb6cd74dcfd234bdee9 @@ -0,0 +1,152 @@ +--- a/colors.c ++++ b/colors.c +@@ -37,6 +37,10 @@ + #include "posixstat.h" // stat related macros (S_ISREG, ...) + #include <fcntl.h> // S_ISUID + ++#ifndef S_ISDIR ++#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) ++#endif ++ + // strlen() + #if defined (HAVE_STRING_H) + # include <string.h> +@@ -182,12 +186,17 @@ _rl_print_color_indicator (const char *f + if (S_ISREG (mode)) + { + colored_filetype = C_FILE; +- ++#ifdef S_ISUID + if ((mode & S_ISUID) != 0 && is_colored (C_SETUID)) + colored_filetype = C_SETUID; +- else if ((mode & S_ISGID) != 0 && is_colored (C_SETGID)) ++ else ++#endif ++#ifdef S_ISGID ++ if ((mode & S_ISGID) != 0 && is_colored (C_SETGID)) + colored_filetype = C_SETGID; +- else if (is_colored (C_CAP) && 0) //f->has_capability) ++ else ++#endif ++ if (is_colored (C_CAP) && 0) //f->has_capability) + colored_filetype = C_CAP; + else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC)) + colored_filetype = C_EXEC; +@@ -211,12 +220,16 @@ _rl_print_color_indicator (const char *f + colored_filetype = C_STICKY; + #endif + } ++#if defined (S_ISLNK) + else if (S_ISLNK (mode)) + colored_filetype = C_LINK; ++#endif + else if (S_ISFIFO (mode)) + colored_filetype = C_FIFO; ++#if defined (S_ISSOCK) + else if (S_ISSOCK (mode)) + colored_filetype = C_SOCK; ++#endif + else if (S_ISBLK (mode)) + colored_filetype = C_BLK; + else if (S_ISCHR (mode)) +--- a/histfile.c ++++ b/histfile.c +@@ -606,12 +606,14 @@ history_truncate_file (fname, lines) + history_lines_written_to_file = 0; + } + ++#if defined (HAVE_CHOWN) + /* Make sure the new filename is owned by the same user as the old. If one + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ + if (rv == 0 && exists) + r = chown (filename, finfo.st_uid, finfo.st_gid); ++#endif + + xfree (filename); + FREE (tempname); +@@ -753,12 +755,14 @@ mmap_error: + history_lines_written_to_file = 0; + } + ++#if defined (HAVE_CHOWN) + /* Make sure the new filename is owned by the same user as the old. If one + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ + if (rv == 0 && exists) + mode = chown (histname, finfo.st_uid, finfo.st_gid); ++#endif + + FREE (histname); + FREE (tempname); +--- a/input.c ++++ b/input.c +@@ -71,6 +71,10 @@ extern int errno; + #include "rlshell.h" + #include "xmalloc.h" + ++#if defined (__MINGW32__) ++#include <conio.h> ++#endif ++ + /* What kind of non-blocking I/O do we have? */ + #if !defined (O_NDELAY) && defined (O_NONBLOCK) + # define O_NDELAY O_NONBLOCK /* Posix style */ +--- a/posixstat.h ++++ b/posixstat.h +@@ -78,30 +78,44 @@ + + #if defined (S_IFBLK) && !defined (S_ISBLK) + #define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK) /* block device */ ++#elif !defined (S_IFBLK) ++#define S_ISBLK(m) 0 + #endif + + #if defined (S_IFCHR) && !defined (S_ISCHR) + #define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR) /* character device */ ++#elif !defined (S_IFCHR) ++#define S_ISCHR(m) 0 + #endif + + #if defined (S_IFDIR) && !defined (S_ISDIR) + #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) /* directory */ ++#elif !defined (S_IFDIR) ++#define S_ISDIR(m) 0 + #endif + + #if defined (S_IFREG) && !defined (S_ISREG) + #define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) /* file */ ++#elif !defined (S_IFREG) ++#define S_ISREG(m) 0 + #endif + + #if defined (S_IFIFO) && !defined (S_ISFIFO) + #define S_ISFIFO(m) (((m)&S_IFMT) == S_IFIFO) /* fifo - named pipe */ ++#elif !defined (S_IFIFO) ++#define S_ISFIFO(m) 0 + #endif + + #if defined (S_IFLNK) && !defined (S_ISLNK) + #define S_ISLNK(m) (((m)&S_IFMT) == S_IFLNK) /* symbolic link */ ++#elif !defined (S_IFLNK) ++#define S_ISLNK(m) 0 + #endif + + #if defined (S_IFSOCK) && !defined (S_ISSOCK) + #define S_ISSOCK(m) (((m)&S_IFMT) == S_IFSOCK) /* socket */ ++#elif !defined (S_IFSOCK) ++#define S_ISSOCK(m) 0 + #endif + + /* +@@ -137,6 +151,8 @@ + /* These are non-standard, but are used in builtins.c$symbolic_umask() */ + #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) + #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) ++#if defined(S_IXUSR) && defined(S_IXOTH) + #define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) ++#endif + + #endif /* _POSIXSTAT_H_ */ diff -uNr a/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch b/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch --- a/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch false +++ b/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch d27c5211b8d18aa22c4031a5edc77aae97c8f610cfca750c98a20e38552de110c2ef7b64d1286f854c98931d9790ba766eb1feea69cdf67a397d4fc1fc320a57 @@ -0,0 +1,14 @@ +https://lists.gnu.org/archive/html/bug-readline/2016-11/msg00000.html + +fix from upstream + +--- a/readline.h ++++ b/readline.h +@@ -413,6 +413,7 @@ + extern void rl_tty_set_default_bindings PARAMS((Keymap)); + extern void rl_tty_unset_default_bindings PARAMS((Keymap)); + ++extern int rl_tty_set_echoing PARAMS((int)); + extern int rl_reset_terminal PARAMS((const char *)); + extern void rl_resize_terminal PARAMS((void)); + extern void rl_set_screen_size PARAMS((int, int)); diff -uNr a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml --- a/sys-libs/readline/metadata.xml false +++ b/sys-libs/readline/metadata.xml 37e1bd643a437ae55bee23fb95b26962a63319caf4cb0d48ed973a7769c2ef7efb5bac369d14ebfc354ab48973e2a3ef64518cadcf0686e767ccae235b58e798 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag> +</use> +</pkgmetadata> diff -uNr a/sys-libs/readline/readline-7.0_p3.ebuild b/sys-libs/readline/readline-7.0_p3.ebuild --- a/sys-libs/readline/readline-7.0_p3.ebuild false +++ b/sys-libs/readline/readline-7.0_p3.ebuild 3a63d0a6f088907db35b38cba1c2ff8c9ff191e8b9bdc263f048f6fe821a90c5789a5405fc11018325bf4f51d9a6fe9101523cf640898dba614ab68b1ab362dd @@ -0,0 +1,163 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal + +# Official patches +# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/ +PLEVEL=${PV##*_p} +MY_PV=${PV/_p*} +MY_PV=${MY_PV/_/-} +MY_P=${PN}-${MY_PV} +[[ ${PV} != *_p* ]] && PLEVEL=0 +patches() { + [[ ${PLEVEL} -eq 0 ]] && return 1 + local opt=$1 + eval set -- {1..${PLEVEL}} + set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") + if [[ ${opt} == -s ]] ; then + echo "${@/#/${DISTDIR}/}" + else + local u + for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do + printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" + done + fi +} + +DESCRIPTION="Another cute console display library" +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +case ${PV} in +*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;; +*) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;; +esac + +LICENSE="GPL-3" +SLOT="0/7" # subslot matches SONAME major +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +IUSE="static-libs utils" + +RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${MY_P}.tar.gz +} + +src_prepare() { + [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) + epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch + epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 + epatch "${FILESDIR}"/${PN}-7.0-headers.patch + epatch "${FILESDIR}"/${PN}-7.0-missing-echo-proto.patch + + # Force ncurses linking. #71420 + # Use pkg-config to get the right values. #457558 + local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) + sed -i \ + -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ + support/shobj-conf || die + sed -i \ + -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ + examples/rlfe/configure || die + + # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated + # objformat for years, so we don't want to rely on that. + sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die + + ln -s ../.. examples/rlfe/readline # for local readline headers +} + +src_configure() { + # fix implicit decls with widechar funcs + append-cppflags -D_GNU_SOURCE + # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html + append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free + + # Make sure configure picks a better ar than `ar`. #484866 + export ac_cv_prog_AR=$(tc-getAR) + + # Force the test since we used sed above to force it. + export bash_cv_termcap_lib=ncurses + + # Control cross-compiling cases when we know the right answer. + # In cases where the C library doesn't support wide characters, readline + # itself won't work correctly, so forcing the answer below should be OK. + if tc-is-cross-compiler ; then + export bash_cv_func_sigsetjmp='present' + export bash_cv_func_ctype_nonascii='yes' + export bash_cv_wcwidth_broken='no' #503312 + fi + + # This is for rlfe, but we need to make sure LDFLAGS doesn't change + # so we can re-use the config cache file between the two. + append-ldflags -L. + + multilib-minimal_src_configure +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + --cache-file="${BUILD_DIR}"/config.cache \ + --docdir='$(datarootdir)'/doc/${PF} \ + --with-curses \ + $(use_enable static-libs static) + + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then + # code is full of AC_TRY_RUN() + mkdir -p examples/rlfe || die + cd examples/rlfe || die + ECONF_SOURCE=${S}/examples/rlfe \ + econf --cache-file="${BUILD_DIR}"/config.cache + fi +} + +multilib_src_compile() { + emake + + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then + # code is full of AC_TRY_RUN() + cd examples/rlfe || die + local l + for l in readline history ; do + ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) + ln -sf ../../lib${l}.a lib${l}.a + done + emake + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi ; then + gen_usr_ldscript -a readline history #4411 + + if use utils && ! tc-is-cross-compiler; then + dobin examples/rlfe/rlfe + fi + fi +} + +multilib_src_install_all() { + einstalldocs + dodoc USAGE + dohtml -r doc/. + docinto ps + dodoc doc/*.ps +} +pkg_preinst() { + # bug #29865 + # Reappeared in #595324 with paludis so keeping this for now... + preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6} +} + +pkg_postinst() { + preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6} +} diff -uNr a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest --- a/sys-libs/zlib/Manifest false +++ b/sys-libs/zlib/Manifest 26b4b3d77513f0d2ae9d6d4fa504abf7b2ed239e167a80b2ba8f42247471c474879cb04c3308b1d450785a45dde64b8f6452f571aefdee38afeda48278b142ef @@ -0,0 +1,4 @@ +AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 BLAKE2B 42fcb91b99b004921dce12b4e71c12c62e80d50243a1cec97522dbaa1cf5fb09cf701e9f988bddd0470c3dafe743d42e60b9ac6903afb2185859d62b1fdf78bc SHA512 9b949d894be2bbb60d687820e79d7a02e733e8426e6602482f3a3902fca3571bbfba38ddd84a88f5a093fdb25ac90e4076905d19b86ab70ebce6e250fd118286 +DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae +EBUILD zlib-1.2.11-r1.ebuild 3029 BLAKE2B 7264674176992d231b0e70a7511de1e44f29f57b4facf4c6774854235c0fa0c1a29b11aa8ca7dde025c1990a88489a620d1d012a9634d82d9b75353fd19b5845 SHA512 be364c4b76bbbfe15de428a72bad82575078e1e4ebbfbaecafe7c409bcaece2e03d85415364abc5e4cd959ef602189dc21433196ed94c301f47306afddb67af2 +MISC metadata.xml 432 BLAKE2B 80b2aa4dbc687fa23b3e64f12af789d2b1f308ccba611de152efde3008a5b6f66ee56121c2c4846a482e426c78e5f921ee7cf9b196c28504ee0de420725a6239 SHA512 947d4b2035ab49c42f6141f14553f1e8f4796b4ddc24c6a4f071ac2300eb120648dd03eef49773295d3e3f30cd9d3cbb391bde798dacf1187b46ff75abd59420 diff -uNr a/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch b/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch --- a/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch false +++ b/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch aa55d5f10b241808efced3573c409731fe99357d872bf6e119cd4dacf4165237171856fb25e2541045d5ff01d23e6b6ef5044fd2df6094a9182fd1e649db72d0 @@ -0,0 +1,67 @@ +From f9694097dd69354b03cb8af959094c7f260db0a1 Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler@alumni.caltech.edu> +Date: Mon, 16 Jan 2017 09:49:35 -0800 +Subject: [PATCH] Permit a deflateParams() parameter change as soon as + possible. + +This commit allows a parameter change even if the input data has +not all been compressed and copied to the application output +buffer, so long as all of the input data has been compressed to +the internal pending output buffer. This also allows an immediate +deflateParams change so long as there have been no deflate calls +since initialization or reset. +--- + deflate.c | 6 +++--- + zlib.h | 11 ++++++----- + 2 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/deflate.c b/deflate.c +index b63311a5..20bda4f6 100644 +--- a/deflate.c ++++ b/deflate.c +@@ -494,7 +494,7 @@ int ZEXPORT deflateResetKeep (strm) + s->wrap == 2 ? crc32(0L, Z_NULL, 0) : + #endif + adler32(0L, Z_NULL, 0); +- s->last_flush = Z_NO_FLUSH; ++ s->last_flush = -2; + + _tr_init(s); + +@@ -587,12 +587,12 @@ int ZEXPORT deflateParams(strm, level, strategy) + func = configuration_table[s->level].func; + + if ((strategy != s->strategy || func != configuration_table[level].func) && +- s->high_water) { ++ s->last_flush != -2) { + /* Flush the last buffer: */ + int err = deflate(strm, Z_BLOCK); + if (err == Z_STREAM_ERROR) + return err; +- if (strm->avail_out == 0) ++ if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead) + return Z_BUF_ERROR; + } + if (s->level != level) { +diff --git a/zlib.h b/zlib.h +index 5daf4f28..577d81e3 100644 +--- a/zlib.h ++++ b/zlib.h +@@ -712,11 +712,12 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, + used to switch between compression and straight copy of the input data, or + to switch to a different kind of input data requiring a different strategy. + If the compression approach (which is a function of the level) or the +- strategy is changed, and if any input has been consumed in a previous +- deflate() call, then the input available so far is compressed with the old +- level and strategy using deflate(strm, Z_BLOCK). There are three approaches +- for the compression levels 0, 1..3, and 4..9 respectively. The new level +- and strategy will take effect at the next call of deflate(). ++ strategy is changed, and if there have been any deflate() calls since the ++ state was initialized or reset, then the input available so far is ++ compressed with the old level and strategy using deflate(strm, Z_BLOCK). ++ There are three approaches for the compression levels 0, 1..3, and 4..9 ++ respectively. The new level and strategy will take effect at the next call ++ of deflate(). + + If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does + not have enough output space to complete, then the parameter change will not diff -uNr a/sys-libs/zlib/metadata.xml b/sys-libs/zlib/metadata.xml --- a/sys-libs/zlib/metadata.xml false +++ b/sys-libs/zlib/metadata.xml 717ef3a5d5c764f04377b71f0f9bb0a3368d997db86baa1bf89a8f6cb3c3dcc2449cc1443bff446619fcb8d56ba1d84813d178bc4cd0bb79472c6eed00021dbf @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="minizip">include the minizip library for quick and dirty zip extraction</flag> +</use> +<upstream> + <remote-id type="cpe">cpe:/a:gnu:zlib</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild --- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild false +++ b/sys-libs/zlib/zlib-1.2.11-r1.ebuild 96320c53f8123b96bbd4b02c914d9e09bae334b6423120a015b18d3bd3a11353cedc120f3bf2e7c716bc3da6ae601c7ac979c9efa7e359009b5b81b48c141d59 @@ -0,0 +1,122 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +AUTOTOOLS_AUTO_DEPEND="no" + +inherit autotools toolchain-funcs multilib multilib-minimal + +DESCRIPTION="Standard (de)compression library" +HOMEPAGE="https://zlib.net/" +SRC_URI="https://zlib.net/${P}.tar.gz + http://www.gzip.org/zlib/${P}.tar.gz + http://www.zlib.net/current/beta/${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0/1" # subslot = SONAME +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="minizip static-libs" + +DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" +RDEPEND="!<dev-libs/libxml2-2.7.7" #309623 + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch + + if use minizip ; then + cd contrib/minizip || die + eautoreconf + fi + + case ${CHOST} in + *-mingw*|mingw*) + # uses preconfigured Makefile rather than configure script + multilib_copy_sources + ;; + esac +} + +echoit() { echo "$@"; "$@"; } + +multilib_src_configure() { + case ${CHOST} in + *-mingw*|mingw*) + ;; + *) # not an autoconf script, so can't use econf + local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167 + echoit "${S}"/configure \ + --shared \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + ${uname:+--uname=${uname}} \ + || die + ;; + esac + + if use minizip ; then + local minizipdir="contrib/minizip" + mkdir -p "${BUILD_DIR}/${minizipdir}" || die + cd ${minizipdir} || die + ECONF_SOURCE="${S}/${minizipdir}" \ + econf $(use_enable static-libs static) + fi +} + +multilib_src_compile() { + case ${CHOST} in + *-mingw*|mingw*) + emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- + sed \ + -e 's|@prefix@|/usr|g' \ + -e 's|@exec_prefix@|${prefix}|g' \ + -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ + -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ + -e 's|@includedir@|${prefix}/include|g' \ + -e 's|@VERSION@|'${PV}'|g' \ + zlib.pc.in > zlib.pc || die + ;; + *) + emake + ;; + esac + use minizip && emake -C contrib/minizip +} + +sed_macros() { + # clean up namespace a little #383179 + # we do it here so we only have to tweak 2 files + sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die +} + +multilib_src_install() { + case ${CHOST} in + *-mingw*|mingw*) + emake -f win32/Makefile.gcc install \ + BINARY_PATH="${ED}/usr/bin" \ + LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ + INCLUDE_PATH="${ED}/usr/include" \ + SHARED_MODE=1 + # overwrites zlib.pc created from win32/Makefile.gcc #620136 + insinto /usr/$(get_libdir)/pkgconfig + doins zlib.pc + ;; + + *) + emake install DESTDIR="${D}" LDCONFIG=: + gen_usr_ldscript -a z + ;; + esac + sed_macros "${ED}"/usr/include/*.h + + if use minizip ; then + emake -C contrib/minizip install DESTDIR="${D}" + sed_macros "${ED}"/usr/include/minizip/*.h + fi + + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645 +} + +multilib_src_install_all() { + dodoc FAQ README ChangeLog doc/*.txt + use minizip && dodoc contrib/minizip/*.txt +} diff -uNr a/sys-process/procps/Manifest b/sys-process/procps/Manifest --- a/sys-process/procps/Manifest false +++ b/sys-process/procps/Manifest a54d8330349b6658128539deac18c9bf6d395332e16d33c5583fff2602b133f608b3e918fc6f70306d8eacc8a7d7d0afe2e4573daa66b846871cfb0963d8dd9f @@ -0,0 +1,5 @@ +AUX procps-3.3.11-sysctl-manpage.patch 941 BLAKE2B e10b6f85325d1ea23b327dffe4ba35662d5110492d0d5fcffad41edff21ddea4ea8c8bcb66582f63abd100a20d0d406e1c3fb176a8c290ba2cc6ecb02aa98248 SHA512 df8b233bde879fa675742baf8b38d43dd7c306fe52013ace715dff02c126d8c5ea12bd93087da10f5e722294eef59577b264309cbdc6f9f3727fa7111c5db313 +AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadbe5e7c54c4b0a65abad6ebe8a89f1b8f7f6bd29114b50678aa89cd0c89d26a95a10aa403d48bcc8371f16eaf34c823390 SHA512 ecc94717366a314ac4bba550b84472555f7b217be2174b68778d3364e16586ab9c21756d2041e2ac9d1449856fcd6aa691d8bd1a8558b4653d068dc1d59c2c71 +DIST procps-ng-3.3.15.tar.xz 904416 BLAKE2B 9fc1384df1d51a13bdf3aaad173160a11c5a7e016a8c397a076b5115e350d2c6fd8ff8d9ad5d83b959020bcd6a1ef9e1bca02e9a63d56881816c5c7d7c9a8bc3 SHA512 bc83ccc1941e7be8266588fdfbba17e2424b30163a215873ee6dee96215d66249f5d5e46fec2278d030b42bd7599861c4878360042dacec4c221ce411453747c +EBUILD procps-3.3.15-r1.ebuild 1981 BLAKE2B 0e8018a3a12a4ef851c571769b7ce081b9e40a6024c31e287d14f66c0f1f99b6fc78fd8f5dc31e2f1fcee84de8c69a13f008aa1408780d9b7977f91217dd25a6 SHA512 9b88a6a07a0e0cdb3628f3d569d191ed2d79f719947b64ce8827f7db9c7f9c5fe0760d2f7dbd83d937a1bd7ec25a9c6d891e1f86b643acd6c8c9b7f7bb573334 +MISC metadata.xml 653 BLAKE2B de137950217a24b13838a10e3dddacd94898c4d4be18c9080e31d666fe74d6f8e5fe3edfb4f3caf369fde1c82858e4c8828883c21f3ed32867a5f35d0771dc89 SHA512 d98bc7ed5e5437134c30db0a2ecbe4f430143aad2b91775e128fe735ddc39801e8d8fe62905cabbd8a41c4d07698110605b74056296282a74ac7622a09272703 diff -uNr a/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch b/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch --- a/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch false +++ b/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch f5e9f304a0d7119f195931d917734a15c1ea342deb0950c3ca0392ee0d882afcb7120c2bfc8279a82c8c4a69e2eac909255736d377173822e57de24781141436 @@ -0,0 +1,32 @@ +--- procps-ng-3.3.11-orig/sysctl.8 ++++ procps-ng-3.3.11/sysctl.8 +@@ -123,21 +123,21 @@ + \fB\-V\fR, \fB\-\-version\fR + Display version information and exit. + .SH EXAMPLES +-/sbin/sysctl \-a ++/usr/sbin/sysctl \-a + .br +-/sbin/sysctl \-n kernel.hostname ++/usr/sbin/sysctl \-n kernel.hostname + .br +-/sbin/sysctl \-w kernel.domainname="example.com" ++/usr/sbin/sysctl \-w kernel.domainname="example.com" + .br +-/sbin/sysctl \-p/etc/sysctl.conf ++/usr/sbin/sysctl \-p/etc/sysctl.conf + .br +-/sbin/sysctl \-a \-\-pattern forward ++/usr/sbin/sysctl \-a \-\-pattern forward + .br +-/sbin/sysctl \-a \-\-pattern forward$ ++/usr/sbin/sysctl \-a \-\-pattern forward$ + .br +-/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp' ++/usr/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp' + .br +-/sbin/sysctl \-\-system \-\-pattern '^net.ipv6' ++/usr/sbin/sysctl \-\-system \-\-pattern '^net.ipv6' + .SH DEPRECATED PARAMETERS + The + .B base_reachable_time diff -uNr a/sys-process/procps/files/procps-3.3.12-proc-tests.patch b/sys-process/procps/files/procps-3.3.12-proc-tests.patch --- a/sys-process/procps/files/procps-3.3.12-proc-tests.patch false +++ b/sys-process/procps/files/procps-3.3.12-proc-tests.patch ea20d204f562b90c36a3f806f5441ba02dc833a961c1fbe374d97dc2c98afebdc9da29f30cf6dfab70286e24cb1dbd5785274281a78d1aefcc9cae5b8cedce23 @@ -0,0 +1,47 @@ +https://bugs.gentoo.org/583036 +http://www.freelists.org/post/procps/Patch-Test-suite-fails-if-procpidsmaps-is-absent,1 + +From: tobbs@opentrash.com +To: procps@freelists.org +Date: Sun, 11 Sep 2016 15:01:29 +0200 +Subject: [procps] [Patch] Test suite fails if /proc/<pid>/smaps is absent +Message-Id: <20160911130129.9A8B3322A81@astra4649.startdedicated.de> + +Summary: Some Linux systems do not have /proc/<pid>/smaps, hence the test +suite fails. Attached a patch to skip tests in that case it. + +When pmap is called with either -c, -x, or -x it tries to read +/proc/<pid>/smaps (pmap.c, l. 540). If not present it exits. +The file /proc/<pid>/smaps exits on Linux systems only if the kernel is +compiled with the option CONFIG_PROC_PAGE_MONITOR (see man page proc(5)). + +In the test suite some tests check the output of pmap -X et al, but they +fail if /proc/<pid>/smaps is not present, because pmap does not produce +their expected output. + +Attached a patch which checks if /proc/<pid>/smaps exits, if not it +skipps the test related to it. + +Note: It is unclear what the 'expected' behaviour/output of pmap should +be if the file /proc/<pid>/smaps is not present. Maybe add an additional +test to check the return code if /proc/<pid>/smaps is absent. + +--- a/testsuite/pmap.test/pmap.exp ++++ b/testsuite/pmap.test/pmap.exp +@@ -45,6 +45,11 @@ + spawn $pmap -qd $mypid + expect_table $test $pmap_procname $pmap_device_items "\$" + ++if { [ file readable "/proc/self/smaps" ] == 0 } { ++ unsupported "Skipping test which require pmap to access /proc/<pid>/smaps, because kernel seems to be compiled without CONFIG_PROC_PAGE_MONITOR." ++ ++} else { ++ + set test "pmap extended output" + spawn $pmap -x $mypid + expect_table $test $pmap_ext_header $pmap_ext_items $pmap_ext_footer +@@ -66,3 +71,4 @@ + spawn $pmap -XX 1 + expect_pass $test "$pmap_initname\$" + ++} diff -uNr a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml --- a/sys-process/procps/metadata.xml false +++ b/sys-process/procps/metadata.xml 8f7ff20d46a87339916ad9144e8022bed0a0606f02ce65aa5b4ccce199c6726c3062aeadd11f211642207f1390a0c41c2c1623f4ef42bfbb97104339dc2de302 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<use> + <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag> + <flag name="kill">Build the kill program</flag> + <flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag> + <flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag> +</use> +<upstream> + <remote-id type="sourceforge">procps</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-process/procps/procps-3.3.15-r1.ebuild b/sys-process/procps/procps-3.3.15-r1.ebuild --- a/sys-process/procps/procps-3.3.15-r1.ebuild false +++ b/sys-process/procps/procps-3.3.15-r1.ebuild f9b2393b5470c18256680bba000666e77700c5a0fe54fe8603751a4d296d385f73f0ef908c81ad93b4e424cec25c92c928a9071a50e5b124fadc477f9e917b8e @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="standard informational utilities and process-handling tools" +HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps" +SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz" + +LICENSE="GPL-2" +SLOT="0/6" # libprocps.so +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" +IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode" + +COMMON_DEPEND=" + elogind? ( sys-auth/elogind ) + ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) + selinux? ( sys-libs/libselinux ) + systemd? ( sys-apps/systemd ) +" +DEPEND="${COMMON_DEPEND} + elogind? ( virtual/pkgconfig ) + ncurses? ( virtual/pkgconfig ) + systemd? ( virtual/pkgconfig ) + test? ( dev-util/dejagnu )" +RDEPEND=" + ${COMMON_DEPEND} + kill? ( + !sys-apps/coreutils[kill] + !sys-apps/util-linux[kill] + ) + !<sys-apps/sysvinit-2.88-r6 +" + +S="${WORKDIR}/${PN}-ng-${PV}" + +PATCHES=( + "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304 + "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036 + + # Upstream fixes +) + +src_configure() { + # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support + append-lfs-flags #471102 + local myeconfargs=( + --docdir='$(datarootdir)'/doc/${PF} + $(use_with elogind) + $(use_enable kill) + $(use_enable modern-top) + $(use_with ncurses) + $(use_enable nls) + $(use_enable selinux libselinux) + $(use_enable static-libs static) + $(use_with systemd) + $(use_enable unicode watch8bit) + ) + econf "${myeconfargs[@]}" +} + +src_test() { + emake check </dev/null #461302 +} + +src_install() { + default + #dodoc sysctl.conf + + dodir /bin + mv "${ED%/}"/usr/bin/ps "${ED%/}"/bin/ || die + if use kill; then + mv "${ED%/}"/usr/bin/kill "${ED}"/bin/ || die + fi + + gen_usr_ldscript -a procps + find "${D}" -name '*.la' -delete || die +} diff -uNr a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest --- a/sys-process/psmisc/Manifest false +++ b/sys-process/psmisc/Manifest c878e1e37f3145610a5a2c8758255786f198ad129a1ede6db6e0e49839d3c04e4c642cef890490b5ad4df2389b034f0248db0ea737a29045ac45f9051271caae @@ -0,0 +1,6 @@ +AUX psmisc-22.21-add-limits_h.patch 355 BLAKE2B ab5b5a90ce1dac17e05eeddb170851561f97f43cac45df8a6ede966a21e75d39a96bbe96618396922b1514c2b29b50c91001bb9eea9ba070d1c97eb84c1d4b97 SHA512 a26cd96decdbcb7ed8822a5cee74254b428a0ff8b76c972b08be80a345f29bfb915ccd7b3816d1ca0c559ddc7b1a945f49091142abef74e508d57ba487b39c49 +AUX psmisc-22.21-fuser_typo_fix.patch 1226 BLAKE2B abe01eb821e6d2796c50387e4e6b2d26bcf220b576355978a96929569e85bb0690f7e79c7b9acf7a614442b6c79cdb356586d28bdb95855112f6c159c5cf491c SHA512 c2e46a19959f368935462bc93bde8bf5ee4a3b5530a66255cd9a83be04acbc6246e0a3900efeb1cb9f1bbaf5a1435c0c65d677f643664be25f87662e6048c930 +AUX psmisc-22.21-sysmacros.patch 693 BLAKE2B f5e346821af0ae418431d8585a6f7f6150d5c28240a2d48c299b9e172f5d7ee27c3dbf8bb0136be03293dd62d4b0d44c83c3832a33177b44082c6f72ab74ad98 SHA512 febac721daad0046eb8367015657904eafaa934dc4b314f19ec487c1953ea2f4ff70e79e7c94473a20e5a69e7ed1eb17a4cfbbac6b102622b12322bb9cc76a09 +DIST psmisc-22.21.tar.gz 457702 BLAKE2B 7e81b695546c3dca6e1ade47bd1cd736ad434eb964608ead3e7d5a3b97f6d3d6c927e8e13ee525e716b66067e5a1573c4f0b8434540b9c66aac6e6b8f15bcfde SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae +EBUILD psmisc-22.21-r3.ebuild 1352 BLAKE2B 5af7830c7ecd9fce0c3c25cd7ce543a56d8f6a3bd1b7fe1ae4feca6e714f9db314722ce754efa24c51cc52f5208c4b6f6c8017f272818b5a056d8291489c4853 SHA512 24536fd9e1d480cc0ed5d8839e26f378f0e4da20a1d4482f202f914104ee97da15452567c2f2372c1fbc3cc0c5148a0dce2ee7645293201a07aee702a2ba61e2 +MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c diff -uNr a/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch b/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch --- a/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch false +++ b/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch 2618d460668f1bdf64724ddc069a12f7e78d5b214cd2572c6baffaf06050b4686cab37a6c80df14b8e2db7550e099c7567bfa4c6e8a14fd039182edc57f027ce @@ -0,0 +1,11 @@ +diff -Naur psmisc-22.21.orig/src/pstree.c psmisc-22.21/src/pstree.c +--- psmisc-22.21.orig/src/pstree.c 2013-09-29 05:11:56.000000000 +0000 ++++ psmisc-22.21/src/pstree.c 2014-03-26 13:30:36.000000000 +0000 +@@ -41,6 +41,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/ioctl.h> ++#include <limits.h> + + #include "i18n.h" + #include "comm.h" diff -uNr a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch --- a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch false +++ b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch b2f1b2c978398b2aee3c52439da43be426cce9862229434097ea1843a5af4b78d84e9e650181611b1ef31e3732270031fee8de65b1fd51b6f43abaf3e859b791 @@ -0,0 +1,44 @@ +From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 +From: Brad Jorsch <anomie@users.sourceforge.net> +Date: Fri, 28 Feb 2014 21:55:02 +1100 +Subject: [PATCH] Typo in fuser makes -M on all the time + +Brad found that fuser had the -M option on all the time. +A simple but significant typo caused this, thanks the the patch. + +Bug-Debian: http://bugs.debian.org/740275 + +Signed-off-by: Craig Small <csmall@enc.com.au> +--- + ChangeLog | 4 ++++ + src/fuser.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index fd1cccf..e5f784c 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++Changes in 22.22 ++================ ++ * Fixed typo in fuser which has -M on Debian #740275 ++ + Changes in 22.21 + ================ + * Missing comma in fuser(1) added Debian #702391 +diff --git a/src/fuser.c b/src/fuser.c +index b485f65..389b302 100644 +--- a/src/fuser.c ++++ b/src/fuser.c +@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) + usage(_("No process specification given")); + + /* Check if -M flag was used and if so check mounts */ +- if (opts * OPT_ISMOUNTPOINT) { ++ if (opts & OPT_ISMOUNTPOINT) { + check_mountpoints(&mounts, &names_head, &names_tail); + } + +-- +2.2.2 + diff -uNr a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch --- a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch false +++ b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch dc628b63289b7ab96a1d817354359eeadb4a7ea51962f1f2b5c41dfd84029c5e63ae261f5d4e01af4ce854fd93bb723805c2290e6873701d4aa110433f5bcbe7 @@ -0,0 +1,26 @@ +From 367886e1c49238d1a02721f849564d77a163465b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 7 Mar 2016 14:52:22 -0500 +Subject: [PATCH] fuser: include sysmacros.h for makedev + +BSD/Linux define makedev in the sysmacros.h header. Include it directly +instead of relying on types.h pulling it in for us. +--- + src/fuser.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/fuser.c b/src/fuser.c +index da94d22..380046f 100644 +--- a/src/fuser.c ++++ b/src/fuser.c +@@ -36,6 +36,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/socket.h> ++#include <sys/sysmacros.h> + #include <sys/wait.h> + #include <arpa/inet.h> + #include <netinet/in.h> +-- +2.6.2 + diff -uNr a/sys-process/psmisc/metadata.xml b/sys-process/psmisc/metadata.xml --- a/sys-process/psmisc/metadata.xml false +++ b/sys-process/psmisc/metadata.xml 7318f2878dfcf17014917293a7f316779a5ad9114180a4f21d9d22f2f93b96bd60a91379a1e4a36d9d7486a92195b34e44cbb76b3df8b31149e9ca8d462bad5e @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<upstream> + <remote-id type="sourceforge">psmisc</remote-id> +</upstream> +</pkgmetadata> diff -uNr a/sys-process/psmisc/psmisc-22.21-r3.ebuild b/sys-process/psmisc/psmisc-22.21-r3.ebuild --- a/sys-process/psmisc/psmisc-22.21-r3.ebuild false +++ b/sys-process/psmisc/psmisc-22.21-r3.ebuild a4db9aa34f23348cc4e8edcf6d4054e4b9d67c7a99fd8a8f25e0fb7995beb8ec50868bfca14d81965a2a2d6b02d9036a8ac793f90bc69c1d805eaa23c2eb7db1 @@ -0,0 +1,61 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils + +DESCRIPTION="A set of tools that use the proc filesystem" +HOMEPAGE="http://psmisc.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ia64 ~mips ppc sh sparc x86" +IUSE="ipv6 nls selinux X" + +RDEPEND=">=sys-libs/ncurses-5.7-r7:0= + nls? ( virtual/libintl ) + selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND} + >=sys-devel/libtool-2.2.6b + nls? ( sys-devel/gettext )" + +DOCS="AUTHORS ChangeLog NEWS README" + +PATCHES=( + "${FILESDIR}/${P}-fuser_typo_fix.patch" + "${FILESDIR}/${P}-sysmacros.patch" + "${FILESDIR}/${P}-add-limits_h.patch" +) + +src_prepare() { + epatch "${PATCHES[@]}" +} + +src_configure() { + econf \ + $(use_enable selinux) \ + --disable-harden-flags \ + $(use_enable ipv6) \ + $(use_enable nls) +} + +src_compile() { + # peekfd is a fragile crap hack #330631 + nonfatal emake -C src peekfd || touch src/peekfd{.o,} + emake +} + +src_install() { + default + + use X || rm -f "${ED}"/usr/bin/pstree.x11 + + [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd + [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1 + + # fuser is needed by init.d scripts; use * wildcard for #458250 + dodir /bin + mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die +} diff -uNr a/virtual/dev-manager/Manifest b/virtual/dev-manager/Manifest --- a/virtual/dev-manager/Manifest false +++ b/virtual/dev-manager/Manifest 76b5d9180dbeabb9d6080275f3fa6ef2d216c1f516bfd8f13817d98c0b28861a343208d1b08a9ae65a6cc0461f00e0e25624700cc056a96a462556c8c027fe4b @@ -0,0 +1,2 @@ +EBUILD dev-manager-0-r1.ebuild 395 BLAKE2B a6d6635fed8d76540774f7971b2eaf09119224f0e2809bb49ad0734ae2eb52549909e57250c101e19c3374253e1995c6e9b765f11ab012cd3a02b35dc36cadd1 SHA512 2043d732f8d348254c822526e65748d4404bbcb23e1c59dd5f6c5831e41131e210177fcda2d66ba2a7b1d067f40a7b788cc77d1bd9c23cefd681e3407b17610b +MISC metadata.xml 352 BLAKE2B 07753e3a30f59a62be6fdd83f306c647d053056f6e348cbc11814d5239450ce1580c33ea166808f48da52dc2d9dfc213c012395494456db3118273b6d99c19a3 SHA512 a458b4e805d27339e74c7ae1a2b9e5e6456da63a5e13258f5d7f7db2f38aa8e550b21a01d61ab6b83789a5f4bb75e40580e8e01b85befd656e58a86503cecabb diff -uNr a/virtual/dev-manager/dev-manager-0-r1.ebuild b/virtual/dev-manager/dev-manager-0-r1.ebuild --- a/virtual/dev-manager/dev-manager-0-r1.ebuild false +++ b/virtual/dev-manager/dev-manager-0-r1.ebuild 990edff2dc51f44c2341fcfdc7f1a379f679c44db6d2494e957fd6c4859b97d24cb6ec0a4f1c3a78ca3b7885a8559e889f3113c696e25d618f3d243c4a127974 @@ -0,0 +1,16 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for the device filesystem manager" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" + +RDEPEND="|| ( + virtual/udev + sys-apps/busybox[mdev] + sys-fs/devfsd + sys-fs/static-dev + sys-freebsd/freebsd-sbin + )" diff -uNr a/virtual/dev-manager/metadata.xml b/virtual/dev-manager/metadata.xml --- a/virtual/dev-manager/metadata.xml false +++ b/virtual/dev-manager/metadata.xml 5a12bc580823f8026d510d79e7977e6e2c65c8588f3e2c7c4d5026633fd90dcbcafeb9f61ee6bb7c0de682694aa46249eeb247d7f4b6a4d9b698e99f664f42ed @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +<maintainer type="project"> + <email>bsd@gentoo.org</email> + <name>BSD Project</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/editor/Manifest b/virtual/editor/Manifest --- a/virtual/editor/Manifest false +++ b/virtual/editor/Manifest 30a6eb4f99465e58a242c88482b9177f1a9f4c7c63c11754563d9ddbb576da5d1a9f97f4339ef7fbeb367e4babdc6453c6c7b5984bd39bcefbfaeb1eada5fa52 @@ -0,0 +1,2 @@ +EBUILD editor-0-r1.ebuild 1452 BLAKE2B 008d3c6b0dc609a384900d0372f98f56c391afbe93541825456542cbbef1be4504f02c90713c05ada8d6e9548f09982b7b69a041c5e6ca4da974e726df3800f3 SHA512 d4a9abd347da35d239e5cf2aa9e06bc83ef14d843b910a4f342acdb8adc6d63c9317e1616d2e7cf8b035b830f7ee0a6317bd9e09767bbedaacfd9120ea9a1b12 +MISC metadata.xml 475 BLAKE2B 04e3bc8d0eda87d6d57801992c848a5a2e68bb69b3688d2be4a7018ff4bdbde6fbab15fe16191b5c2b0b3e32a56a596931a7877160f1c265a0229a71d70bce64 SHA512 ffe46c6473a0f3d81555997b3d90569f90eb3dd467f8746430d7fac34832ce3697d2af68b508f9dcf44d5b232396ceca174daf5bcd71e7fd413f7007cc2bfe60 diff -uNr a/virtual/editor/editor-0-r1.ebuild b/virtual/editor/editor-0-r1.ebuild --- a/virtual/editor/editor-0-r1.ebuild false +++ b/virtual/editor/editor-0-r1.ebuild 3c098a8cba75f90bd1b007585eeb0e02ab1e6ffeedb5f3e4b169eb10f21a3f846f42ff20657856d8ce0845e9704b2131ef337623054d521597e72cd0d8f95582 @@ -0,0 +1,58 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for editor" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# Add a package to RDEPEND only if the editor: +# - can edit ordinary text files, +# - works on the console, +# - is a "display" or "visual" editor (e.g., using ncurses). + +RDEPEND="|| ( + app-editors/nano + app-editors/dav + app-editors/e3 + app-editors/ee + app-editors/efte + app-editors/elvis + app-editors/emacs + app-editors/emacs-vcs + app-editors/emact + app-editors/ersatz-emacs + app-editors/fe + app-editors/jasspa-microemacs + app-editors/jed + app-editors/joe + app-editors/jove + app-editors/kakoune + app-editors/le + app-editors/levee + app-editors/lpe + app-editors/mg + app-editors/ne + app-editors/neovim + app-editors/ng + app-editors/nvi + app-editors/qemacs + app-editors/teco + app-editors/uemacs-pk + app-editors/vile + app-editors/vim + app-editors/gvim + app-editors/vis + app-editors/xemacs + app-editors/zile + app-misc/mc[edit] + dev-lisp/cmucl + mail-client/alpine[-onlyalpine] +)" + +# Packages outside app-editors providing an editor: +# app-misc/mc: mcedit (#62643) +# dev-lisp/cmucl: hemlock +# mail-client/alpine: pico +# sys-apps/busybox: vi diff -uNr a/virtual/editor/metadata.xml b/virtual/editor/metadata.xml --- a/virtual/editor/metadata.xml false +++ b/virtual/editor/metadata.xml c2432a9ac647125d45e6bc0682649e7d0f7d1b39d39508a458fa38fecb7df84325cf4740920a451df820d33211316350fab0618c13c263e3f76a0574ed36e327 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>emacs@gentoo.org</email> + <name>Gentoo Emacs project</name> +</maintainer> +<maintainer type="project"> + <email>vim@gentoo.org</email> + <name>Gentoo Vim Project</name> +</maintainer> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/libc/Manifest b/virtual/libc/Manifest --- a/virtual/libc/Manifest false +++ b/virtual/libc/Manifest ec44b5f8807f0cda9afbb641e7b3d5a3d38f02b021432f5f53f91632471cb6ebfb2997778d9cc90c5bfc4472dd3dc9a6e25c690c1f57f4544857aa3b8d7e53fc @@ -0,0 +1,2 @@ +EBUILD libc-1.ebuild 814 BLAKE2B 737bfc3e1ef5ea3d23a0ac59286ea836568946d039b0c6a36d5a69bab2a4e9a41964123c2b73b667efd310c7fe42ebfbcc5f2fa77e33550847d3b79e9df0293c SHA512 f9009d4e70845bc0e6ff5c0a9bcd701f09be90f56bccb5260bf134bb46ff548f574ef475ddd460a01a1d8bc6213d8e047035a373cc51704076f13d856e3263f2 +MISC metadata.xml 464 BLAKE2B b702a3ffcfeda49ee9c7b760bde3f4b23e041f8ce69ab905a114f49b95b44f40a37d132487e7d31fdbd7295d863a0793b8fcf5995e525b37328c530d9f780b61 SHA512 e968aea2bddffd7f442c1a9a1ca8064e49f12382fd38ec6f60cb031851cc401bea7e52be437f4bb0f7b76ffbc3484cdc8134b63b5a8094b5589de85ade7c2310 diff -uNr a/virtual/libc/libc-1.ebuild b/virtual/libc/libc-1.ebuild --- a/virtual/libc/libc-1.ebuild false +++ b/virtual/libc/libc-1.ebuild e3bfe017ef5c5023a8e7b2d4092c056bcf46650888fa0d51c3b678e79d6b5f33d71467eddb74226f6b6cfb7fb349f4661184d384fbc99ccf736c074922348ced @@ -0,0 +1,21 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for the C library" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# explicitly depend on SLOT 2.2 of glibc, because it sets +# a different SLOT for cross-compiling +# Cygwin uses newlib, which lacks libcrypt +RDEPEND="!prefix-guest? ( + elibc_glibc? ( sys-libs/glibc:2.2 ) + elibc_musl? ( sys-libs/musl ) + elibc_uclibc? ( || ( sys-libs/uclibc-ng sys-libs/uclibc ) ) + elibc_FreeBSD? ( sys-freebsd/freebsd-lib ) + ) + prefix-guest? ( + elibc_Cygwin? ( sys-libs/cygwin-crypt ) + )" diff -uNr a/virtual/libc/metadata.xml b/virtual/libc/metadata.xml --- a/virtual/libc/metadata.xml false +++ b/virtual/libc/metadata.xml 591aa651f63c61429a284f39d64e4a0ec13bcd8f298e07df999dc5f57f558e531dd11815c645cbeb0a5bd03e910939e51ca32ec6c74914626c7a54066ab0c469 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> +</maintainer> +<maintainer type="project"> + <email>embedded@gentoo.org</email> + <name>Embedded Gentoo</name> +</maintainer> +<maintainer type="project"> + <email>bsd@gentoo.org</email> + <name>BSD Project</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/libelf/Manifest b/virtual/libelf/Manifest --- a/virtual/libelf/Manifest false +++ b/virtual/libelf/Manifest fc336d492d17bb099b6ff7c92f8d0b61b3b40dff82bc2067ea6908596e1dbd0ede547356cd97f6ec1b8fb4a28809305ff684280435f8d97d1814ed8e352560f7 @@ -0,0 +1,2 @@ +EBUILD libelf-2.ebuild 415 BLAKE2B ec5e17cd6cc92d74ba3552affa471d16db5448b9d1628ca6cf269f0a9cf93a75530db6cb4162c9ab6ba30e0f835a197c5156a9497745d87937ea4d29e182b33b SHA512 6ca054e33f8ae413322c6f2774717c6a3b50d21e34bf2b37656633d0111997b43d927b20d9a92244b2535bdf572ad6b656552fc4b1fcb8cd2fba62027a49df07 +MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 diff -uNr a/virtual/libelf/libelf-2.ebuild b/virtual/libelf/libelf-2.ebuild --- a/virtual/libelf/libelf-2.ebuild false +++ b/virtual/libelf/libelf-2.ebuild 2eebb4f1518a0806230336e16bddc019aa5b3a23e72ab28a7d599492e5964a2c87eda96a3c7b88bda1bda72514e0cd7e99854ea72fbe19a69e56faa7a9cc4d71 @@ -0,0 +1,12 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib-build + +DESCRIPTION="Virtual for libelf.so.0 provider dev-libs/libelf" +SLOT="0/0" +KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=">=dev-libs/libelf-0.8.13-r2:0/0[${MULTILIB_USEDEP}]" diff -uNr a/virtual/libelf/metadata.xml b/virtual/libelf/metadata.xml --- a/virtual/libelf/metadata.xml false +++ b/virtual/libelf/metadata.xml f75f43604f4a009998574dd7419c6afb7bc374081fb05cc054fff1c7c6d003d687c2db83648c76bfa34d86a1ec6deabe47eb82cf07f4b82d91066cbceac12790 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>blueness@gentoo.org</email> + <name>Anthony G. Basile</name> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/libffi/Manifest b/virtual/libffi/Manifest --- a/virtual/libffi/Manifest false +++ b/virtual/libffi/Manifest eece1acaf47e8986df6e0de4c4353614dd7591ae8200d8f700a942675c544bedbc7fe75f9f8a5dd1c733772a219b8be91e70d26ee46a09c55958f3b258953a02 @@ -0,0 +1,2 @@ +EBUILD libffi-3.0.13-r1.ebuild 687 BLAKE2B b0338680f1ffd4d3a8e364014be5ddebd5f653c0cca840e9b122f503706f2829b733079762aac76ee902722807eb58691d878386f7868b48ccab5837ef9c2eed SHA512 8c5fcd86b13117e9c282de6fa76c8d72ed1b1345fbcf5c31ac6946cb1117ec55f42875189cc81781757dd74488fb146ee4d898167ed336ec20139d1844da00d6 +MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d diff -uNr a/virtual/libffi/libffi-3.0.13-r1.ebuild b/virtual/libffi/libffi-3.0.13-r1.ebuild --- a/virtual/libffi/libffi-3.0.13-r1.ebuild false +++ b/virtual/libffi/libffi-3.0.13-r1.ebuild e98b209de4671bd2772a1680d8d2bd7f1fd81d3851f8180bcebf315c35e4987208c23b0837dc71de6b41b4157477c23fe2692dac098e999260c8a833f26f0196 @@ -0,0 +1,15 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# The purpose of this ebuild is to provide quick fallback if and when we need to +# switch back to internal copy of libffi from sys-devel/gcc. + +EAPI=5 + +inherit multilib-build + +DESCRIPTION="A virtual for the Foreign Function Interface implementation" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=">=dev-libs/libffi-3.0.13-r1[${MULTILIB_USEDEP}]" diff -uNr a/virtual/libffi/metadata.xml b/virtual/libffi/metadata.xml --- a/virtual/libffi/metadata.xml false +++ b/virtual/libffi/metadata.xml 9b846e41fcbf744602560b257018c54a7e128596b9510fba871af4652d2288c1601bf04a719ef743ac3589240ab771d9666854aa9bee7977dce6faa9b00c336b @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/libiconv/Manifest b/virtual/libiconv/Manifest --- a/virtual/libiconv/Manifest false +++ b/virtual/libiconv/Manifest c0538c5746e9bf20ad0e0ac65a097efd77842ce90ab110a713970e26934eea3ebfdeb7913d9a0c3ede1929413df449d50c272557832328c66cc25de2d105961c @@ -0,0 +1,2 @@ +EBUILD libiconv-0-r2.ebuild 815 BLAKE2B f9c2c1ce3c8444b627542c892b3b951933ccada113f31230811de32ce84e644a41afc3a8301b5b8f41be2eb1b823dbee97e20da8dc16988faa40ea22e8e76591 SHA512 6d4dae5d862013160233fac9f68616e36b0eb5a3e3751bdd0ba4a5f0012cfdc57def7ab7e605e8869de3070d89dee96cb3a29907f65363fa80dc25c6e1010d49 +MISC metadata.xml 237 BLAKE2B 938cc6a9647a554a53f829bb0dd4eed5a9f7a7ac29ab29e9f6cc703e7c445edf90d7ff88c2fcd5cbe5674b781ae156d26a6dad15073cac6e41b1362fb69b2f69 SHA512 13cc664af65a9f211ed55992c72a6163d37cdbb142d5ebf88ad14849456b4d4cfbc7bc0f888ff9760cef2515bd8def7481e7cb6d5c00de7ef60de3de85b6ab89 diff -uNr a/virtual/libiconv/libiconv-0-r2.ebuild b/virtual/libiconv/libiconv-0-r2.ebuild --- a/virtual/libiconv/libiconv-0-r2.ebuild false +++ b/virtual/libiconv/libiconv-0-r2.ebuild 4d214d7197eb3effa94dd881de6672cf2196f8e6cab647a83bd92438d780bd5be13f000919b4dfe57ee99106c6f7372e5b1d7f1c2f082d2d22eea3780b8497f3 @@ -0,0 +1,15 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit multilib-build + +DESCRIPTION="Virtual for the GNU conversion library" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib" + +# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between +# that and gcc +RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( || ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-10.0[${MULTILIB_USEDEP}] ) ) ) ) )" diff -uNr a/virtual/libiconv/metadata.xml b/virtual/libiconv/metadata.xml --- a/virtual/libiconv/metadata.xml false +++ b/virtual/libiconv/metadata.xml 9bd6ce2be5ba480321fd817456bf2bdd02dab9a4acf706077f73726f6d74358d7857f38f561e9d20cdcfe5414a1b61ddc26fc6c17da0d99b48ce3ffd9039713d @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>alt@gentoo.org</email> + <name>Gentoo Alt</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/libintl/Manifest b/virtual/libintl/Manifest --- a/virtual/libintl/Manifest false +++ b/virtual/libintl/Manifest 698bce00b4823dcf0f639cfbd2d4313fd45fedf90c830a14195d16c6eb157d5c0488d5bc34908d4376423f99f0c938db39d75f2724cd79571c81c9778a0e1018 @@ -0,0 +1,2 @@ +EBUILD libintl-0-r2.ebuild 751 BLAKE2B d1f6cada8a29fa86b04e635e6cea67c9a8cfdd394d75a3eb7f928805dbcdf044e368c03ba090a86e377af21b8b4829460a50256caa5ea05e3092475a39ff3c7f SHA512 dccf90f9e5992f018f635050d9f2801d091fecf766fc3b952a973249c959aca8f09c9014df6fd739b73b0f5cc4b1c4a6d8ae8fe34216610bd63593feb77446e2 +MISC metadata.xml 237 BLAKE2B 938cc6a9647a554a53f829bb0dd4eed5a9f7a7ac29ab29e9f6cc703e7c445edf90d7ff88c2fcd5cbe5674b781ae156d26a6dad15073cac6e41b1362fb69b2f69 SHA512 13cc664af65a9f211ed55992c72a6163d37cdbb142d5ebf88ad14849456b4d4cfbc7bc0f888ff9760cef2515bd8def7481e7cb6d5c00de7ef60de3de85b6ab89 diff -uNr a/virtual/libintl/libintl-0-r2.ebuild b/virtual/libintl/libintl-0-r2.ebuild --- a/virtual/libintl/libintl-0-r2.ebuild false +++ b/virtual/libintl/libintl-0-r2.ebuild f5935955cd51f90b603465aa80c970fc64be17e54478b3634f164f6832c7d6ecf3d15d17a7b5cf86842ac5a39c0907595e367eb2d41552740ff7768c4529de36 @@ -0,0 +1,15 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit multilib-build + +DESCRIPTION="Virtual for the GNU Internationalization Library" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="elibc_glibc elibc_musl elibc_uclibc" + +# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between +# that and gcc. And don't force uClibc to dep on this. +RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) ) )" diff -uNr a/virtual/libintl/metadata.xml b/virtual/libintl/metadata.xml --- a/virtual/libintl/metadata.xml false +++ b/virtual/libintl/metadata.xml 9bd6ce2be5ba480321fd817456bf2bdd02dab9a4acf706077f73726f6d74358d7857f38f561e9d20cdcfe5414a1b61ddc26fc6c17da0d99b48ce3ffd9039713d @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>alt@gentoo.org</email> + <name>Gentoo Alt</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/logger/Manifest b/virtual/logger/Manifest --- a/virtual/logger/Manifest false +++ b/virtual/logger/Manifest 03b6122dcc711744bf86a603984efc02d327c5d0e9b102426337f6a1e82d3eedb4c57ef12b4e44f09761938cc9adc0ce94b7ab1760be1dd41a14e53147a31425 @@ -0,0 +1,2 @@ +EBUILD logger-0.ebuild 620 BLAKE2B 40e487d23f98d31e8068031ffbee1567e20ae286955be45b166561b887d853c3bedadcfe3a0677ca2a79352dbcf1fbf8ec43a0ec30754ac5d1e583e56d697983 SHA512 a5fe7072b7d6c2656fd522e4c02f6c8b87c4336ae9be75cf646017e8904a21ea3dacd4b93fa012557b1e010065679da9b6de1b68fbe16a6f41a9138665a0c3df +MISC metadata.xml 369 BLAKE2B 29642895d74d819ff7cb00b91809f80d01ef37a4e0df40ab3a366b898de2d7b99968bf02b6fbeb42d0b7867451920529cb6ff1bf69bd7480d3b55e2bd3abadec SHA512 a43e7a7e1fe1b62d12129442e43a1c1099fa51b0eea790c299dadd628180e2ea46412506277607571fff179f4860896685fae00f8e0b9e2a9d5c5753d2ade82f diff -uNr a/virtual/logger/logger-0.ebuild b/virtual/logger/logger-0.ebuild --- a/virtual/logger/logger-0.ebuild false +++ b/virtual/logger/logger-0.ebuild 5b09b651edd3c97f1f59e32c88aeeeef178be7820eaa7f77dc32d2e67fbc23c9934f1a3e29e9cd2b0a064d94c4a02f6af46d6d04626be1c7495bb7d262246ccd @@ -0,0 +1,20 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for system loggers" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="|| ( + app-admin/metalog + app-admin/rsyslog + app-admin/socklog + app-admin/sysklogd + app-admin/syslog-ng + app-admin/syslogread + sys-freebsd/freebsd-usbin + sys-apps/busybox[syslog] + >=sys-apps/systemd-38 +)" diff -uNr a/virtual/logger/metadata.xml b/virtual/logger/metadata.xml --- a/virtual/logger/metadata.xml false +++ b/virtual/logger/metadata.xml 889d1871c50031069fb2aa4ffdfee738a126bdcea25e367c923957bf58bf5941f58f818f76e74b0709b6267f624e06d3ee827f01b73cbf92de23c50ea5a75d54 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> + <email>ultrabug@gentoo.org</email> + <name>Alexys Jacob</name> +</maintainer> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/man/Manifest b/virtual/man/Manifest --- a/virtual/man/Manifest false +++ b/virtual/man/Manifest 69a0d7cc47d18acf48a917cd94354ed9e356b0cd9300e9e152b3f3e98f3c296036638aac857b76f5a4d96a7c7dbbdc1de2bc7c479b331039f7c94ed6f9045d1a @@ -0,0 +1,2 @@ +EBUILD man-0-r1.ebuild 464 BLAKE2B 5476f37d558d283881555d092692ff6e74bd7121c0fc0cf9edaf970dd2b44a0f9af26c35f4aa51fc181d86bcedc40629f66cb47d894e21899adf83eff6c8130f SHA512 ae606809733933f34ce83006606137e18ad4b9f09b6c6705fc109a51345921d8fb104f3ae4fc448a9618bd1e41b5ba6f453a0aa4cdb32d14f334485b37dcb83e +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/virtual/man/man-0-r1.ebuild b/virtual/man/man-0-r1.ebuild --- a/virtual/man/man-0-r1.ebuild false +++ b/virtual/man/man-0-r1.ebuild e7604cc1a3369685935a6c85c526120bd090ff7f07456d948fc6fe489cc699e07bcf54d69625f019f89e9e563987510a18840f696a603590d2d15d5e755b5a1b @@ -0,0 +1,10 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for man" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="|| ( sys-apps/man-db sys-apps/man )" diff -uNr a/virtual/man/metadata.xml b/virtual/man/metadata.xml --- a/virtual/man/metadata.xml false +++ b/virtual/man/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/modutils/Manifest b/virtual/modutils/Manifest --- a/virtual/modutils/Manifest false +++ b/virtual/modutils/Manifest 25406055a10333faf00f25a1cf4304deeb9ba95160733ebf8fe783055cc743cf2472149f82254aae529d9151d9ddc6cfe9800700fb74aea1237ad6fbe01deb99 @@ -0,0 +1,2 @@ +EBUILD modutils-0.ebuild 331 BLAKE2B 5d4d94986ec04ca7c78aca022e6cbfe8fce2790ea8d87719f9cae80a195d95d0d681dad4e662f9b26b75c6f42a9115070c2aca45211e77ecfac8a319e3572174 SHA512 520e06ab7cfe1383a15b292384ce126975ce0fa0b2e33b875e36c0e96830f9501cfc6a4a339d910fcfeff9bef577e4f34c0f9db863c79a191970c7510525de29 +MISC metadata.xml 340 BLAKE2B 43c304f31f3af986d183200f1c22aaa660530f9da3a0f34d83c142cc609e361df3ce5c5c8b76064c5254a985352e0869eab521ed7b93c47758149bdcd112fb5e SHA512 e5445adcb20bc99c84f3b135af0080b0333dcb386cd35ab8b3c68ff068362c2ff4e125963517a0c08886c2c1840e3673204ed538a29f0b7e069813a549bc67db diff -uNr a/virtual/modutils/metadata.xml b/virtual/modutils/metadata.xml --- a/virtual/modutils/metadata.xml false +++ b/virtual/modutils/metadata.xml f1bd646ecbcb493f33ca667d904da04a2aede0ca73e3dc28c16d851a1cab4bef5ee54bcad1a4f8f44a372db27e4deb059bf5100ee8ee926f0a5712153d1691a0 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>udev-bugs@gentoo.org</email> + </maintainer> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + </pkgmetadata> diff -uNr a/virtual/modutils/modutils-0.ebuild b/virtual/modutils/modutils-0.ebuild --- a/virtual/modutils/modutils-0.ebuild false +++ b/virtual/modutils/modutils-0.ebuild 6043dc0a95ddd7585dba2aad9154715fa1df1e57151864eae3f1c671cf176bf5a314f2edb02fe4c6c483beaeda6517ea9be287b1fb67ec91a0ab5a41f9c35209 @@ -0,0 +1,10 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for utilities to manage Linux kernel modules" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" + +RDEPEND="|| ( sys-apps/kmod[tools] sys-apps/modutils )" diff -uNr a/virtual/mta/Manifest b/virtual/mta/Manifest --- a/virtual/mta/Manifest false +++ b/virtual/mta/Manifest dfdb520b6b436e4a524f0cac8b3302804c0fe744d6d06c2808c3bc2853170fb4260edd31032c24656f72afe7e3a1fffa22a4f2fcf890284c346d00340e0e8d88 @@ -0,0 +1,2 @@ +EBUILD mta-1.ebuild 751 BLAKE2B 59bb21ff2f87948424f0b078364055a07a90a75c74fc268c1e4e25b552abe995d2b3d97f64813b7061c3faad858710c5eb1cb39323b211e9970a0a919d6f2b3a SHA512 94fa29f350ba05879783dc935fbad05a595bbda047a72c9ea1edf61db4e5e6387de84cbcb65941bc1d341911cfbbb6beccdd2a3e4057842dd610ce1cee42aad8 +MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db diff -uNr a/virtual/mta/metadata.xml b/virtual/mta/metadata.xml --- a/virtual/mta/metadata.xml false +++ b/virtual/mta/metadata.xml a5f3aa43c1b6f1ace00234f1b89ff5b387cb794d6934d83e5f4931e581b842508eb9d4b62604dff45b5b24306150b55021875487566a9ffcf567da3a62143c57 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>net-mail@gentoo.org</email> + <name>Net-Mail</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/mta/mta-1.ebuild b/virtual/mta/mta-1.ebuild --- a/virtual/mta/mta-1.ebuild false +++ b/virtual/mta/mta-1.ebuild 1a6a75a6e6ef6021d66067cafed40c02febfbf43d38dfa460012761d91053952e0890ac0bdcb37e555de88aed76d4fe9d9ef573b42926ff884f9fa069f183d09 @@ -0,0 +1,23 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for Message Transfer Agents" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# mail-mta/citadel is from sunrise +RDEPEND="|| ( mail-mta/nullmailer + mail-mta/msmtp[mta] + mail-mta/ssmtp[mta] + mail-mta/courier + mail-mta/esmtp + mail-mta/exim + mail-mta/mini-qmail + mail-mta/netqmail + mail-mta/postfix + mail-mta/qmail-ldap + mail-mta/sendmail + mail-mta/opensmtpd + mail-mta/citadel[-postfix] )" diff -uNr a/virtual/os-headers/Manifest b/virtual/os-headers/Manifest --- a/virtual/os-headers/Manifest false +++ b/virtual/os-headers/Manifest 6e799b36db309331693c0f89d98b6f2d3fdfc34d862dffc06813a1dd82f219a25a74db0bb262249710601dfd4386ec57bd9efcd393c6e49ead48a44ce4828038 @@ -0,0 +1,2 @@ +EBUILD os-headers-0.ebuild 649 BLAKE2B 5f28d3539549e8ae66ea967280175eccbcd62765a9dc58fd4824a752eb2f94fe0fc0060846b1c729d82e0e026e0061d3e5a5295b9c00bbaaad34590330843d7b SHA512 0d8a2399d57757013ad5b0c29156844712fd6bab5f69b0cc2e0d32e59b5ca8266f921ca1a5d8b9178d27cab207e604eb85e88c6251738aab6b04d9bb362b5c14 +MISC metadata.xml 356 BLAKE2B dfdbe957c17aa00de768e659f3406001e0ea7a2e20dcfdc3b737f591fa489737224ac04444060e2993e64981b039ebceff9c1083ed3ed1b9597c253cd2b3a872 SHA512 8771efbd53a5bce7d929691b5e0954eddbf9cdc0aa51922efef0ea7fdedb7aa1197def3a65c8603906b36ed7664f55ea05f99e874a37cd522d1ebf4753db2ed0 diff -uNr a/virtual/os-headers/metadata.xml b/virtual/os-headers/metadata.xml --- a/virtual/os-headers/metadata.xml false +++ b/virtual/os-headers/metadata.xml 4e853c377f728d673cebc76be36422bee1c2fc381ac042145bff444ca766372e317d3f0b4fe685415475ae9f3ab12f939632aec086b158c539c55fb27461cc5f @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>toolchain@gentoo.org</email> + <name>Gentoo Toolchain Project</name> +</maintainer> +<maintainer type="project"> + <email>bsd@gentoo.org</email> + <name>BSD Project</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/os-headers/os-headers-0.ebuild b/virtual/os-headers/os-headers-0.ebuild --- a/virtual/os-headers/os-headers-0.ebuild false +++ b/virtual/os-headers/os-headers-0.ebuild b8df124209b1e2733f0ae4010d1dbd04a2ae2c758264d76e163541791c643ae8effde1036da9d37a72cdbab1889742e467ecae86f2f83e61c0ff5804589282e3 @@ -0,0 +1,16 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for operating system headers" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# depend on SLOT 0 of linux-headers, because kernel-2.eclass +# sets a different SLOT for cross-building +RDEPEND=" + || ( + kernel_linux? ( sys-kernel/linux-headers:0 ) + !prefix? ( sys-freebsd/freebsd-lib ) + )" diff -uNr a/virtual/package-manager/Manifest b/virtual/package-manager/Manifest --- a/virtual/package-manager/Manifest false +++ b/virtual/package-manager/Manifest f2ddb661dea8fd1e39268ed1bbe089603a26287465c488b0d06251e857cad01a071573aabd8ae9926e12a3f87a4ba6bb0fecb2b50b924f2873fc8cffa07956cc @@ -0,0 +1,2 @@ +EBUILD package-manager-1.ebuild 537 BLAKE2B 784139400b6c6883fc7d7bada57873b2ce8155b9cdd6b48d5692f7db2a1d86907a31708ed2aec16c0080c6c1ac343384009e96336c1a81a29102d4fe2d3d4cc5 SHA512 c206c0beb14af94f7ecd8235663e5b1ca51b4c2b3e37e10c79d451feeede89f58e96192b65ee7c2843255dcfe4b3690c46a279f8bc0dfe2b1cded83f340d1fcd +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/virtual/package-manager/metadata.xml b/virtual/package-manager/metadata.xml --- a/virtual/package-manager/metadata.xml false +++ b/virtual/package-manager/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/package-manager/package-manager-1.ebuild b/virtual/package-manager/package-manager-1.ebuild --- a/virtual/package-manager/package-manager-1.ebuild false +++ b/virtual/package-manager/package-manager-1.ebuild 56602fd7c5346f71bce7bf25c58f3ebc531195d455dbf2a4c6064ae0bbac5960ef1699fa24eba9a6c6632dd4146576645c6ecdefc40dbb2b303230cef459a86c @@ -0,0 +1,16 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for the package manager" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + || ( + sys-apps/portage + sys-apps/portage-mgorny + sys-apps/paludis + sys-apps/pkgcore + )" diff -uNr a/virtual/pager/Manifest b/virtual/pager/Manifest --- a/virtual/pager/Manifest false +++ b/virtual/pager/Manifest 8ff990776f1083c2c9fa1caddbf8632f30900a49913f8f4ea997f396622166d9c44c299d67be489dd0b56b40b9ad5f7d372c113bd04a23c7f16100c3b6059577 @@ -0,0 +1,2 @@ +EBUILD pager-0.ebuild 551 BLAKE2B fd03ddd08a36bdb9e1a0de7e8e6b5095e3a28e1abb98428772ee30ef12f9d09124bc2fcfb0718d5e06935145854f098d4ea1a116fae860a1d9c9f8d0bad14e88 SHA512 bf793a9eaf951b432d4b9915cda6244f958b906f81058f9c3260ec8c32875a6576e6f0bccb67ecde706cdef2aca5a31d4f86a223a76ef1f5b1f30781cfefdddf +MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff -uNr a/virtual/pager/metadata.xml b/virtual/pager/metadata.xml --- a/virtual/pager/metadata.xml false +++ b/virtual/pager/metadata.xml 4f2d8e38345ca132e77f691fc6f683b5b29db669d75c372598d70ffcb4bb0074dd266f6b53765cf6b8f471c77be5b88e2881446e7f53c6113723ba7eb1b4e25a @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + +</pkgmetadata> diff -uNr a/virtual/pager/pager-0.ebuild b/virtual/pager/pager-0.ebuild --- a/virtual/pager/pager-0.ebuild false +++ b/virtual/pager/pager-0.ebuild 25f758ba3e2c67a0f2d97b151219e5cb505f0596e6003de1d2be486248d1330b35dd32f85b32f1ce6bad810776713800a73ff2e88cc6c7f97afdd72283504813 @@ -0,0 +1,14 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for command-line pagers" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="|| ( sys-apps/less + sys-apps/most + sys-apps/util-linux[ncurses] + app-text/lv + app-editors/vim[vim-pager] )" diff -uNr a/virtual/pam/Manifest b/virtual/pam/Manifest --- a/virtual/pam/Manifest false +++ b/virtual/pam/Manifest 9b66c5cb58cca9e900d00ce14c6722861dd7486b38ed6955298ac75d9b63194025b39f9136dcb979ad5a87f15d140db2f06f0aed0f75c9985cbfcd0538bcf008 @@ -0,0 +1,2 @@ +EBUILD pam-0-r1.ebuild 462 BLAKE2B 46b3d96c2644be031e64b7cb7bfb6deb1cffbb4923d5545fd27d829ae035aacf702ec86db2743e699a39db37d868f357a7067802ebb7e4e8e8b07f8be1b21723 SHA512 7a897f07df117340fecf611c382389d104a0fca566e51bd603590ae27c9993e277e9c8056dba078f8ecfe9fed5e3720813aecc7b10f91c1dc037c8fdcb6514cc +MISC metadata.xml 218 BLAKE2B 56f47c590634b26d19b53090a64e5949c6033480438239a582e2b46caf1e24c6a0cfc5865ebebe3602c9be473cbed1697035986bd108df1d1361b2c2f6092d2f SHA512 7be455e43575c72306315d52cfbde10ad9b4168a5da4a0ab7b9bf6c526720d0cf1eb2ec25592d0822c3cf792b185fd0a1b88902bc52cca055dd279c1416ae9bc diff -uNr a/virtual/pam/metadata.xml b/virtual/pam/metadata.xml --- a/virtual/pam/metadata.xml false +++ b/virtual/pam/metadata.xml 0a31772968abbd91f4c73faac23d9a667b07a2cbe87c337e11dfcd899dcc03a91c26d1887e380c8991c47bc26eb5425ed4423651374da53b94a33e6d195ae12e @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>pam-bugs@gentoo.org</email> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/pam/pam-0-r1.ebuild b/virtual/pam/pam-0-r1.ebuild --- a/virtual/pam/pam-0-r1.ebuild false +++ b/virtual/pam/pam-0-r1.ebuild 0fb1ac9af3aaeaef7c6f22a74b59947e00bec137493885b0efd8133b2c863bf30678aab8402b1d6cff49733748173c95bd805a877a64162d73fbeb3bddbf4065 @@ -0,0 +1,16 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit multilib-build + +DESCRIPTION="Virtual for PAM (Pluggable Authentication Modules)" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + +RDEPEND=" + || ( + >=sys-libs/pam-1.1.6-r2[${MULTILIB_USEDEP}] + >=sys-auth/openpam-20120526-r1[${MULTILIB_USEDEP}] + )" diff -uNr a/virtual/perl-Data-Dumper/Manifest b/virtual/perl-Data-Dumper/Manifest --- a/virtual/perl-Data-Dumper/Manifest false +++ b/virtual/perl-Data-Dumper/Manifest 2ab1e7d2a2812fbd74b2fe5f23b6b2a7062814d8312d1dbb82aed10cc668fb5c9f8e56305f6bea8a9118b3ad5c7fe1c77921023cd02ef5fab0e7bbe00f66e33d @@ -0,0 +1,2 @@ +EBUILD perl-Data-Dumper-2.160.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f +MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695 diff -uNr a/virtual/perl-Data-Dumper/metadata.xml b/virtual/perl-Data-Dumper/metadata.xml --- a/virtual/perl-Data-Dumper/metadata.xml false +++ b/virtual/perl-Data-Dumper/metadata.xml cef99d75fd60a0453629f5e0bdb4eb939915b5d0f57dbb2968adc7acacfa9c43c6293d3a3378cfbce3a6d66859bd0781f02bb8d47153e78ded8c76d3dd741340 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>perl@gentoo.org</email> + <name>Gentoo Perl Project</name> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.160.0-r1.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.160.0-r1.ebuild --- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.160.0-r1.ebuild false +++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.160.0-r1.ebuild efdb0bf3163c8b4daa0ef0547a912c5c6d0165f0255ef439143ec834f1f1072b9e9f6a45d3d5fd01f3029d0d2c796167e72e30be0b26bd6f14ba0387d93a614f @@ -0,0 +1,15 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !<perl-core/${PN#perl-}-${PV} + !>perl-core/${PN#perl-}-${PV}-r999 +" diff -uNr a/virtual/perl-ExtUtils-MakeMaker/Manifest b/virtual/perl-ExtUtils-MakeMaker/Manifest --- a/virtual/perl-ExtUtils-MakeMaker/Manifest false +++ b/virtual/perl-ExtUtils-MakeMaker/Manifest 8e4fe060b082c043d211664215744087e2fb924b0c57d3c0046970f76d7149adc7c01dfadd0e15761b1ee83db3a7887a0b5f95e6a355097268f7d92c1a4c53e6 @@ -0,0 +1,2 @@ +EBUILD perl-ExtUtils-MakeMaker-7.100.200_rc-r4.ebuild 605 BLAKE2B ff572aa02c526374c96fa719104cc1a04a7f7378d6d6b0ff7aecfcd41f221afcbbaf83cf9d3d829f09a1dfe1c4a72f9225db891c06643e2435155e2fa4846c64 SHA512 6d9ff7a1c64bb88d7c02273f350a625931d109383299d685c0096a7a5fc9eb9fa45bc8ce86607a94d8e57d80482948004abf276c0a53fdf7c113068131d585c6 +MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84 diff -uNr a/virtual/perl-ExtUtils-MakeMaker/metadata.xml b/virtual/perl-ExtUtils-MakeMaker/metadata.xml --- a/virtual/perl-ExtUtils-MakeMaker/metadata.xml false +++ b/virtual/perl-ExtUtils-MakeMaker/metadata.xml f716b843adde45bec3693c1e115a6f480da2e5a65d5ab7d0c46ce86cdc40f35cc3c31ac2ccc44c4ff64c21a0b0da99c38f26c96a679bf35cc88af1edfa6b891d @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>perl@gentoo.org</email> + <name>Gentoo Perl Project</name> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r4.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r4.ebuild --- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r4.ebuild false +++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.100.200_rc-r4.ebuild 6a603cc051077cd1ba876c7971282f66b7f79e8704747be418364e97cca0adb9917cc865783ec11af76ffdfd2e4ca6889d4a0056823de00669f8cae661bfb0bf @@ -0,0 +1,15 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !<perl-core/${PN#perl-}-${PV} + !>perl-core/${PN#perl-}-${PV}-r999 +" diff -uNr a/virtual/perl-File-Path/Manifest b/virtual/perl-File-Path/Manifest --- a/virtual/perl-File-Path/Manifest false +++ b/virtual/perl-File-Path/Manifest 65db1305b8286de5a162f825d5bc5e6fce860b7e98008576892d084e05c5bdca02e11d3865dbd8d4e58656a2d1083d85c44b500f1fc32762a09e72b27c624ed6 @@ -0,0 +1,2 @@ +EBUILD perl-File-Path-2.130.0.ebuild 541 BLAKE2B e4701947e0923c6664635cc28e65a08421d314355a5e70e5119aacbebf39f458e42ac51e50fdbd623ecdea99f86c4f752f8e5efe9bfc23aefaa3e99ab2038ead SHA512 bdca0a240035e58a586a33a16ec9965add6d1134630f198bbc99832cff3e575f063358ab47074c58dfe25241c734ddc5583315f280a19399723ac5416136c676 +MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695 diff -uNr a/virtual/perl-File-Path/metadata.xml b/virtual/perl-File-Path/metadata.xml --- a/virtual/perl-File-Path/metadata.xml false +++ b/virtual/perl-File-Path/metadata.xml cef99d75fd60a0453629f5e0bdb4eb939915b5d0f57dbb2968adc7acacfa9c43c6293d3a3378cfbce3a6d66859bd0781f02bb8d47153e78ded8c76d3dd741340 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>perl@gentoo.org</email> + <name>Gentoo Perl Project</name> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild b/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild --- a/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild false +++ b/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild 8d1304cb65f4680b3cf8c7553f35bc51270a007f26025db8311482a5cadd3eb19d2d63ae0083094aa95e59a5054f36b2cecaa59196ee578b859b1c21482f76a4 @@ -0,0 +1,15 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + ~perl-core/${PN#perl-}-${PV} + dev-lang/perl:= + !<perl-core/${PN#perl-}-${PV} + !>perl-core/${PN#perl-}-${PV}-r999 +" diff -uNr a/virtual/perl-File-Spec/Manifest b/virtual/perl-File-Spec/Manifest --- a/virtual/perl-File-Spec/Manifest false +++ b/virtual/perl-File-Spec/Manifest f962a06bfdc0338918b923d15aa1ad2d098f89eb449e28b4ae0012d20f7dd89e86b01139b17fa0c97a2f8e3a9be930e7bb5d6660e55e1720135db57cfc9ff9ab @@ -0,0 +1,2 @@ +EBUILD perl-File-Spec-3.630.100_rc-r4.ebuild 605 BLAKE2B ff572aa02c526374c96fa719104cc1a04a7f7378d6d6b0ff7aecfcd41f221afcbbaf83cf9d3d829f09a1dfe1c4a72f9225db891c06643e2435155e2fa4846c64 SHA512 6d9ff7a1c64bb88d7c02273f350a625931d109383299d685c0096a7a5fc9eb9fa45bc8ce86607a94d8e57d80482948004abf276c0a53fdf7c113068131d585c6 +MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e diff -uNr a/virtual/perl-File-Spec/metadata.xml b/virtual/perl-File-Spec/metadata.xml --- a/virtual/perl-File-Spec/metadata.xml false +++ b/virtual/perl-File-Spec/metadata.xml ca5c0a569db5c19c1dbc9ae3afbe01ff11464463d22351d7dbdc59037cba8f06ee79cd202286e87af4a20980948d8964dd722c1bee2797a58a58c9dfdfac3c0e @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>perl@gentoo.org</email> + <name>Gentoo Perl Project</name> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r4.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r4.ebuild --- a/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r4.ebuild false +++ b/virtual/perl-File-Spec/perl-File-Spec-3.630.100_rc-r4.ebuild 6a603cc051077cd1ba876c7971282f66b7f79e8704747be418364e97cca0adb9917cc865783ec11af76ffdfd2e4ca6889d4a0056823de00669f8cae661bfb0bf @@ -0,0 +1,15 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !<perl-core/${PN#perl-}-${PV} + !>perl-core/${PN#perl-}-${PV}-r999 +" diff -uNr a/virtual/perl-File-Temp/Manifest b/virtual/perl-File-Temp/Manifest --- a/virtual/perl-File-Temp/Manifest false +++ b/virtual/perl-File-Temp/Manifest a9841575093ef50f652525227ecf640e97ee70bcf4f046334eea952db3e0401b5354536910f42d5506d577f35b22f14f0836a3919424d7a783f6290dd1ea8a2e @@ -0,0 +1,2 @@ +EBUILD perl-File-Temp-0.230.400-r5.ebuild 609 BLAKE2B c0a42f4b238708a955a1703a9b9306df4de6ec7b1c25c98cc8ef5931001457e15570fedb8eeddc541ddb9375fa5b0c088f2ef0a2e04b82ef3617c1bcdff3d19f SHA512 6e9f062cd0227f17787b6927367e482122f0c8232ba5a47dcc18cd50c2a4e7d1a81eb934960def16a70e131cd18e205c788c76ae970087e345a43a77d4e4643d +MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e diff -uNr a/virtual/perl-File-Temp/metadata.xml b/virtual/perl-File-Temp/metadata.xml --- a/virtual/perl-File-Temp/metadata.xml false +++ b/virtual/perl-File-Temp/metadata.xml ca5c0a569db5c19c1dbc9ae3afbe01ff11464463d22351d7dbdc59037cba8f06ee79cd202286e87af4a20980948d8964dd722c1bee2797a58a58c9dfdfac3c0e @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>perl@gentoo.org</email> + <name>Gentoo Perl Project</name> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/perl-File-Temp/perl-File-Temp-0.230.400-r5.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.230.400-r5.ebuild --- a/virtual/perl-File-Temp/perl-File-Temp-0.230.400-r5.ebuild false +++ b/virtual/perl-File-Temp/perl-File-Temp-0.230.400-r5.ebuild e66084cd31f3e1b138d3f75f6bbd212fc7bb3919d343362928e7cb1a964ab68a68866448a56c60f3ed943e857561e9664afe98193dab25f002ac2c6f5b1fb6ed @@ -0,0 +1,16 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + ~perl-core/${PN#perl-}-${PV} + !=perl-core/File-Temp-0.230.400 + dev-lang/perl:= +" + +# this is the dev-lang/perl-5.20, 5.22, 5.24, 5.26 version but we need the security patch diff -uNr a/virtual/perl-Test-Harness/Manifest b/virtual/perl-Test-Harness/Manifest --- a/virtual/perl-Test-Harness/Manifest false +++ b/virtual/perl-Test-Harness/Manifest cef77d4718b83da196e328715aa0d62aae501bc347d9b7173badd0fa668027cd1842cb6229669998113f2c32a455b246bf554f6807f6518b4dcb4e2cd5d5f191 @@ -0,0 +1,2 @@ +EBUILD perl-Test-Harness-3.360.100_rc-r3.ebuild 605 BLAKE2B ff572aa02c526374c96fa719104cc1a04a7f7378d6d6b0ff7aecfcd41f221afcbbaf83cf9d3d829f09a1dfe1c4a72f9225db891c06643e2435155e2fa4846c64 SHA512 6d9ff7a1c64bb88d7c02273f350a625931d109383299d685c0096a7a5fc9eb9fa45bc8ce86607a94d8e57d80482948004abf276c0a53fdf7c113068131d585c6 +MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695 diff -uNr a/virtual/perl-Test-Harness/metadata.xml b/virtual/perl-Test-Harness/metadata.xml --- a/virtual/perl-Test-Harness/metadata.xml false +++ b/virtual/perl-Test-Harness/metadata.xml cef99d75fd60a0453629f5e0bdb4eb939915b5d0f57dbb2968adc7acacfa9c43c6293d3a3378cfbce3a6d66859bd0781f02bb8d47153e78ded8c76d3dd741340 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>perl@gentoo.org</email> + <name>Gentoo Perl Project</name> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r3.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r3.ebuild --- a/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r3.ebuild false +++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.360.100_rc-r3.ebuild 6a603cc051077cd1ba876c7971282f66b7f79e8704747be418364e97cca0adb9917cc865783ec11af76ffdfd2e4ca6889d4a0056823de00669f8cae661bfb0bf @@ -0,0 +1,15 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !<perl-core/${PN#perl-}-${PV} + !>perl-core/${PN#perl-}-${PV}-r999 +" diff -uNr a/virtual/pkgconfig/Manifest b/virtual/pkgconfig/Manifest --- a/virtual/pkgconfig/Manifest false +++ b/virtual/pkgconfig/Manifest 70733c50fdfc2d9dc75fa063d45bb6f4e14c0b400126f1b139f9edcd0e6825ccb6967ba3616f606bbe08d8e6d4e7baeb7add2721f072eda56b671d250bc8e63d @@ -0,0 +1,2 @@ +EBUILD pkgconfig-0-r1.ebuild 672 BLAKE2B 7d04ecb4921e0605573ab7cb9c2615fd8157e2726a752070553b8ac6e1a0779fbb657fe9cc871271d42b05a9b2d026cd81ec2015a11675417e4e8cbb59b95dc4 SHA512 aac58335e56bc37969b1e870128f9a3344e095a5de2e31091446295ab86b833ee82ce3e7b14a71d6309d348e967416e3f2f5f3c5f6bcdcd9ae94d5dbd8d5764a +MISC metadata.xml 374 BLAKE2B a03324d45e07a57ed30c3396a4a2d7b18b2bed71ce39f1e40472532665601882163a11298726b917fb080cbb9a5e9c8bc83d095272439c28a76e8c8519f4caa3 SHA512 61d5f5e569ceeb1e20e809e7f34bd70c32e304d57c5ca6f2260fbe8435cb7a870ec13b0aa8c6c4aabec379d0f7f7478fbc668fcfc0778762efe0b1655bbf40aa diff -uNr a/virtual/pkgconfig/metadata.xml b/virtual/pkgconfig/metadata.xml --- a/virtual/pkgconfig/metadata.xml false +++ b/virtual/pkgconfig/metadata.xml 3b6e9b4907f964203e8f75000411baa94c22c3e9c4fa12084b2b84febb3922c6e5fc9cfe8c6b65b443eb2a0d790d91648e4d96d008ed1a5474b143bc7b4c2575 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + <name>Gentoo Freedesktop Project</name> +</maintainer> +<maintainer type="project"> + <email>embedded@gentoo.org</email> + <name>Embedded Gentoo</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/pkgconfig/pkgconfig-0-r1.ebuild b/virtual/pkgconfig/pkgconfig-0-r1.ebuild --- a/virtual/pkgconfig/pkgconfig-0-r1.ebuild false +++ b/virtual/pkgconfig/pkgconfig-0-r1.ebuild 1843fea6c14d58b9c5933d49e24ca7c93647bb3a6ca6dfb279214a0340a8d858192e2fb89daca80e50e9f9a49615ff47e1406ba514113079f77ccb581a4ca90d @@ -0,0 +1,17 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit multilib-build + +DESCRIPTION="Virtual for the pkg-config implementation" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + || ( + >=dev-util/pkgconfig-0.28-r1[${MULTILIB_USEDEP}] + >=dev-util/pkgconf-0.9.12[pkg-config,${MULTILIB_USEDEP}] + >=dev-util/pkgconfig-openbsd-20130507-r1[pkg-config,${MULTILIB_USEDEP}] + )" diff -uNr a/virtual/python-ipaddress/Manifest b/virtual/python-ipaddress/Manifest --- a/virtual/python-ipaddress/Manifest false +++ b/virtual/python-ipaddress/Manifest 04132f6b4a9ccd8393e51cf4834c5085cb0c28dacac0e840f848156aa025b83b102b36a81bd782829280bbcb8cb8bfe2731c6dea78037f93ad4857d766e88257 @@ -0,0 +1,2 @@ +EBUILD python-ipaddress-1.0-r1.ebuild 556 BLAKE2B 9cbdeda8ce72928d3d28bc3412702c126f5d73b83fd19334972c41c4d7666faca007bb7c55b59af36a18c3624abb31107e5c6b6fc4d92599e24f41cacba5fe97 SHA512 d6b1b3d9c0d780cb683c8cb846c1ca7bd6032ff796f349d4b03a749bfcff9aa9a40965243e53fd4599252a5b44574455dbe7a105c6e4c5803d9edbc20e56748b +MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 diff -uNr a/virtual/python-ipaddress/metadata.xml b/virtual/python-ipaddress/metadata.xml --- a/virtual/python-ipaddress/metadata.xml false +++ b/virtual/python-ipaddress/metadata.xml f03580f742965fc8e9fea8d8a9dc053e123459906ce7ddad7212a08ce3e1937bfb30349ea5979674b6d68348956267644f2f4178df01c144c26025f6f73b5070 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild b/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild --- a/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild false +++ b/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild 98ab9f8343f6da9ed69b7e927f0aef68f2b4edffedfe1b501194c852d37584f4cfecff17d9e7ecb02f00b4ebf5d81903fc779869e6972c99db242b698dc9c649 @@ -0,0 +1,17 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) + +inherit python-r1 + +DESCRIPTION="A virtual for Python ipaddress module" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' \ + python2_7 pypy)" diff -uNr a/virtual/service-manager/Manifest b/virtual/service-manager/Manifest --- a/virtual/service-manager/Manifest false +++ b/virtual/service-manager/Manifest 0e84c2bd694bd3cb5f882055ad931cb595a72088d9e34dea908b0b17104d9896f9cb2f034128636172ed149fd5ad1e29abe3828f43b565b64eb241d961cf320c @@ -0,0 +1,2 @@ +EBUILD service-manager-0.ebuild 656 BLAKE2B db95880353cbfa8f545bcf0b72757b23c97af91956e55f9083dd96f079f2584904925306f8cf7fa4af415efa99455fb8d43b75c937d3732f3608d43bc325473a SHA512 27beec2d5e615d09fc4a31dfa6fa103179ed0b1fe41614001814201bb99f43681c5a0708656c557dad30d0eebdeabc001d985d6bb9594422e35d26ccfe9119c3 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/virtual/service-manager/metadata.xml b/virtual/service-manager/metadata.xml --- a/virtual/service-manager/metadata.xml false +++ b/virtual/service-manager/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/service-manager/service-manager-0.ebuild b/virtual/service-manager/service-manager-0.ebuild --- a/virtual/service-manager/service-manager-0.ebuild false +++ b/virtual/service-manager/service-manager-0.ebuild e58ff3c6d804557d2b5c3e0f22b1f76426bdc1a843584c00674f5b2d7a6bb7473f23a61748a9de068fa75121fb5ed7908f19b87734b67fe5a570243d395750ba @@ -0,0 +1,20 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for various service managers" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="kernel_linux prefix" + +RDEPEND=" + prefix? ( >=sys-apps/baselayout-prefix-2.2 ) + !prefix? ( + || ( + sys-apps/openrc + kernel_linux? ( || ( + sys-apps/systemd + sys-process/runit + virtual/daemontools + ) ) ) )" diff -uNr a/virtual/shadow/Manifest b/virtual/shadow/Manifest --- a/virtual/shadow/Manifest false +++ b/virtual/shadow/Manifest c8cfdeab20631733eb53356bcd544021ad17c1ecd935c208337ca57411f6e6898c33b7f5913ccaaa9474e4ac0fcaba140bd47e32c506a471bf8cfd4a578d0ac0 @@ -0,0 +1,2 @@ +EBUILD shadow-0.ebuild 723 BLAKE2B 09e09053d63dc15e5ce7d4943a85f9d132179c99ff59e0e09e7c6065547096c0eda758f1ac31ecc46277ed424a31adc963859b823189fd22c7558d37ed1b92ee SHA512 cc00fad96614911eb01725ce2af6a9404ddd1be02ff3544765457f92eeccdd50044bce79b72717521f0b1320f57f00c449ecb4b2c4cba898e005f48cf966d625 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/virtual/shadow/metadata.xml b/virtual/shadow/metadata.xml --- a/virtual/shadow/metadata.xml false +++ b/virtual/shadow/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/shadow/shadow-0.ebuild b/virtual/shadow/shadow-0.ebuild --- a/virtual/shadow/shadow-0.ebuild false +++ b/virtual/shadow/shadow-0.ebuild 982bdede395d98fd01c57c549502393ac3f78328d64e6af6233c4b6250d44012e3246a6250c4bab22f264368a0d97f051e945db8679c652a1c6d36bdb9996c37 @@ -0,0 +1,14 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual for user account management utilities" + +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# >=shadow-4-1 is required because of bug #367633 (user.eclass needs it). +# On Prefix installations we sort of have to hope there is some shadow +# available, on UNIX-like (or emulated) systems this usually is the case. +RDEPEND="!prefix? ( || ( >=sys-apps/shadow-4.1 sys-apps/hardened-shadow ) )" diff -uNr a/virtual/ssh/Manifest b/virtual/ssh/Manifest --- a/virtual/ssh/Manifest false +++ b/virtual/ssh/Manifest f4349bbb94d77554ed9fe30483e51c733ce97fae1957d79e431f4ffd8af5f34721671bca151644b48608afbc307b830fb30dc2ac99d8f44d3080788635d38841 @@ -0,0 +1,2 @@ +EBUILD ssh-0.ebuild 582 BLAKE2B c5f4a681e2873d6015eeb6533d515316627298a2b963e54899b5ec0a6f29de03c3cd1368b6a809ed745b9e58316c803ec16fb0ec902d15df64fe2a1cb8def906 SHA512 b8446da3b9fe11b496a09e2f76b73373f14f611de1ae54ecdac826bff267244ea283b605a67dad11699f564be4baba1f112a53ceed6af80df445596fa304d409 +MISC metadata.xml 488 BLAKE2B e57ebdf4357d109eac78b03f0b1a815188f80a598a5a51f9dba3084ec3b9b52a3c3a26f137b8f273f3734b9be0fd14b71480ca58c87a8f1b635a23d6cacb96a1 SHA512 9b86ff6b58eda9c228c06de44c99efeddecb0c2c8024f044525f006ab067c3747659e607aed3c9ad08e292948e9d2245537d435a31fcb3e8b59ed93d1a31e19a diff -uNr a/virtual/ssh/metadata.xml b/virtual/ssh/metadata.xml --- a/virtual/ssh/metadata.xml false +++ b/virtual/ssh/metadata.xml 1fa75e2ba91a246742733d3355d9f2ba6927393422238ae919c2db758782e0fde5a7620b1d8fb40811ca066b610642d471b97423030a26de8ae6d5f13b1f4afe @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <maintainer type="project"> + <email>embedded@gentoo.org</email> + <name>Embedded Gentoo</name> + </maintainer> + <use> + <flag name="minimal"> + Prefer <pkg>net-misc/dropbear</pkg> over <pkg>net-misc/openssh</pkg> + </flag> + </use> +</pkgmetadata> diff -uNr a/virtual/ssh/ssh-0.ebuild b/virtual/ssh/ssh-0.ebuild --- a/virtual/ssh/ssh-0.ebuild false +++ b/virtual/ssh/ssh-0.ebuild ee7c9d87e1da4385e79e6cf12d9f6ba9b55ec5d25cc090e3cecbfa14d33cc1f96d818d87029c43d537b36d2e40716b84676abb91dfaf4fc74635b88609642e1e @@ -0,0 +1,18 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual for SSH client and server" + +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="minimal" + +RDEPEND=" + minimal? ( + || ( net-misc/dropbear net-misc/openssh ) + ) + !minimal? ( + || ( net-misc/openssh net-misc/dropbear ) + )" diff -uNr a/virtual/tmpfiles/Manifest b/virtual/tmpfiles/Manifest --- a/virtual/tmpfiles/Manifest false +++ b/virtual/tmpfiles/Manifest 23a92576c7990c5881dc7b90d1cd2c14d03a14cfc7df5ace741e8df1f3121663af0a7e361f068c7239f4f21a96c8e575f8fde2c464356f51eb1315df91e2989f @@ -0,0 +1,2 @@ +EBUILD tmpfiles-0.ebuild 363 BLAKE2B a8e187834d03b6c608a733b73335415ad952b10e7fef0edef7a8610d79cd01a9552439f8e5e24ee82ce19cd11504e0be6867db291340d1c43c69ae1a3abec3d3 SHA512 406643db1185bc5a37472c8315519a953c0e4c27041a75af6808d88385d7d50dc34145f6215cd4f3d76886114c64e388c375f2603e1e503d28b1a0646e947b76 +MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0 diff -uNr a/virtual/tmpfiles/metadata.xml b/virtual/tmpfiles/metadata.xml --- a/virtual/tmpfiles/metadata.xml false +++ b/virtual/tmpfiles/metadata.xml fdf4d9290f6870fcbe21eafe9feb8692321be392c9c3baa008765029399fa52fd6b4c7345905b70b4072c5feb0c94298bf4bba61836513c5f43274f49ec84122 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/tmpfiles/tmpfiles-0.ebuild b/virtual/tmpfiles/tmpfiles-0.ebuild --- a/virtual/tmpfiles/tmpfiles-0.ebuild false +++ b/virtual/tmpfiles/tmpfiles-0.ebuild 64fe63846e6836228d337ea12c1f63cd417cfe0e58fde5a17a9e47dbeec47c8ae3bdc61076602de43dacf116eedc43c992d89a5e0081575965ee81ba0c231746 @@ -0,0 +1,14 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Virtual to select between different tmpfiles.d handlers" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" + +RDEPEND=" + || ( + sys-apps/opentmpfiles + sys-apps/systemd + )" diff -uNr a/virtual/udev/Manifest b/virtual/udev/Manifest --- a/virtual/udev/Manifest false +++ b/virtual/udev/Manifest e769594b565b8880cd050274d96fb58ce53c18507a7d3dbf2a23ecbf51f5243e0063a5b0a89094664bab68e66d48815439bc240eb064e4865fa7bc1d3258d65f @@ -0,0 +1,2 @@ +EBUILD udev-217.ebuild 406 BLAKE2B d3b7a7ac1246e55a4933a3da65f4566e08a0fe1da640a937acb29e837f4a217658162a164420668ee7cbe5d9a1356b31289af5d984e7d91fbafe334808a9eca3 SHA512 7a3f5fe7054aae3417dfe493f58adf06eac42c9b2099d0acfb5332ecce627ecf64387e9928b31d42c54e80990a36f5dc933e1741768f1a319b4fb70adeed788b +MISC metadata.xml 379 BLAKE2B 5b6f06cda07bf27984ccc9d28751ffffab6debce45c8d883d963334f4295e6fdece7de2175290b4ba807aa417c0e0f3ca4c21f262185968f66c76d3f8ac8d0c8 SHA512 8353b418ec271a0ae9ae0d0a6bad81eb941610a989a5497c940929f14c622bf8199ffbc5061bc723977aa3c01aacf66a37f72311cf1f69082982f27503b17013 diff -uNr a/virtual/udev/metadata.xml b/virtual/udev/metadata.xml --- a/virtual/udev/metadata.xml false +++ b/virtual/udev/metadata.xml d45b62b5c8644814ff4a9f65a4a21d087da40d0430e93253004d2d2c490ad0821c468321ba3e40935985052a593e0a8b4d59f81b0a1c96494d294b0a072460d6 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>udev-bugs@gentoo.org</email> + </maintainer> + <maintainer type="project"> + <email>eudev@gentoo.org</email> + </maintainer> + <maintainer type="project"> + <email>systemd@gentoo.org</email> + </maintainer> +</pkgmetadata> diff -uNr a/virtual/udev/udev-217.ebuild b/virtual/udev/udev-217.ebuild --- a/virtual/udev/udev-217.ebuild false +++ b/virtual/udev/udev-217.ebuild 81c339db7989ccf0c95add78e999b4cf42f053888617b1a1aa7bb43f02f2b21d43cb12e9cf5edbd0ced50ddd872cd4a5467fe50c76b10f7cbd5aab936b864b1b @@ -0,0 +1,13 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Virtual to select between different udev daemon providers" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +IUSE="systemd" + +RDEPEND=" + !systemd? ( || ( >=sys-fs/eudev-2.1.1 >=sys-fs/udev-217 ) ) + systemd? ( >=sys-apps/systemd-217:0 )" diff -uNr a/virtual/yacc/Manifest b/virtual/yacc/Manifest --- a/virtual/yacc/Manifest false +++ b/virtual/yacc/Manifest c29ea7683a0994e21fcf6afec72ce252927e272f2b69f33102e8ea5da5d36d06eb6b15fecebd69e3f6dfd549ae71ae13ae7586b394d9bd62c86353e6bcfe493f @@ -0,0 +1,2 @@ +EBUILD yacc-0.ebuild 513 BLAKE2B 056b500aeb72aa23b9a48435d359d91d8f07a50a3044a4b853c99ebab6992bf34a8582d0585211627c2262892dee68f3c321efdcbdc2f9ae2c4083d8a5332c31 SHA512 2e27b1a9e6551fa30bb79c83fb85d10c5272df505f199278a9cc519714e4c81a6a8cb9e1289dc7ba1853dbf0afabee3bbaee019c20b2896473a2a948642f1c2d +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/virtual/yacc/metadata.xml b/virtual/yacc/metadata.xml --- a/virtual/yacc/metadata.xml false +++ b/virtual/yacc/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> +</maintainer> +</pkgmetadata> diff -uNr a/virtual/yacc/yacc-0.ebuild b/virtual/yacc/yacc-0.ebuild --- a/virtual/yacc/yacc-0.ebuild false +++ b/virtual/yacc/yacc-0.ebuild daa97f54c0c5091a203a267a3f1d9034dd89b2559c7f638e1741c4238e904891746630822bb9478abf421bb0eec5ef9d1e1bd958290612422f7ed51ebd641b2e @@ -0,0 +1,10 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="virtual for yacc (yet another compiler compiler)" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="|| ( sys-devel/bison dev-util/byacc dev-util/yacc )" diff -uNr a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest --- a/x11-misc/shared-mime-info/Manifest false +++ b/x11-misc/shared-mime-info/Manifest 500a1f1a6e6da4d900c25a58a517e78c32dd056571e3ae221a9fb4719e46603a2731a7afac959530d7dd2d3fce9a19d3ac46864f9f267f9a9f083d428867ee1c @@ -0,0 +1,3 @@ +DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491 +EBUILD shared-mime-info-1.9.ebuild 1468 BLAKE2B 0209388692eb50642d52579e68b110424c8417886e2d7f89a1129c6aa45472e8ed9fb2ca722fceffddf9f449db9fa6a053bd543a8cdbab43afa1c0b9268ba952 SHA512 2b5b7ddc08167cc72df3f5c07ee1a9b76c316ad76c6fce1bea43ffb044c91e7792d850b21afefbbf7a580ea9597eeceb738cc4db9bbc8532c99d70fdcfe68a50 +MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae diff -uNr a/x11-misc/shared-mime-info/metadata.xml b/x11-misc/shared-mime-info/metadata.xml --- a/x11-misc/shared-mime-info/metadata.xml false +++ b/x11-misc/shared-mime-info/metadata.xml 0eeccb5e9d8d3b5193f40bc0c848d5e37b6a2fa3802f2eaea7e5518e2da876889cce7813688afd0c1d42b4f4a4ad7e0df655dae9bc3d3f81f6777c6dee56e841 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + </maintainer> +</pkgmetadata> diff -uNr a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild --- a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild false +++ b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild 77fdebfb5909d6c96080db88a4c60ffed189a9412eeee724dd1ad5c162106b0e2c0205e362379861acb17e0e4dd1243d4ecb2b6623658e0b028f9309f18f1b08 @@ -0,0 +1,53 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit xdg-utils + +DESCRIPTION="The Shared MIME-info Database specification" +HOMEPAGE="https://freedesktop.org/wiki/Software/shared-mime-info" +SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" + +RDEPEND=">=dev-libs/glib-2 + dev-libs/libxml2" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +DOCS=( ChangeLog HACKING NEWS README ) + +src_configure() { + export ac_cv_func_fdatasync=no #487504 + + econf \ + $(use_enable test default-make-check) \ + --disable-update-mimedb +} + +src_compile() { + # FIXME: 0.91 fails with -j9 every second time like: + # update_mime_database-update-mime-database.o: file not recognized: File truncated + # collect2: ld returned 1 exit status + emake -j1 +} + +src_install() { + default + + # in prefix, install an env.d entry such that prefix patch is used/added + if use prefix; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die + doenvd "${T}"/50mimeinfo + fi +} + +pkg_postinst() { + use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share + xdg_mimeinfo_database

diff -uNr a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest --- a/app-admin/eselect/Manifest false +++ b/app-admin/eselect/Manifest 621131061ad9525e3a35d4386c2efe5778a62efbecfe15d72e0a3250ea6d428bb51f61f07e103eebff9948c90a1e5835f33b7b673eac20252f49c02aafc47ed4 @@ -0,0 +1,3 @@ +DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081 +EBUILD eselect-1.4.12.ebuild 1634 BLAKE2B e28298f0caa8e8751385c546d23bebbcf6839481a43a3752c5b1e35e7d62822dbf961c58f8c81b5d7eab01cfbb0ddecf88697670c2c6003ab73906078270b3d9 SHA512 22e4238d5ed8f6229236bdcd3cb6186a1fe80bbf5b51a356392d382fbe83839a5287bf212603214dbd2f40e155dc647c3a4fd366676a707339b4550c0223d8a9 +MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3 diff -uNr a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild --- a/app-admin/eselect/eselect-1.4.12.ebuild false +++ b/app-admin/eselect/eselect-1.4.12.ebuild 6021df7c4bb17431b5f0d45210b260eb3a1d9afc5a996c12eb9a575b6d0d25ce2fac86bfa7cad37d4039c947034126267db4a066c2c543bb5893e9928e37fa19 @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit bash-completion-r1 + +DESCRIPTION="Gentoo's multi-purpose configuration and management tool" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect" +SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz" + +LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc emacs vim-syntax" + +RDEPEND="sys-apps/sed + || ( + sys-apps/coreutils + sys-freebsd/freebsd-bin + app-misc/realpath + )" +DEPEND="${RDEPEND} + doc? ( dev-python/docutils )" +RDEPEND="${RDEPEND} + sys-apps/file + sys-libs/ncurses:0" + +PDEPEND="emacs? ( app-emacs/eselect-mode ) + vim-syntax? ( app-vim/eselect-syntax )" + +src_compile() { + emake + use doc && emake html +} + +src_install() { + emake DESTDIR="${D}" install + newbashcomp misc/${PN}.bashcomp ${PN} + dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt + if use doc; then + docinto html + dodoc *.html doc/*.html doc/*.css + fi + + # needed by news module + keepdir /var/lib/gentoo/news + if ! use prefix; then + fowners root:portage /var/lib/gentoo/news + fperms g+w /var/lib/gentoo/news + fi +} + +pkg_postinst() { + # fowners in src_install doesn't work for the portage group: + # merging changes the group back to root + if ! use prefix; then + chgrp portage "${EROOT}/var/lib/gentoo/news" \ + && chmod g+w "${EROOT}/var/lib/gentoo/news" + fi +} diff -uNr a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.xml --- a/app-admin/eselect/metadata.xml false +++ b/app-admin/eselect/metadata.xml 8b1c662f9688a88e1bd6aa61990775753feff9b658aa40ed3f27f2f0e38175bff1ebafa07caf4a6402391628cfc8fb6c50479af0b4a34dea896a9195f86c3b7d @@ -0,0 +1,8 @@ + + + + + eselect@gentoo.org + eselect configuration and management tool + + diff -uNr a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest --- a/app-admin/metalog/Manifest false +++ b/app-admin/metalog/Manifest 2934cd6e502b8aae5fde0cae564fa473c3df3c919de63ce4aa30365efb360def0303c5a091a7e0143832781c7115b72d2fcf65b3c47a035ab07647ed49979946 @@ -0,0 +1,8 @@ +AUX consolelog.sh 269 BLAKE2B 83aefc979d30847eb2d0b588232361cf129dec5a01ff8fafea7dd14daf4e2376c7381ce43e715e1093f13083d0e42cb037fcd65ae83f13b964c946f147e42cb9 SHA512 4cbf2145480d67b46db8a291137f5d953ce07d5d35b7c011e3dec13e4e5ab729f81666884c23db568065cb0b16fddba7178570c04777428861107aeb7c48f332 +AUX metalog-0.9-metalog-conf.patch 269 BLAKE2B ed59aa36a7388b4f91be80731fcfda0c806fc8bb90b86ca6357fea949ff6f231b42b37fdf2f044541c07fbbc4b0a67db4d6dcdcb18c9cd5091e2c3106bb4fc34 SHA512 0c95e8461e89d9469452d2ef66fa52f469b61578b12a6c72adb73e48807f998f8fb58cf0b3f1bc5caa38296fd59c8f8d1fc209beec81790387816d1c497a07df +AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac642195c7566667c7a330a4113acdd451522c907aa0814195ed5124aa92184bfca08eddc670b2d3f SHA512 4fea6b7f48e55d5f69a9c9a69f54623bb9d515e2fd2eda6829f8b769eec85e3de448eb42feb6bf65645400480169b3d70d56dff090103cfc95a3810515c42b2e +AUX metalog.initd 701 BLAKE2B 9cb211b887b7294a11649710d45c104603fa9b9c27469f33c20613b58d0eede015cc7faa7d489530150bacc9ae5c4f4ecdee69ac2a9fbd4eb7157296413d0594 SHA512 45eb2f4c5a99723ac24bdb90726a81efef422aab7c991d1502a0bb728a4138cda74b2f8efb4cc70f1375b21b92039639e8bd5ab01af310991a81fce668f6f096 +AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8 +DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289 +EBUILD metalog-3-r2.ebuild 1471 BLAKE2B 5da0f4866c405bd0d7073a1d98a8ad9acef166ff67af57c3330aafd68aacc7bc6ae8c81d28e402554ee637d26f5ce3aa14adfcdcb5a4cad3422a44f849e5bdb9 SHA512 91abf5ae5b73cd63246672d6bffe3ecbef91c271556958f7d1488bece9445109030752d5c932050e0413541aa240b3f09afd881f0a7350b58bfcf8dafe76bf70 +MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37 diff -uNr a/app-admin/metalog/files/consolelog.sh b/app-admin/metalog/files/consolelog.sh --- a/app-admin/metalog/files/consolelog.sh false +++ b/app-admin/metalog/files/consolelog.sh c3c532788716377f949037a92fa3abf2d907f1eae2b66929a2b909d3c6dccd0a9b4fecd92a9e40d5d3f191f9d2247516fe554d21cd1d0d0487f187cbfa9db014 @@ -0,0 +1,20 @@ +#!/bin/sh +# consolelog.sh +# For metalog -- log to a console + +set -f + +. /etc/conf.d/metalog +if [ -z "${CONSOLE}" ] ; then + CONSOLE="/dev/console" +fi + +if [ -z "${FORMAT}" ] ; then + FORMAT='$1 [$2] $3' +fi + +for d in ${CONSOLE} ; do + eval echo ${FORMAT} > ${d} +done + +exit 0 diff -uNr a/app-admin/metalog/files/metalog-0.9-metalog-conf.patch b/app-admin/metalog/files/metalog-0.9-metalog-conf.patch --- a/app-admin/metalog/files/metalog-0.9-metalog-conf.patch false +++ b/app-admin/metalog/files/metalog-0.9-metalog-conf.patch abc03d8808f0ec2e960f652cdba6420a4a8ffe7582340a07f01c7d90ab276f306fb84181ca551911a630a1f4dcb3209dc3e91b5d0a7470167a9c4b3108913aba @@ -0,0 +1,11 @@ +--- a/metalog.conf ++++ b/metalog.conf +@@ -21,6 +21,8 @@ + # merely write $@ to some device (your console for messages): + # echo "$@" > /dev/tty10 + # ++# Hint: you can control the consolelog.sh behavior in /etc/conf.d/metalog ++# + #console logging : + # + # facility = "*" diff -uNr a/app-admin/metalog/files/metalog.confd b/app-admin/metalog/files/metalog.confd --- a/app-admin/metalog/files/metalog.confd false +++ b/app-admin/metalog/files/metalog.confd af6754e4cfc12e0992b4d59a0cf408fbf73e5454d64694e43412ba6cdf3c2e6206d3ae5bd84e9ce0edd0b2f0bf9d7fc255ea152273b039f575ac580d9cd6c7ba @@ -0,0 +1,18 @@ +# /etc/conf.d/metalog + +# Some useful options: +# -a Log with buffering +# -s Log without buffering +# See `metalog --help` for more + +METALOG_OPTS="" + + +# Options used by /usr/sbin/consolelog.sh + +# Space delimited list of devices to write "console" messages to +#CONSOLE="/dev/console /dev/tty10" +CONSOLE="/dev/tty10" + +# Format of logging (make sure you use single quotes) +FORMAT='$1 [$2] $3' diff -uNr a/app-admin/metalog/files/metalog.initd b/app-admin/metalog/files/metalog.initd --- a/app-admin/metalog/files/metalog.initd false +++ b/app-admin/metalog/files/metalog.initd 48e1cfd00328b4bb953d2640a8733eebbb7b6748eace9680e36f34142eb061b051f437a8dab4872d0b017e66e9dd850a7dd02b2a72ae269429f963add928343f @@ -0,0 +1,41 @@ +#!/sbin/openrc-run +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="buffer unbuffer" + +PIDFILE=/var/run/metalog.pid + +depend() { + need localmount + use clock hostname + after bootmisc + provide logger +} + +ssd() { start-stop-daemon --exec /usr/sbin/metalog --pidfile "${PIDFILE}" "$@" ; } + +start() { + ebegin "Starting metalog" + ssd --start -- \ + --daemonize --pidfile="${PIDFILE}" ${METALOG_OPTS} + eend $? +} + +stop() { + ebegin "Stopping metalog" + ssd --stop + eend $? +} + +buffer() { + ebegin "Enabling log buffering" + ssd --signal USR2 + eend $? +} + +unbuffer() { + ebegin "Disabling log buffering" + ssd --signal USR1 + eend $? +} diff -uNr a/app-admin/metalog/files/metalog.service-r1 b/app-admin/metalog/files/metalog.service-r1 --- a/app-admin/metalog/files/metalog.service-r1 false +++ b/app-admin/metalog/files/metalog.service-r1 01b45eef79dfe78c4d4f782806e37dd2ffb24e4588d4ac987db3c9b9b9810213a1bc1537a3830f7f58d26ab940bc1944cda00fca29b9eafc43263a9813cd0033 @@ -0,0 +1,10 @@ +[Unit] +Description=System Logger Daemon + +[Service] +ExecStart=/usr/sbin/metalog +Restart=always + +[Install] +WantedBy=multi-user.target +Alias=syslog.service diff -uNr a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml --- a/app-admin/metalog/metadata.xml false +++ b/app-admin/metalog/metadata.xml cc4111d6c9dae4f522c9e04c7e82ab58e1cb0d0b29d68b21b5fce046eae317fe8c47347ae63f314d0e2b0f1861e2e194923b0195bda98dbe116d68640294f84d @@ -0,0 +1,11 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + metalog + + diff -uNr a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild --- a/app-admin/metalog/metalog-3-r2.ebuild false +++ b/app-admin/metalog/metalog-3-r2.ebuild f7b30141fe7241cf86dc67fe750fdd00675fe889d4cc730553f52952e44da77a6961e32a4627682f3e7495ee68be1af943f19f66a2a197c8c63a6c5a109a836a @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +inherit eutils systemd + +DESCRIPTION="A highly configurable replacement for syslogd/klogd" +HOMEPAGE="http://metalog.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="unicode" + +RDEPEND=">=dev-libs/libpcre-3.4" +DEPEND="${RDEPEND} + virtual/pkgconfig + app-arch/xz-utils" + +PATCHES=( "${FILESDIR}"/${PN}-0.9-metalog-conf.patch ) + +src_configure() { + econf $(use_with unicode) +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS ChangeLog README NEWS metalog.conf + + into / + dosbin "${FILESDIR}"/consolelog.sh + + newinitd "${FILESDIR}"/metalog.initd metalog + newconfd "${FILESDIR}"/metalog.confd metalog + systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service" +} + +pkg_preinst() { + if [[ -d "${ROOT}"/etc/metalog ]] && [[ ! -e "${ROOT}"/etc/metalog.conf ]] ; then + mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf + rmdir "${ROOT}"/etc/metalog + export MOVED_METALOG_CONF=true + else + export MOVED_METALOG_CONF=false + fi +} + +pkg_postinst() { + if ${MOVED_METALOG_CONF} ; then + ewarn "The default metalog.conf file has been moved" + ewarn "from /etc/metalog/metalog.conf to just" + ewarn "/etc/metalog.conf. If you had a standard" + ewarn "setup, the file has been moved for you." + fi +} diff -uNr a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest --- a/app-admin/perl-cleaner/Manifest false +++ b/app-admin/perl-cleaner/Manifest a8d4fa3a1cf574df409c78a23225e49a93a622f1452e87ea443c1e0a839ac5668b954d6d711b6862a5d29b0b80dc755551a8bd14a01159c5713c2537ae51ebd8 @@ -0,0 +1,4 @@ +AUX perl-cleaner-2.20-prefix.patch 4874 BLAKE2B cf598a2e1aa03959ac1f1a799daaf33ceb640e99652da386e4a15e58fd02a06d4462251a347431ca943dad2cd3945942d4a9d3e95bb9cd607bda61c1843018cc SHA512 217ab3c7958e791c7e71ede8763ff98db7479d7eaeaa5fc9b0eb8607ed4a28ee1e7bb648a8e6fbc05913755b6eb0555fb70cd81c9124ebf562119b24ce66cb6f +DIST perl-cleaner-2.25.tar.bz2 7435 BLAKE2B 348f5429874bf7b1db5c9ba5b1479c3d5fbce68fc9ef91aa44dad3325ab2287d4bfda9221063dd643ec3b6df465443bb9a024705ec46f15c50ccd618ef193ce6 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9 +EBUILD perl-cleaner-2.25.ebuild 1052 BLAKE2B 9ec3cfc3c17e3ea15805c9587d4120eee87cafbe8664300f7bf1ccf871ceecee63cd5c83fc6c3fd63e4f1750dc0bbc3aa0f786c3b33731f4e8211edd989c40db SHA512 5cf28cf372371dfc165d64ea4fdfc989ea153357ff678b6f97716d7870df4d2a8e0140e33ba02762c62befb0bb647b1b0655e3cdcc0ea9c7f231f9be4b00e04c +MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314 diff -uNr a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch b/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch --- a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch false +++ b/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch 481ca64cf34693ee46d834be4135b08f51afb80129f3e6815f5648cf3bf12e70412b2bc9bf4d9e13d68cf2ec961bad51abf364e3920b75bc0d504e0149d94aab @@ -0,0 +1,111 @@ +add Prefix and Darwin support + +--- perl-cleaner ++++ perl-cleaner +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!@GENTOO_PORTAGE_EPREFIX@/bin/bash + # vim: set et sw=4 sts=4 tw=80: + # Copyright 2005-2014 Gentoo Foundation + # Distributed under the terms of the GNU General Public License v2 +@@ -22,13 +22,13 @@ + PKGS_EXCEPTIONS="dev-lang/perl sys-devel/libperl app-emulation/emul-linux-x86-baselibs" + PKGS_MANUAL="" + +-PKG_DBDIR=/var/db/pkg ++PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg" + + # See bug 504116 for details +-if [ -e /lib/gentoo/functions.sh ]; then +- . /lib/gentoo/functions.sh +-elif [ -e /etc/init.d/functions.sh ]; then +- . /etc/init.d/functions.sh ++if [ -e "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh" ]; then ++ . "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh" ++elif [ -e "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh" ]; then ++ . "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh" + else + echo "$0: Unable to find functions.sh" + exit 1 +@@ -157,7 +157,7 @@ + + veinfo 1 "Locating ph files for removal" + eindent "" +- for i in /usr/lib{,64,x32}/perl5 ; do ++ for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/lib{,64,x32}/perl5 ; do + [[ ! -d ${i} ]] && continue + veinfo 4 "...in ${i}" + while IFS= read -r -d $'\0' file ; do +@@ -183,13 +183,13 @@ + veinfo 1 "Pretend. Nothing to do." + return + fi +- pushd /usr/include > /dev/null ++ pushd "@GENTOO_PORTAGE_EPREFIX@"/usr/include > /dev/null + if [[ ${version} =~ ^5.(8|10) ]] ; then + eindent +- veinfo 2 "...in /usr/include" ++ veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include" + h2ph ${option} * 2>/dev/null + for dir in sys arpa netinet bits security asm gnu linux ; do +- veinfo 2 "...in /usr/include/$dir/" ++ veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include/$dir/" + h2ph ${option} -r $dir/* + done + eoutdent +@@ -220,13 +220,16 @@ + veinfo 1 "Locating ebuilds linked against libperl" + fi + ++ local scanelf=scanelf ++ [[ -e "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.dylib ]] \ ++ && scanelf=scanmacho + if ${LIBPERL} ; then +- if ! type -P scanelf >/dev/null 2>&1; then +- ewarn "scanelf not found! Install app-misc/pax-utils." ++ if ! type -P ${scanelf} >/dev/null 2>&1; then ++ ewarn "${scanelf} not found! Install app-misc/pax-utils." + ewarn "--libperl is disbled." + LIBPERL=false + else +- SONAME="$(scanelf -qBS "$(realpath /usr/lib/libperl.so 2>/dev/null )" | awk '{ print $1 }')" ++ SONAME="$(${scanelf} -qBS "$(realpath "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.{so,dylib} 2>/dev/null )" | awk '{ print $1 }')" + veinfo 4 SONAME="${SONAME}" + fi + fi +@@ -268,7 +271,7 @@ + while read -r type file ; do + shopt -s extglob + [[ ${type} == obj ]] || [[ ${type} == sym ]] || continue +- [[ ${file} =~ ^/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue ++ [[ ${file} =~ ^"@GENTOO_PORTAGE_EPREFIX@"/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue + file=${file% +(!([[:space:]])) +([[:digit:]])} + shopt -u extglob + if ${FORCE} || outdated_path "${file}" ; then +@@ -302,7 +305,7 @@ + + if ${LIBPERL} ; then + # We assume the broken libs have all bin or lib in their path +- broken_libs="$(scanelf -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.so\.[0-9.]*' | sort -u )" ++ broken_libs="$(${scanelf} -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.$so\|dylib$\.[0-9.]*' | sort -u )" + if [[ -n "${broken_libs}" ]] ; then + if ${FORCE} || [[ ${broken_libs} != ${SONAME} ]] ; then + PKGS_TO_REMERGE+=" ${CATPKGVER}" +@@ -327,7 +330,7 @@ + exit $? + fi + +- if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x /usr/bin/portageq ]] ; then ++ if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq ]] ; then + # Filter out --getbinpkg, --getbinpkgonly, --usepkg and --usepkgonly options in EMERGE_DEFAULT_OPTS + emerge_default_opts="" + for option in $(portageq envvar EMERGE_DEFAULT_OPTS ) ; do +@@ -383,7 +386,7 @@ + veinfo 1 "or edited. This script cannot deal with them." + vecho 1 + +- for i in /usr/{share,lib{,32,64,x32}}/perl5 ; do ++ for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/{share,lib{,32,64,x32}}/perl5 ; do + [[ -d $i ]] && perlpath[${#perlpath[*]}]="$(realpath $i 2>/dev/null )" + done + [[ ${#perlpath[*]} == 0 ]] && return diff -uNr a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml --- a/app-admin/perl-cleaner/metadata.xml false +++ b/app-admin/perl-cleaner/metadata.xml 3e8e970ba6c4ad9e864399041ac78d1def6bdc13613fa40ebf87f2b07e6f499221d598b23cfb8ad8533b43c5341908fbfb17047d9e9d19d06672eafdb6daccce @@ -0,0 +1,9 @@ + + + + + perl@gentoo.org + Gentoo Perl Project + + + diff -uNr a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild --- a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild false +++ b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild e0caaf565005ef7a704d06e0d6cd24d61a6f2b0ffa01f88649013682648e40e150a09e66ea2cf6d16f271e37cd7bb413d99b04ca67714d68fe3731c583379224 @@ -0,0 +1,42 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit prefix + +DESCRIPTION="User land tool for cleaning up old perl installs" +HOMEPAGE="https://www.gentoo.org/proj/en/perl/" + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git" +else + SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man" + +RDEPEND="app-shells/bash + dev-lang/perl + || ( + ( sys-apps/portage app-portage/portage-utils ) + sys-apps/pkgcore + sys-apps/paludis + ) +" + +src_prepare() { + default + eprefixify ${PN} +} + +src_install() { + dosbin perl-cleaner + doman perl-cleaner.1 +} diff -uNr a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest --- a/app-admin/sudo/Manifest false +++ b/app-admin/sudo/Manifest 780cc6f6f59ba769a5ab8e8071a151998757e253c60650a99e7b1cbc2bf9f36d1ba988f338f2378505d5a8f9eca8869b4355694f6de92bc5b351b48db542446a @@ -0,0 +1,3 @@ +DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695 +EBUILD sudo-1.8.22-r2.ebuild 6056 BLAKE2B a737eb8863356270e64a60f681cb37bed81de09899cb6edca61e8c1b69653f318212f99e46a6861a6574fbc7ea9b3c7433f6daf636280922ec9350ba185376fb SHA512 64f6f9d83bcf5fc1eb8323b33b5dee9f96f89782a3ba0f7b41c517dbe6eade6524faad5d4b8dac4020b3454a7783ff123e4f2ec99c885f3c0dbf778c3ee29ec8 +MISC metadata.xml 1060 BLAKE2B 9d18c75cd15621433e2391bceaff27f7bafcf9fe39691b62ee040e894055193eb1d68acef48b467244978dcac79bc1bfb20af11952f641eab75104b2350b3d7c SHA512 e229a2df28f8bb87efb05a2980860fc37f8e324633444e26d9eb303397e16ca12e9e17ed6939e8e8044f03ab45eda4cb0401e38fdb9409229fc99a64c6da007e diff -uNr a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml --- a/app-admin/sudo/metadata.xml false +++ b/app-admin/sudo/metadata.xml 56efe19bc255f5309fe0b2e9ff212563866220adfbcb4cdc65bcf97f173ab7196c9fb8e3f8ab6a9dcdaac0436f2a132aa04616f618014539dd3aca591df5fea1 @@ -0,0 +1,24 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + Sudo (superuser do) allows a system administrator to give certain + users (or groups of users) the ability to run some (or all) + commands as root or another user while logging the commands and + arguments. + + + Use SHA2 from dev-libs/libgcrypt instead of sudo's internal SHA2 + Let sudo print insults when the user types the wrong password + Use SHA2 from dev-libs/openssl instead of sudo's internal SHA2 + Allow sudo to send emails with sendmail + Add System Security Services Daemon support + + + cpe:/a:todd_miller:sudo + + diff -uNr a/app-admin/sudo/sudo-1.8.22-r2.ebuild b/app-admin/sudo/sudo-1.8.22-r2.ebuild --- a/app-admin/sudo/sudo-1.8.22-r2.ebuild false +++ b/app-admin/sudo/sudo-1.8.22-r2.ebuild e9db0d90ac3098d352526eaf06fbc449d4ea5a99d60ebb50d816b461e7cc4769c52569288cf830b3c53eac3e8a71845fa6d78136f0342f2722f47dc189819972 @@ -0,0 +1,228 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils pam multilib libtool + +MY_P=${P/_/} +MY_P=${MY_P/beta/b} + +uri_prefix= +case ${P} in + *_beta*|*_rc*) uri_prefix=beta/ ;; +esac + +DESCRIPTION="Allows users or groups to run commands as other users" +HOMEPAGE="https://www.sudo.ws/" +SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz + ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz" + +# Basic license is ISC-style as-is, some files are released under +# 3-clause BSD license +LICENSE="ISC BSD" +SLOT="0" +if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris" +fi +IUSE="gcrypt ldap libressl nls pam offensive openssl sasl selinux +sendmail skey" + +CDEPEND=" + gcrypt? ( dev-libs/libgcrypt:= ) + openssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + pam? ( virtual/pam ) + sasl? ( dev-libs/cyrus-sasl ) + skey? ( >=sys-auth/skey-1.1.5-r1 ) + ldap? ( + >=net-nds/openldap-2.1.30-r1 + dev-libs/cyrus-sasl + ) + sys-libs/zlib +" +RDEPEND=" + ${CDEPEND} + selinux? ( sec-policy/selinux-sudo ) + ldap? ( dev-lang/perl ) + pam? ( sys-auth/pambase ) + >=app-misc/editor-wrapper-3 + virtual/editor + sendmail? ( virtual/mta ) +" +DEPEND=" + ${CDEPEND} + sys-devel/bison +" + +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + pam? ( !skey ) + skey? ( !pam ) + ?? ( gcrypt openssl ) +" + +MAKEOPTS+=" SAMPLES=" + +src_prepare() { + default + elibtoolize +} + +set_rootpath() { + # FIXME: secure_path is a compile time setting. using ROOTPATH + # is not perfect, env-update may invalidate this, but until it + # is available as a sudoers setting this will have to do. + einfo "Setting secure_path ..." + + # first extract the default ROOTPATH from build env + ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}") + if [[ -z ${ROOTPATH} ]] ; then + ewarn " Failed to find ROOTPATH, please report this" + fi + + # then remove duplicate path entries + cleanpath() { + local newpath thisp IFS=: + for thisp in $1 ; do + if [[ :${newpath}: != *:${thisp}:* ]] ; then + newpath+=:$thisp + else + einfo " Duplicate entry ${thisp} removed..." + fi + done + ROOTPATH=${newpath#:} + } + cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}} + + # finally, strip gcc paths #136027 + rmpath() { + local e newpath thisp IFS=: + for thisp in ${ROOTPATH} ; do + for e ; do [[ $thisp == $e ]] && continue 2 ; done + newpath+=:$thisp + done + ROOTPATH=${newpath#:} + } + rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*' + + einfo "... done" +} + +src_configure() { + local ROOTPATH + set_rootpath + + # audit: somebody got to explain me how I can test this before I + # enable it.. - Diego + # plugindir: autoconf code is crappy and does not delay evaluation + # until `make` time, so we have to use a full path here rather than + # basing off other values. + myeconfargs=( + --enable-zlib=system + --with-editor="${EPREFIX}"/usr/libexec/editor + --with-env-editor + --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo + --with-rundir="${EPREFIX}"/var/run/sudo + --with-secure-path="${ROOTPATH}" + --with-vardir="${EPREFIX}"/var/db/sudo + --without-linux-audit + --without-opie + $(use_enable gcrypt) + $(use_enable nls) + $(use_enable openssl) + $(use_enable sasl) + $(use_with offensive insults) + $(use_with offensive all-insults) + $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) + $(use_with ldap) + $(use_with pam) + $(use_with skey) + $(use_with selinux) + $(use_with sendmail) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if use ldap ; then + dodoc README.LDAP + dosbin plugins/sudoers/sudoers2ldif + + cat <<-EOF > "${T}"/ldap.conf.sudo + # See ldap.conf(5) and README.LDAP for details + # This file should only be readable by root + + # supported directives: host, port, ssl, ldap_version + # uri, binddn, bindpw, sudoers_base, sudoers_debug + # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key} + EOF + + insinto /etc + doins "${T}"/ldap.conf.sudo + fperms 0440 /etc/ldap.conf.sudo + + insinto /etc/openldap/schema + newins doc/schema.OpenLDAP sudo.schema + fi + + pamd_mimic system-auth sudo auth account session + + keepdir /var/db/sudo/lectured + fperms 0700 /var/db/sudo/lectured + fperms 0711 /var/db/sudo #652958 + + # Don't install into /var/run as that is a tmpfs most of the time + # (bug #504854) + rm -rf "${ED}"/var/run +} + +pkg_postinst() { + #652958 + local sudo_db="${EROOT}/var/db/sudo" + if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then + chmod 711 "${sudo_db}" || die + fi + + if use ldap ; then + ewarn + ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration." + ewarn + if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then + ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly" + ewarn "configured in /etc/nsswitch.conf." + ewarn + ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:" + ewarn " sudoers: ldap files" + ewarn + fi + fi + if use prefix ; then + ewarn + ewarn "To use sudo, you need to change file ownership and permissions" + ewarn "with root privileges, as follows:" + ewarn + ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo" + ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so" + ewarn " # chown root:root ${EPREFIX}/etc/sudoers" + ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d" + ewarn " # chown root:root ${EPREFIX}/var/db/sudo" + ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo" + ewarn + fi + + elog "To use the -A (askpass) option, you need to install a compatible" + elog "password program from the following list. Starred packages will" + elog "automatically register for the use with sudo (but will not force" + elog "the -A option):" + elog "" + elog " [*] net-misc/ssh-askpass-fullscreen" + elog " net-misc/x11-ssh-askpass" + elog "" + elog "You can override the choice by setting the SUDO_ASKPASS environmnent" + elog "variable to the program you want to use." +} diff -uNr a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest --- a/app-arch/bzip2/Manifest false +++ b/app-arch/bzip2/Manifest c5b1f70f7f81d8a191d017fb43422cc89a1e1dab393e16888212b77cb83f524cfa8dbd28c157516d88c4ec6e3b030c51b7b30c86430ad5a60fe8f4f0fe17ed5c @@ -0,0 +1,12 @@ +AUX bzip2-1.0.3-no-test.patch 165 BLAKE2B 48f0f9393d1f7e6f56c93ecc53e80ea7507b7ac921e0d459082c9ac51eb98f9e89233c12975c2346b1c7e424e505116df881b1e57207a7ef325e0c55e2ce90ce SHA512 c6064aada01b9eebdaf5350bcc0f9b52dcc03fa8b5e361d5cb09260de0d301c190e406c5daa0edfb808bc2cb5061a4cd5361f920741024b750fa8e7570715e95 +AUX bzip2-1.0.4-POSIX-shell.patch 676 BLAKE2B f6ba04224ad924979221924dc81398455404a18b36754bc104ec67c4aa44e15512e51b84f5247f4737b1e242b5aa1497c76ebfd5cefa05d3ed4cfb2ee53c1781 SHA512 66e02e9422ecee1ae6e8e007eba95581313fcfa5703fa648470ff8975b5453e3d5323a4acf6264658612a6a2972e5c74cce061ce749e51d5e74769d068e4b365 +AUX bzip2-1.0.4-makefile-CFLAGS.patch 577 BLAKE2B adc265fbd71745e1f688c85386e48389c15569263861efa3aaa76a0328d71724fda22a23e95234cc13c90c95536b21e776bebffa79433d4f42e82d44c88588a7 SHA512 031780e77710619eb8c91350885a602b1cc1768e3776e46313a9535df6d8eb9502fa99624d81e5eccdebfaf97786148c3cd10fb2faed69c5a2ba24158915c0cd +AUX bzip2-1.0.4-man-links.patch 402 BLAKE2B 9a3cabc0e3964f75408445d7a2d94422ffa38e22d0869e4f97b252ef2947173ab9a504f0c1cd82fc7479494038f899f4a2429e39729d6f3d80e570ca8ef97797 SHA512 91abd3af9ffb339cbf85e28cc65b9193d8799d81281320d4709e234f3f40483b390fd9517ad3a8aab8d240f011786df8f17e9240104a43d1292bca983c1c22cc +AUX bzip2-1.0.6-CVE-2016-3189.patch 594 BLAKE2B b4a9f6e0267637d1f815e1b8cdbddfdd5e54fcc05cbd2f31c7e64494626b7531f2bb2b5ae8b288ce0ca116abc131235dbf31f32411b58b91e156a136adbc7ad1 SHA512 0b1d5814b93397c588c9b22a7bba57e2a7360ec30a781ca3c9236781089fb8e9f0393a9fd93c880517d084f54712b631302cffa4af81a91dff791717645ec81b +AUX bzip2-1.0.6-mingw.patch 556 BLAKE2B 1885f5fe9a895e365606fd48d616553a23aa40d381ee87de8f725ed39b936e778ab517d00807a3a84120802d23fc5b54df48b3d33bebb18c7f9ba1c9afa961cc SHA512 e28442acc456c996eb6bc1866cd3814a9aea9c8a4ac2767a59bd03273ee95e34efdb4d00a17c64242a3395056b38c7083ec6f4c986e91d02f5348af1af2a35c8 +AUX bzip2-1.0.6-out-of-tree-build.patch 2121 BLAKE2B ff2d18e161e2ed437b3452639b352984e1037bbfa86857d90836994f306ddc375353c36a0afad15c58ad84021f1180bcdd10002c0ce546acc9426a68d263570b SHA512 f4a85c8b9ba0fe0ffadcb058550bb948e84c51f4c213957ffeb1072258efb1caa957c496ce0a0fb4d4b5f7dfdf062995a819487b9475389cfb25583fa061143e +AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e8f88d1ad906ef4bcecf4796ec125434b0e4d56f83715f30114d808aad9811b72cc890e85ace1901350d96f9d3f91 SHA512 e72ada256b08b539e4489d714d4d8612c643549cd25b1ec4e455b2c769c0955fe0e1f54504b259db213f3c72aa78c08d1f0513ce1ae113182691b504bd9c09b7 +AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab +DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 +EBUILD bzip2-1.0.6-r9.ebuild 3055 BLAKE2B c5efbec64d753aff0c0c1e6f3d85304795046583da91dcc2d5947426572f80047fac16f6476b13d9c35d7faffbfde25941c26434d8ab776b787195f263c82ef2 SHA512 9a8cc1ebe60852e1a4c0893531ef90d87f8d82151dbac64e820717c5983947ff068aec05d2907464634d174bb60fc36d95e2bd1ca5406de318237dc7da573625 +MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0 diff -uNr a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild --- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild false +++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 8b696550a4e8ebafd002556bbd3dc620c793e6d4d1c4dd1533a3e529f96a08e43481e63ebc9c005dace12152c66168524f6af9f57bf82190c8e1a1b19b2b5220 @@ -0,0 +1,116 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly +# (since we're building shared libs) ... + +EAPI=6 + +inherit toolchain-funcs multilib-minimal + +DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" +HOMEPAGE="http://www.bzip.org/" +SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz" + +LICENSE="BZIP2" +SLOT="0/1" # subslot = SONAME +KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="static static-libs" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch + "${FILESDIR}"/${PN}-1.0.6-saneso.patch + "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986 + "${FILESDIR}"/${PN}-1.0.6-progress.patch + "${FILESDIR}"/${PN}-1.0.3-no-test.patch + "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365 + "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573 + "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch + "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466 +) + +DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf ) +HTML_DOCS=( manual.html ) + +src_prepare() { + default + + # - Use right man path + # - Generate symlinks instead of hardlinks + # - pass custom variables to control libdir + sed -i \ + -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \ + -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \ + -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ + Makefile || die +} + +bemake() { + emake \ + VPATH="${S}" \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + "$@" +} + +multilib_src_compile() { + bemake -f "${S}"/Makefile-libbz2_so all + # Make sure we link against the shared lib #504648 + ln -s libbz2.so.${PV} libbz2.so || die + bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" +} + +multilib_src_install() { + into /usr + + # Install the shared lib manually. We install: + # .x.x.x - standard shared lib behavior + # .x.x - SONAME some distros use #338321 + # .x - SONAME Gentoo uses + dolib.so libbz2.so.${PV} + local v + for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do + dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} + done + use static-libs && dolib.a libbz2.a + + if multilib_is_native_abi ; then + gen_usr_ldscript -a bz2 + + dobin bzip2recover + into / + dobin bzip2 + fi +} + +multilib_src_install_all() { + # `make install` doesn't cope with out-of-tree builds, nor with + # installing just non-binaries, so handle things ourselves. + insinto /usr/include + doins bzlib.h + into /usr + dobin bz{diff,grep,more} + doman *.1 + + dosym bzdiff /usr/bin/bzcmp + dosym bzdiff.1 /usr/share/man/man1/bzcmp.1 + + dosym bzmore /usr/bin/bzless + dosym bzmore.1 /usr/share/man/man1/bzless.1 + + local x + for x in bunzip2 bzcat bzip2recover ; do + dosym bzip2.1 /usr/share/man/man1/${x}.1 + done + for x in bz{e,f}grep ; do + dosym bzgrep /usr/bin/${x} + dosym bzgrep.1 /usr/share/man/man1/${x}.1 + done + + einstalldocs + + # move "important" bzip2 binaries to /bin and use the shared libbz2.so + dosym bzip2 /bin/bzcat + dosym bzip2 /bin/bunzip2 +} diff -uNr a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch --- a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch false +++ b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch 0c01ec63b5e908dc4fa0375b0e4b692530bd7f8824dd6ea289fa57ff260024dde0ee265f240f8facb11d9920f0ea522077b3ab8530c395ed24abf5b3905913f5 @@ -0,0 +1,9 @@ +--- a/Makefile ++++ b/Makefile +@@ -23,5 +23,5 @@ + bzlib.o + +-all: libbz2.a bzip2 bzip2recover test ++all: libbz2.a bzip2 bzip2recover + + bzip2: libbz2.a bzip2.o diff -uNr a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch --- a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch false +++ b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch b5f7bc081efe41d9a4aa5fa5121d0e2319130c61fe162790bcadf2794a8416358746cb28147e66bc19ccf03ebe61f663badc6cf0946e05fcb30facb04e94c3ce @@ -0,0 +1,21 @@ +bzgrep uses !/bin/sh but then uses the bashism ${var//} so replace those +with calls to sed so POSIX shells work + +http://bugs.gentoo.org/193365 + +--- a/bzgrep ++++ b/bzgrep +@@ -63,10 +63,9 @@ + bzip2 -cdfq "$i" | $grep $opt "$pat" + r=$? + else +- j=${i//\\/\\\\} +- j=${j//|/\\|} +- j=${j//&/\\&} +- j=`printf "%s" "$j" | tr '\n' ' '` ++ # the backslashes here are doubled up as we have to escape each one for the ++ # shell and then escape each one for the sed expression ++ j=`printf "%s" "${i}" | sed -e 's:\\\\:\\\\\\\\:g' -e 's:[|]:\\\\|:g' -e 's:[&]:\\\\&:g' | tr '\n' ' '` + bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|" + r=$? + fi diff -uNr a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch --- a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch false +++ b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch 2b44e442330df28707c743b899fca213b3ac381ade623f686738421c7abc127bcde3da6ec97392b904c0961e6ba0c13de4c671779ec47075c0bc7a78de06b705 @@ -0,0 +1,25 @@ +--- a/Makefile ++++ b/Makefile +@@ -18,10 +18,9 @@ + CC=gcc + AR=ar + RANLIB=ranlib +-LDFLAGS= + + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS) + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so +@@ -24,7 +24,7 @@ + SHELL=/bin/sh + CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS) + + OBJS= blocksort.o \ + huffman.o \ diff -uNr a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch --- a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch false +++ b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch f0eb84bf073d1bdff68664176521dcd57611ca6f9aee64c56ba65a8eab65401b8cc2f8fabf3b165b99d1410aa88361248d6305c4436eed7dfb99ead17cf6f62d @@ -0,0 +1,12 @@ +http://bugs.gentoo.org/172986 + +--- a/Makefile ++++ b/Makefile +@@ -85,4 +85,7 @@ + cp -f bzip2.1 $(PREFIX)/share/man/man1 + chmod a+r $(PREFIX)/share/man/man1/bzip2.1 ++ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1 ++ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzcat.1 ++ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1 + cp -f bzlib.h $(PREFIX)/include + chmod a+r $(PREFIX)/include/bzlib.h diff -uNr a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch --- a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch false +++ b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch 6de15f3f53ce40666efc5130bdb379b117efed13ff226b09ebb71a0567214b35f72d58537966833f1e8901087f617976218c5dacc8169fe508a0852a4dd86f75 @@ -0,0 +1,18 @@ +Upstream-Status: Backport +https://bugzilla.suse.com/attachment.cgi?id=681334 + +CVE: CVE-2016-3189 +Signed-off-by: Armin Kuster + +Index: bzip2-1.0.6/bzip2recover.c +=================================================================== +--- a/bzip2recover.c ++++ b/bzip2recover.c +@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) + bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); + bsPutUInt32 ( bsWr, blockCRC ); + bsClose ( bsWr ); ++ outFile = NULL; + } + if (wrBlock >= rbCtr) break; + wrBlock++; diff -uNr a/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch b/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch --- a/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch false +++ b/app-arch/bzip2/files/bzip2-1.0.6-mingw.patch 9ea665c74a3801a663834ab40c6d8f9df07d6fa80ba64f3ab1c6e598ff7c12234b470c674b93650549d0474c54dd851ae2bc8da4e32e741767fa4455b6f34e66 @@ -0,0 +1,27 @@ +make it build for mingw targets + +https://bugs.gentoo.org/393573 + +--- a/bzip2.c ++++ b/bzip2.c +@@ -129,7 +129,7 @@ + #if BZ_LCCWIN32 + # include + # include +-# include ++# include + + # define NORETURN /**/ + # define PATH_SEP '\\' +--- a/bzlib.h ++++ b/bzlib.h +@@ -81,6 +81,9 @@ typedef + /* windows.h define small to char */ + # undef small + # endif ++# ifndef WINAPI ++# define WINAPI ++# endif + # ifdef BZ_EXPORT + # define BZ_API(func) WINAPI func + # define BZ_EXTERN extern diff -uNr a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch --- a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch false +++ b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch c4cf74af81214f1567b8f4ecd71611a4734f8272a4ee4e507bc9f4d4e37761d6c931f6419c3a5d20311694af7891cca930a2905dfa384155e933bfcda6bb3603 @@ -0,0 +1,79 @@ +--- a/Makefile ++++ b/Makefile +@@ -53,7 +53,6 @@ libbz2.a: $(OBJS) + + check: test + test: bzip2 +- @cat words1 + ./bzip2 -1 < sample1.ref > sample1.rb2 + ./bzip2 -2 < sample2.ref > sample2.rb2 + ./bzip2 -3 < sample3.ref > sample3.rb2 +@@ -66,7 +65,6 @@ test: bzip2 + cmp sample1.tst sample1.ref + cmp sample2.tst sample2.ref + cmp sample3.tst sample3.ref +- @cat words3 + + install: bzip2 bzip2recover + if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi +@@ -115,25 +113,8 @@ clean: + sample1.rb2 sample2.rb2 sample3.rb2 \ + sample1.tst sample2.tst sample3.tst + +-blocksort.o: blocksort.c +- @cat words0 +- $(CC) $(CFLAGS) -c blocksort.c +-huffman.o: huffman.c +- $(CC) $(CFLAGS) -c huffman.c +-crctable.o: crctable.c +- $(CC) $(CFLAGS) -c crctable.c +-randtable.o: randtable.c +- $(CC) $(CFLAGS) -c randtable.c +-compress.o: compress.c +- $(CC) $(CFLAGS) -c compress.c +-decompress.o: decompress.c +- $(CC) $(CFLAGS) -c decompress.c +-bzlib.o: bzlib.c +- $(CC) $(CFLAGS) -c bzlib.c +-bzip2.o: bzip2.c +- $(CC) $(CFLAGS) -c bzip2.c +-bzip2recover.o: bzip2recover.c +- $(CC) $(CFLAGS) -c bzip2recover.c ++%.o: %.c ++ $(CC) $(CFLAGS) -c $< + + + distclean: clean +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so +@@ -36,9 +36,7 @@ OBJS= blocksort.o \ + + all: $(OBJS) + $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) +- $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 +- rm -f libbz2.so.1.0 +- ln -s libbz2.so.1.0.6 libbz2.so.1.0 ++ ln -sf libbz2.so.1.0.6 libbz2.so.1.0 + + clean: + rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared +@@ -43,17 +43,5 @@ all: $(OBJS) + clean: + rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared + +-blocksort.o: blocksort.c +- $(CC) $(CFLAGS) -c blocksort.c +-huffman.o: huffman.c +- $(CC) $(CFLAGS) -c huffman.c +-crctable.o: crctable.c +- $(CC) $(CFLAGS) -c crctable.c +-randtable.o: randtable.c +- $(CC) $(CFLAGS) -c randtable.c +-compress.o: compress.c +- $(CC) $(CFLAGS) -c compress.c +-decompress.o: decompress.c +- $(CC) $(CFLAGS) -c decompress.c +-bzlib.o: bzlib.c +- $(CC) $(CFLAGS) -c bzlib.c ++%.o: %.c ++ $(CC) $(CFLAGS) -c $< diff -uNr a/app-arch/bzip2/files/bzip2-1.0.6-progress.patch b/app-arch/bzip2/files/bzip2-1.0.6-progress.patch --- a/app-arch/bzip2/files/bzip2-1.0.6-progress.patch false +++ b/app-arch/bzip2/files/bzip2-1.0.6-progress.patch 914f708bed165a995380f7feb5521c351a57e438584b9f79c9a2e12141e11bc049c77827d2e95b89fd614a28e5078738d20c73bae5ad000d22821769a86306c3 @@ -0,0 +1,163 @@ +Ripped from Mandrake + +http://bugs.gentoo.org/82192 + +--- a/bzip2.1 ++++ b/bzip2.1 +@@ -235,6 +235,10 @@ + Suppress non-essential warning messages. Messages pertaining to + I/O errors and other critical events will not be suppressed. + .TP ++.B \-p \-\-show\-progress ++Show percentage of input\-file done and while compressing show the percentage ++of the original file the new file is. ++.TP + .B \-v --verbose + Verbose mode -- show the compression ratio for each file processed. + Further \-v's increase the verbosity level, spewing out lots of +--- a/bzip2.c ++++ b/bzip2.c +@@ -145,6 +145,7 @@ + #include + #include + #include ++#include + #include + #include "bzlib.h" + +@@ -301,6 +302,7 @@ + Char progNameReally[FILE_NAME_LEN]; + FILE *outputHandleJustInCase; + Int32 workFactor; ++Char showProgress; + + static void panic ( Char* ) NORETURN; + static void ioError ( void ) NORETURN; +@@ -425,6 +427,12 @@ + UInt32 nbytes_in_lo32, nbytes_in_hi32; + UInt32 nbytes_out_lo32, nbytes_out_hi32; + Int32 bzerr, bzerr_dummy, ret; ++ double fileSize = 0; /* initialized to make the compiler stop crying */ ++ /* double because big files might otherwhise give ++ * overflows. not long long since not all compilers ++ * support that one ++ */ ++ time_t startTime, currentTime; + + SET_BINARY_MODE(stream); + SET_BINARY_MODE(zStream); +@@ -432,12 +440,21 @@ + if (ferror(stream)) goto errhandler_io; + if (ferror(zStream)) goto errhandler_io; + ++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { ++ (void)fseek(stream, 0, SEEK_END); ++ fileSize = ftello(stream); ++ rewind(stream); ++ if (verbosity >= 1) ++ fprintf(stderr, "Input-file size: %ld\n", (long)fileSize); ++ } ++ + bzf = BZ2_bzWriteOpen ( &bzerr, zStream, + blockSize100k, verbosity, workFactor ); + if (bzerr != BZ_OK) goto errhandler; + + if (verbosity >= 2) fprintf ( stderr, "\n" ); + ++ time(&startTime); + while (True) { + + if (myfeof(stream)) break; +@@ -446,6 +463,22 @@ + if (nIbuf > 0) BZ2_bzWrite ( &bzerr, bzf, (void*)ibuf, nIbuf ); + if (bzerr != BZ_OK) goto errhandler; + ++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { ++ time(¤tTime); ++ ++ if ((currentTime - startTime) > 1) { /* show progress every 2 seconds */ ++ double curInPos = ftello(stream); ++ double curOutPos = ftello(zStream); ++ ++ startTime = currentTime; ++ ++ fprintf(stderr, "%.2f%% done", (curInPos * 100.0) / fileSize); ++ if (srcMode == SM_F2F) ++ fprintf(stderr, ", new size: %.2f%%", (curOutPos * 100.0) / curInPos); ++ ++ fprintf(stderr, " \r"); ++ } ++ } + } + + BZ2_bzWriteClose64 ( &bzerr, bzf, 0, +@@ -526,6 +559,8 @@ + UChar unused[BZ_MAX_UNUSED]; + Int32 nUnused; + UChar* unusedTmp; ++ double fileSize = 0; /* initialized to make the compiler stop crying */ ++ time_t startTime, currentTime; + + nUnused = 0; + streamNo = 0; +@@ -533,9 +568,19 @@ + SET_BINARY_MODE(stream); + SET_BINARY_MODE(zStream); + ++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { ++ off_t dummy = ftello(zStream); ++ (void)fseeko(zStream, 0, SEEK_END); ++ fileSize = ftello(zStream); ++ (void)fseeko(zStream, dummy, SEEK_SET); ++ if (verbosity >= 1) ++ fprintf(stderr, "Input-file size: %ld\n", (long)fileSize); ++ } ++ + if (ferror(stream)) goto errhandler_io; + if (ferror(zStream)) goto errhandler_io; + ++ time(&startTime); + while (True) { + + bzf = BZ2_bzReadOpen ( +@@ -551,6 +596,16 @@ + if ((bzerr == BZ_OK || bzerr == BZ_STREAM_END) && nread > 0) + fwrite ( obuf, sizeof(UChar), nread, stream ); + if (ferror(stream)) goto errhandler_io; ++ ++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { ++ time(¤tTime); ++ if ((currentTime - startTime) >= 2) { ++ double curInPos = ftello(zStream); ++ startTime = currentTime; ++ ++ fprintf(stderr, "%.2f%% done\r", (curInPos * 100.0) / fileSize); ++ } ++ } + } + if (bzerr != BZ_STREAM_END) goto errhandler; + +@@ -1872,6 +1927,7 @@ + deleteOutputOnInterrupt = False; + exitValue = 0; + i = j = 0; /* avoid bogus warning from egcs-1.1.X */ ++ showProgress = False; + + /*-- Set up signal handlers for mem access errors --*/ + signal (SIGSEGV, mySIGSEGVorSIGBUScatcher); +@@ -1949,6 +2005,7 @@ + case 'k': keepInputFiles = True; break; + case 's': smallMode = True; break; + case 'q': noisy = False; break; ++ case 'p': showProgress = True; break; + case '1': blockSize100k = 1; break; + case '2': blockSize100k = 2; break; + case '3': blockSize100k = 3; break; +@@ -1985,6 +2042,7 @@ + if (ISFLAG("--keep")) keepInputFiles = True; else + if (ISFLAG("--small")) smallMode = True; else + if (ISFLAG("--quiet")) noisy = False; else ++ if (ISFLAG("--show-progress")) showProgress = True; else + if (ISFLAG("--version")) license(); else + if (ISFLAG("--license")) license(); else + if (ISFLAG("--exponential")) workFactor = 1; else diff -uNr a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch --- a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch false +++ b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch 127b9afba341ef467054eef952548a5b77180cbabb4e94b7be19bfa168e5357dbb1cdfb38daf14de25bf6620f0c21c31bcb7d9af139e69386974dd0a3909b575 @@ -0,0 +1,13 @@ +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so +@@ -35,8 +35,8 @@ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 ++ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.6 libbz2.so.1.0 + diff -uNr a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml --- a/app-arch/bzip2/metadata.xml false +++ b/app-arch/bzip2/metadata.xml ae1cc92ee9a4bccb7d43fd83cf405ae3d6b48479cff35d8311f25206a3016c0bcd3083c6516f748fb4601fb69382cc89e619effcc825aff221126bdccee02166 @@ -0,0 +1,11 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + cpe:/a:bzip:bzip2 + + diff -uNr a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest --- a/app-arch/cpio/Manifest false +++ b/app-arch/cpio/Manifest 6417f4f4b80a547dfd428e1b91961a49a596fb3e6cb283775b9311ed518f1a544df9c33b9f9f8ec2877d269cde8523c6eba49f7b99a0c8c9869263ac9bf69312 @@ -0,0 +1,5 @@ +AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa8971ca8beee6eb04b6ad3974c0d2770ac23669839b348013974ee827affb7b943d4dfa1be8d29b0b77c8ebea5e01791df SHA512 725468331dbb24e37333f9f56d8f295a7e521dd855f97993a2f62bf6b3a8f44d924b868ad5315dd90706ac28fcbb0b7da4c30e77ad5f401e7c5543410cc42f7a +AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03 +DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120 +EBUILD cpio-2.12-r1.ebuild 870 BLAKE2B a86550e4b94d3f69a47389a56187a469aaba96528030d9d0794f281849aacb99bfeaaa77aa0e67fe628c6eefbb7af20b862728b330fddcb8640403daad0712e7 SHA512 b18f461cea53f0ea28ca50da48449cc6670e2ddac21b6939caf07af304730727a7835245be73454639c149ad502fe704851c156fbf97311a19510efe00d7f397 +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild --- a/app-arch/cpio/cpio-2.12-r1.ebuild false +++ b/app-arch/cpio/cpio-2.12-r1.ebuild d942ff497b12c2f34a184e7be10e705c203e4ded2f2e42ee7d3cb04f6648e4e6f931f954a6de87e71418251d911350615bb96eb4b93f22388a9e75cfa61af9cd @@ -0,0 +1,27 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils + +DESCRIPTION="A file archival tool which can also read and write tar files" +HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html" +SRC_URI="mirror://gnu/cpio/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295 + epatch "${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428 +} + +src_configure() { + econf \ + $(use_enable nls) \ + --bindir="${EPREFIX}"/bin \ + --with-rmt="${EPREFIX}"/usr/sbin/rmt +} diff -uNr a/app-arch/cpio/files/cpio-2.12-name-overflow.patch b/app-arch/cpio/files/cpio-2.12-name-overflow.patch --- a/app-arch/cpio/files/cpio-2.12-name-overflow.patch false +++ b/app-arch/cpio/files/cpio-2.12-name-overflow.patch 2e9d71eac00b30eeab402d14f7f7ba5f1dd5685f66d76e1ae324c1ad12bcfa36977ab8de5379516cf570933c092f093b3fca3a4e38c660d0a8b105855939f498 @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/572428 +https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00002.html +http://seclists.org/oss-sec/2016/q1/136 + +--- a/src/copyin.c ++++ b/src/copyin.c +@@ -1385,6 +1385,8 @@ + break; + } + ++ if (file_hdr.c_namesize <= 1) ++ file_hdr.c_name = xrealloc (file_hdr.c_name, 2); + cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag, + false); + diff -uNr a/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch b/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch --- a/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch false +++ b/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch 9d3d476ee66c2c911e11df6ba77a0df4e53af545e18229d658c637b8155fe4f2d41e1e28d32ad91fdccb937de2efa29e00fe25c923fc32513c795783b4372bce @@ -0,0 +1,11 @@ +--- cpio-2.12/src/cpiohdr.h ++++ cpio-2.12/src/cpiohdr.h +@@ -25,6 +25,8 @@ + + # ifdef HAVE_ATTRIB_PACKED + # define ATTRIB_PACKED __attribute__((packed)) ++# else ++# define ATTRIB_PACKED + # endif + + # ifdef HAVE_PRAGMA_PACK diff -uNr a/app-arch/cpio/metadata.xml b/app-arch/cpio/metadata.xml --- a/app-arch/cpio/metadata.xml false +++ b/app-arch/cpio/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + diff -uNr a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest --- a/app-arch/gzip/Manifest false +++ b/app-arch/gzip/Manifest 23f478d676a30daa5697a5a9c0f40086271e2388ae9e22ba1d7fea1522fe1069e49c5684638bb5d6ebb3d38e6d4066fd78d498a0ad929576265f4e94ee029292 @@ -0,0 +1,5 @@ +AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd +AUX gzip-1.4-asmv.patch 630 BLAKE2B 64508293c8257db3dafd2b20fe5bc23aa37b54f90b63eaeb7a67643ea837b88d58b90fa8b177d84a538eef183d5e49ab98e6b5f8a482303e68ef2c5acb390faf SHA512 7769c98cfc8d6c7c48bc1772d45b44c6c4e1a9fa266dbe5bfe1b9822434b96f7c42ec0d2f4444a5ee8ae8086e571f6891756c7c22f61352649721044eda61a0f +DIST gzip-1.8.tar.xz 728116 BLAKE2B 34b707bd403791aca8620de3520637c460dbd9167a4fb693c78438115862781350ef5e256ad0accce75b25515b82fcd3e405cc310d6ea36f2d2609b0a270c4db SHA512 efd3e2439476054badeb127d9156e24e9252129111219f13fd939596c057b2a96291630b2717181984b391abf249ac8699488bbd01ceeb8a70b121c500b10c55 +EBUILD gzip-1.8.ebuild 1177 BLAKE2B aaf2b99cec28e67f048a05c88d3a958140a322cc7f232242c06cd800443e8cb5f5e05d19bb60e6662aa01dea521a0ccb79cddc2bc8160880eaf3ea501da10a32 SHA512 f64ac3b923a2dfcb881f90cadfe64cabde16cbde83fef903b35bae5ce23f5422f281cc04e37c3a043978d59d08cc506a06b489d02b4a347a15b7aee1b43b4a4c +MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96 diff -uNr a/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch b/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch --- a/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch false +++ b/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch c17c9212bb84b09627a47edd3d4fceb7c3417b39b433fb7aac068d28f7ca6f21d8c4da20065ef9a10342c8761042208f7a326efae839b6dee71a25249d1a2176 @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -926,7 +926,7 @@ + rm -f "$$dest" && \ + case $@ in \ + install-exec-hook) \ +- ln "$$source" "$$dest" || $(LN_S) "$$source" "$$dest";; \ ++ $(LN_S) "$$source" "$$dest";; \ + esac \ + ) || exit; \ + done; \ diff -uNr a/app-arch/gzip/files/gzip-1.4-asmv.patch b/app-arch/gzip/files/gzip-1.4-asmv.patch --- a/app-arch/gzip/files/gzip-1.4-asmv.patch false +++ b/app-arch/gzip/files/gzip-1.4-asmv.patch 3a5d8b4d0fb3ca31cbb0280340f512a0727c5547821f7fe92e59cbaa644056ddfb7c0ff7dd3270233345afccb826a138cf71d69d4faae9d50115b1c9ff6950cf @@ -0,0 +1,30 @@ +http://bugs.gentoo.org/show_bug.cgi?id=302773 + +--- a/tailor.h ++++ b/tailor.h +@@ -69,9 +69,6 @@ + # include + # define OS_CODE 0x00 + # define SET_BINARY_MODE(fd) setmode(fd, O_BINARY) +-# if !defined(NO_ASM) && !defined(ASMV) +-# define ASMV +-# endif + #else + # define near + #endif +@@ -182,7 +179,6 @@ + # define PATH_SEP2 ':' + # define STDC_HEADERS + # define OS_CODE 0x01 +-# define ASMV + # ifdef __GNUC__ + # define HAVE_DIRENT_H + # define HAVE_FCNTL_H +@@ -201,7 +197,6 @@ + #endif + + #if defined(ATARI) || defined(atarist) +-# define ASMV + # define OS_CODE 0x05 + # ifdef TOSFS + # define PATH_SEP2 '\\' diff -uNr a/app-arch/gzip/gzip-1.8.ebuild b/app-arch/gzip/gzip-1.8.ebuild --- a/app-arch/gzip/gzip-1.8.ebuild false +++ b/app-arch/gzip/gzip-1.8.ebuild ead6095a6dd81329efb4b2551e86fca45d78a133bf4cf57cc4582992575d7fead74f81cfa9ba8c3f8530d2ea2d212f16b61c25c7281baf9c1c4c6982b0480225 @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils flag-o-matic + +DESCRIPTION="Standard GNU compressor" +HOMEPAGE="https://www.gnu.org/software/gzip/" +SRC_URI="mirror://gnu/gzip/${P}.tar.xz + mirror://gnu-alpha/gzip/${P}.tar.xz + mirror://gentoo/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="pic static" + +PATCHES=( + "${FILESDIR}/${PN}-1.3.8-install-symlinks.patch" + "${FILESDIR}/${PN}-1.4-asmv.patch" +) + +src_prepare() { + epatch "${PATCHES[@]}" +} + +src_configure() { + use static && append-flags -static + # avoid text relocation in gzip + use pic && export DEFS="NO_ASM" + econf +} + +src_install() { + default + docinto txt + dodoc algorithm.doc gzip.doc + + # keep most things in /usr, just the fun stuff in / + dodir /bin + mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die + sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die +} diff -uNr a/app-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml --- a/app-arch/gzip/metadata.xml false +++ b/app-arch/gzip/metadata.xml 87476a1c7e4ac72e82812403bcc4b0abc80db4751dcd9b862349200aba8d9e8222a0f085ccbfe51c3bcafff9839599d20cdf8888c136d15144bb1deb7ff9f5df @@ -0,0 +1,14 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + cpe:/a:gnu:gzip + + +disable optimized assembly code that is not PIC friendly + + diff -uNr a/app-arch/tar/Manifest b/app-arch/tar/Manifest --- a/app-arch/tar/Manifest false +++ b/app-arch/tar/Manifest 05b613b11a6704db39f95f010ca8fd499cf3837722cf3df5b9fffa2b0296e6f09fcaf4eef8d0d014a216e068d0766361f115e012e131f600f42bba5f41e1cf8a @@ -0,0 +1,8 @@ +AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152 +AUX tar-1.29-add-files.patch 6602 BLAKE2B ac4687bccd88e1fb3b2c565901815988b0ff0d9d42b46f71878c0293db0e0ce453d3b2fd3ead26d136997bd6f87b1400eb2310fd4d40c07a56b63a5528e5a7fa SHA512 5c87dd4a8e6d86c8e2311ac8487958abbda846484aec664ab82b7502ac1bb6a6cd43d3869fc64e06f792915b6a0659c41b9481357e5da19fbe43f9c913a10f3e +AUX tar-1.29-extract-pathname-bypass-upstream.patch 1604 BLAKE2B 83364c5dee8d12b7cb67d8497666ec3082e0e209aeb4c84cc26292d43da0820bd14188f3003244a379cf5b6bdb5d3d7d566b42ec2c35d62f1d5713be7395e001 SHA512 c13046f8b0bcc435197c859006b1cfd12b79377f3b90edfd4b77f86ec6d3ca431c716d731be84884f0ec6d6129765cbfbccb5971d0b909c3f45aff8f0b9b45cb +AUX tar-1.29-extract-pathname-bypass.patch 723 BLAKE2B c63c23dd1f256263cb4d1371e7a3eeccfe1da4aa74c13fd23f9bc1721b06e06d388eb99e1d9d17fb3344875be8b80e2a433f78360c89f6b2b7408302f346d0cc SHA512 ba06ae53b4effcdd0996be07ae03fae7237c579a82d2606fe25100bed447287a68e37282ba2b017eed0c26cb0f4bf77dcdb4fca2f5175e1bbaed91408b0bd54a +AUX tar-1.30-fix-test-92.patch 257 BLAKE2B ee4fe8420f56191a8e4d9edefd109c948eb693532e2c3bb2073a8d55631aed142ab9c3adfa64d6461eb1aa9221a1aca6ec5086f15b3b9154effdb8e7128a8601 SHA512 aa1c80edbf1c846e23aa34ed343ffebad969b26fed9d4ccdc779f3df5bc384bb44d6c78044c385dbb7c01e68462568b941e8ec1060eb97bf36606d7beb790c1c +DIST tar-1.29.tar.bz2 2715993 BLAKE2B 656b77a49c463ec7ade87a97b71469dadbf01551131bdf0cfa895b7b2a7d073a4cd51e9bec4169b134d83155aca18af1a89ddb5d14cb1dc0d9968184870d69f3 SHA512 d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b +EBUILD tar-1.29-r3.ebuild 2227 BLAKE2B 50afab4df588f55fdab5d3cfd4258d3c65192ee0cc7079527a05fcbee0a2ec50e3875302a241faa351edc41e5f77351382ecd3e291037eec11115d4c729aebde SHA512 270db39d7490c4829fb11cb680b39e75963bb065fe3ebdf78ab024300dae27f78e18453dc76c029a6cdfc4af9511074322aaafc3e89910e63e976065d92867a3 +MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7 diff -uNr a/app-arch/tar/files/rmt b/app-arch/tar/files/rmt --- a/app-arch/tar/files/rmt false +++ b/app-arch/tar/files/rmt 75f01fcd06fef2641a2acd3f353a269f456d89af8d2c465eddb00336247cb262dc492dd217fc7fc8ac8e9a39c61b0796f8a34e9eca1511dc2b8f20685db42f91 @@ -0,0 +1,8 @@ +#!/bin/sh +# +# This is not a mistake. This shell script (/etc/rmt) has been provided +# for compatibility with other Unix-like systems, some of which have +# utilities that expect to find (and execute) rmt in the /etc directory +# on remote systems. +# +exec rmt "$@" diff -uNr a/app-arch/tar/files/tar-1.29-add-files.patch b/app-arch/tar/files/tar-1.29-add-files.patch --- a/app-arch/tar/files/tar-1.29-add-files.patch false +++ b/app-arch/tar/files/tar-1.29-add-files.patch 76b5f3089ab191931c74ae6579349ac6c7a6cb45aa7b9bb2dc873e6d0a21e88d8d27f9868ccf1840107a4ec5e83dfe324e327e0b4b7611191df3be285de1b15d @@ -0,0 +1,194 @@ +From 3a283cfe9f8f1f127e8dc5597a5ea1d249985a54 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Sat, 12 Nov 2016 11:20:47 +0200 +Subject: [PATCH] Fix the --add-file option. + +* src/common.h (name_more_files): New proto. +(files_from_option): Remove. +* src/names.c (name_more_files): New file. +(names_options): Fix declaration of the +add-file option. +(names_parse_opt): Handle --add-file. +* src/tar.c (struct tar_args): Remove the input_files member. +Change all uses: use name_more_files() instead. +* tests/Makefile.am: Add new test. +* tests/add-file.at: New testcase. +* tests/testsuite.at: Add new test. +--- + src/common.h | 4 +--- + src/names.c | 24 ++++++++++++------- + src/tar.c | 16 ++++--------- + tests/Makefile.am | 3 ++- + tests/add-file.at | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + tests/testsuite.at | 1 + + 6 files changed, 92 insertions(+), 23 deletions(-) + create mode 100644 tests/add-file.at + +diff --git a/src/common.h b/src/common.h +index 50c34cc7c09b..6fdb6225f18b 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -414,9 +414,6 @@ GLOBAL bool show_transformed_names_option; + timestamps from archives with an unusual member order. It is automatically + set for incremental archives. */ + GLOBAL bool delay_directory_restore_option; +- +-/* When set, tar will not refuse to create empty archives */ +-GLOBAL bool files_from_option; + + /* Declarations for each module. */ + +@@ -738,6 +735,7 @@ void uid_to_uname (uid_t uid, char **uname); + int uname_to_uid (char const *uname, uid_t *puid); + + void name_init (void); ++bool name_more_files (void); + void name_add_name (const char *name); + void name_term (void); + const char *name_next (int change_dirs); +diff --git a/src/names.c b/src/names.c +index 219aa77a4356..1a9465667cd3 100644 +--- a/src/names.c ++++ b/src/names.c +@@ -32,7 +32,8 @@ static void name_add_file (const char *name); + + enum + { +- EXCLUDE_BACKUPS_OPTION = 256, ++ ADD_FILE_OPTION = 256, ++ EXCLUDE_BACKUPS_OPTION, + EXCLUDE_CACHES_OPTION, + EXCLUDE_CACHES_UNDER_OPTION, + EXCLUDE_CACHES_ALL_OPTION, +@@ -67,7 +68,7 @@ static struct argp_option names_options[] = { + {NULL, 0, NULL, 0, + N_("Local file name selection:"), GRID }, + +- {"add-file", ARGP_KEY_ARG, N_("FILE"), 0, ++ {"add-file", ADD_FILE_OPTION, N_("FILE"), 0, + N_("add given FILE to the archive (useful if its name starts with a dash)"), GRID+1 }, + {"directory", 'C', N_("DIR"), 0, + N_("change to directory DIR"), GRID+1 }, +@@ -190,10 +191,10 @@ names_parse_opt (int key, char *arg, struct argp_state *state) + + case 'T': + name_add_file (arg); +- /* Indicate we've been given -T option. This is for backward +- compatibility only, so that `tar cfT archive /dev/null will +- succeed */ +- files_from_option = true; ++ break; ++ ++ case ADD_FILE_OPTION: ++ name_add_name (arg); + break; + + default: +@@ -651,8 +652,8 @@ struct name_elt /* A name_array element. */ + } v; + }; + +-static struct name_elt *name_head; /* store a list of names */ +-size_t name_count; /* how many of the entries are names? */ ++static struct name_elt *name_head;/* store a list of names */ ++size_t name_count; /* how many of the entries are file names? */ + + static struct name_elt * + name_elt_alloc (void) +@@ -784,6 +785,12 @@ name_list_advance (void) + } + } + ++/* Return true if there are names or options in the list */ ++bool ++name_more_files (void) ++{ ++ return name_count > 0; ++} + + /* Add to name_array the file NAME with fnmatch options MATFLAGS */ + void +@@ -823,6 +830,7 @@ name_add_file (const char *name) + ep->v.file.name = name; + ep->v.file.line = 0; + ep->v.file.fp = NULL; ++ name_count++; + } + + /* Names from external name file. */ +diff --git a/src/tar.c b/src/tar.c +index 35bac38c2793..a361fc2c607f 100644 +--- a/src/tar.c ++++ b/src/tar.c +@@ -813,7 +813,6 @@ struct tar_args /* Variables used during option parsing */ + bool pax_option; /* True if --pax-option was given */ + char const *backup_suffix_string; /* --suffix option argument */ + char const *version_control_string; /* --backup option argument */ +- bool input_files; /* True if some input files where given */ + int compress_autodetect; /* True if compression autodetection should + be attempted when creating archives */ + }; +@@ -1322,7 +1321,6 @@ parse_opt (int key, char *arg, struct argp_state *state) + case ARGP_KEY_ARG: + /* File name or non-parsed option, because of ARGP_IN_ORDER */ + name_add_name (arg); +- args->input_files = true; + break; + + case 'A': +@@ -2179,7 +2177,7 @@ more_options (int argc, char **argv, struct option_locus *loc) + args.loc = loc; + if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_EXIT, &idx, &args)) + abort (); /* shouldn't happen */ +- if (loc->source == OPTS_ENVIRON && args.input_files) ++ if (loc->source == OPTS_ENVIRON && name_more_files ()) + USAGE_ERROR ((0, 0, _("non-option arguments in %s"), loc->name)); + } + +@@ -2221,7 +2219,6 @@ decode_options (int argc, char **argv) + args.pax_option = false; + args.backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX"); + args.version_control_string = 0; +- args.input_files = false; + args.compress_autodetect = false; + + subcommand_option = UNKNOWN_SUBCOMMAND; +@@ -2340,10 +2337,7 @@ decode_options (int argc, char **argv) + + /* Handle operands after any "--" argument. */ + for (; idx < argc; idx++) +- { +- name_add_name (argv[idx]); +- args.input_files = true; +- } ++ name_add_name (argv[idx]); + + /* Derive option values and check option consistency. */ + +@@ -2365,7 +2359,7 @@ decode_options (int argc, char **argv) + + if (occurrence_option) + { +- if (!args.input_files) ++ if (!name_more_files ()) + USAGE_ERROR ((0, 0, + _("--occurrence is meaningless without a file list"))); + if (!IS_SUBCOMMAND_CLASS (SUBCL_OCCUR)) +@@ -2569,7 +2563,7 @@ decode_options (int argc, char **argv) + { + /* --test-label is silent if the user has specified the label name to + compare against. */ +- if (!args.input_files) ++ if (!name_more_files ()) + verbose_option++; + } + else if (utc_option) +@@ -2598,7 +2592,7 @@ decode_options (int argc, char **argv) + switch (subcommand_option) + { + case CREATE_SUBCOMMAND: +- if (!args.input_files && !files_from_option) ++ if (!name_more_files ()) + USAGE_ERROR ((0, 0, + _("Cowardly refusing to create an empty archive"))); + if (args.compress_autodetect && archive_names diff -uNr a/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch b/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch --- a/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch false +++ b/app-arch/tar/files/tar-1.29-extract-pathname-bypass-upstream.patch 31942e8a3a9a7c0c564a7b9e1fd7b3b52d0753906489ed2089c28075d2f0e72dbeb79a8ea79d6e73d792e2ddd91179c846c3ca7d3ffcd0a385be0c9b882262e4 @@ -0,0 +1,60 @@ +https://bugs.gentoo.org/598334 + +From 7340f67b9860ea0531c1450e5aa261c50f67165d Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sat, 29 Oct 2016 21:04:40 -0700 +Subject: [PATCH] When extracting, skip ".." members + +* NEWS: Document this. +* src/extract.c (extract_archive): Skip members whose names +contain "..". +--- + NEWS | 8 +++++++- + src/extract.c | 8 ++++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +--- a/NEWS ++++ b/NEWS +@@ -1,6 +1,16 @@ + GNU tar NEWS - User visible changes. 2016-05-16 + Please send GNU tar bug reports to + ++ ++ ++version 1.29-r2+ Gentoo ++ ++* Member names containing '..' components are now skipped when extracting. ++ ++This fixes tar's behavior to match its documentation, and is a bit ++safer when extracting untrusted archives over old files (an unsafe ++practice that the tar manual has long recommended against). ++ + + version 1.29 - Sergey Poznyakoff, 2016-05-16 + +--- a/src/extract.c ++++ b/src/extract.c +@@ -1629,12 +1629,20 @@ + { + char typeflag; + tar_extractor_t fun; ++ bool skip_dotdot_name; + + fatal_exit_hook = extract_finish; + + set_next_block_after (current_header); + ++ skip_dotdot_name = (!absolute_names_option ++ && contains_dot_dot (current_stat_info.orig_file_name)); ++ if (skip_dotdot_name) ++ ERROR ((0, 0, _("%s: Member name contains '..'"), ++ quotearg_colon (current_stat_info.orig_file_name))); ++ + if (!current_stat_info.file_name[0] ++ || skip_dotdot_name + || (interactive_option + && !confirm ("extract", current_stat_info.file_name))) + { +-- +2.11.0.rc2 + diff -uNr a/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch b/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch --- a/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch false +++ b/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch 90231267470c43db32b0471244c247aea2275293520da78c34e8817fa86b13f498d271f0f2fb187dabdbcfaf69d3c342f90d1478794c8c16e89236ccf19c8a9c @@ -0,0 +1,27 @@ +--- a/lib/paxnames.c 2016-04-06 00:04:47.314860045 +0300 ++++ b/lib/paxnames.c 2016-04-06 02:08:44.962297881 +0300 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + + /* Hash tables of strings. */ +@@ -114,7 +115,15 @@ + for (p = file_name + prefix_len; *p; ) + { + if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2])) +- prefix_len = p + 2 - file_name; ++ { ++ static char const *const diagnostic[] = ++ { ++ N_("%s: Member name contains '..'"), ++ N_("%s: Hard link target contains '..'") ++ }; ++ ERROR ((0, 0, _(diagnostic[link_target]), ++ quotearg_colon (file_name))); ++ } + + do + { diff -uNr a/app-arch/tar/files/tar-1.30-fix-test-92.patch b/app-arch/tar/files/tar-1.30-fix-test-92.patch --- a/app-arch/tar/files/tar-1.30-fix-test-92.patch false +++ b/app-arch/tar/files/tar-1.30-fix-test-92.patch 1d36d145e8d829e433a33e2ea68c8aa21585ea1d5e825ada1a0d4b6a8e1ad0586ab385c82e77d6d127bf24df54f38391f7947cc48371b6fe4375da67fa5d730f @@ -0,0 +1,13 @@ +http://lists.gnu.org/archive/html/bug-tar/2017-12/msg00027.html + +--- a/tests/difflink.at ++++ b/tests/difflink.at +@@ -21,7 +21,7 @@ mkdir a + genfile -f a/x + ln -s x a/y + ln a/y a/z +-tar cf a.tar a ++tar cf a.tar a/x a/y a/z + rm a/z + ln -s x a/z + tar df a.tar diff -uNr a/app-arch/tar/metadata.xml b/app-arch/tar/metadata.xml --- a/app-arch/tar/metadata.xml false +++ b/app-arch/tar/metadata.xml c265857eaf1d2756ac11a81816ff336d4f8f031d73c008627b3f796f18947163596a1e91f59550a9c2524099492fc550834715a719b93fa3a75e68e2faf37329 @@ -0,0 +1,14 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + just install `tar` + + + cpe:/a:gnu:tar + + diff -uNr a/app-arch/tar/tar-1.29-r3.ebuild b/app-arch/tar/tar-1.29-r3.ebuild --- a/app-arch/tar/tar-1.29-r3.ebuild false +++ b/app-arch/tar/tar-1.29-r3.ebuild 3a99e4834ee9938d9aac506cb3afc254146bc416f2b7a1e07fb9fd0166b51c161f344462a0588b531ee6db06fca0806f1dd9f02a6b277731562a2e8dc8ba92b0 @@ -0,0 +1,81 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit flag-o-matic eutils + +DESCRIPTION="Use this to make tarballs :)" +HOMEPAGE="https://www.gnu.org/software/tar/" +SRC_URI="mirror://gnu/tar/${P}.tar.bz2 + mirror://gnu-alpha/tar/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr" + +RDEPEND="acl? ( virtual/acl ) + selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND} + nls? ( >=sys-devel/gettext-0.10.35 ) + xattr? ( elibc_glibc? ( sys-apps/attr ) )" + +PATCHES=( + "${FILESDIR}/${P}-extract-pathname-bypass-upstream.patch" #598334 + "${FILESDIR}/${P}-add-files.patch" +) + +src_prepare() { + epatch "${PATCHES[@]}" + epatch_user + + if ! use userland_GNU ; then + sed -i \ + -e 's:/backup\.sh:/gbackup.sh:' \ + scripts/{backup,dump-remind,restore}.in \ + || die "sed non-GNU" + fi +} + +src_configure() { + use static && append-ldflags -static + FORCE_UNSAFE_CONFIGURE=1 \ + econf \ + --enable-backup-scripts \ + --bindir="${EPREFIX}"/bin \ + --libexecdir="${EPREFIX}"/usr/sbin \ + $(usex userland_GNU "" "--program-prefix=g") \ + $(use_with acl posix-acls) \ + $(use_enable nls) \ + $(use_with selinux) \ + $(use_with xattr xattrs) +} + +src_install() { + default + + local p=$(usex userland_GNU "" "g") + if [[ -z ${p} ]] ; then + # a nasty yet required piece of baggage + exeinto /etc + doexe "${FILESDIR}"/rmt + fi + + # autoconf looks for gtar before tar (in configure scripts), hence + # in Prefix it is important that it is there, otherwise, a gtar from + # the host system (FreeBSD, Solaris, Darwin) will be found instead + # of the Prefix provided (GNU) tar + if use prefix ; then + dosym tar /bin/gtar + fi + + mv "${ED}"/usr/sbin/${p}backup{,-tar} || die + mv "${ED}"/usr/sbin/${p}restore{,-tar} || die + + if use minimal ; then + find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ + -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ + -delete || die + fi +} diff -uNr a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest --- a/app-arch/unzip/Manifest false +++ b/app-arch/unzip/Manifest fee4982db60c0e56333fef62549cc1163b46ea5585e3816c3d65ec02d3b5613bcaa18be33a5545114d8f9addbedf6ff9ab99a6ee2b7ec87f8e87452a10d743da @@ -0,0 +1,7 @@ +AUX unzip-6.0-format-security.patch 4424 BLAKE2B c76ac7c9874238ff20c85e35d8bab809c4b668ff22eb93a3ac614653ab3843fbd80aebb552d285640b13f38f5bb264f6fe3c192b1d30128dfbd33fd9f28da40f SHA512 78340a1a16ed1951e5311fcfb76e38ec58ec0b6dcd74951624dc7778e41ae067d7dba38f394ed3a03436df197582f5d47c49e7c2d62d04c4fcd974eedb9bc726 +AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1ddfee1abc810e57cef52780482abd8c25950cf0da4d976d89745f4aa65b6269f21d0eac290230621b782fa1e0d06 SHA512 189ce2045430d2d04e27049672a3cfb205319edab1ac1522700a7f89344e5718235d8a15238390f6b4317af493796a65cac6a83f7dceb402bc736628d7a89cda +AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d616662e3fa706bcb9813707af3f2bfebff1a2b4290d943718ca35aa2ce098f20b5d370a624c1a16b81d4e921a3bdeb SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5 +DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d +DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 +EBUILD unzip-6.0_p21-r2.ebuild 2603 BLAKE2B 3048169f536561dbefb24bdf58a6d6bd9cd765debea8a96d29af7583313a73d20de06c18301df70205bec6c4829aa6dc54340413a758a5aeb249b4ee5f567f9f SHA512 66197722dae7909378d5b7f66c81924ca1a6d04947549460708bf63aaf19e833fb958b0d5b0e90e07900c25cdb14530983fc98132f8509f779a254e0434d2e61 +MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653 diff -uNr a/app-arch/unzip/files/unzip-6.0-format-security.patch b/app-arch/unzip/files/unzip-6.0-format-security.patch --- a/app-arch/unzip/files/unzip-6.0-format-security.patch false +++ b/app-arch/unzip/files/unzip-6.0-format-security.patch 4049ff47d8aa7194caa8633e9f153de4ac60267d0f8eda1b84ad8fa4784cf1482c75abe7c7abd11b0a1f48b5ecf722c35aa3e08c3355b0166a40a879f5e184e4 @@ -0,0 +1,91 @@ +Fix build with -Werror=format-security + +Origin: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=master-next&id=f7d80257afcfefdc85b6745328f2d12b957a848b +Author: Edwin Plauchu + +diff --git a/extract.c b/extract.c +index 7cd9123..25c5a62 100644 +--- a/extract.c ++++ b/extract.c +@@ -475,7 +475,7 @@ int extract_or_test_files(__G) /* return PK-type error code */ + Info(slide, 0x401, ((char *)slide, + LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1)); + Info(slide, 0x401, ((char *)slide, +- LoadFarString(ReportMsg))); ++ "%s",LoadFarString(ReportMsg))); + error_in_archive = PK_BADERR; + } + reached_end = TRUE; /* ...so no more left to do */ +@@ -754,8 +754,8 @@ int extract_or_test_files(__G) /* return PK-type error code */ + + #ifndef SFX + if (no_endsig_found) { /* just to make sure */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); +- Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg))); ++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(ReportMsg))); + if (!error_in_archive) /* don't overwrite stronger error */ + error_in_archive = PK_WARN; + } +diff --git a/list.c b/list.c +index 15e0011..0b484f6 100644 +--- a/list.c ++++ b/list.c +@@ -181,7 +181,7 @@ int list_files(__G) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide, "%s", LoadFarString(ReportMsg))); + return PK_BADERR; /* sig not found */ + } + } +@@ -507,7 +507,7 @@ int list_files(__G) /* return PK-type error code */ + && (!G.ecrec.is_zip64_archive) + && (memcmp(G.sig, end_central_sig, 4) != 0) + ) { /* just to make sure again */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; /* didn't find sig */ + } + +@@ -591,7 +591,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide, "%s", LoadFarString(ReportMsg))); + return PK_BADERR; /* sig not found */ + } + } +@@ -674,7 +674,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ + ---------------------------------------------------------------------------*/ + + if (memcmp(G.sig, end_central_sig, 4)) { /* just to make sure again */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; + } + if (*nmember == 0L && error_in_archive <= PK_WARN) +diff --git a/zipinfo.c b/zipinfo.c +index 0ac75b3..1e7fa82 100644 +--- a/zipinfo.c ++++ b/zipinfo.c +@@ -833,7 +833,7 @@ int zipinfo(__G) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide, "%s", LoadFarString(ReportMsg))); + error_in_archive = PK_BADERR; /* sig not found */ + break; + } +@@ -1022,7 +1022,7 @@ int zipinfo(__G) /* return PK-type error code */ + && (!G.ecrec.is_zip64_archive) + && (memcmp(G.sig, end_central_sig, 4) != 0) + ) { /* just to make sure again */ +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; /* didn't find sig */ + } + diff -uNr a/app-arch/unzip/files/unzip-6.0-natspec.patch b/app-arch/unzip/files/unzip-6.0-natspec.patch --- a/app-arch/unzip/files/unzip-6.0-natspec.patch false +++ b/app-arch/unzip/files/unzip-6.0-natspec.patch 4a2c3ffd1062ae4e5aa73f5d110cb77cc6fcf7322da3769abe31fb07becba31488147c820dda29b60fb5791f709b5600811a46fa538824af4362150f0e2a7aa8 @@ -0,0 +1,372 @@ +This patch makes zip use libnatspec to recode file names is national charset. +Initially this patch was written for altlinux: +http://sisyphus.ru/ru/srpm/Sisyphus/zip/patches + +Later it was a bit improved and improved version was posted here (in Russian): +http://www.opennet.ru/tips/info/2494.shtml + +Gentoo reference: +https://bugs.gentoo.org/show_bug.cgi?id=275244 + +diff -pur unzip60orig/unix/configure unzip60/unix/configure +--- unzip60orig/unix/configure 2009-04-16 23:25:12.000000000 +0400 ++++ unzip60/unix/configure 2010-11-26 19:07:43.000000000 +0300 +@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS} + IZ_BZIP2=${3} + CFLAGS="${CFLAGS} -I. -DUNIX" + LFLAGS1="" +-LFLAGS2="-s" ++LFLAGS2="-l natspec" + LN="ln -s" + + CFLAGS_OPT='' +diff -pur unzip60orig/unix/Makefile unzip60/unix/Makefile +--- unzip60orig/unix/Makefile 2009-01-19 01:41:18.000000000 +0300 ++++ unzip60/unix/Makefile 2010-11-29 14:25:58.461000001 +0300 +@@ -45,14 +45,14 @@ + CC = cc# try using "gcc" target rather than changing this (CC and LD + LD = $(CC)# must match, else "unresolved symbol: ___main" is possible) + AS = as +-LOC = $(D_USE_BZ2) $(LOCAL_UNZIP) ++LOC = $(D_USE_BZ2) -DNO_SETLOCALE $(LOCAL_UNZIP) + AF = $(LOC) + CFLAGS = -O + CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC) + CF = $(CFLAGS) $(CF_NOOPT) + LFLAGS1 = + LF = -o unzip$E $(LFLAGS1) +-LF2 = -s ++LF2 = -l natspec + + # UnZipSFX flags + SL = -o unzipsfx$E $(LFLAGS1) +@@ -121,7 +121,7 @@ INSTALL_PROGRAM = $(INSTALL) + INSTALL_D = mkdir -p + # on some systems, manext=l and MANDIR=/usr/man/man$(manext) may be appropriate + manext = 1 +-prefix = /usr/local ++prefix = /usr + BINDIR = $(prefix)/bin# where to install executables + MANDIR = $(prefix)/man/man$(manext)# where to install man pages + INSTALLEDBIN = $(BINDIR)/funzip$E $(BINDIR)/unzip$E $(BINDIR)/unzipsfx$E \ +diff -pur unzip60orig/unix/unix.c unzip60/unix/unix.c +--- unzip60orig/unix/unix.c 2009-01-24 02:31:26.000000000 +0300 ++++ unzip60/unix/unix.c 2010-11-26 16:58:35.000000000 +0300 +@@ -30,6 +30,9 @@ + #define UNZIP_INTERNAL + #include "unzip.h" + ++#include ++#include ++ + #ifdef SCO_XENIX + # define SYSNDIR + #else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */ +@@ -1874,3 +1877,44 @@ static void qlfix(__G__ ef_ptr, ef_len) + } + } + #endif /* QLZIP */ ++ ++ ++char OEM_CP[MAX_CP_NAME] = ""; ++char ISO_CP[MAX_CP_NAME] = ""; ++ ++/* Getr the default value of OEM_CP based on the current locale. ++ * ISO_CP is left alone for now. */ ++void init_conversion_charsets() ++{ ++ /* Make a guess only if OEM_CP not already set. */ ++ if(*OEM_CP == '\0') { ++ const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, ""); ++ strncpy(OEM_CP, archive_charset, sizeof(OEM_CP)); ++ } ++ ++ if(*ISO_CP == '\0') { ++ const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_WINCS, ""); ++ strncpy(ISO_CP, archive_charset, sizeof(ISO_CP)); ++ } ++ ++} ++ ++/* Convert a string from OEM_CP to the current locale charset. */ ++inline void oem_intern(char *string) ++{ ++ char *buf = natspec_convert(string, 0, OEM_CP, 0); ++ /* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE], ++ use FILNAMSIZ as string size */ ++ strncpy(string, buf, FILNAMSIZ); ++ free (buf); ++} ++ ++/* Convert a string from ISO_CP to the current locale charset. */ ++inline void iso_intern(char *string) ++{ ++ char *buf = natspec_convert(string, 0, ISO_CP, 0); ++ /* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE], ++ use FILNAMSIZ as string size */ ++ strncpy(string, buf, FILNAMSIZ); ++ free (buf); ++} +diff -pur unzip60orig/unix/unxcfg.h unzip60/unix/unxcfg.h +--- unzip60orig/unix/unxcfg.h 2009-04-16 22:36:12.000000000 +0400 ++++ unzip60/unix/unxcfg.h 2010-11-26 16:58:35.000000000 +0300 +@@ -227,4 +227,30 @@ typedef struct stat z_stat; + /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */ + /* and notfirstcall are used by do_wild(). */ + ++ ++#define MAX_CP_NAME 25 ++ ++#ifdef SETLOCALE ++# undef SETLOCALE ++#endif ++#define SETLOCALE(category, locale) setlocale(category, locale) ++#include ++ ++#ifdef _ISO_INTERN ++# undef _ISO_INTERN ++#endif ++#define _ISO_INTERN(str1) iso_intern(str1) ++ ++#ifdef _OEM_INTERN ++# undef _OEM_INTERN ++#endif ++#ifndef IZ_OEM2ISO_ARRAY ++# define IZ_OEM2ISO_ARRAY ++#endif ++#define _OEM_INTERN(str1) oem_intern(str1) ++ ++void iso_intern(char *); ++void oem_intern(char *); ++void init_conversion_charsets(void); ++ + #endif /* !__unxcfg_h */ +diff -pur unzip60orig/unzip.c unzip60/unzip.c +--- unzip60orig/unzip.c 2009-04-16 22:26:52.000000000 +0400 ++++ unzip60/unzip.c 2010-11-26 16:58:35.000000000 +0300 +@@ -331,7 +331,9 @@ static ZCONST char Far ZipInfoUsageLine3 + -h print header line -t print totals for listed files or for all\n\ + -z print zipfile comment -T print file times in sortable decimal format\ + \n -C be case-insensitive %s\ +- -x exclude filenames that follow from listing\n"; ++ -x exclude filenames that follow from listing\n\ ++ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\ ++ -I CHARSET specify a character encoding for UNIX and other archives\n"; + #ifdef MORE + static ZCONST char Far ZipInfoUsageLine4[] = + " -M page output through built-in \"more\"\n"; +@@ -673,7 +674,9 @@ modifiers:\n\ + -j junk paths (do not make directories) -aa treat ALL files as text\n\ + -U use escapes for all non-ASCII Unicode -UU ignore any Unicode fields\n\ + -C match filenames case-insensitively -L make (some) names \ +-lowercase\n %-42s -V retain VMS version numbers\n%s"; ++lowercase\n %-42s -V retain VMS version numbers\n%s\ ++ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\ ++ -I CHARSET specify a character encoding for UNIX and other archives\n"; + #endif /* ?VMS */ + #else /* !UNICODE_SUPPORT */ + #ifdef VMS +@@ -692,7 +695,9 @@ modifiers:\n\ + -o overwrite files WITHOUT prompting -a auto-convert any text files\n\ + -j junk paths (do not make directories) -aa treat ALL files as text\n\ + -C match filenames case-insensitively -L make (some) names \ +-lowercase\n %-42s -V retain VMS version numbers\n%s"; ++lowercase\n %-42s -V retain VMS version numbers\n%s\ ++ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\ ++ -I CHARSET specify a character encoding for UNIX and other archives\n"; + #endif /* ?VMS */ + #endif /* ?UNICODE_SUPPORT */ + +@@ -803,6 +808,10 @@ int unzip(__G__ argc, argv) + #endif /* UNICODE_SUPPORT */ + + ++#ifdef UNIX ++ init_conversion_charsets(); ++#endif ++ + #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__)) + extern void DebugMalloc(void); + +@@ -1336,6 +1345,11 @@ int uz_opts(__G__ pargc, pargv) + argc = *pargc; + argv = *pargv; + ++#ifdef UNIX ++ extern char OEM_CP[MAX_CP_NAME]; ++ extern char ISO_CP[MAX_CP_NAME]; ++#endif ++ + while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) { + s = *argv + 1; + while ((c = *s++) != 0) { /* "!= 0": prevent Turbo C warning */ +@@ -1517,6 +1531,35 @@ int uz_opts(__G__ pargc, pargv) + } + break; + #endif /* MACOS */ ++#ifdef UNIX ++ case ('I'): ++ if (negative) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: encodings can't be negated")); ++ return(PK_PARAM); ++ } else { ++ if(*s) { /* Handle the -Icharset case */ ++ /* Assume that charsets can't start with a dash to spot arguments misuse */ ++ if(*s == '-') { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ } else { /* -I charset */ ++ ++argv; ++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ s = *argv; ++ strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ } ++ while(*(++s)); /* No params straight after charset name */ ++ } ++ break; ++#endif /* ?UNIX */ + case ('j'): /* junk pathnames/directory structure */ + if (negative) + uO.jflag = FALSE, negative = 0; +@@ -1592,6 +1635,35 @@ int uz_opts(__G__ pargc, pargv) + } else + ++uO.overwrite_all; + break; ++#ifdef UNIX ++ case ('O'): ++ if (negative) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: encodings can't be negated")); ++ return(PK_PARAM); ++ } else { ++ if(*s) { /* Handle the -Ocharset case */ ++ /* Assume that charsets can't start with a dash to spot arguments misuse */ ++ if(*s == '-') { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ } else { /* -O charset */ ++ ++argv; ++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -O argument")); ++ return(PK_PARAM); ++ } ++ s = *argv; ++ strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ } ++ while(*(++s)); /* No params straight after charset name */ ++ } ++ break; ++#endif /* ?UNIX */ + case ('p'): /* pipes: extract to stdout, no messages */ + if (negative) { + uO.cflag = FALSE; +diff -pur unzip60orig/unzpriv.h unzip60/unzpriv.h +--- unzip60orig/unzpriv.h 2009-04-20 03:59:26.000000000 +0400 ++++ unzip60/unzpriv.h 2010-11-26 16:58:35.000000000 +0300 +@@ -3008,7 +3008,7 @@ char *GetLoadPath OF((__GPRO)); + !(((islochdr) || (isuxatt)) && \ + ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \ + (hostnum) == FS_HPFS_ || \ +- ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \ ++ ((hostnum) == FS_NTFS_/* && (hostver) == 50*/)) { \ + _OEM_INTERN((string)); \ + } else { \ + _ISO_INTERN((string)); \ +diff -pur unzip60orig/zipinfo.c unzip60/zipinfo.c +--- unzip60orig/zipinfo.c 2009-02-08 20:04:30.000000000 +0300 ++++ unzip60/zipinfo.c 2010-11-26 16:58:35.000000000 +0300 +@@ -457,6 +457,10 @@ int zi_opts(__G__ pargc, pargv) + int tflag_slm=TRUE, tflag_2v=FALSE; + int explicit_h=FALSE, explicit_t=FALSE; + ++#ifdef UNIX ++ extern char OEM_CP[MAX_CP_NAME]; ++ extern char ISO_CP[MAX_CP_NAME]; ++#endif + + #ifdef MACOS + uO.lflag = LFLAG; /* reset default on each call */ +@@ -501,6 +505,35 @@ int zi_opts(__G__ pargc, pargv) + uO.lflag = 0; + } + break; ++#ifdef UNIX ++ case ('I'): ++ if (negative) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: encodings can't be negated")); ++ return(PK_PARAM); ++ } else { ++ if(*s) { /* Handle the -Icharset case */ ++ /* Assume that charsets can't start with a dash to spot arguments misuse */ ++ if(*s == '-') { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ } else { /* -I charset */ ++ ++argv; ++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ s = *argv; ++ strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ } ++ while(*(++s)); /* No params straight after charset name */ ++ } ++ break; ++#endif /* ?UNIX */ + case 'l': /* longer form of "ls -l" type listing */ + if (negative) + uO.lflag = -2, negative = 0; +@@ -521,6 +554,35 @@ int zi_opts(__G__ pargc, pargv) + G.M_flag = TRUE; + break; + #endif ++#ifdef UNIX ++ case ('O'): ++ if (negative) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: encodings can't be negated")); ++ return(PK_PARAM); ++ } else { ++ if(*s) { /* Handle the -Ocharset case */ ++ /* Assume that charsets can't start with a dash to spot arguments misuse */ ++ if(*s == '-') { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ } else { /* -O charset */ ++ ++argv; ++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -O argument")); ++ return(PK_PARAM); ++ } ++ s = *argv; ++ strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ } ++ while(*(++s)); /* No params straight after charset name */ ++ } ++ break; ++#endif /* ?UNIX */ + case 's': /* default: shorter "ls -l" type listing */ + if (negative) + uO.lflag = -2, negative = 0; diff -uNr a/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch b/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch --- a/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch false +++ b/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch cf2a78feea53882abf8afbe7cd6f9bc3cdbf54a3ca012e5c4c90efbd9b6e3ca90f1f77641b5cdef3165704098ed5171dd0dd40e75d5855cb45f5b90a0d368e43 @@ -0,0 +1,13 @@ +Make sure that the asm files don't incorrectly trigger an executable +stack marking in the final shared library. That's bad, mmmkay. + +--- unzip/crc_i386.S ++++ unzip/crc_i386.S +@@ -302,3 +302,7 @@ + #endif /* i386 || _i386 || _I386 || __i386 */ + + #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */ ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff -uNr a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml --- a/app-arch/unzip/metadata.xml false +++ b/app-arch/unzip/metadata.xml b8bfffbae1464a5db858a02cf7a97c90b116974a3cd65869e3ce0b99cdd772dbbd5b74cadca7700f8ff367784f036c411b2ee9bbf1d73bbd2213c23da4e6caac @@ -0,0 +1,14 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows. + + + infozip + + diff -uNr a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild --- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild false +++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild d3b1658bb8c11c650cce585f963463841a641474adfe1680ab33ab096424445b52e45029b89addc5f1a399a9f6b9d43a1e6595f2dd5b94dd3678a30f2447838b @@ -0,0 +1,86 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils toolchain-funcs flag-o-matic + +MY_PV="${PV//.}" +MY_PV="${MY_PV%_p*}" +MY_P="${PN}${MY_PV}" + +DESCRIPTION="unzipper for pkzip-compressed files" +HOMEPAGE="http://www.info-zip.org/" +SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz + mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" + +LICENSE="Info-ZIP" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +IUSE="bzip2 natspec unicode" + +DEPEND="bzip2? ( app-arch/bzip2 ) + natspec? ( dev-libs/libnatspec )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + local deb="${WORKDIR}"/debian/patches + rm "${deb}"/02-this-is-debian-unzip.patch || die + eapply "${deb}"/*.patch + + eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch + eapply "${FILESDIR}"/${PN}-6.0-format-security.patch + use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 + sed -i -r \ + -e '/^CFLAGS/d' \ + -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ + -e '/^STRIP/s:=.*:=true:' \ + -e "s:\:CC=\"$(tc-getCC)\":" \ + -e "s:\:LD=\"$(tc-getCC)\":" \ + -e "s:\:AS=\"$(tc-getCC)\":" \ + -e 's:LF2 = -s:LF2 = :' \ + -e 's:LF = :LF = $(LDFLAGS) :' \ + -e 's:SL = :SL = $(LDFLAGS) :' \ + -e 's:FL = :FL = $(LDFLAGS) :' \ + -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \ + -e 's:$(AS) :$(AS) $(ASFLAGS) :g' \ + unix/Makefile \ + || die "sed unix/Makefile failed" + + # Delete bundled code to make sure we don't use it. + rm -r bzip2 || die + + eapply_user +} + +src_configure() { + case ${CHOST} in + i?86*-*linux*) TARGET="linux_asm" ;; + *linux*) TARGET="linux_noasm" ;; + i?86*-*bsd* | \ + i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm + *bsd* | *dragonfly*) TARGET="bsd" ;; + *-darwin*) TARGET="macosx" ;; + *-cygwin*) TARGET="cygwin" ;; + *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; + esac + + [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD + use bzip2 && append-cppflags -DUSE_BZIP2 + use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING + append-cppflags -DLARGE_FILE_SUPPORT #281473 +} + +src_compile() { + ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ + emake -f unix/Makefile ${TARGET} +} + +src_install() { + dobin unzip funzip unzipsfx unix/zipgrep + dosym unzip /usr/bin/zipinfo + doman man/*.1 + dodoc BUGS History* README ToDo WHERE +} diff -uNr a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest --- a/app-arch/xz-utils/Manifest false +++ b/app-arch/xz-utils/Manifest 42fc4b09009f2f2105f60faf77482358ddcb198b43d9e5fb08fe2ff1ebbaa331d46c1a73732ebeaf19a99e5094dbf8673a1162fa722a22e03b1c6437f480b699 @@ -0,0 +1,3 @@ +DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6 +EBUILD xz-utils-5.2.3.ebuild 2600 BLAKE2B 3543e5f2c3021c9243b4484359fefd4705d6f7cef894ea14aa54190ff07f7b75e63996efcbd7c809b3125084c572b0141902bda3afce0bffd004ca43912818f8 SHA512 1e60ce955c6b67554ba5e59d1d7eb7d4ed37b830c4ea2d039732232057039a6b4a5b626bc333f93fa61e63c967ba3a33514427466e7ecdbb7db8e12f289950f4 +MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1 diff -uNr a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml --- a/app-arch/xz-utils/metadata.xml false +++ b/app-arch/xz-utils/metadata.xml da8eaf8a57950e487af8c676c53bb0f53a3e272cea262fbce541a3de6ce58f3f21800ea403208bf32b8bd38b26fed1ca0dc3074062d0597a7d096f6414f06c68 @@ -0,0 +1,13 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + Build additional filters that are not + used in any of the default xz presets. This includes delta + and BCJ coders, additional match finders and SHA256 checks. + + diff -uNr a/app-arch/xz-utils/xz-utils-5.2.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild --- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild false +++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild 0172eea04de283c31eb633518a1bc483014548dee94ebf5277dbcb6a812b441a3455cb0ea1cc173e3850f98bce44e93473bef9c283fd964a0041dd556c4a483c @@ -0,0 +1,91 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Remember: we cannot leverage autotools in this ebuild in order +# to avoid circular deps with autotools + +EAPI=5 + +inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.tukaani.org/xz.git" + inherit git-r3 autotools + SRC_URI="" + EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068 +else + MY_P="${PN/-utils}-${PV/_}" + SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + S=${WORKDIR}/${MY_P} + EXTRA_DEPEND= +fi + +DESCRIPTION="utils for managing LZMA compressed files" +HOMEPAGE="https://tukaani.org/xz/" + +# See top-level COPYING file as it outlines the various pieces and their licenses. +LICENSE="public-domain LGPL-2.1+ GPL-2+" +SLOT="0" +IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads" + +RDEPEND="! +Date: Mon, 8 May 2017 13:52:39 +0200 +Subject: [PATCH] gpg: Fix typo. + +-- +Signed-off-by: Justus Winter +--- + g10/packet.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/g10/packet.h b/g10/packet.h +index a10495c..d42510d 100644 +--- a/g10/packet.h ++++ b/g10/packet.h +@@ -623,7 +623,7 @@ struct parse_packet_ctx_s + iobuf_t inp; /* The input stream with the packets. */ + struct packet_struct last_pkt; /* The last parsed packet. */ + int free_last_pkt; /* Indicates that LAST_PKT must be freed. */ +- int skip_meta; /* Skip right trust packets. */ ++ int skip_meta; /* Skip ring trust packets. */ + }; + typedef struct parse_packet_ctx_s *parse_packet_ctx_t; + +-- +2.10.2 + diff -uNr a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch --- a/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch false +++ b/app-crypt/gnupg/files/gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch 5e2fcc20004da01abdcffdaf0c1a7f14ac9664284915df6eb9449be98028bfba6f061733d0f4ebb0e567fb0e98591577138238dfbc7972eb5ab788929380142d @@ -0,0 +1,86 @@ +From 22739433e98be80e46fe7d01d52a9627c1aebaae Mon Sep 17 00:00:00 2001 +From: Justus Winter +Date: Mon, 8 May 2017 14:24:00 +0200 +Subject: [PATCH] gpg: Properly account for ring trust packets. + +* g10/keyring.c (keyring_get_keyblock): Use the parser's packet count +instead of counting ourself. +* g10/packet.h (struct parse_packet_ctx_s): New field +'n_parsed_packets'. +(init_parse_packet): Initialize new field. +* g10/parse-packet.c (parse): Count packets. +-- + +The 'keyring' keystore depends on the number of packets for delete and +update operations. With the rework of the ring trust packets, the +trust packets were no longer properly accounted for leading to keyring +corruptions. + +The 'keybox' store was not affected. + +GnuPG-bug-id: 3123 +GnuPG-bug-id: 3135 +GnuPG-bug-id: 3144 +Fixes-commit: a8895c99a7d0750132477d80cd66caaf3a709113 +Signed-off-by: Justus Winter +--- + g10/keyring.c | 4 ++-- + g10/packet.h | 2 ++ + g10/parse-packet.c | 3 +++ + 3 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/g10/keyring.c b/g10/keyring.c +index e223f0f..50f1b82 100644 +--- a/g10/keyring.c ++++ b/g10/keyring.c +@@ -409,11 +409,11 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb) + pkt = xmalloc (sizeof *pkt); + init_packet (pkt); + init_parse_packet (&parsectx, a); +- hd->found.n_packets = 0;; ++ hd->found.n_packets = 0; + lastnode = NULL; + save_mode = set_packet_list_mode(0); + while ((rc=parse_packet (&parsectx, pkt)) != -1) { +- hd->found.n_packets++; ++ hd->found.n_packets = parsectx.n_parsed_packets; + if (gpg_err_code (rc) == GPG_ERR_UNKNOWN_PACKET) { + free_packet (pkt, &parsectx); + init_packet (pkt); +diff --git a/g10/packet.h b/g10/packet.h +index d42510d..cf2121c 100644 +--- a/g10/packet.h ++++ b/g10/packet.h +@@ -624,6 +624,7 @@ struct parse_packet_ctx_s + struct packet_struct last_pkt; /* The last parsed packet. */ + int free_last_pkt; /* Indicates that LAST_PKT must be freed. */ + int skip_meta; /* Skip ring trust packets. */ ++ unsigned int n_parsed_packets; /* Number of parsed packets. */ + }; + typedef struct parse_packet_ctx_s *parse_packet_ctx_t; + +@@ -633,6 +634,7 @@ typedef struct parse_packet_ctx_s *parse_packet_ctx_t; + (a)->last_pkt.pkt.generic= NULL;\ + (a)->free_last_pkt = 0; \ + (a)->skip_meta = 0; \ ++ (a)->n_parsed_packets = 0; \ + } while (0) + + #define deinit_parse_packet(a) do { \ +diff --git a/g10/parse-packet.c b/g10/parse-packet.c +index fa44f83..dbb7af8 100644 +--- a/g10/parse-packet.c ++++ b/g10/parse-packet.c +@@ -764,6 +764,9 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos, + partial? (new_ctb ? " partial" : " indeterminate") :"", + new_ctb? " new-ctb":""); + ++ /* Count it. */ ++ ctx->n_parsed_packets++; ++ + pkt->pkttype = pkttype; + rc = GPG_ERR_UNKNOWN_PACKET; /* default error */ + switch (pkttype) +-- +2.10.2 + diff -uNr a/app-crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch --- a/app-crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch false +++ b/app-crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch e3982af208293640515bf44807f8192e59b21c14eaadd6499f095ca5a35a058b8561feed3e0bb5aa62197789fd457112d6df353167cddf0c053c48644037191c @@ -0,0 +1,33 @@ +From e3bdb7d17264b8d5bd9abab97c96d9c4a50e4f61 Mon Sep 17 00:00:00 2001 +From: Kristian Fiskerstrand +Date: Mon, 3 Apr 2017 23:44:56 +0300 +Subject: [PATCH] gpgscm: Use shorter socket path lengts to improve test + reliability + +-- +As socket lengths are normally restricted to 108 characters +(UNIX_PATH_MAX variable in /usr/include/linux/un.h), using 42 characters +by default easily results in errors. +--- + tests/gpgscm/tests.scm | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm +index 592b36f..f54a387 100644 +--- a/tests/gpgscm/tests.scm ++++ b/tests/gpgscm/tests.scm +@@ -273,9 +273,9 @@ + (canonical-path (_mkdtemp (if (null? components) + (path-join + (get-temp-path) +- (string-append "gpgscm-" (get-isotime) "-" ++ (string-append "gscm" + (basename-suffix *scriptname* ".scm") +- "-XXXXXX")) ++ "XXXXXX")) + (apply path-join components))))) + + ;; Make a temporary directory and remove it at interpreter shutdown. +-- +2.10.2 + diff -uNr a/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch b/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch --- a/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch false +++ b/app-crypt/gnupg/files/gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch 1cf29dad555232545e7246710a2081001b6c01d23389101f3bb72c1184560160dcb74b0a8c40fafaa5f54400bb4e910a0075f0cf6865d63f659fac69078bf388 @@ -0,0 +1,31 @@ +From b7f48a0095a5b010b94f8192f4adc1adf8697567 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 31 Jan 2018 16:57:19 +0100 +Subject: [PATCH] dirmngr: Handle failures related to missing IPv6 gracefully + +Handle the two possible connect failures related to missing IPv6 support +gracefully by marking the host dead and retrying with another one. +If IPv6 is disabled via procfs, connect() will return EADDRNOTAVAIL. +If IPv6 is not compiled into the kernel, it will return EAFNOSUPPORT. +This makes it possible to use dual-stack hkp servers on hosts not having +IPv6 without random connection failures. +--- + dirmngr/ks-engine-hkp.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c +index 4a0b08f4f..a9bb93666 100644 +--- a/dirmngr/ks-engine-hkp.c ++++ b/dirmngr/ks-engine-hkp.c +@@ -1353,6 +1353,8 @@ handle_send_request_error (ctrl_t ctrl, gpg_error_t err, const char *request, + case GPG_ERR_UNKNOWN_HOST: + case GPG_ERR_NETWORK: + case GPG_ERR_EIO: /* Sometimes used by estream cookie functions. */ ++ case GPG_ERR_EADDRNOTAVAIL: /* e.g. when IPv6 is disabled */ ++ case GPG_ERR_EAFNOSUPPORT: /* e.g. when IPv6 is not compiled in */ + if (mark_host_dead (request) && *tries_left) + retry = 1; + break; +-- +2.16.1 + diff -uNr a/app-crypt/gnupg/gnupg-1.4.21.ebuild b/app-crypt/gnupg/gnupg-1.4.21.ebuild --- a/app-crypt/gnupg/gnupg-1.4.21.ebuild false +++ b/app-crypt/gnupg/gnupg-1.4.21.ebuild a4179354a71ec1e0785cfdad65e8fe8ff505667e8144079b66e23b2349d25f4b95f17d4b6393137b05d7016b217dd889cc67bdb7505c61923127050b3383ac12 @@ -0,0 +1,114 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs + +ECCVER="0.2.0" +ECCVER_GNUPG="1.4.9" +ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff" +MY_P=${P/_/} + +DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement" +HOMEPAGE="http://www.gnupg.org/" +SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib" + +COMMON_DEPEND=" + ldap? ( net-nds/openldap ) + bzip2? ( app-arch/bzip2 ) + zlib? ( sys-libs/zlib ) + curl? ( net-misc/curl ) + mta? ( virtual/mta ) + readline? ( sys-libs/readline:0= ) + smartcard? ( =virtual/libusb-0* ) + usb? ( =virtual/libusb-0* )" + +RDEPEND="!static? ( ${COMMON_DEPEND} ) + selinux? ( sec-policy/selinux-gpg ) + nls? ( virtual/libintl )" + +DEPEND="${COMMON_DEPEND} + dev-lang/perl + nls? ( sys-devel/gettext )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # bug#469388 + sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in + + # Fix PIC definitions + sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \ + || die "sed PIC failed" + sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \ + die "sed PIC failed" +} + +src_configure() { + # Certain sparc32 machines seem to have trouble building correctly with + # -mcpu enabled. While this is not a gnupg problem, it is a temporary + # fix until the gcc problem can be tracked down. + if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then + filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7 + fi + + # 'USE=static' support was requested in #29299 + use static && append-ldflags -static + + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable ldap) \ + $(use_enable mta mailto) \ + --enable-hkp \ + --enable-finger \ + $(use_with !zlib included-zlib) \ + $(use_with curl libcurl /usr) \ + $(use_enable nls) \ + $(use_enable bzip2) \ + $(use_enable smartcard card-support) \ + $(use_enable selinux selinux-support) \ + --without-capabilities \ + $(use_with readline) \ + $(use_with usb libusb /usr) \ + --enable-static-rnd=linux \ + --libexecdir="${EPREFIX}/usr/libexec" \ + --enable-noexecstack \ + CC_FOR_BUILD=$(tc-getBUILD_CC) \ + ${myconf} +} + +src_install() { + default + + # keep the documentation in /usr/share/doc/... + rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die + + dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \ + TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP} + + exeinto /usr/libexec/gnupg + doexe tools/make-dns-cert +} + +pkg_postinst() { + ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9," + ewarn "you MUST make the gpg binary setuid." + echo +# if use !bindist && use ecc; then +# ewarn +# ewarn "The elliptical curves patch is experimental" +# ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html" +# fi + elog + elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg" + elog + elog "If you wish to view images emerge:" + elog "media-gfx/xloadimage, media-gfx/xli or any other viewer" + elog "Remember to use photo-viewer option in configuration file to activate the right viewer" +} diff -uNr a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml --- a/app-crypt/gnupg/metadata.xml false +++ b/app-crypt/gnupg/metadata.xml 259af91109664e2a07af4167adabef2cd3453371c9847ff090e23b86716a7cd67003fb5f2a7958fa12348eda8ca81cc2ab4ca7380734a2ed901c1f5209defb78 @@ -0,0 +1,38 @@ + + + + + k_f@gentoo.org + Kristian Fiskerstrand + + + crypto@gentoo.org + Crypto + + + GnuPG is a complete and free implementation of the OpenPGP standard as + defined by RFC4880. + + + + Build scdaemon software. Enables usage of OpenPGP cards. For + other type of smartcards, try app-crypt/gnupg-pkcs11-scd. + Bring in dev-libs/libusb as a dependency; enable scdaemon. + + + Build direct CCID access for scdaemon; requires dev-libs/libusb. + + + Build mta support using virtual/mta. + + + Enable support for Trust on First use trust model; requires dev-db/sqlite. + + + Install extra tools (including gpgsplit and gpg-zip). + + + Install the wks-server + + + diff -uNr a/app-editors/nano/Manifest b/app-editors/nano/Manifest --- a/app-editors/nano/Manifest false +++ b/app-editors/nano/Manifest 581247a6b20e4436ca77b1a6584fcbed3291990c4d92b021ed69c375a06c8910d71eb24c1c2b3a360f17da734f0352aebcfaf1ef068cee632753bb616882d10a @@ -0,0 +1,4 @@ +AUX nano-2.8.7-minimal_compile_fix.patch 1206 BLAKE2B 72265b226a23282baf1d16fe62637a3a6123342da9ddf9fa205d7eaafea710aa62fcafad1188cc1c08bd537be3ddb98403afbfd035fdac5712d6bf24bf2fa40e SHA512 1ebf43ca322c0cd49b7a3ffaad33057d4ac899c7a930569df124e54f713b28ece7e01aa625db91ece0126a07228256d188154bce464bd4c1a97945d686d9f0f3 +DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79 +EBUILD nano-2.8.7.ebuild 2307 BLAKE2B b7ab4e20fcb2dcec5b6f2a198fbcb2a2619f9f29081521d1ce7a555be8bf44ef060ad9b8f3f229bf272bd5cf6c5f066e10d08f2596b5d3954279be71a4d09ad6 SHA512 693683af78bc48911cb50813cd8e02ded2546ce8efc79c5897c804c64479d889518d88f1cbcfa79e11409fd0f26543be270f2da451618d4b3756dd7d2bc7b4bc +MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82 diff -uNr a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch --- a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch false +++ b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch 123e8b69edc09cd7faa9defa8d95ca9648988e46c75591d8004fbd60411f06ac9f8771bcacfbd3f289dff8213c4c31300a96aaf2f4048b7924a3dcc1a2c71ec1 @@ -0,0 +1,38 @@ +From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Tue, 29 Aug 2017 19:28:44 +0200 +Subject: tweaks: fix compilation when configured with --enable-tiny + +When moving the cursor to the top-left corner, it is not necessary +to compute leftedge because firstcolumn IS the relevant leftedge. + +Reported-by: Jordi Mallach +--- + src/move.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/move.c b/src/move.c +index d138356..ce276e4 100644 +--- a/src/move.c ++++ b/src/move.c +@@ -121,7 +121,7 @@ void do_page_up(void) + openfile->current = openfile->edittop; + openfile->current_y = 0; + +- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); ++ leftedge = openfile->firstcolumn; + target_column = 0; + } else + get_edge_and_target(&leftedge, &target_column); +@@ -152,7 +152,7 @@ void do_page_down(void) + openfile->current = openfile->edittop; + openfile->current_y = 0; + +- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); ++ leftedge = openfile->firstcolumn; + target_column = 0; + } else + get_edge_and_target(&leftedge, &target_column); +-- +cgit v1.0-41-gc330 + diff -uNr a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml --- a/app-editors/nano/metadata.xml false +++ b/app-editors/nano/metadata.xml 15f7ba139ffd12f12648c5733fa6406beae11565bfac9bb2a576457392b1f79e647712a958f73ce53d3017e3d45a9676da9fa873640fbd6f6e15565a416b3b76 @@ -0,0 +1,39 @@ + + + + + polynomial-c@gentoo.org + Lars Wendler + + +GNU nano - an enhanced clone of the Pico text editor. + +The nano project was started because of a few "problems" with the +wonderfully easy-to-use and friendly Pico text editor. + +First and foremost is its license: the Pine suite does not use the +GPL or a GPL-friendly license, and has unclear restrictions on +redistribution. Because of this, Pine and Pico are not included with +many GNU/Linux distributions. Also, other features (like goto line +number or search and replace) were unavailable until recently or +require a command line flag. Yuck. + +nano aims to solve these problems by emulating the functionality of +Pico as closely as possible while addressing the problems above and +perhaps providing other extra functionality. + + + Enable justify/unjustify functions for text formatting. + + Enable debug messages and assert warnings. Note that these will all be sent + straight to stderr rather than some logging facility. + + + Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting + + + Disable all fancy features, including ones that otherwise have a dedicated + USE flag (such as spelling). + + + diff -uNr a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild --- a/app-editors/nano/nano-2.8.7.ebuild false +++ b/app-editors/nano/nano-2.8.7.ebuild f16afbc8e1a4721a37517e10b2c7fa716d0fc5510627742e7f6e7a7f168898693bd87e52bd5dedb38d0717a65bc39b7eea77ce4b39643ead9aaa5ded4d3f33be @@ -0,0 +1,87 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils flag-o-matic +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.sv.gnu.org/nano.git" + inherit git-r3 autotools +else + MY_P=${PN}-${PV/_} + SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="GNU GPL'd Pico clone with more functionality" +HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" + +LICENSE="GPL-3" +SLOT="0" +IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode" + +LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] + sys-libs/ncurses:0=[static-libs(+)] + magic? ( sys-apps/file[static-libs(+)] ) + nls? ( virtual/libintl ) + !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/pkgconfig + static? ( ${LIB_DEPEND} )" + +PATCHES=( + "${FILESDIR}/${P}-minimal_compile_fix.patch" #629510 +) + +src_prepare() { + default + if [[ ${PV} == "9999" ]] ; then + eautoreconf + fi +} + +src_configure() { + use static && append-ldflags -static + local myconf=( + --bindir="${EPREFIX}"/bin + --htmldir=/trash + $(use_enable !minimal color) + $(use_enable !minimal multibuffer) + $(use_enable !minimal nanorc) + --disable-wrapping-as-root + $(use_enable magic libmagic) + $(use_enable spell speller) + $(use_enable justify) + $(use_enable debug) + $(use_enable nls) + $(use_enable unicode utf8) + $(use_enable minimal tiny) + $(usex ncurses --without-slang $(use_with slang)) + ) + case ${CHOST} in + *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 + esac + econf "${myconf[@]}" +} + +src_install() { + default + rm -rf "${D}"/trash + + dodoc doc/sample.nanorc + docinto html + dodoc doc/faq.html + insinto /etc + newins doc/sample.nanorc nanorc + if ! use minimal ; then + # Enable colorization by default. + sed -i \ + -e '/^# include /s:# *::' \ + "${ED%/}"/etc/nanorc || die + fi + + dodir /usr/bin + dosym ../../bin/nano /usr/bin/nano +} diff -uNr a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest --- a/app-eselect/eselect-python/Manifest false +++ b/app-eselect/eselect-python/Manifest 62470983033cecf0fa25da04177ef3f58e6c44617013526d194e91aabf08987bc46d24670196aebcfdb49de2e19e1b39b94c4d0515f10574621efe46f9d7503f @@ -0,0 +1,3 @@ +DIST eselect-python-20171204.tar.bz2 46655 BLAKE2B f0bc46c796a1b9e01f964994219b9c7831f99844a12e97429b40482e28a590a2d825f7b6fbca27b0ca1ce616e5cfb388272af686ea2de65fda69da0319fddeda SHA512 f89183ca992bc38f2308a3217602d5ce6ec4b3b5b614f2aec48fb5b3b7e50a2e44dd18af36a7cfbd4b45d05346f2be97605e35fd274558e9173c6974681c8fa9 +EBUILD eselect-python-20171204.ebuild 1097 BLAKE2B aba4e4bdf7a42648e0de794efb149cd1009d1eb04f3425ebfea426096e905f13fec3fcf58c2d4ae077db345caa359567fca4921f919aded50bae2e3a58192729 SHA512 bd0330ef77f0b1b6ccb76734fb58cc43a96ac490e08e4871b21e1425c67ec2c7ac5a06f08a21ad5c21f3970ddc91940766dedd3047d2e1f17583df25bcfcec6b +MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 diff -uNr a/app-eselect/eselect-python/eselect-python-20171204.ebuild b/app-eselect/eselect-python/eselect-python-20171204.ebuild --- a/app-eselect/eselect-python/eselect-python-20171204.ebuild false +++ b/app-eselect/eselect-python/eselect-python-20171204.ebuild 8aafbe11d7a09c6c00ae5a4e5f0b5eb103e486197916274119d0bf67228d5844b745810f8a67c6c7be96b39401686401be3e02f4971bda42de4b2b11b3298355 @@ -0,0 +1,40 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == "99999999" ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git" +else + SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Eselect module for management of multiple Python versions" +HOMEPAGE="https://www.gentoo.org/proj/en/Python/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +# python-exec-2.4.2 for working -l option +RDEPEND=">=app-admin/eselect-1.2.3 + >=dev-lang/python-exec-2.4.2" + +src_prepare() { + default + [[ ${PV} == "99999999" ]] && eautoreconf +} + +pkg_postinst() { + local py + + if has_version 'dev-lang/python'; then + eselect python update --if-unset + fi + + if has_version "=dev-lang/python-3*"; then + eselect python update "--python3" --if-unset + fi +} diff -uNr a/app-eselect/eselect-python/metadata.xml b/app-eselect/eselect-python/metadata.xml --- a/app-eselect/eselect-python/metadata.xml false +++ b/app-eselect/eselect-python/metadata.xml f03580f742965fc8e9fea8d8a9dc053e123459906ce7ddad7212a08ce3e1937bfb30349ea5979674b6d68348956267644f2f4178df01c144c26025f6f73b5070 @@ -0,0 +1,8 @@ + + + + + python@gentoo.org + Python + + diff -uNr a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest --- a/app-misc/c_rehash/Manifest false +++ b/app-misc/c_rehash/Manifest 9d9eb0a15173a0459ea47875ca8fd1f9c6176c9c9b2ce46078936c0e17bf4263fc1f883d415320c7ea1c5af5867b1bbe60eb17f82e9dba8528f24817b031e88a @@ -0,0 +1,3 @@ +DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da +EBUILD c_rehash-1.7-r1.ebuild 1028 BLAKE2B 62a51670325b44cab5bcdadfab89322f34f9014983eb94fb7e7cb4992a167bcb204b1d77c5ad64e2eb5bb64c64ea1218e322e1661c40f86f9719dff6248aaeae SHA512 bc6500a576495bbecb42f49292dff490d33758e27e256392540e23db8e011f6b6e82efaa28b87d832dc0cc47caacf969dd4676247759fc32b03c53243c33ecb8 +MISC metadata.xml 339 BLAKE2B d4fe9d24a3b12ddea1d503e6998c510bdbce33677cb45c3deab9c4de28a0c88d592d1357e9e7b029ad46d043095cdfe00e747dc63c1feccb5fab6c14d4459710 SHA512 611bcd575733b05ac99027ea49a79c29fa969eeccf75b12cfda6e77a42b2241e414951b25b089eeac7fd2255d42872b38c68fc5d004880b5dfe7a89c73e8f64c diff -uNr a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild --- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild false +++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild 66e5ed0b19e8cf943714debf11a721cfb34a92779d80b79d2f45f3e9d8175f71cb4a163fc44a5f1c86e8cf88afff5240f4d28b30c9900847f1f01ab0cc108482 @@ -0,0 +1,31 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="c_rehash script from OpenSSL" +HOMEPAGE="https://www.openssl.org/ https://github.com/pld-linux/openssl/" +SRC_URI="https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=${PV} -> openssl-c_rehash.sh.${PV}" + +LICENSE="openssl" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +RDEPEND="! "${WORKDIR}"/c_rehash || die #416717 +} + +src_install() { + dobin "${WORKDIR}"/c_rehash +} diff -uNr a/app-misc/c_rehash/metadata.xml b/app-misc/c_rehash/metadata.xml --- a/app-misc/c_rehash/metadata.xml false +++ b/app-misc/c_rehash/metadata.xml 5a5e40e89f7b0175769db38ac3ce0c44307133620eec8fb833f7ab3021e9fc721b2db50583a8df3cfe8b5095c1440818e1fd17a497b6779c1abc52c737cc43a4 @@ -0,0 +1,11 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + pld-linux/openssl + + diff -uNr a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest --- a/app-misc/ca-certificates/Manifest false +++ b/app-misc/ca-certificates/Manifest 86d3a0f3e747777dd31caa609c6c0494c05bb8c1e61cc853b62161bdcdd9d589cb6c7fbb10a37fc29225139aea8af0bad59ec5c302aaf6b92371f785d210e9b2 @@ -0,0 +1,6 @@ +AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59 +DIST ca-certificates_20170717.tar.xz 293028 BLAKE2B 85076cd980841f32e2544c7be020fca9bcd5ef7066ae3cef195cbf9755f8b8e800a8e4076662fa1b7da600c2235e49048eb6e1166b0618fc7685221ab790fed3 SHA512 dfeb5a19bb33bcb127a159b73fcc63b41c99827d77eb4a6069def0cffc7ae8dd10dab97c1ddfdd5b70d0c93e650a51ed5dcd03908516e7ca8b3022bf46eeb7e6 +DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65 +DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 +EBUILD ca-certificates-20170717.3.36.1.ebuild 6253 BLAKE2B 6bfae7c926cac36f7bb5358dd1113a6f8bb30bf0c12518ddbe9e0bd771dbf119bbb9e9592c026fde71910552cfd7864dc04b7e9e1686a316019d1bc7de1509b7 SHA512 d233304edde3acf2f0c9732debaa00641d1caa678e91c6fbd7b8ab40d9792fb8acba2468f54dcb34c9e5431aad969b57ce47afbe46bda1a7d5fa62041bfa8bf2 +MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c diff -uNr a/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild --- a/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild false +++ b/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild 1adbbcb0e560a9ad06d55a63d4765377c11cf1f983c8fb5515f91c3e4f1d6b1c394dae29cb022ae5e6505cc70ae38b1c70a6f96de5bac366d0cbe553bcb4f52b @@ -0,0 +1,190 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# The Debian ca-certificates package merely takes the CA database as it exists +# in the nss package and repackages it for use by openssl. +# +# The issue with using the compiled debs directly is two fold: +# - they do not update frequently enough for us to rely on them +# - they pull the CA database from nss tip of tree rather than the release +# +# So we take the Debian source tools and combine them with the latest nss +# release to produce (largely) the same end result. The difference is that +# now we know our cert database is kept in sync with nss and, if need be, +# can be sync with nss tip of tree more frequently to respond to bugs. + +# When triaging bugs from users, here's some handy tips: +# - To see what cert is hitting errors, use openssl: +# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME +# Focus on the errors written to stderr. +# +# - Look at the upstream log as to why certs were added/removed: +# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt +# +# - If people want to add/remove certs, tell them to file w/mozilla: +# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit eutils python-any-r1 + +if [[ ${PV} == *.* ]] ; then + # Compile from source ourselves. + PRECOMPILED=false + inherit versionator + + DEB_VER=$(get_version_component_range 1) + NSS_VER=$(get_version_component_range 2-) + RTM_NAME="NSS_${NSS_VER//./_}_RTM" +else + # Debian precompiled version. + PRECOMPILED=true + inherit unpacker +fi + +DESCRIPTION="Common CA Certificates PEM files" +HOMEPAGE="https://packages.debian.org/sid/ca-certificates" +NMU_PR="" +if ${PRECOMPILED} ; then + SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" +else + SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz + https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz + cacert? ( + https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch + )" +fi + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="insecure_certs" +${PRECOMPILED} || IUSE+=" cacert" + +DEPEND="" +if ${PRECOMPILED} ; then + DEPEND+=" !/dev/null + epatch "${DISTDIR}"/nss-cacert-class1-class3.patch + popd >/dev/null + fi + fi + + default + eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch + local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') + sed -i \ + -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ + -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ + usr/sbin/update-ca-certificates || die +} + +src_compile() { + cd "image/${EPREFIX}" || die + if ! ${PRECOMPILED} ; then + python_setup + local d="${S}/${PN}/mozilla" c="usr/share/${PN}" + # Grab the database from the nss sources. + cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die + emake -C "${d}" + + # Now move the files to the same places that the precompiled would. + mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla + if use cacert ; then + mkdir -p "${c}"/cacert.org + mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die + fi + mv "${d}"/*.crt "${c}"/mozilla/ || die + else + mv usr/share/doc/{ca-certificates,${PF}} || die + fi + + if ! use insecure_certs ; then + elog "To prevent applications relying on system's trusted root certificate store" + elog "from using CAs where at least one major browser vendor Gentoo is following" + elog "has decided to apply trust level restrictions, the following" + elog "certificate(s) were removed:" + # Remove untrusted certs from StartCom and WoSign (bug #598072) + elog "$(find "${c}" -type f $ \ + -iname '*startcom*' \ + -o -iname '*wosign*' \ + $ -printf '%P removed; see https://bugs.gentoo.org/598072 for details\n' -delete)" + fi + + ( + echo "# Automatically generated by ${CATEGORY}/${PF}" + echo "# $(date -u)" + echo "# Do not edit." + cd "${c}" + find * -name '*.crt' | LC_ALL=C sort + ) > etc/ca-certificates.conf + + sh usr/sbin/update-ca-certificates --root "${S}/image" || die +} + +src_install() { + cp -pPR image/* "${D}"/ || die + if ! ${PRECOMPILED} ; then + cd ca-certificates + doman sbin/*.8 + dodoc debian/README.* examples/ca-certificates-local/README + fi + + echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates + doenvd 98ca-certificates +} + +pkg_postinst() { + if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then + # if the user has local certs, we need to rebuild again + # to include their stuff in the db. + # However it's too overzealous when the user has custom certs in place. + # --fresh is to clean up dangling symlinks + "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" + fi + + if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then + ewarn "Removing the following broken symlinks:" + ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" + fi +} diff -uNr a/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch b/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch --- a/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch false +++ b/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch 9981c39bfe385d76fa838027ee3ff3bd5fd7ceccb8607dfaeb7984fcb64e26cecb34d5bd894d8d1b61f742fd7cc4e02033914acd5495b77fc14d0025b56115b2 @@ -0,0 +1,49 @@ +add a --root option so we can generate with DESTDIR installs + +--- a/image/usr/sbin/update-ca-certificates ++++ b/image/usr/sbin/update-ca-certificates +@@ -30,6 +30,8 @@ LOCALCERTSDIR=/usr/local/share/ca-certificates + CERTBUNDLE=ca-certificates.crt + ETCCERTSDIR=/etc/ssl/certs + HOOKSDIR=/etc/ca-certificates/update.d ++ROOT="" ++RELPATH="" + + while [ $# -gt 0 ]; + do +@@ -59,13 +61,25 @@ do + --hooksdir) + shift + HOOKSDIR="$1";; ++ --root|-r) ++ shift ++ # Needed as c_rehash wants to read the files directly. ++ # This gets us from $CERTSCONF to $CERTSDIR. ++ RELPATH="../../.." ++ ROOT=$(readlink -f "$1");; + --help|-h|*) +- echo "$0: [--verbose] [--fresh]" ++ echo "$0: [--verbose] [--fresh] [--root ]" + exit;; + esac + shift + done + ++CERTSCONF="$ROOT$CERTSCONF" ++CERTSDIR="$ROOT$CERTSDIR" ++LOCALCERTSDIR="$ROOT$LOCALCERTSDIR" ++ETCCERTSDIR="$ROOT$ETCCERTSDIR" ++HOOKSDIR="$ROOT$HOOKSDIR" ++ + if [ ! -s "$CERTSCONF" ] + then + fresh=1 +@@ -94,7 +107,7 @@ add() { + -e 's/,/_/g').pem" + if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] + then +- ln -sf "$CERT" "$PEM" ++ ln -sf "${RELPATH}${CERT#$ROOT}" "$PEM" + echo "+$PEM" >> "$ADDED" + fi + # Add trailing newline to certificate, if it is missing (#635570) diff -uNr a/app-misc/ca-certificates/metadata.xml b/app-misc/ca-certificates/metadata.xml --- a/app-misc/ca-certificates/metadata.xml false +++ b/app-misc/ca-certificates/metadata.xml c87432a7cbe4ea3f2923708691cb5c6cdab52c094cc6045d333a5e2b530e08690f8cdd87b5439d0bbcd80374404b3f1d414deac6abe814c2872c28aae50e009d @@ -0,0 +1,17 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + + Include root certificates from CAcert (http://www.cacert.org/) and Software + in the Public Interest (http://www.spi-inc.org/) + + + Install certificates which are known to be untrustworthy. + + + diff -uNr a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest --- a/app-misc/editor-wrapper/Manifest false +++ b/app-misc/editor-wrapper/Manifest cbeb35420fd7085ff7434209888b3e046337bdd538271774ae9ad5eaefba80150a9bd844fa6200df7074ca171dac81fd7892acca3fa1a27b8ba0dcf49d1a559c @@ -0,0 +1,3 @@ +AUX editor-wrapper-4.sh 405 BLAKE2B 0d1e023e9865f0278bd2fb5e0ceeb0bd8b92befe5544186d163946d7efe6f0a6749184052927b6d60adfec8b2b703168a85fb968bef50702ab42bbbec8bd73fc SHA512 b29f54c662494f9ed0d26c44a8a9a85e22d0d3d70c870fdb8eda3fe1a97ed188e5b8299ed524a5e00f7cb1a3603be340e544192e75b98daa6afda6b2c185faa8 +EBUILD editor-wrapper-4.ebuild 900 BLAKE2B 8bc6c390923b917de50aa6619f6dc87c6961984963784a09b26824965ea15b6427a854810e20dce80277d107e2aea66015e19589348280433a8cc8a35186b80e SHA512 9c181b10b0b88c470a0f868be425c97a48df84eff9f84d94b3e0fc8bcdaccf5ed74c37494dea7af4a2022b0347ba8be3a7f7d86f8a2ded81346db31d9a809f27 +MISC metadata.xml 367 BLAKE2B c144d95fdc55aafe6dfe786f325aea6756cb51e05b7b370392bf201e5daf827ddd5b0b755d5d37d6e2a06f7929af634223f2d33a1e0e0684677ca90464e5e4df SHA512 f566d335cb37d8d951e7b86e3f4a3bafa5ed2d1b270d5d730c6e9576230848e64849f7ebf0a133a7572847faf0c075f0158f125c3f29d941b598b46ca0c7f4c3 diff -uNr a/app-misc/editor-wrapper/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4.ebuild --- a/app-misc/editor-wrapper/editor-wrapper-4.ebuild false +++ b/app-misc/editor-wrapper/editor-wrapper-4.ebuild 217644170a7f0eb444cf8bde0c9bf5c92775a3d0bae900b708489891620a315d73e03056b89db17ba9ececdf05f08f77a265f26d2d700ba5c417f911dad93732 @@ -0,0 +1,31 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Wrapper scripts that will execute EDITOR or PAGER" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +S="${WORKDIR}" + +src_prepare() { + sed -e 's/@VAR@/EDITOR/g' "${FILESDIR}/${P}.sh" >editor || die + sed -e 's/@VAR@/PAGER/g' "${FILESDIR}/${P}.sh" >pager || die + if use prefix ; then + sed -i \ + -e "s:#!/bin/sh:#!/usr/bin/env sh:" \ + -e "s: /etc/profile: \"${EPREFIX}/etc/profile\":" \ + editor pager || die + fi +} + +src_install() { + exeinto /usr/libexec + doexe editor pager +} diff -uNr a/app-misc/editor-wrapper/files/editor-wrapper-4.sh b/app-misc/editor-wrapper/files/editor-wrapper-4.sh --- a/app-misc/editor-wrapper/files/editor-wrapper-4.sh false +++ b/app-misc/editor-wrapper/files/editor-wrapper-4.sh 1a1d0a02d3640c8d0a83e31ba1a41b08d27d7662068e609bd3c07386647bf7a8ea8687dcdb29b9960f1c6fc1090be5f2ce5819f673dce56174e912614dd99513 @@ -0,0 +1,17 @@ +#!/bin/sh +# Copyright 2009-2011 Gentoo Foundation +# Distributed under the terms of the MIT/X11 license + +# Wrapper script, executes ${@VAR@} with arguments $@ + +if [ -z "${@VAR@}" ]; then + # Try to get @VAR@ from system profile + @VAR@=$(. /etc/profile >/dev/null 2>&1; echo "${@VAR@}") +fi + +if [ -z "${@VAR@}" ]; then + echo "$0: The @VAR@ variable must be set" >&2 + exit 1 +fi + +exec ${@VAR@} "$@" diff -uNr a/app-misc/editor-wrapper/metadata.xml b/app-misc/editor-wrapper/metadata.xml --- a/app-misc/editor-wrapper/metadata.xml false +++ b/app-misc/editor-wrapper/metadata.xml 73c055d4fef328c8937e802d46d08e3e12cdfcf61eff3e4ebab261f0318ebe8e62313451f33a5e6320c70cb6ac35e71f971ee764b880e62ced66bf939d55e911 @@ -0,0 +1,12 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + emacs@gentoo.org + Gentoo Emacs project + + diff -uNr a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest --- a/app-misc/mime-types/Manifest false +++ b/app-misc/mime-types/Manifest 128d51ad4ba2aa720f25bb4ff73fa6f8c2757f4b5da3695b25ef690525a78f3a4c607405120c1572eb925731ca44229fb156f73ded4cde6cf1a52024eef19f76 @@ -0,0 +1,3 @@ +DIST mime-types-9.tar.bz2 15524 BLAKE2B 075f73f6d41a6b9100baf891378b12658c1370ac3aee8ba47cdb972cf30835eb2e9f6eb8a6314a7097dc5f90b091607519750860b065a2c4a822e26223925447 SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6 +EBUILD mime-types-9.ebuild 603 BLAKE2B 258d7d0314407b15c6b631b08939a39ceba6044bd47dffba4d5442d2da022536bda2714ef753c195d6e49db87ae8f7c7c77ce6f4be1b167b0b07460fefdac50d SHA512 589a9d7908120387be3bfc042212e98ed09fa6a9c347f63b166afd40f0d31285689a6562ea229b79b34010f095eae8b78b6a68b208928fcbec5ffc2002ba9d90 +MISC metadata.xml 346 BLAKE2B 218632e5ffb174f52dea645949149ddd7af766a3f2906b366f95399a6268055ea3d83e89aab32e1b341e2cb7ffdf21344fddc2d2e0b083c4ed7a5df9cb634dc3 SHA512 65aa65edd1d47b4d6f87120e6685cccbc90c8daedabcac6f9ebfbab562682cc226d7a6f83886f61e38bb3fbfcd6b32ca17725291d6f95939cc1d40dc8bb0173a diff -uNr a/app-misc/mime-types/metadata.xml b/app-misc/mime-types/metadata.xml --- a/app-misc/mime-types/metadata.xml false +++ b/app-misc/mime-types/metadata.xml 39bea051347b6361da42ff129f9e09826239d03c37076ae611c1c80fb571f63f4db1279f3ec410f84fe846a5cf59272b42583d0263a7912e13e5cf38b62b643e @@ -0,0 +1,12 @@ + + + + + djc@gentoo.org + Dirkjan Ochtman + + + net-mail@gentoo.org + Net-Mail + + diff -uNr a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild --- a/app-misc/mime-types/mime-types-9.ebuild false +++ b/app-misc/mime-types/mime-types-9.ebuild a948228b278d30c094be6942936daea6a80825860cbaa73161d228f07f7b71b5267008f93eae1d480d864ec164e33ad3014f2b5428bc5ae7731529d367e79730 @@ -0,0 +1,21 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Provides /etc/mime.types file" +HOMEPAGE="https://www.gentoo.org/" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_install() { + insinto /etc + doins mime.types +} diff -uNr a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest --- a/app-misc/pax-utils/Manifest false +++ b/app-misc/pax-utils/Manifest b692ee8695314c45cfe2758f4c2c5ee7e15a92e3e89cc2d85e7b60609d52fed3ba72bf878f46d591c636c79d311289aed2e615abe924b368d43866456d9541ce @@ -0,0 +1,3 @@ +DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c +EBUILD pax-utils-1.2.3.ebuild 1477 BLAKE2B e3e27277bcf7d95983713cb31a0a57b998d500d42d26ba75b364b42da9b3c9b82635b02148daba3e675a816b446b2d9ec09b851635b5800712d1bd61d594211f SHA512 a407d1613f4489687d3d86bae6fb9bf8f527fb123fbd59e56ac9f390e80de5063610e76ca2570b78fb35e05abed5c735939599e7604265aed68185f4cf49e731 +MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1 diff -uNr a/app-misc/pax-utils/metadata.xml b/app-misc/pax-utils/metadata.xml --- a/app-misc/pax-utils/metadata.xml false +++ b/app-misc/pax-utils/metadata.xml 191397d4797cc295677ccf8d03c8ea41856f9ad001f1e16757812a4bc15cde8fae888bb4a3d066f34f2c7fa70463b6841ca6172767c9a381d649c2d7d3fdbd56 @@ -0,0 +1,16 @@ + + + + + slyfox@gentoo.org + Sergei Trofimovich + + + toolchain@gentoo.org + Gentoo Toolchain Project + + A suite of ELF tools to aid auditing systems. Contains various ELF related utils for ELF32, ELF64 binaries useful for displaying PaX and security info on a large groups of binary files. + + Install a more powerful/faster version of lddtree + + diff -uNr a/app-misc/pax-utils/pax-utils-1.2.3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3.ebuild --- a/app-misc/pax-utils/pax-utils-1.2.3.ebuild false +++ b/app-misc/pax-utils/pax-utils-1.2.3.ebuild 95a7584d3992eadb4a00d49e6e89fc1942bc9f2e901b51e4ea5ff91d699237078c5e5ca073ae31de43f8a7e21e6c3711f96b367829bc52d96ae5dc92314ee8fc @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils toolchain-funcs unpacker + +DESCRIPTION="ELF utils that can check files for security relevant properties" +HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" +SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps debug python seccomp" + +RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) + python? ( dev-python/pyelftools ) + seccomp? ( sys-libs/libseccomp )" +DEPEND="${RDEPEND} + caps? ( virtual/pkgconfig ) + seccomp? ( virtual/pkgconfig ) + app-arch/xz-utils" + +_emake() { + emake \ + USE_CAP=$(usex caps) \ + USE_DEBUG=$(usex debug) \ + USE_PYTHON=$(usex python) \ + USE_SECCOMP=$(usex seccomp) \ + "$@" +} + +src_configure() { + # Avoid slow configure+gnulib+make if on an up-to-date Linux system + if use prefix || ! use kernel_linux || \ + has_version ' + + + + base-system@gentoo.org + + diff -uNr a/app-portage/layman/Manifest b/app-portage/layman/Manifest --- a/app-portage/layman/Manifest false +++ b/app-portage/layman/Manifest a97266c064a4279f67e8ddb276a46d8c1e5e77486bfc19fed48a7c26055010243d442823fdf9d31ad4efb167b7d871534d0442e181a9fee01b9b25e3a0d3ce9e @@ -0,0 +1,9 @@ +AUX layman-2.0.0.doctest.patch 933 BLAKE2B d2e9c8f4b49fdd37530981d6f0cd621a676eba9688e0c45e68cd82e774b052085f556b437a13789f0554bdf18a6a1112ce3b1503abf6a0719cfbb4efde20bc5e SHA512 37a3bf04ba5185bf7f885321a4a925e24218d6e283b4c9d85e4935e0fb3dacf4fa543fa79e146c44bcbf833e7348dc49270cd0baa562a5e2539fc792b91abaf8 +AUX layman-2.0.0.svn_upgrade.patch 2447 BLAKE2B 0603c816eff3eef5824e04619c4b7634e253993028823b1c19713c76c1953d0df8160655e3a35d17a083736839628b75f77f8364e40a3e38d90035cc80c01561 SHA512 a3b9d0a0049aef011ddaadc627c38c9730e547aa4941fc1081ea7727f228e72080314a1cc376fa96ba23efe365529795a1b501c90b76561f6c4bff9aba72eb1f +AUX layman-2.2.0-adds-kwargs-debug.patch 1015 BLAKE2B b0f249a7e66606cd06f9107882d4a6edaed658b01a75c99f00ac03e8e8db8dc5fb1c2dc1e4738a8800c09645d44e7f39012d37dccf3c6c4ffc00f42833aff99e SHA512 cedf55524b2d11ae41a05192e8ba31fce677fb528560b168e4441bf2274c864c23a0d6463e79ea34c29e61ff1d4f514efba32bcee914fe6b915b6f039f8e106e +AUX layman-2.2.0-change-for-upstream-ssl-fetch.patch 1234 BLAKE2B 1592e974a34142b62a21fe58011d98d118060a9bbc4e1e5d7ae0fdae1791a7715d325a9e3a2374a223f764fa3f40990855ec5d205a63a96d6b61cb1c3e4167d9 SHA512 bd58b813e3b364f4116537c1a66b0109a6a08fb5a30a53a691c697739197d84fed4449bbd3b751396e81d4adbb0f72101bd04e949068534bb77ced929c5c4191 +AUX layman-2.2.0-removes-doctest-remnants.patch 6172 BLAKE2B 0f6e9b68ebfb85f08c06a26e52a13bc3412edcf58d052cc72d576efbaeb8bd7c9a04268465632de0c3d611ed9fc369ae0d1dc9d2d61955a934124a70c7e46958 SHA512 9c8f81269d7219a6a1d0ca6365be3e49c6c407810670a5acf71edf8d47255772e67631a018b1f1a1a4bc0f1981663882d30c2480af1e90fef09030bf2e12935e +AUX layman-2.4.1-sourcefileattributechanges.patch 1889 BLAKE2B b99001a1fbc19224111ab565343146230ac464add57bfb8ae3e202d339a6e7cb36dd3ba9050625cb1a9d3420ad892dc2417bbb5a5045a8bf6bf7e4e939f9a1a0 SHA512 ffb5015069c1b1725514d18abff9a7c152825335f05a7edf160d0e90a3d7cd9d0a6338fb24ed8a6ebcc24c2f23beefc4bc35d3d12fe887d86a3251bdb03fc4f2 +DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf +EBUILD layman-2.4.2-r1.ebuild 2289 BLAKE2B 46d9b5292320f7d091822630cb69037f0745a9dd35f1b4b5b7da8c60571a7072a82635603e0403e9b4819b80d511429025a6d2909eef14e64dd3bb37d5af93e9 SHA512 d4d2e268bba46ff1c6c33963c4ff75239db5f28c8eb64109a86d3531c7f707c61a2011d4270d2a55c3365aeb59a6344a6ccbdcabc89c0bae3405b6278c91eca1 +MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e diff -uNr a/app-portage/layman/files/layman-2.0.0.doctest.patch b/app-portage/layman/files/layman-2.0.0.doctest.patch --- a/app-portage/layman/files/layman-2.0.0.doctest.patch false +++ b/app-portage/layman/files/layman-2.0.0.doctest.patch ff47a25ad5c49a66885bffdb1b85be005c82d50ec0a726ed9dcbada9872f5f5bc2f7e18e9084087c5a04ad19124fb80d0e2c0ee155a03b86e70fb4e0d00bb745 @@ -0,0 +1,20 @@ +diff --git a/layman/db.py b/layman/db.py +index e2d740c..55a846a 100644 +--- a/layman/db.py ++++ b/layman/db.py +@@ -93,6 +93,7 @@ class DB(DbBase): + >>> from layman.config import OptionConfig + >>> myoptions = {'installed' : + ... here + '/tests/testfiles/global-overlays.xml', ++ ... 'local_list': here + '/tests/testfiles/overlays.xml', + ... 'make_conf' : write2, + ... 'nocheck' : 'yes', + ... 'storage' : tmpdir} +@@ -173,6 +174,7 @@ class DB(DbBase): + >>> from layman.config import OptionConfig + >>> myoptions = {'installed' : + ... here + '/tests/testfiles/global-overlays.xml', ++ ... 'local_list': here + '/tests/testfiles/overlays.xml', + ... 'make_conf' : write2, + ... 'nocheck' : 'yes', + ... 'storage' : tmpdir} diff -uNr a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch b/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch --- a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch false +++ b/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch fccc354553c1f4f3baaba35c9c1d95b760ef6f07a2bc135469bf14f9df2bb76a53dc05c14c29e8c0ef1db1af5d00ed0c9f6a5d16cd8841b282abc829062ae675 @@ -0,0 +1,58 @@ +From 580097d4bc0cd3f07b4ce1b8da33e63f03ef0305 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Mon, 6 Jan 2014 22:01:12 -0800 +Subject: [PATCH] Update svn's check_upgrade() for newer svn versions. + +Thanks you, Arfrever, for your assistance. +--- + layman/overlays/svn.py | 32 ++++++++++++-------------------- + 1 file changed, 12 insertions(+), 20 deletions(-) + +diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py +index 4804925..374a516 100644 +--- a/layman/overlays/svn.py ++++ b/layman/overlays/svn.py +@@ -131,27 +131,19 @@ class SvnOverlay(OverlaySource): + return + + def check_upgrade(self, target): +- '''Code to check the installed svn version and +- run "svn upgrade" if needed.''' ++ '''Code to run "svn upgrade" it only takes longer ++ than checking if it does need an upgrade if it is ++ actually needed. ++ ''' + file_to_run = _resolve_command(self.command(), self.output.error)[1] +- args = file_to_run + ' -q --version' ++ args = " ".join([file_to_run, " upgrade", target]) +- pipe = Popen(args, shell=True, stdout=PIPE) ++ pipe = Popen(args, shell=True, stdout=PIPE, stderr=PIPE) + if pipe: +- self.output.debug("SVN: check_upgrade()... have a valid pipe", 4) +- version = pipe.stdout.readline().strip('\n') +- self.output.debug("SVN: check_upgrade()... svn version found: %s" +- % version, 4) ++ self.output.debug("SVN: check_upgrade()... have a valid pipe, " ++ "running upgrade", 4) ++ upgrade_output = pipe.stdout.readline().strip('\n') ++ if upgrade_output: ++ self.output.debug(" output: %s" % upgrade_output, 4) ++ self.output.debug("SVN: check_upgrade()... svn upgrade done", 4) + pipe.terminate() +- if version >= '1.7.0': +- self.output.debug("SVN: check_upgrade()... svn upgrade maybe", +- 4) +- _path = path([target,'.svn/wc.db']) +- if not os.path.exists(_path): +- self.output.info("An svn upgrade needs to be run...", +- 2) +- args = ["upgrade"] +- return self.run_command(self.command(), args, +- cwd=target, cmd="svn upgrade") +- return +- else: +- return ++ return +-- +1.8.3.2 + diff -uNr a/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch b/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch --- a/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch false +++ b/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch 2c204cdbba25f3af2a3b4922da3cfe04bffa777f9ee1ace0447456067fa008aa8ed7dd7e9920cf58c32a843a550953e3181b3645643d425c56c4bbdfdaa22acf @@ -0,0 +1,28 @@ +From: Devan Franchini +Date: Sun, 7 Dec 2014 23:12:36 -0500 +Subject: [PATCH] Adds kwargs-debug and modifies kwargs-info level to 5 + +--- a/layman/overlays/archive.py ++++ b/layman/overlays/archive.py +@@ -50,7 +50,8 @@ class ArchiveOverlay(OverlaySource): + connector_output = { + 'info': self.output.debug, + 'error': self.output.error, +- 'kwargs-info': {'level': 2}, ++ 'kwargs-info': {'level': 5}, ++ 'kwargs-debug': {'level': 2}, + 'kwargs-error': {'level': None}, + } + +--- a/layman/remotedb.py ++++ b/layman/remotedb.py +@@ -120,6 +120,6 @@ class RemoteDB(DbBase): + 'info': self.output.info, + 'debug': self.output.debug, + 'error': self.output.error, +- 'kwargs-info': {'level': 2}, ++ 'kwargs-info': {'level': 5}, + 'kwargs-debug': {'level': 2}, + 'kwargs-error':{'level': None}, + } + diff -uNr a/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch b/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch --- a/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch false +++ b/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch 414f263766c70f14cea790923b3f324f71f27b22700fc6c173ed2f7a25e99c2159a836f98decd999c8cd76e02a8f034a515e0c8e3a6c8d375da5bcb15606dcef @@ -0,0 +1,38 @@ +From 81f1545f1371931d560492e8b323096d4befc775 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Fri, 17 Oct 2014 19:40:38 -0700 +Subject: [PATCH] remotedb.py: Change for upstream ssl-fetch change + +--- + layman/remotedb.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/layman/remotedb.py b/layman/remotedb.py +index f0f7ea9..b866bd7 100644 +--- a/layman/remotedb.py ++++ b/layman/remotedb.py +@@ -57,7 +57,7 @@ class RemoteDB(DbBase): + self.detached_urls = [] + self.signed_urls = [] + self.proxies = config.proxies +- ++ + self.urls = [i.strip() + for i in config['overlays'].split('\n') if len(i)] + +@@ -116,9 +116,11 @@ class RemoteDB(DbBase): + need_gpg = [False, True, True] + # setup the ssl-fetch output map + connector_output = { +- 'info': self.output.debug, ++ 'info': self.output.info, ++ 'debug': self.output.debug, + 'error': self.output.error, + 'kwargs-info': {'level': 2}, ++ 'kwargs-debug': {'level': 2}, + 'kwargs-error':{'level': None}, + } + fetcher = Connector(connector_output, self.proxies, USERAGENT) +-- +2.0.5 + diff -uNr a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch b/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch --- a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch false +++ b/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch 3fed7b3a24f6818293807f868e1d2df8bd62f64b19fe32f8959ed3f409208edd86fe4ec3d9ab3d532fc1fde95c9ed53fee17c07525a0b8d0c5e72244b0cdb712 @@ -0,0 +1,208 @@ +From: Devan Franchini +Date: Fri, 18 Oct 2014 15:21:24 -0400 +Subject: [PATCH] Removes doctest remnants + +--- a/layman/api.py 2014-10-18 14:27:13.233842116 -0400 ++++ b/layman/api.py 2014-10-18 14:29:51.184849673 -0400 +@@ -714,15 +714,3 @@ + write = os.fdopen(fd_w, 'w') + read = os.fdopen(fd_r, 'r') + return (read, write, fd_r, fd_w) +- +- +-if __name__ == '__main__': +- import doctest, sys +- +- # Ignore warnings here. We are just testing +- from warnings import filterwarnings, resetwarnings +- filterwarnings('ignore') +- +- doctest.testmod(sys.modules[__name__]) +- +- resetwarnings() +--- a/layman/argsparser.py 2014-10-18 14:27:13.233842116 -0400 ++++ b/layman/argsparser.py 2014-10-18 14:30:35.256851781 -0400 +@@ -404,14 +404,3 @@ + self.output.debug('ARGSPARSER: Returning keys', 9) + + return keys +- +- +-#=============================================================================== +-# +-# Testing +-# +-#------------------------------------------------------------------------------- +- +-if __name__ == '__main__': +- import doctest +- doctest.testmod(sys.modules[__name__]) +--- a/layman/cli.py 2014-10-18 14:27:13.233842116 -0400 ++++ b/layman/cli.py 2014-10-18 14:32:11.456856384 -0400 +@@ -397,15 +397,3 @@ + # blank newline -- no " *" + self.output.notice('') + return info != {} +- +- +-if __name__ == '__main__': +- import doctest +- +- # Ignore warnings here. We are just testing +- from warnings import filterwarnings, resetwarnings +- filterwarnings('ignore') +- +- doctest.testmod(sys.modules[__name__]) +- +- resetwarnings() +--- a/layman/config.py 2014-10-18 14:27:13.233842116 -0400 ++++ b/layman/config.py 2014-10-18 14:31:02.528853086 -0400 +@@ -348,13 +348,3 @@ + if new_defaults is not None: + self._defaults.update(new_defaults) + return +- +-#=============================================================================== +-# +-# Testing +-# +-#------------------------------------------------------------------------------- +- +-if __name__ == '__main__': +- import doctest +- doctest.testmod(sys.modules[__name__]) +--- a/layman/db.py 2014-10-18 14:27:13.234842116 -0400 ++++ b/layman/db.py 2014-10-18 14:32:32.160857374 -0400 +@@ -315,21 +315,3 @@ + raise Exception('Syncing overlay "' + overlay_name + + '" returned status ' + str(result) + '!' + + '\ndb.sync()') +- +- +-#=============================================================================== +-# +-# Testing +-# +-#------------------------------------------------------------------------------- +- +-if __name__ == '__main__': +- import doctest, sys +- +- # Ignore warnings here. We are just testing +- from warnings import filterwarnings, resetwarnings +- filterwarnings('ignore') +- +- doctest.testmod(sys.modules[__name__]) +- +- resetwarnings() +--- a/layman/dbbase.py 2014-10-18 14:27:13.234842116 -0400 ++++ b/layman/dbbase.py 2014-10-18 14:31:14.648853666 -0400 +@@ -252,21 +252,3 @@ + """returns a list of the overlay names + """ + return sorted(self.overlays) +- +- +-#=============================================================================== +-# +-# Testing +-# +-#------------------------------------------------------------------------------- +- +-if __name__ == '__main__': +- import doctest +- +- # Ignore warnings here. We are just testing +- from warnings import filterwarnings, resetwarnings +- filterwarnings('ignore') +- +- doctest.testmod(sys.modules[__name__]) +- +- resetwarnings() +--- a/layman/overlays/archive.py 2014-10-18 14:27:13.253842116 -0400 ++++ b/layman/overlays/archive.py 2014-10-18 14:31:54.640855579 -0400 +@@ -188,15 +188,3 @@ + ''' + + return self.is_supported() +- +- +-if __name__ == '__main__': +- import doctest +- +- # Ignore warnings here. We are just testing. +- from warnings import filterwarnings, resetwarnings +- filterwarnings('ignore') +- +- doctest.testmod(sys.modules[__name__]) +- +- resetwarnings() +--- a/layman/overlays/modules/tar/tar.py 2014-10-18 14:27:13.245842116 -0400 ++++ b/layman/overlays/modules/tar/tar.py 2014-10-18 15:10:13.303965557 -0400 +@@ -94,14 +94,3 @@ + return require_supported( + [(self.command(), 'tar', 'app-arch/tar'), ], + self.output.warn) +- +-if __name__ == '__main__': +- import doctest +- +- # Ignore warnings here. We are just testing +- from warnings import filterwarnings, resetwarnings +- filterwarnings('ignore') +- +- doctest.testmod(sys.modules[__name__]) +- +- resetwarnings() +--- a/layman/overlays/overlay.py 2014-10-18 14:27:13.253842116 -0400 ++++ b/layman/overlays/overlay.py 2014-10-18 14:31:38.624854813 -0400 +@@ -546,14 +546,3 @@ + def source_types(self): + for i in self.sources: + yield i.type +- +- +-#============================================================================== +-# +-# Testing +-# +-#------------------------------------------------------------------------------ +- +-if __name__ == '__main__': +- import doctest +- doctest.testmod(sys.modules[__name__]) +--- a/layman/remotedb.py 2014-10-18 14:27:13.253842116 -0400 ++++ b/layman/remotedb.py 2014-10-18 14:29:31.064848710 -0400 +@@ -384,14 +384,3 @@ + self.signed_urls = [i.strip() + for i in self.config['gpg_signed_lists'].split('\n') if len(i)] + ''' +- +-if __name__ == '__main__': +- import doctest +- +- # Ignore warnings here. We are just testing +- from warnings import filterwarnings, resetwarnings +- filterwarnings('ignore') +- +- doctest.testmod(sys.modules[__name__]) +- +- resetwarnings() +--- a/layman/utils.py 2014-10-18 14:27:13.254842117 -0400 ++++ b/layman/utils.py 2014-10-18 14:30:24.088851247 -0400 +@@ -347,14 +347,3 @@ + for key in kwargs: + result[key] = kwargs[key] + return result +- +- +-#=============================================================================== +-# +-# Testing +-# +-#------------------------------------------------------------------------------- +- +-if __name__ == '__main__': +- import doctest +- doctest.testmod(sys.modules[__name__]) + diff -uNr a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch --- a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch false +++ b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch 98116fbdab3024e893141a902dfa5cd8cfe98c85b1abaf146c52b9a7c321b3a0b17662676f73387c60ea74cc45d72c82041608661944a6f7de096c6623d083da @@ -0,0 +1,42 @@ +From 90fe6724d0a8d1ebfe6443dee118432e20432b8b Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Tue, 10 May 2016 15:12:02 -0700 +Subject: [PATCH] layman/module.py: Fix commit 63808ef00f94 mis-applied + 'sourcefile' attribute changes + +It was not looking for the 'sourcefile' attribute first, then falling back to the kidname for +backward compatibility. +It was incorrectly looking for an ImportError, instead of a 'sourcefile' KeyError. +The filepath of the affected file for the error message had an extra leading '_'. +Add the module name to the warning message. +--- + layman/module.py | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/layman/module.py b/layman/module.py +index 08bcbc2..092418f 100644 +--- a/layman/module.py ++++ b/layman/module.py +@@ -49,13 +49,14 @@ class Module(object): + kid = self.module_spec['provides'][submodule] + kidname = kid['name'] + try: ++ kid['module_name'] = '.'.join([mod_name, kid['sourcefile']]) ++ except KeyError: + kid['module_name'] = '.'.join([mod_name, kidname]) +- except ImportError: +- kid['module_name'] = '.'.join([mod_name, self.name]) +- f = self.__module.__file__ +- msg = 'Module.__initialize(); module spec is old, missing '\ ++ f = self._module.__file__ ++ msg = 'Module.__initialize(); %(module)s module spec is old, missing '\ + 'attribute: \'sourcefile\'.\nBackward compatibility '\ +- 'may be removed in the future.\nFile: %(f)s' % {'f': f} ++ 'may be removed in the future.\nFile: %(f)s' % { ++ 'module': self.name, 'f': f} + self.output.warn(msg) + kid['is_imported'] = False + self.kids[kidname] = kid +-- +2.8.3 + diff -uNr a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild --- a/app-portage/layman/layman-2.4.2-r1.ebuild false +++ b/app-portage/layman/layman-2.4.2-r1.ebuild 167a9d99a048d6c921fdb5628a4255e695f6f9ca947a9f23f08befcbe53253ae33c70e40c960ceb80392429226641ed24defc83c69134ac57df22b6dd6ccc7e0 @@ -0,0 +1,98 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) +PYTHON_REQ_USE="xml(+),sqlite?" + +inherit eutils distutils-r1 linux-info prefix + +DESCRIPTION="Tool to manage Gentoo overlays" +HOMEPAGE="https://wiki.gentoo.org/wiki/Layman" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test" + +DEPEND="test? ( dev-vcs/subversion ) + " + +RDEPEND=" + bazaar? ( dev-vcs/bzr ) + cvs? ( dev-vcs/cvs ) + darcs? ( dev-vcs/darcs ) + git? ( dev-vcs/git ) + mercurial? ( dev-vcs/mercurial ) + g-sorcery? ( app-portage/g-sorcery ) + subversion? ( + || ( + >=dev-vcs/subversion-1.5.4[http] + >=dev-vcs/subversion-1.5.4[webdav-neon] + >=dev-vcs/subversion-1.5.4[webdav-serf] + ) + ) + gpg? ( >=dev-python/pyGPG-0.2 ) + sync-plugin-portage? ( + || ( + >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] + sys-apps/portage-mgorny[${PYTHON_USEDEP}] + ) + ) + !sync-plugin-portage? ( + || ( + sys-apps/portage[${PYTHON_USEDEP}] + sys-apps/portage-mgorny[${PYTHON_USEDEP}] + ) + ) + >=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}] + " + +layman_check_kernel_config() { + local CONFIG_CHECK + use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS" + [[ -n ${CONFIG_CHECK} ]] && check_extra_config +} + +pkg_pretend() { + layman_check_kernel_config +} + +pkg_setup() { + layman_check_kernel_config +} + +python_prepare_all() { + python_setup + esetup.py setup_plugins + distutils-r1_python_prepare_all + eprefixify etc/layman.cfg layman/config.py +} + +python_test() { + suite=layman/tests/external.py + PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed" + unset suite +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /etc/layman + doins etc/layman.cfg + + doman doc/layman.8 + dohtml doc/layman.8.html + + keepdir /var/lib/layman + keepdir /etc/layman/overlays +} + +pkg_postinst() { + # now run layman's update utility + einfo "Running layman-updater..." + "${EROOT}"/usr/bin/layman-updater + einfo +} diff -uNr a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml --- a/app-portage/layman/metadata.xml false +++ b/app-portage/layman/metadata.xml dad01ff3a0f73b1c4d1c0db1807b1384f5480260c8515330347745911d65954793f9e5bf003ec2dea7cfa78013824dc335ced12e61ed625f965eb30a20270213 @@ -0,0 +1,23 @@ + + + + + layman@gentoo.org + Gentoo Layman team + + + Support dev-vcs/bzr based overlays + Support dev-vcs/cvs based overlays + Support dev-vcs/darcs based overlays + Support app-portage/g-sorcery based overlays + Support dev-vcs/git based overlays + Support app-crypt/gnupg signed overlays lists and manifests + Support dev-vcs/mercurial based overlays + Support mounting squashfs image overlays locally read-only + Support dev-vcs/subversion based overlays + Install the sys-apps/portage sync module + + + layman + + diff -uNr a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest --- a/app-portage/portage-utils/Manifest false +++ b/app-portage/portage-utils/Manifest 48cc8faf624e62356565ec624934fd7f6ec5ed74b13980269f852db66476ace29adc7bd66f04f0e376759c872c4967643dacd153217221f6a707a6557defaac0 @@ -0,0 +1,5 @@ +AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713fb0d43f475fb3f6c8582ecaca88f11852097aa1cd9b866e690ccdc760194a316b72d1ebb37 SHA512 0153d2931c2d2a0f03e74f75dadc14d115c0d0e50cbc43e17c1b05a6a406b4bf47435bd32d1b2f559ce6a576e24a30dcf47e8ea6d346371553560ceb055b4429 +AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae +DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 +EBUILD portage-utils-0.64.ebuild 1308 BLAKE2B cd497cc22dbda169a006b1a14e5264eacd5594ae35d48511e8d605d48d96135f5a3dab037955bbc8b634ac68982d29b31398d7302d8989cab365150400d72fb2 SHA512 f99299e75aa903edcf4e556671ad2653f5d430b1b84e6d8404a4bcd889731c0c180ab8451295f4da62f51a36459e83b993072e54753fbb619be124955bce3cf5 +MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13 diff -uNr a/app-portage/portage-utils/files/post_sync b/app-portage/portage-utils/files/post_sync --- a/app-portage/portage-utils/files/post_sync false +++ b/app-portage/portage-utils/files/post_sync c40f9e9fd6a0fd68521fad9d151c4f20531daf7baeccf6577af3fff26c595e4e6ae30f8040e441b2660b3a44418b3c450ae48d6e696ce0a379808769e0d75e4f @@ -0,0 +1,8 @@ +#!/bin/sh +# Copyright 2006-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +for f in /etc/portage/postsync.d/* ; do + [ -x "${f}" ] && "${f}" +done +: diff -uNr a/app-portage/portage-utils/files/q-reinitialize b/app-portage/portage-utils/files/q-reinitialize --- a/app-portage/portage-utils/files/q-reinitialize false +++ b/app-portage/portage-utils/files/q-reinitialize 8db22c0d1218c904ab1f5b68034e427b29acca7784ad02d7908e6b7a4952e9a12fb7de09bfaef1de13e5871f5f973e47a929ee88fae45d2cc06cd8a7368cef81 @@ -0,0 +1,3 @@ +#!/bin/sh +[ -x /usr/bin/q ] && /usr/bin/q -r ${PORTAGE_QUIET:+-q} +: diff -uNr a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml --- a/app-portage/portage-utils/metadata.xml false +++ b/app-portage/portage-utils/metadata.xml 0d72bfe01ac974203aea367661e6db52d5944d4520f77a44e53a4fba882541f12a2b87a6eff60361d0c0e76505f18b16738eed996903aaf3b4ac249d0e912d84 @@ -0,0 +1,8 @@ + + + + + grobian@gentoo.org + Fabian Groffen + + diff -uNr a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild --- a/app-portage/portage-utils/portage-utils-0.64.ebuild false +++ b/app-portage/portage-utils/portage-utils-0.64.ebuild 67e2656279ebc15983095985e24e71bc743b28801cbac61e4ace537f72d85cea906f657a2c11097ed791fd867446683d4a2be0cc5dc05a7dc47fdfbf873137b3 @@ -0,0 +1,43 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit toolchain-funcs + +DESCRIPTION="small and fast portage helper tools written in C" +HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" +SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls static" + +RDEPEND="dev-libs/iniparser:0" +DEPEND="${RDEPEND} + app-arch/xz-utils + static? ( dev-libs/iniparser:0[static-libs] )" + +src_prepare() { + # bug #638970, caused by gemato writing Manifest.gz files in + # metadata/md5-cache dir, unlike hashgen + sed -i -e '/find [.] -mindepth/s/-type f/-type f ! -name "Manifest.*"/' \ + tests/atom_explode/dotest || die +} + +src_configure() { + # Avoid slow configure+gnulib+make if on an up-to-date Linux system + if use prefix || ! use kernel_linux || \ + has_version ' + # include + #else +-# if HAVE_SYS_TIME_H ++# ifdef HAVE_SYS_TIME_H + # include + # else + # include + # endif + #endif + +-#if HAVE_UNISTD_H ++#include ++#include ++ ++#ifdef HAVE_UNISTD_H + # include + #endif + +-#if !HAVE_ALARM ++#ifndef HAVE_ALARM + # define alarm(X) /* empty */ + #endif + +@@ -12416,6 +12419,7 @@ else + #undef putenv + + static time_t time_t_max; ++static time_t time_t_min; + + /* Values we'll use to set the TZ environment variable. */ + static const char *const tz_strings[] = { +@@ -12424,9 +12428,9 @@ static const char *const tz_strings[] = { + }; + #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) + +-/* Fail if mktime fails to convert a date in the spring-forward gap. ++/* Return 0 if mktime fails to convert a date in the spring-forward gap. + Based on a problem report from Andreas Jaeger. */ +-static void ++static int + spring_forward_gap () + { + /* glibc (up to about 1998-10-07) failed this test. */ +@@ -12445,23 +12449,27 @@ spring_forward_gap () + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; +- if (mktime (&tm) == (time_t)-1) +- exit (1); ++ return mktime (&tm) != (time_t) -1; + } + +-static void +-mktime_test (now) ++static int ++mktime_test1 (now) + time_t now; + { + struct tm *lt; +- if ((lt = localtime (&now)) && mktime (lt) != now) +- exit (1); +- now = time_t_max - now; +- if ((lt = localtime (&now)) && mktime (lt) != now) +- exit (1); ++ return ! (lt = localtime (&now)) || mktime (lt) == now; + } + +-static void ++static int ++mktime_test (now) ++ time_t now; ++{ ++ return (mktime_test1 (now) ++ && mktime_test1 ((time_t) (time_t_max - now)) ++ && mktime_test1 ((time_t) (time_t_min + now))); ++} ++ ++static int + irix_6_4_bug () + { + /* Based on code from Ariel Faigon. */ +@@ -12474,11 +12482,10 @@ irix_6_4_bug () + tm.tm_sec = 0; + tm.tm_isdst = -1; + mktime (&tm); +- if (tm.tm_mon != 2 || tm.tm_mday != 31) +- exit (1); ++ return tm.tm_mon == 2 && tm.tm_mday == 31; + } + +-static void ++static int + bigtime_test (j) + int j; + { +@@ -12500,8 +12507,39 @@ bigtime_test (j) + && lt->tm_wday == tm.tm_wday + && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) + == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) +- exit (1); ++ return 0; + } ++ return 1; ++} ++ ++static int ++year_2050_test () ++{ ++ /* The correct answer for 2050-02-01 00:00:00 in Pacific time, ++ ignoring leap seconds. */ ++ unsigned long int answer = 2527315200UL; ++ ++ struct tm tm; ++ time_t t; ++ tm.tm_year = 2050 - 1900; ++ tm.tm_mon = 2 - 1; ++ tm.tm_mday = 1; ++ tm.tm_hour = tm.tm_min = tm.tm_sec = 0; ++ tm.tm_isdst = -1; ++ ++ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" ++ instead of "TZ=America/Vancouver" in order to detect the bug even ++ on systems that don't support the Olson extension, or don't have the ++ full zoneinfo tables installed. */ ++ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); ++ ++ t = mktime (&tm); ++ ++ /* Check that the result is either a failure, or close enough ++ to the correct answer that we can assume the discrepancy is ++ due to leap seconds. */ ++ return (t == (time_t) -1 ++ || (0 < t && answer - 120 <= t && t <= answer + 120)); + } + + int +@@ -12515,9 +12553,15 @@ main () + isn't worth using anyway. */ + alarm (60); + +- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) +- continue; +- time_t_max--; ++ for (;;) ++ { ++ t = (time_t_max << 1) + 1; ++ if (t <= time_t_max) ++ break; ++ time_t_max = t; ++ } ++ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; ++ + delta = time_t_max / 997; /* a suitable prime number */ + for (i = 0; i < N_STRINGS; i++) + { +@@ -12525,17 +12569,22 @@ main () + putenv (tz_strings[i]); + + for (t = 0; t <= time_t_max - delta; t += delta) +- mktime_test (t); +- mktime_test ((time_t) 60 * 60); +- mktime_test ((time_t) 60 * 60 * 24); +- +- for (j = 1; 0 < j; j *= 2) +- bigtime_test (j); +- bigtime_test (j - 1); ++ if (! mktime_test (t)) ++ return 1; ++ if (! (mktime_test ((time_t) 1) ++ && mktime_test ((time_t) (60 * 60)) ++ && mktime_test ((time_t) (60 * 60 * 24)))) ++ return 1; ++ ++ for (j = 1; ; j <<= 1) ++ if (! bigtime_test (j)) ++ return 1; ++ else if (INT_MAX / 2 < j) ++ break; ++ if (! bigtime_test (INT_MAX)) ++ return 1; + } +- irix_6_4_bug (); +- spring_forward_gap (); +- exit (0); ++ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); + } + _ACEOF + rm -f conftest$ac_exeext diff -uNr a/app-shells/bash/files/autoconf-mktime-2.59.patch b/app-shells/bash/files/autoconf-mktime-2.59.patch --- a/app-shells/bash/files/autoconf-mktime-2.59.patch false +++ b/app-shells/bash/files/autoconf-mktime-2.59.patch ee5e94d82a4a1518d4a8d4454d0a29ad62431b22ffc46e1d7d4840df2895ec7d872b7a1fd0109ce68a1ef7cabf95533eed80c605bba4e0f7060cc557eb9aad8f @@ -0,0 +1,197 @@ +http://bugs.gentoo.org/220040 +--- configure ++++ configure +@@ -5299,26 +6059,25 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + /* Test program from Paul Eggert and Tony Leneis. */ +-#if TIME_WITH_SYS_TIME ++#ifdef TIME_WITH_SYS_TIME + # include + # include + #else +-# if HAVE_SYS_TIME_H ++# ifdef HAVE_SYS_TIME_H + # include + # else + # include + # endif + #endif + +-#if HAVE_STDLIB_H +-# include +-#endif ++#include ++#include + +-#if HAVE_UNISTD_H ++#ifdef HAVE_UNISTD_H + # include + #endif + +-#if !HAVE_ALARM ++#ifndef HAVE_ALARM + # define alarm(X) /* empty */ + #endif + +@@ -5335,9 +6094,9 @@ + }; + #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) + +-/* Fail if mktime fails to convert a date in the spring-forward gap. ++/* Return 0 if mktime fails to convert a date in the spring-forward gap. + Based on a problem report from Andreas Jaeger. */ +-static void ++static int + spring_forward_gap () + { + /* glibc (up to about 1998-10-07) failed this test. */ +@@ -5356,29 +6115,27 @@ + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; +- if (mktime (&tm) == (time_t)-1) +- exit (1); ++ return mktime (&tm) != (time_t) -1; + } + +-static void ++static int + mktime_test1 (now) + time_t now; + { + struct tm *lt; +- if ((lt = localtime (&now)) && mktime (lt) != now) +- exit (1); ++ return ! (lt = localtime (&now)) || mktime (lt) == now; + } + +-static void ++static int + mktime_test (now) + time_t now; + { +- mktime_test1 (now); +- mktime_test1 ((time_t) (time_t_max - now)); +- mktime_test1 ((time_t) (time_t_min + now)); ++ return (mktime_test1 (now) ++ && mktime_test1 ((time_t) (time_t_max - now)) ++ && mktime_test1 ((time_t) (time_t_min + now))); + } + +-static void ++static int + irix_6_4_bug () + { + /* Based on code from Ariel Faigon. */ +@@ -5391,11 +6148,10 @@ + tm.tm_sec = 0; + tm.tm_isdst = -1; + mktime (&tm); +- if (tm.tm_mon != 2 || tm.tm_mday != 31) +- exit (1); ++ return tm.tm_mon == 2 && tm.tm_mday == 31; + } + +-static void ++static int + bigtime_test (j) + int j; + { +@@ -5417,8 +6173,39 @@ + && lt->tm_wday == tm.tm_wday + && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) + == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) +- exit (1); ++ return 0; + } ++ return 1; ++} ++ ++static int ++year_2050_test () ++{ ++ /* The correct answer for 2050-02-01 00:00:00 in Pacific time, ++ ignoring leap seconds. */ ++ unsigned long int answer = 2527315200UL; ++ ++ struct tm tm; ++ time_t t; ++ tm.tm_year = 2050 - 1900; ++ tm.tm_mon = 2 - 1; ++ tm.tm_mday = 1; ++ tm.tm_hour = tm.tm_min = tm.tm_sec = 0; ++ tm.tm_isdst = -1; ++ ++ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" ++ instead of "TZ=America/Vancouver" in order to detect the bug even ++ on systems that don't support the Olson extension, or don't have the ++ full zoneinfo tables installed. */ ++ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); ++ ++ t = mktime (&tm); ++ ++ /* Check that the result is either a failure, or close enough ++ to the correct answer that we can assume the discrepancy is ++ due to leap seconds. */ ++ return (t == (time_t) -1 ++ || (0 < t && answer - 120 <= t && t <= answer + 120)); + } + + int +@@ -5432,12 +6219,15 @@ + isn't worth using anyway. */ + alarm (60); + +- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) +- continue; +- time_t_max--; +- if ((time_t) -1 < 0) +- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) +- continue; ++ for (;;) ++ { ++ t = (time_t_max << 1) + 1; ++ if (t <= time_t_max) ++ break; ++ time_t_max = t; ++ } ++ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; ++ + delta = time_t_max / 997; /* a suitable prime number */ + for (i = 0; i < N_STRINGS; i++) + { +@@ -5445,18 +6235,22 @@ + putenv (tz_strings[i]); + + for (t = 0; t <= time_t_max - delta; t += delta) +- mktime_test (t); +- mktime_test ((time_t) 1); +- mktime_test ((time_t) (60 * 60)); +- mktime_test ((time_t) (60 * 60 * 24)); +- +- for (j = 1; 0 < j; j *= 2) +- bigtime_test (j); +- bigtime_test (j - 1); ++ if (! mktime_test (t)) ++ return 1; ++ if (! (mktime_test ((time_t) 1) ++ && mktime_test ((time_t) (60 * 60)) ++ && mktime_test ((time_t) (60 * 60 * 24)))) ++ return 1; ++ ++ for (j = 1; ; j <<= 1) ++ if (! bigtime_test (j)) ++ return 1; ++ else if (INT_MAX / 2 < j) ++ break; ++ if (! bigtime_test (INT_MAX)) ++ return 1; + } +- irix_6_4_bug (); +- spring_forward_gap (); +- exit (0); ++ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); + } + _ACEOF + rm -f conftest$ac_exeext diff -uNr a/app-shells/bash/files/bash-2.05b-destdir.patch b/app-shells/bash/files/bash-2.05b-destdir.patch --- a/app-shells/bash/files/bash-2.05b-destdir.patch false +++ b/app-shells/bash/files/bash-2.05b-destdir.patch 9099c3c86b956a525b86b542b7060652cba2b54461895764affcf51a84aa78aecd2db7860e256267d980cc495930179e0066a3257ab0bd598f98b4b1f513b6cf @@ -0,0 +1,28 @@ +support DESTDIR install + +--- bash-2.05b/Makefile.in ++++ bash-2.05b/Makefile.in +@@ -20,16 +20,16 @@ + all: .made + + # Include some boilerplate Gnu makefile definitions. +-prefix = @prefix@ ++prefix = $(DESTDIR)@prefix@ + +-exec_prefix = @exec_prefix@ +-bindir = @bindir@ +-libdir = @libdir@ +-infodir = @infodir@ +-includedir = @includedir@ ++exec_prefix = $(DESTDIR)@exec_prefix@ ++bindir = $(DESTDIR)@bindir@ ++libdir = $(DESTDIR)@libdir@ ++infodir = $(DESTDIR)@infodir@ ++includedir = $(DESTDIR)@includedir@ + datadir = @datadir@ + +-mandir = @mandir@ ++mandir = $(DESTDIR)@mandir@ + manpfx = man + + man1ext = .1 diff -uNr a/app-shells/bash/files/bash-2.05b-empty-herestring.patch b/app-shells/bash/files/bash-2.05b-empty-herestring.patch --- a/app-shells/bash/files/bash-2.05b-empty-herestring.patch false +++ b/app-shells/bash/files/bash-2.05b-empty-herestring.patch bcaf057edf13428fd790d3d8fc47a905025be5e6b007459bef6f2f507a6dd27dbf824a46da9f43f6c515a1beb96086331d0094cf1638a112d561b951914c5b1f @@ -0,0 +1,25 @@ +################################################################### +# Added by Tavis Ormandy 01/05/2003 +# Reproduce with +# +# $ xargs <<< ${EMTPY_VARIABLE} +# Segmentation fault. +# +# note: bash will still give you a "\n" with this patch, but this is +# standard behaviour, if you need proof: +# +# $ wc -l <<< "" +############################### + +--- bash-2.05b/redir.c ++++ bash-2.05b/redir.c +@@ -263,7 +263,7 @@ + int herelen, n, e; + + herestr = expand_string_to_string (redirectee->word, 0); +- herelen = strlen (herestr); ++ herelen = (herestr == NULL) ? 0 : strlen (herestr); + + n = write (fd, herestr, herelen); + if (n == herelen) + { diff -uNr a/app-shells/bash/files/bash-2.05b-fix-job-warning.patch b/app-shells/bash/files/bash-2.05b-fix-job-warning.patch --- a/app-shells/bash/files/bash-2.05b-fix-job-warning.patch false +++ b/app-shells/bash/files/bash-2.05b-fix-job-warning.patch dfa110fb5bf94138abf0e5ce325ee8878bdf7c0514dd83bcc147217f60e38da683436ef6a0ae12c934789299769bf361513694eb49b61f6138ce5bf7e47ea890 @@ -0,0 +1,14 @@ +fix obvious error: +common.c:247:5: warning: format '%s' expects a matching 'char *' argument [-Wformat=] + +--- a/builtins/common.c ++++ b/builtins/common.c +@@ -244,7 +244,7 @@ + char *s; + { + if (s) +- builtin_error ("%s: no job control"); ++ builtin_error ("%s: no job control", s); + else + builtin_error ("no job control"); + } diff -uNr a/app-shells/bash/files/bash-2.05b-jobs.patch b/app-shells/bash/files/bash-2.05b-jobs.patch --- a/app-shells/bash/files/bash-2.05b-jobs.patch false +++ b/app-shells/bash/files/bash-2.05b-jobs.patch 88265fbe63a24e0bc591f0185b530d19a393781144be5bed95d45ca81834f7f371ce1373e8e28474d4863488cc18d95dfa19bf4a7bc17ce98bbd52a4c53a7eef @@ -0,0 +1,28 @@ +Fix using bash with post-20040808 glibc ebuilds (from fedora) + +--- bash-2.05b/jobs.c ++++ bash-2.05b/jobs.c +@@ -2423,6 +2423,7 @@ + PROCESS *child; + pid_t pid; + int call_set_current, last_stopped_job, job, children_exited, waitpid_flags; ++ static int wcontinued_not_supported = 0; + + call_set_current = children_exited = 0; + last_stopped_job = NO_JOB; +@@ -2436,7 +2437,15 @@ + : 0; + if (sigchld || block == 0) + waitpid_flags |= WNOHANG; ++ retry: ++ if (wcontinued_not_supported) ++ waitpid_flags &= ~WCONTINUED; + pid = WAITPID (-1, &status, waitpid_flags); ++ if (pid == -1 && errno == EINVAL) ++ { ++ wcontinued_not_supported = 1; ++ goto retry; ++ } + + /* The check for WNOHANG is to make sure we decrement sigchld only + if it was non-zero before we called waitpid. */ diff -uNr a/app-shells/bash/files/bash-2.05b-parallel-build.patch b/app-shells/bash/files/bash-2.05b-parallel-build.patch --- a/app-shells/bash/files/bash-2.05b-parallel-build.patch false +++ b/app-shells/bash/files/bash-2.05b-parallel-build.patch 9bdfed73dbe3bad9b95e5cadd2f23beef3f308394a9bc7e8a9bcab6dead4cba91706da0c0a6b124e7e9cc2a0d296af5addcb176eaa50bbfc4f456f9e96a094d9 @@ -0,0 +1,15 @@ +Fix parallel make + +http://bugs.gentoo.org/41002 + +--- a/Makefile.in ++++ b/Makefile.in +@@ -604,7 +604,7 @@ + + config.h: stamp-h + +-stamp-h: config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h ++stamp-h: version.h config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h + CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status + + config.status: $(srcdir)/configure diff -uNr a/app-shells/bash/files/bash-2.05b-protos.patch b/app-shells/bash/files/bash-2.05b-protos.patch --- a/app-shells/bash/files/bash-2.05b-protos.patch false +++ b/app-shells/bash/files/bash-2.05b-protos.patch 816a5b860c88f21fd2985ffe9ba9dc2c7536a27f57696e2d5fffdef61de049246e6d673f4da263180e609ef9e37b7808c125b095a71cbfea40a8e81eda01e3ef @@ -0,0 +1,25 @@ +move prototypes around so they show up when needed + +--- a/externs.h ++++ b/externs.h +@@ -327,6 +327,9 @@ + #undef xstrchr + extern char *xstrchr __P((const char *, int)); + ++/* declarations for functions defined in lib/sh/zcatfd.c */ ++extern int zcatfd __P((int, int, char *)); ++ + /* declarations for functions defined in lib/sh/zread.c */ + extern ssize_t zread __P((int, char *, size_t)); + extern ssize_t zreadintr __P((int, char *, size_t)); +--- a/jobs.h ++++ b/jobs.h +@@ -175,6 +175,8 @@ + extern void ignore_tty_job_signals __P((void)); + extern void default_tty_job_signals __P((void)); + ++extern void close_pgrp_pipe __P((void)); ++ + #if defined (JOB_CONTROL) + extern int job_control; + #endif diff -uNr a/app-shells/bash/files/bash-2.05b-rbash.patch b/app-shells/bash/files/bash-2.05b-rbash.patch --- a/app-shells/bash/files/bash-2.05b-rbash.patch false +++ b/app-shells/bash/files/bash-2.05b-rbash.patch 6d40fb55a519119a9e79deca575114bfb04c46deb367f2d1fa78f09e0b2bc8e4c4252a4aad090a75ec9bdb3668efd45b7fbf526eecd64a055a3e1750b195552b @@ -0,0 +1,27 @@ +Fix broken rbash functionality when used as a login shell via /etc/passwd + +http://bugs.gentoo.org/26854 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=170298 + +Backported from bash-3.1 + +--- bash-2.05b/shell.c ++++ bash-2.05b/shell.c +@@ -1065,6 +1099,8 @@ + if (restricted) + return 1; + temp = base_pathname (name); ++ if (*temp == '-') ++ temp++; + return (STREQ (temp, RESTRICTED_SHELL_NAME)); + } + +@@ -1082,6 +1118,8 @@ + char *temp; + + temp = base_pathname (name); ++ if (*temp == '-') ++ temp++; + if (restricted || (STREQ (temp, RESTRICTED_SHELL_NAME))) + { + set_var_read_only ("PATH"); diff -uNr a/app-shells/bash/files/bash-3.0-darwin-conn.patch b/app-shells/bash/files/bash-3.0-darwin-conn.patch --- a/app-shells/bash/files/bash-3.0-darwin-conn.patch false +++ b/app-shells/bash/files/bash-3.0-darwin-conn.patch eda8430703af36f4276eaa718c99308d5a94a5fdc8cd1235a04fbbffc4b38ad82b9f804a418c0502bb19cf60048501795a2d6335111ed3e553be655431594480 @@ -0,0 +1,20 @@ +Sune Foldager writes: +On Darwin (Mac OS X), bash incorrectly assumed that it has been called over a +network connection (such as ssh, rsh etc.), when stdin stems from the pipe() +system call. This is because bash's heuristic code for determining if it's +been started over a net connection is incorrect on Darwin kernels. + +http://bugs.gentoo.org/79124 + +--- a/lib/sh/netconn.c ++++ b/lib/sh/netconn.c +@@ -53,7 +53,8 @@ + l = sizeof(sa); + rv = getpeername(fd, &sa, &l); + /* Solaris 2.5 getpeername() returns EINVAL if the fd is not a socket. */ +- return ((rv < 0 && (errno == ENOTSOCK || errno == EINVAL)) ? 0 : 1); ++ /* Darwin 7.7.0 getpeername() returns ENOTCONN if the fd was created with pipe(). */ ++ return ((rv < 0 && (errno == ENOTSOCK || errno == ENOTCONN || errno == EINVAL)) ? 0 : 1); + #else /* !HAVE_GETPEERNAME || SVR4_2 || __BEOS__ */ + # if defined (SVR4) || defined (SVR4_2) + /* Sockets on SVR4 and SVR4.2 are character special (streams) devices. */ diff -uNr a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch --- a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch false +++ b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch 925e228be6f7c6a4e9b2b373e0811e5ff36d0e6deb48311ffc369fe716c24f12d6e4822b4d24dc3fbf255e58df9b8278bf7a103584f5351f37334ec285952b27 @@ -0,0 +1,20 @@ +Fix an error when using pipes and PGRP_PIPE is enabled. +( exec 3>&1; : `echo >&3` ) +bash: 3: Bad file descriptor + +http://bugs.gentoo.org/92349 + +Patch from upstream + +*** jobs.c Wed Sep 8 11:08:16 2004 +--- jobs.c Thu Jun 30 17:21:26 2005 +*************** +*** 3456,3459 **** +--- 3901,3907 ---- + stop_making_children (); + start_pipeline (); ++ #if defined (PGRP_PIPE) ++ pipe_close (pgrp_pipe); ++ #endif + delete_all_jobs (0); + set_job_control (0); diff -uNr a/app-shells/bash/files/bash-3.0-protos.patch b/app-shells/bash/files/bash-3.0-protos.patch --- a/app-shells/bash/files/bash-3.0-protos.patch false +++ b/app-shells/bash/files/bash-3.0-protos.patch 726734c5b74de202fd72fa87167a1088ff70ba611a7684f6c8f69d8d66eb4be2e93fe0e60cec7ee97963cf5c44f83271522d398ea90349260d19be92f98d46b3 @@ -0,0 +1,68 @@ +move prototypes around so they show up when needed + +--- a/externs.h ++++ b/externs.h +@@ -327,6 +327,9 @@ + #undef xstrchr + extern char *xstrchr __P((const char *, int)); + ++/* declarations for functions defined in lib/sh/zcatfd.c */ ++extern int zcatfd __P((int, int, char *)); ++ + /* declarations for functions defined in lib/sh/zread.c */ + extern ssize_t zread __P((int, char *, size_t)); + extern ssize_t zreadintr __P((int, char *, size_t)); +--- a/jobs.h ++++ b/jobs.h +@@ -175,6 +175,8 @@ + extern void ignore_tty_job_signals __P((void)); + extern void default_tty_job_signals __P((void)); + ++extern void close_pgrp_pipe __P((void)); ++ + #if defined (JOB_CONTROL) + extern int job_control; + #endif +--- a/general.c ++++ b/general.c +@@ -39,6 +39,8 @@ + #include "bashintl.h" + + #include "shell.h" ++#include "test.h" ++ + #include + + #if !defined (errno) +--- a/builtins/evalfile.c ++++ b/builtins/evalfile.c +@@ -39,6 +39,7 @@ + #include "../flags.h" + #include "../input.h" + #include "../execute_cmd.h" ++#include "../trap.h" + + #if defined (HISTORY) + # include "../bashhist.h" +--- a/lib/glob/strmatch.c ++++ b/lib/glob/strmatch.c +@@ -25,9 +25,6 @@ + #include "strmatch.h" + + extern int xstrmatch __P((char *, char *, int)); +-#if defined (HAVE_MULTIBYTE) +-extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int)); +-#endif + + int + strmatch (pattern, string, flags) +--- a/lib/glob/strmatch.h ++++ b/lib/glob/strmatch.h +@@ -57,6 +57,7 @@ + + #if HANDLE_MULTIBYTE + extern int wcsmatch __P((wchar_t *, wchar_t *, int)); ++extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int)); + #endif + + #endif /* _STRMATCH_H */ diff -uNr a/app-shells/bash/files/bash-3.0-rbash.patch b/app-shells/bash/files/bash-3.0-rbash.patch --- a/app-shells/bash/files/bash-3.0-rbash.patch false +++ b/app-shells/bash/files/bash-3.0-rbash.patch 78400a0caeafe0a63edc6e3aaba15c6282db158f46ae0b84c34d28c228a19d851f70fe6c16cfc00697f32bd2b8810af2bb7d8fa574a78209b92417329e041eb4 @@ -0,0 +1,18 @@ +Fix broken rbash functionality when used as a login shell via /etc/passwd + +http://bugs.gentoo.org/26854 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=170298 + +Backported from bash-3.1 + +--- bash-3.0/shell.c ++++ bash-3.0/shell.c +@@ -1089,6 +1099,8 @@ + if (restricted) + return 1; + temp = base_pathname (name); ++ if (*temp == '-') ++ temp++; + return (STREQ (temp, RESTRICTED_SHELL_NAME)); + } + diff -uNr a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch b/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch --- a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch false +++ b/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch 40f97d31ac94946d7ee6f8f6041a37c44c3fd2472a0bce77360246712ede726f461e2bba68bf5024501686ed40d37a116f9563d0280abfa2d9c445e9484cb739 @@ -0,0 +1,20 @@ +Description: +When using 'read -u 3' or the like, and the pipe-buf already contains +more than one line, the first line is returned, and bytes up to the next +multiple of 128 are skipped. + +http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00168.html +http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00173.html +http://bugs.gentoo.org/show_bug.cgi?id=87093 + +--- builtins/read.def ++++ builtins/read.def +@@ -276,7 +276,7 @@ + input_is_tty = isatty (fd); + if (input_is_tty == 0) + #ifndef __CYGWIN__ +- input_is_pipe = (lseek (0, 0L, SEEK_CUR) < 0) && (errno == ESPIPE); ++ input_is_pipe = (lseek (fd, 0L, SEEK_CUR) < 0) && (errno == ESPIPE); + #else + input_is_pipe = 1; + #endif diff -uNr a/app-shells/bash/files/bash-3.0-read-memleak.patch b/app-shells/bash/files/bash-3.0-read-memleak.patch --- a/app-shells/bash/files/bash-3.0-read-memleak.patch false +++ b/app-shells/bash/files/bash-3.0-read-memleak.patch ec374942032869999c0d0fe2c1d7d4fcfdcd87ff382b5f1cd03311d79d380857f633151746f6d6da85758481bde9f31a17b9c9aa945706bfa628786024f32e59 @@ -0,0 +1,15 @@ +Ripped from Fedora + +http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00013.html +https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173283 + +--- bash-3.0/builtins/read.def ++++ bash-3.0/builtins/read.def +@@ -461,6 +461,7 @@ + if (retval < 0) + { + builtin_error (_("read error: %d: %s"), fd, strerror (errno)); ++ run_unwind_frame ("read_builtin"); + return (EXECUTION_FAILURE); + } + #endif diff -uNr a/app-shells/bash/files/bash-3.0-strnlen.patch b/app-shells/bash/files/bash-3.0-strnlen.patch --- a/app-shells/bash/files/bash-3.0-strnlen.patch false +++ b/app-shells/bash/files/bash-3.0-strnlen.patch 0da0fb3eab464ef163085d98ed47c0d0842f9bd057e8ce80338f99cddc2695fbe44546997ce4516f73c4d0df6da5af5ad4ce8db6180bfbe5737e030caf149c54 @@ -0,0 +1,175 @@ +Add strnlen function for non-glibc systems, as one of Fedora's patches requires it. + +--- bash-3.0/configure.in ++++ bash-3.0/configure.in +@@ -613,6 +613,9 @@ + AC_LIBOBJ(vprint) + fi + ++AC_CHECK_FUNCS([strnlen]) ++AC_LIBOBJ(strnlen) ++ + dnl signal stuff + AC_TYPE_SIGNAL + +--- /dev/null ++++ bash-3.0/lib/sh/strnlen.c +@@ -0,0 +1,27 @@ ++/* ++ Copyright (C) 2005 Gentoo Foundation ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of the GNU General Public License ++ as published by the Free Software Foundation; either version 2 ++ of the License, or (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, US ++*/ ++ ++#include ++ ++size_t strnlen(const char *s, size_t n) ++{ ++ int i; ++ for (i=0; s[i] && i&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif ++ ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++case $LIBOBJS in ++ "strnlen.$ac_objext" | \ ++ *" strnlen.$ac_objext" | \ ++ "strnlen.$ac_objext "* | \ ++ *" strnlen.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS strnlen.$ac_objext" ;; ++esac ++ ++ + echo "$as_me:$LINENO: checking return type of signal handlers" >&5 + echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 + if test "${ac_cv_type_signal+set}" = set; then diff -uNr a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch b/app-shells/bash/files/bash-3.0-trap-fg-signals.patch --- a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch false +++ b/app-shells/bash/files/bash-3.0-trap-fg-signals.patch 396970f4a6471c1461a69b2d13978145a25d8a1379d39015d6bcaa280b41db76453c49b988dbb4fda764fb1840f74f160ec252245efd291dbe1baeb518ed1653 @@ -0,0 +1,23 @@ +Don't barf on handled signals inside of scripts. Makes for nicer output. + +patch by Martin Schlemmer + +--- jobs.c ++++ jobs.c +@@ -2893,11 +2893,11 @@ + } + else if (IS_FOREGROUND (job)) + { +-#if !defined (DONT_REPORT_SIGPIPE) +- if (termsig && WIFSIGNALED (s) && termsig != SIGINT) +-#else +- if (termsig && WIFSIGNALED (s) && termsig != SIGINT && termsig != SIGPIPE) +-#endif ++ if (termsig && WIFSIGNALED (s) && termsig != SIGINT && ++#if defined (DONT_REPORT_SIGPIPE) ++ termsig != SIGPIPE && ++#endif ++ signal_is_trapped (termsig) == 0) + { + fprintf (stderr, "%s", j_strsignal (termsig)); + diff -uNr a/app-shells/bash/files/bash-3.1-dev-fd-buffer-overflow.patch b/app-shells/bash/files/bash-3.1-dev-fd-buffer-overflow.patch --- a/app-shells/bash/files/bash-3.1-dev-fd-buffer-overflow.patch false +++ b/app-shells/bash/files/bash-3.1-dev-fd-buffer-overflow.patch c8cf502067dc79b51eb5289352cafb5d0e18efc2a3ba5dd303f338dee0370a0d5299fb049e89548f5676137c0481e05bb599ab53ea88fbc79748a0723d0d16a2 @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/431850 + +this is a backport of the upstream bash42-033 patch for bash 3.1/3.0/2.05 + +--- a/test.c ++++ b/test.c +@@ -194,7 +194,8 @@ + trailing slash. Make sure /dev/fd/xx really uses DEV_FD_PREFIX/xx. + On most systems, with the notable exception of linux, this is + effectively a no-op. */ +- char pbuf[32]; ++ static char *pbuf = 0; ++ pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8)); + strcpy (pbuf, DEV_FD_PREFIX); + strcat (pbuf, path + 8); + return (stat (pbuf, finfo)); diff -uNr a/app-shells/bash/files/bash-3.1-dev-fd-test-as-user.patch b/app-shells/bash/files/bash-3.1-dev-fd-test-as-user.patch --- a/app-shells/bash/files/bash-3.1-dev-fd-test-as-user.patch false +++ b/app-shells/bash/files/bash-3.1-dev-fd-test-as-user.patch 01f9cb3ae036ffd3660580e8737c68872aa8768685b40f28b851cfad50b3138e0905738a22c80ef38cc571d7341595ebc892a8013be11e25ba7de96bc273228a @@ -0,0 +1,14 @@ +Fix the /dev/fd test when running as a non root user +after logging in as a root user #131875 + +--- bash-3.1/configure ++++ bash-3.1/configure +@@ -23098,7 +23098,7 @@ + if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then + # check for systems like FreeBSD 5 that only provide /dev/fd/[012] + exec 3<&0 +- if test -r /dev/fd/3; then ++ if test -e /dev/fd/3; then + bash_cv_dev_fd=standard + else + bash_cv_dev_fd=absent diff -uNr a/app-shells/bash/files/bash-3.1-fix-dash-login-shell.patch b/app-shells/bash/files/bash-3.1-fix-dash-login-shell.patch --- a/app-shells/bash/files/bash-3.1-fix-dash-login-shell.patch false +++ b/app-shells/bash/files/bash-3.1-fix-dash-login-shell.patch f10deed71b537f13641862be515e34ebe8743f4d9b686fa9acf180acd079d6199930a18c59bd336ed58c65d90c4c04d516bf01495a1db68263e03319883a905c @@ -0,0 +1,52 @@ +http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00054.html +http://bugs.gentoo.org/118257 + +Date: Fri, 13 Jan 2006 17:11:10 +0000 +From: Tim Waugh +To: bug-bash@gnu.org +Subject: [patch] fix 'exec -l /bin/bash' + +Configuration Information [Automatically generated, do not change]: +Machine: i386 +OS: linux-gnu +Compiler: i386-redhat-linux-gcc +Compilation CFLAGS: -DPROGRAM='bash' -DCONF_HOSTTYPE='i386' -DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='i386-redhat-linux-gnu' -DCONF_VENDOR='redhat' -DLOCALEDIR='/usr/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H -I. -I. -I./include -I./lib -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables +uname output: Linux gene.surrey.redhat.com 2.6.13-1.1597_FC5 #1 Thu Oct 6 02:13:06 EDT 2005 i686 i686 i386 GNU/Linux +Machine Type: i386-redhat-linux-gnu + +Bash Version: 3.1 +Patch Level: 1 +Release Status: release + +Description: + If bash has argv[0] as '-/bin/bash' it does not become a login + shell. + +Repeat-By: + exec -l /bin/bash + shopt + +Fix: + +--- bash-3.1/shell.c.login 2006-01-13 16:52:14.000000000 +0000 ++++ bash-3.1/shell.c 2006-01-13 16:52:15.000000000 +0000 +@@ -1543,9 +1543,10 @@ + any startup files; just try to be more like /bin/sh. */ + shell_name = argv0 ? base_pathname (argv0) : PROGRAM; + +- if (*shell_name == '-') ++ if (argv0 && *argv0 == '-') + { +- shell_name++; ++ if (*shell_name == '-') ++ shell_name++; + login_shell++; + } + + + +_______________________________________________ +Bug-bash mailing list +Bug-bash@gnu.org +http://lists.gnu.org/mailman/listinfo/bug-bash + diff -uNr a/app-shells/bash/files/bash-3.1-protos.patch b/app-shells/bash/files/bash-3.1-protos.patch --- a/app-shells/bash/files/bash-3.1-protos.patch false +++ b/app-shells/bash/files/bash-3.1-protos.patch c472f42bf726210aaba9378606c47f89f8307163a17ce0f21514243c47ee74f310a28864c09f8a15ccf8cb86fed9737811416742979bae5465dca9ef318e85ee @@ -0,0 +1,67 @@ +move prototypes around so they show up when needed + +--- a/jobs.h ++++ b/jobs.h +@@ -182,6 +182,7 @@ + + extern int count_all_jobs __P((void)); + ++extern void close_pgrp_pipe __P((void)); + extern void terminate_current_pipeline __P((void)); + extern void terminate_stopped_jobs __P((void)); + extern void hangup_all_jobs __P((void)); +--- a/lib/glob/strmatch.c ++++ b/lib/glob/strmatch.c +@@ -25,9 +25,6 @@ + #include "strmatch.h" + + extern int xstrmatch __P((char *, char *, int)); +-#if defined (HAVE_MULTIBYTE) +-extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int)); +-#endif + + int + strmatch (pattern, string, flags) +--- a/lib/glob/strmatch.h ++++ b/lib/glob/strmatch.h +@@ -57,6 +57,7 @@ + + #if HANDLE_MULTIBYTE + extern int wcsmatch __P((wchar_t *, wchar_t *, int)); ++extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int)); + #endif + + #endif /* _STRMATCH_H */ +--- a/builtins/echo.def ++++ b/builtins/echo.def +@@ -31,6 +31,8 @@ + #include + #include "../shell.h" + ++#include "common.h" ++ + $BUILTIN echo + $FUNCTION echo_builtin + $DEPENDS_ON V9_ECHO +--- a/lib/sh/winsize.c ++++ b/lib/sh/winsize.c +@@ -55,6 +55,7 @@ + #if defined (READLINE) + extern void rl_set_screen_size __P((int, int)); + #endif ++extern void sh_set_lines_and_columns __P((int, int)); + + void + get_new_window_size (from_sig, rp, cp) +--- a/support/bashversion.c ++++ b/support/bashversion.c +@@ -47,6 +47,9 @@ + extern char *dist_version; + extern int patch_level; + ++extern char *shell_version_string __P((void)); ++extern void show_shell_version __P((int)); ++ + char *shell_name = "bash"; + char *progname; + diff -uNr a/app-shells/bash/files/bash-3.1-ulimit.patch b/app-shells/bash/files/bash-3.1-ulimit.patch --- a/app-shells/bash/files/bash-3.1-ulimit.patch false +++ b/app-shells/bash/files/bash-3.1-ulimit.patch 7ce6de218df56faeb085692a7a72bdf010a1a160609d705a37314d8f490d7f6a7e06015e520a49cb3613d28a0b175ca0e70a472a10a29143e9d31a0b6e84f5d7 @@ -0,0 +1,122 @@ +Ripped from Fedora + +Add support for RLIMIT_NICE/RLIMIT_RTPRIO and add missing documentation +for many other options + +--- builtins/ulimit.def ++++ builtins/ulimit.def +@@ -24,7 +24,7 @@ + $BUILTIN ulimit + $FUNCTION ulimit_builtin + $DEPENDS_ON !_MINIX +-$SHORT_DOC ulimit [-SHacdfilmnpqstuvx] [limit] ++$SHORT_DOC ulimit [-SHacdefilmnpqrstuvx] [limit] + Ulimit provides control over the resources available to processes + started by the shell, on systems that allow such control. If an + option is given, it is interpreted as follows: +@@ -34,18 +34,20 @@ + -a all current limits are reported + -c the maximum size of core files created + -d the maximum size of a process's data segment ++ -e the maximum scheduling priority (`nice') + -f the maximum size of files created by the shell +- -i the maximum number of pending signals ++ -i the maximum number of pending signals + -l the maximum size a process may lock into memory + -m the maximum resident set size + -n the maximum number of open file descriptors + -p the pipe buffer size +- -q the maximum number of bytes in POSIX message queues ++ -q the maximum number of bytes in POSIX message queues ++ -r the maximum rt priority + -s the maximum stack size + -t the maximum amount of cpu time in seconds + -u the maximum number of user processes + -v the size of virtual memory +- -x the maximum number of file locks ++ -x the maximum number of file locks + + If LIMIT is given, it is the new value of the specified resource; + the special LIMIT values `soft', `hard', and `unlimited' stand for +@@ -202,6 +204,9 @@ + #ifdef RLIMIT_DATA + { 'd', RLIMIT_DATA, 1024, "data seg size", "kbytes" }, + #endif ++#ifdef RLIMIT_NICE ++ { 'e', RLIMIT_NICE, 1, "max nice", (char *)NULL}, ++#endif + { 'f', RLIMIT_FILESIZE, 1024, "file size", "blocks" }, + #ifdef RLIMIT_SIGPENDING + { 'i', RLIMIT_SIGPENDING, 1, "pending signals", (char *)NULL }, +@@ -217,6 +222,9 @@ + #ifdef RLIMIT_MSGQUEUE + { 'q', RLIMIT_MSGQUEUE, 1, "POSIX message queues", "bytes" }, + #endif ++#ifdef RLIMIT_RTPRIO ++ { 'r', RLIMIT_RTPRIO, 1, "max rt priority", (char *)NULL}, ++#endif + #ifdef RLIMIT_STACK + { 's', RLIMIT_STACK, 1024, "stack size", "kbytes" }, + #endif +--- doc/bashref.texi ++++ doc/bashref.texi +@@ -3833,7 +3833,7 @@ + @item ulimit + @btindex ulimit + @example +-ulimit [-acdfilmnpqstuvxSH] [@var{limit}] ++ulimit [-acdefilmnpqrstuvxSH] [@var{limit}] + @end example + @code{ulimit} provides control over the resources available to processes + started by the shell, on systems that allow such control. If an +@@ -3854,6 +3854,9 @@ + @item -d + The maximum size of a process's data segment. + ++@item -e ++The maximum scheduling priority. ++ + @item -f + The maximum size of files created by the shell. + +@@ -3875,6 +3878,9 @@ + @item -q + The maximum number of bytes in POSIX message queues. + ++@item -r ++The maximum RT priority. ++ + @item -s + The maximum stack size. + +--- doc/bash.1 ++++ doc/bash.1 +@@ -8490,7 +8490,7 @@ + returns true if any of the arguments are found, false if + none are found. + .TP +-\fBulimit\fP [\fB\-SHacdfilmnpqstuvx\fP [\fIlimit\fP]] ++\fBulimit\fP [\fB\-SHacdefilmnpqrstuvx\fP [\fIlimit\fP]] + Provides control over the resources available to the shell and to + processes started by it, on systems that allow such control. + The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is +@@ -8526,6 +8526,9 @@ + .B \-d + The maximum size of a process's data segment + .TP ++.B \-e ++The maximum scheduling priority (`nice') ++.TP + .B \-f + The maximum size of files created by the shell + .TP +@@ -8548,6 +8551,9 @@ + .B \-q + The maximum number of bytes in POSIX message queues + .TP ++.B \-r ++The maximum rt priority ++.TP + .B \-s + The maximum stack size + .TP diff -uNr a/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch b/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch --- a/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch false +++ b/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch 643a7af3f5367f611e751a71326f89980b6950023e2ed8db4673082de2a366ec648bbbbaa6667dd1eda545c0a94dd5dd505fd1aabd1a3641172ee99fadad24c8 @@ -0,0 +1,26 @@ +diff -ur bash-3.2.orig/aclocal.m4 bash-3.2/aclocal.m4 +--- bash-3.2.orig/aclocal.m4 2006-12-30 20:00:31 +0000 ++++ bash-3.2/aclocal.m4 2006-12-30 20:02:02 +0000 +@@ -1544,7 +1544,8 @@ + if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then + # check for systems like FreeBSD 5 that only provide /dev/fd/[012] + exec 3 + #include "builtins.h" + #include "shell.h" ++#include "common.h" + + basename_builtin (list) + WORD_LIST *list; +--- bash-3.2/examples/loadables/cut.c ++++ bash-3.2/examples/loadables/cut.c +@@ -63,6 +63,7 @@ + #include "builtins.h" + #include "shell.h" + #include "bashgetopt.h" ++#include "common.h" + + #if !defined (errno) + extern int errno; +--- bash-3.2/examples/loadables/dirname.c ++++ bash-3.2/examples/loadables/dirname.c +@@ -11,6 +11,7 @@ + #include + #include "builtins.h" + #include "shell.h" ++#include "common.h" + + dirname_builtin (list) + WORD_LIST *list; +--- bash-3.2/examples/loadables/finfo.c ++++ bash-3.2/examples/loadables/finfo.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + #include "bashansi.h" + #include "shell.h" +--- bash-3.2/examples/loadables/head.c ++++ bash-3.2/examples/loadables/head.c +@@ -21,6 +21,7 @@ + #include "builtins.h" + #include "shell.h" + #include "bashgetopt.h" ++#include "common.h" + + #if !defined (errno) + extern int errno; +--- bash-3.2/examples/loadables/ln.c ++++ bash-3.2/examples/loadables/ln.c +@@ -18,6 +18,7 @@ + #include "builtins.h" + #include "shell.h" + #include "bashgetopt.h" ++#include "common.h" + + #if !defined (errno) + extern int errno; +--- bash-3.2/examples/loadables/logname.c ++++ bash-3.2/examples/loadables/logname.c +@@ -11,6 +11,7 @@ + + #include "builtins.h" + #include "shell.h" ++#include "common.h" + + #if !defined (errno) + extern int errno; +--- bash-3.2/examples/loadables/mkdir.c ++++ bash-3.2/examples/loadables/mkdir.c +@@ -16,6 +16,7 @@ + #include "builtins.h" + #include "shell.h" + #include "bashgetopt.h" ++#include "common.h" + + #if !defined (errno) + extern int errno; +--- bash-3.2/examples/loadables/pathchk.c ++++ bash-3.2/examples/loadables/pathchk.c +@@ -45,6 +45,7 @@ + #include "stdc.h" + #include "bashgetopt.h" + #include "maxpath.h" ++#include "common.h" + + #if !defined (errno) + extern int errno; +--- bash-3.2/examples/loadables/print.c ++++ bash-3.2/examples/loadables/print.c +@@ -17,6 +17,8 @@ + #include "builtins.h" + #include "stdc.h" + #include "bashgetopt.h" ++#include "builtext.h" ++#include "common.h" + + #if !defined (errno) + extern int errno; +--- bash-3.2/examples/loadables/printenv.c ++++ bash-3.2/examples/loadables/printenv.c +@@ -11,6 +11,7 @@ + #include "builtins.h" + #include "shell.h" + #include "bashgetopt.h" ++#include "common.h" + + extern char **export_env; + +--- bash-3.2/examples/loadables/push.c ++++ bash-3.2/examples/loadables/push.c +@@ -11,6 +11,7 @@ + #include "shell.h" + #include "jobs.h" + #include "bashgetopt.h" ++#include "common.h" + + #ifndef errno + extern int errno; +--- bash-3.2/examples/loadables/realpath.c ++++ bash-3.2/examples/loadables/realpath.c +@@ -34,6 +34,7 @@ + #include "builtins.h" + #include "shell.h" + #include "bashgetopt.h" ++#include "common.h" + + #ifndef errno + extern int errno; +@@ -67,14 +68,14 @@ + vflag = 1; + break; + default: +- usage(); ++ builtin_usage(); + } + } + + list = loptend; + + if (list == 0) +- usage(); ++ builtin_usage(); + + for (es = EXECUTION_SUCCESS; list; list = list->next) { + p = list->word->word; +--- bash-3.2/examples/loadables/rmdir.c ++++ bash-3.2/examples/loadables/rmdir.c +@@ -8,6 +8,7 @@ + #include + #include "builtins.h" + #include "shell.h" ++#include "common.h" + + #if !defined (errno) + extern int errno; +--- bash-3.2/examples/loadables/sleep.c ++++ bash-3.2/examples/loadables/sleep.c +@@ -27,6 +27,7 @@ + + #include "shell.h" + #include "builtins.h" ++#include "common.h" + + #define RETURN(x) \ + do { \ +--- bash-3.2/examples/loadables/tee.c ++++ bash-3.2/examples/loadables/tee.c +@@ -22,6 +22,7 @@ + #include "builtins.h" + #include "shell.h" + #include "bashgetopt.h" ++#include "common.h" + + #if !defined (errno) + extern int errno; +--- bash-3.2/examples/loadables/truefalse.c ++++ bash-3.2/examples/loadables/truefalse.c +@@ -1,5 +1,7 @@ + /* true and false builtins */ + ++#include ++ + #include "bashtypes.h" + #include "shell.h" + #include "builtins.h" +--- bash-3.2/examples/loadables/tty.c ++++ bash-3.2/examples/loadables/tty.c +@@ -8,6 +8,7 @@ + #include "builtins.h" + #include "shell.h" + #include "bashgetopt.h" ++#include "common.h" + + extern char *ttyname (); + +--- bash-3.2/examples/loadables/uname.c ++++ bash-3.2/examples/loadables/uname.c +@@ -27,6 +27,7 @@ + #include "builtins.h" + #include "shell.h" + #include "bashgetopt.h" ++#include "common.h" + + #define FLAG_SYSNAME 0x01 /* -s */ + #define FLAG_NODENAME 0x02 /* -n */ +--- bash-3.2/examples/loadables/unlink.c ++++ bash-3.2/examples/loadables/unlink.c +@@ -14,6 +14,7 @@ + + #include "builtins.h" + #include "shell.h" ++#include "common.h" + + #ifndef errno + extern int errno; +--- bash-3.2/examples/loadables/whoami.c ++++ bash-3.2/examples/loadables/whoami.c +@@ -8,6 +8,7 @@ + #include "builtins.h" + #include "shell.h" + #include "bashgetopt.h" ++#include "common.h" + + whoami_builtin (list) + WORD_LIST *list; +--- bash-3.2/examples/loadables/Makefile.in ++++ bash-3.2/examples/loadables/Makefile.in +@@ -68,7 +68,7 @@ + SHOBJ_CC = @SHOBJ_CC@ + SHOBJ_CFLAGS = @SHOBJ_CFLAGS@ + SHOBJ_LD = @SHOBJ_LD@ +-SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@ ++SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@ @LDFLAGS@ + SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@ + SHOBJ_LIBS = @SHOBJ_LIBS@ + SHOBJ_STATUS = @SHOBJ_STATUS@ diff -uNr a/app-shells/bash/files/bash-3.2-process-subst.patch b/app-shells/bash/files/bash-3.2-process-subst.patch --- a/app-shells/bash/files/bash-3.2-process-subst.patch false +++ b/app-shells/bash/files/bash-3.2-process-subst.patch 843673500fbdcd8d855ead0a79041f474fb701b64e8d9f1f8970f6d56ab66903f4784a0a3665682cc158e4f062fde253a60b17196c2bd56e6e92db1f3f10a734 @@ -0,0 +1,12 @@ +Fix process substitution on BSD + +--- execute_cmd.c ++++ execute_cmd.c +@@ -2672,6 +2672,7 @@ + + do_piping (pipe_in, pipe_out); + ++ subshell_environment = 0; + if (async) + subshell_environment |= SUBSHELL_ASYNC; + if (pipe_in != NO_PIPE || pipe_out != NO_PIPE) diff -uNr a/app-shells/bash/files/bash-3.2-protos.patch b/app-shells/bash/files/bash-3.2-protos.patch --- a/app-shells/bash/files/bash-3.2-protos.patch false +++ b/app-shells/bash/files/bash-3.2-protos.patch 35fcabd745787e6220d949fb353ff33c89923f030218d9f9e6fd836bb66f40cf8819a731eb77dde59207300d596e4e431d7b0b7c37ad2ed7d2e5272f312a9f3d @@ -0,0 +1,57 @@ +move prototypes around so they show up when needed + +--- a/jobs.h ++++ b/jobs.h +@@ -182,6 +182,7 @@ + + extern int count_all_jobs __P((void)); + ++extern void close_pgrp_pipe __P((void)); + extern void terminate_current_pipeline __P((void)); + extern void terminate_stopped_jobs __P((void)); + extern void hangup_all_jobs __P((void)); +--- a/lib/glob/strmatch.c ++++ b/lib/glob/strmatch.c +@@ -25,9 +25,6 @@ + #include "strmatch.h" + + extern int xstrmatch __P((char *, char *, int)); +-#if defined (HAVE_MULTIBYTE) +-extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int)); +-#endif + + int + strmatch (pattern, string, flags) +--- a/lib/glob/strmatch.h ++++ b/lib/glob/strmatch.h +@@ -57,6 +57,7 @@ + + #if HANDLE_MULTIBYTE + extern int wcsmatch __P((wchar_t *, wchar_t *, int)); ++extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int)); + #endif + + #endif /* _STRMATCH_H */ +--- a/quit.h ++++ b/quit.h +@@ -21,6 +21,8 @@ + #if !defined (_QUIT_H_) + #define _QUIT_H_ + ++#include "sig.h" ++ + /* Non-zero means SIGINT has already ocurred. */ + extern volatile int interrupt_state; + extern volatile int terminating_signal; +--- a/support/bashversion.c ++++ b/support/bashversion.c +@@ -47,6 +47,9 @@ + extern char *dist_version; + extern int patch_level; + ++extern char *shell_version_string __P((void)); ++extern void show_shell_version __P((int)); ++ + char *shell_name = "bash"; + char *progname; + diff -uNr a/app-shells/bash/files/bash-3.2-session-leader.patch b/app-shells/bash/files/bash-3.2-session-leader.patch --- a/app-shells/bash/files/bash-3.2-session-leader.patch false +++ b/app-shells/bash/files/bash-3.2-session-leader.patch d2a19c0ebacf63f16ff5acbcb6b1201fa8c37f72621e0f9ce81dfb1a62b5210f525a28de5fd1f8e220d57b37cb588924f4182818f16111e604c3e9513efa7b8c @@ -0,0 +1,65 @@ +http://bugs.gentoo.org/231775 +http://lists.gnu.org/archive/html/bug-bash/2008-07/msg00010.html + +A parent bash shell sometimes will set the session leader tty (using tcsetpgrp) +back to itself, taking control away from a child bash shell, due to a race +condition. A result is that the child can then not then execute some commands +(like stty) from its init script (e.g. .bashrc). The result I (and others) +have seen is that the bash shell will hang while reading the init script. + +*** jobs.c.20080704 2008-07-10 15:14:13.000000000 -0400 +--- jobs.c 2008-07-10 15:17:59.000000000 -0400 +*************** +*** 266,269 **** +--- 266,270 ---- + static void set_job_running __P((int)); + static void setjstatus __P((int)); ++ static int maybe_give_terminal_to __P((pid_t, pid_t, int)); + static void mark_all_jobs_as_dead __P((void)); + static void mark_dead_jobs_as_notified __P((int)); +*************** +*** 637,641 **** + */ + if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0) +! give_terminal_to (newjob->pgrp, 0); + } + } +--- 638,642 ---- + */ + if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0) +! maybe_give_terminal_to (shell_pgrp, newjob->pgrp, 0); + } + } +*************** +*** 3833,3836 **** +--- 3834,3863 ---- + } + ++ /* Give terminal to NPGRP iff it's currently owned by OPGRP. FLAGS are the ++ flags to pass to give_terminal_to(). */ ++ static int ++ maybe_give_terminal_to (opgrp, npgrp, flags) ++ pid_t opgrp, npgrp; ++ int flags; ++ { ++ int tpgrp; ++ ++ tpgrp = tcgetpgrp (shell_tty); ++ if (tpgrp == npgrp) ++ { ++ terminal_pgrp = npgrp; ++ return 0; ++ } ++ else if (tpgrp != opgrp) ++ { ++ #if defined (DEBUG) ++ internal_warning ("maybe_give_terminal_to: terminal pgrp == %d shell pgrp = %d", tpgrp, opgrp); ++ #endif ++ return -1; ++ } ++ else ++ return (give_terminal_to (npgrp, flags)); ++ } ++ + /* Clear out any jobs in the job array. This is intended to be used by + children of the shell, who should not have any job structures as baggage diff -uNr a/app-shells/bash/files/bash-3.2-ulimit.patch b/app-shells/bash/files/bash-3.2-ulimit.patch --- a/app-shells/bash/files/bash-3.2-ulimit.patch false +++ b/app-shells/bash/files/bash-3.2-ulimit.patch bf1e9a69f0e8243caa4785f8ffb46364a1bbec61d4d45faee77ec0127ce485fced24dceeecc4d761c02ce167e6dcde263e2b7608d850ddc3c0405b3cc36862ba @@ -0,0 +1,13 @@ +add missing docs for -e and -r options + +--- builtins/ulimit.def ++++ builtins/ulimit.def +@@ -24,7 +24,7 @@ + $BUILTIN ulimit + $FUNCTION ulimit_builtin + $DEPENDS_ON !_MINIX +-$SHORT_DOC ulimit [-SHacdfilmnpqstuvx] [limit] ++$SHORT_DOC ulimit [-SHacdefilmnpqrstuvx] [limit] + Ulimit provides control over the resources available to processes + started by the shell, on systems that allow such control. If an + option is given, it is interpreted as follows: diff -uNr a/app-shells/bash/files/bash-4.0-configure.patch b/app-shells/bash/files/bash-4.0-configure.patch --- a/app-shells/bash/files/bash-4.0-configure.patch false +++ b/app-shells/bash/files/bash-4.0-configure.patch 4c87a85072a200ad71d2d6e81312e7fb813d87e424bd8b7c3e31bd4e55012e87f25f90f617bc3852d10a4fb217a07c3a65e8e498a980f21f5f938f86cccd3ef6 @@ -0,0 +1,25 @@ +http://bugs.gentoo.org/304901 + +newer patches touch configure ... we don't want autotool deps, so update +the files ourselves + +--- bash-4.0/configure ++++ bash-4.0/configure +@@ -5806,7 +5806,7 @@ + # static version specified as -llibname to override the + # dynamic version + case "${host_os}" in +- darwin[89]*) READLINE_LIB='${READLINE_LIBRARY}' ;; ++ darwin[89]*|darwin10*) READLINE_LIB='${READLINE_LIBRARY}' ;; + *) READLINE_LIB=-lreadline ;; + esac + fi +@@ -5847,7 +5847,7 @@ + # static version specified as -llibname to override the + # dynamic version + case "${host_os}" in +- darwin[89]*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; ++ darwin[89]*|darwin10*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; + *) HISTORY_LIB=-lhistory ;; + esac + fi diff -uNr a/app-shells/bash/files/bash-4.0-ldflags-for-build.patch b/app-shells/bash/files/bash-4.0-ldflags-for-build.patch --- a/app-shells/bash/files/bash-4.0-ldflags-for-build.patch false +++ b/app-shells/bash/files/bash-4.0-ldflags-for-build.patch ab181aabeb01fa43d1053e5c81f8e7a87ce5044a2b3240c5d1c79505372422861d39a10a44bfd7845e8bc0b25073a580bb018ad634ae9d80e7a812b8bfe7d95b @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/211947 + +fix from Takashi YOSHII: dont use target ldflags for build apps + +--- bash/Makefile.in ++++ bash/Makefile.in +@@ -143,7 +143,7 @@ + CCFLAGS_FOR_BUILD = $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) + + LDFLAGS = @LDFLAGS@ $(STATIC_LD) $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS) +-LDFLAGS_FOR_BUILD = $(LDFLAGS) ++LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD) + + INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) $(INTL_INC) + diff -uNr a/app-shells/bash/files/bash-4.0-negative-return.patch b/app-shells/bash/files/bash-4.0-negative-return.patch --- a/app-shells/bash/files/bash-4.0-negative-return.patch false +++ b/app-shells/bash/files/bash-4.0-negative-return.patch 6890dc93ebb809dca22d8fc1f878088c76ed53d6020b92a7a4173a32017fbff05b5dda4201f33d45b4ac9a41dc1f49481702e3b4692dd713cd1fd38301250fc7 @@ -0,0 +1,33 @@ +http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00158.html + +make `return` accept negative values again + +hack by me (vapier@gentoo.org) ... i'm not familiar with bash source code, so +i imagine this isn't the best way to do it ... + +--- bash/builtins/return.def ++++ bash/builtins/return.def +@@ -60,9 +60,23 @@ + return_builtin (list) + WORD_LIST *list; + { ++ int neg = 0; ++ if (list && list->word && list->word->word) { ++ char *word = list->word->word; ++ if (*word == '-') { ++ while (*word++) ++ if (!isdigit(*word)) ++ break; ++ if (!*word) ++ neg = 1; ++ } ++ } ++ ++ if (!neg) { + if (no_options (list)) + return (EX_USAGE); + list = loptend; /* skip over possible `--' */ ++ } + + return_catch_value = get_exitstat (list); + diff -uNr a/app-shells/bash/files/bash-4.0-parallel-build.patch b/app-shells/bash/files/bash-4.0-parallel-build.patch --- a/app-shells/bash/files/bash-4.0-parallel-build.patch false +++ b/app-shells/bash/files/bash-4.0-parallel-build.patch 2ef7893edd08833080c8b662f10e4ac41fd4c8488663ad0bba55354745c3e9e4e2ca8341e53512ab47498fe94076f8bd5e1c337975096e1c2741c1f42d8efdfa @@ -0,0 +1,65 @@ +http://bugs.gentoo.org/267613 + +add missing dep + +patch by Peter Alfredsen + +--- bash-4.0/Makefile.in ++++ bash-4.0/Makefile.in +@@ -1022,10 +1022,11 @@ + subst.o: flags.h jobs.h siglist.h execute_cmd.h ${BASHINCDIR}/filecntl.h trap.h pathexp.h + subst.o: mailcheck.h input.h $(DEFSRC)/getopt.h $(DEFSRC)/common.h + subst.o: bashline.h bashhist.h ${GLOB_LIBSRC}/strmatch.h + subst.o: ${BASHINCDIR}/chartypes.h + subst.o: ${BASHINCDIR}/shmbutil.h ++subst.o: ${DEFDIR}/builtext.h + test.o: bashtypes.h ${BASHINCDIR}/posixstat.h ${BASHINCDIR}/filecntl.h + test.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h + test.o: general.h xmalloc.h bashtypes.h variables.h arrayfunc.h conftypes.h array.h hashlib.h + test.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h + test.o: make_cmd.h subst.h sig.h pathnames.h externs.h test.h + +http://bugs.gentoo.org/284633 + +and another ... + +--- bash-4.0/lib/sh/Makefile.in ++++ bash-4.0/lib/sh/Makefile.in +@@ -136,6 +136,9 @@ + ${BUILD_DIR}/version.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile + -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} version.h ) + ++${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile ++ -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h ) ++ + # rules for losing makes, like SunOS + casemod.o: casemod.c + clktck.o: clktck.c + +http://bugs.gentoo.org/300143 + +and another ... + +--- bash-4.0/lib/glob/Makefile.in ++++ bash-4.0/lib/glob/Makefile.in +@@ -119,6 +119,11 @@ + mostlyclean: clean + -( cd doc && $(MAKE) $(MFLAGS) $@ ) + ++# Dependencies ++ ++${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile ++ -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h ) ++ + ###################################################################### + # # + # Dependencies for the object files which make up this library. # +@@ -136,7 +141,7 @@ + strmatch.o: $(BUILD_DIR)/config.h + strmatch.o: $(BASHINCDIR)/stdc.h + +-glob.o: $(BUILD_DIR)/config.h ++glob.o: $(BUILD_DIR)/config.h $(topdir)/shell.h $(BUILD_DIR)/pathnames.h + glob.o: $(topdir)/bashtypes.h $(BASHINCDIR)/ansi_stdlib.h $(topdir)/bashansi.h + glob.o: $(BASHINCDIR)/posixstat.h $(BASHINCDIR)/memalloc.h + glob.o: strmatch.h glob.h diff -uNr a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch --- a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch false +++ b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch 40d3e48cfdbf839febfc4a48a13abfe314265de312a9feba8cf905c27d28b51f0b3ee043e91deed36d1b0265732a1c9a71da4eb7a05d4a9a3682b943e8b8ab36 @@ -0,0 +1,29 @@ +Bash built-in test fails to correctly report exeuctable status for non- +executable files when run by root on FreeBSD. + +See http://bugs.gentoo.org/303411 + +Patch from Johan Hattne +--- lib/sh/eaccess.c.orig ++++ lib/sh/eaccess.c +@@ -198,11 +198,19 @@ + char *path; + int mode; + { ++ struct stat s; ++ int ret; ++ + if (path_is_devfd (path)) + return (sh_stataccess (path, mode)); + + #if defined (HAVE_EACCESS) /* FreeBSD */ +- return (eaccess (path, mode)); ++ if (stat (path, &s) != 0) ++ return (-1); ++ ret = eaccess (path, mode); ++ if (mode == X_OK && ret == 0 && !S_ISDIR(s.st_mode) && geteuid() == 0) ++ return ((s.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0 ? -1 : 0); ++ return (ret); + #elif defined (EFF_ONLY_OK) /* SVR4(?), SVR4.2 */ + return access (path, mode|EFF_ONLY_OK); + #else diff -uNr a/app-shells/bash/files/bash-4.1-parallel-build.patch b/app-shells/bash/files/bash-4.1-parallel-build.patch --- a/app-shells/bash/files/bash-4.1-parallel-build.patch false +++ b/app-shells/bash/files/bash-4.1-parallel-build.patch 2dc94e4b19a2370a291050d68fd49934cd18502f74bc49f14cfa0d39c9e34709f7499a88f60082d69f292447d53cbe419d7cdbba0253091eb1b973ef633e61b0 @@ -0,0 +1,23 @@ +--- bash-4.1/lib/glob/Makefile.in ++++ bash-4.1/lib/glob/Makefile.in +@@ -119,6 +119,11 @@ + mostlyclean: clean + -( cd doc && $(MAKE) $(MFLAGS) $@ ) + ++# Dependencies ++ ++${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile ++ -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h ) ++ + ###################################################################### + # # + # Dependencies for the object files which make up this library. # +@@ -136,7 +141,7 @@ + strmatch.o: $(BUILD_DIR)/config.h + strmatch.o: $(BASHINCDIR)/stdc.h + +-glob.o: $(BUILD_DIR)/config.h ++glob.o: $(BUILD_DIR)/config.h $(topdir)/shell.h $(BUILD_DIR)/pathnames.h + glob.o: $(topdir)/bashtypes.h $(BASHINCDIR)/ansi_stdlib.h $(topdir)/bashansi.h + glob.o: $(BASHINCDIR)/posixstat.h $(BASHINCDIR)/memalloc.h + glob.o: strmatch.h glob.h diff -uNr a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch --- a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch false +++ b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch 32895365d58b62d4a503625fc5131c6a234a373b88024cac5e6461b7fed9a60146c7328a189db9c45afbc4807b135f1ed330ddc5bf6cb506612d6e712f4b49f9 @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/431850 + +this is a minor tweak to the upstream patch to also apply to bash 4.1/4.0/3.2 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-033 + +Bug-Reported-by: David Leverton +Bug-Reference-ID: <4FCCE737.1060603@googlemail.com> +Bug-Reference-URL: + +Bug-Description: + +Bash uses a static buffer when expanding the /dev/fd prefix for the test +and conditional commands, among other uses, when it should use a dynamic +buffer to avoid buffer overflow. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/lib/sh/eaccess.c 2011-01-08 20:50:10.000000000 -0500 +--- lib/sh/eaccess.c 2012-06-04 21:06:43.000000000 -0400 +*************** +*** 83,86 **** +--- 83,88 ---- + struct stat *finfo; + { ++ static char *pbuf = 0; ++ + if (*path == '\0') + { +*************** +*** 107,111 **** + On most systems, with the notable exception of linux, this is + effectively a no-op. */ +! char pbuf[32]; + strcpy (pbuf, DEV_FD_PREFIX); + strcat (pbuf, path + 8); +--- 109,113 ---- + On most systems, with the notable exception of linux, this is + effectively a no-op. */ +! pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8)); + strcpy (pbuf, DEV_FD_PREFIX); + strcat (pbuf, path + 8); diff -uNr a/app-shells/bash/files/bash-4.2-execute-job-control.patch b/app-shells/bash/files/bash-4.2-execute-job-control.patch --- a/app-shells/bash/files/bash-4.2-execute-job-control.patch false +++ b/app-shells/bash/files/bash-4.2-execute-job-control.patch ec123688fe0f272d37b8bb3a59c9675f245a4c8b300ca54c5493d80561adf1c8ce3c151df595900d13b007f46e8897d8619e13f735eaf5119777314efef23df4 @@ -0,0 +1,24 @@ +fix build when job control is disabled + +http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html +http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00057.html +http://lists.gnu.org/archive/html/bug-bash/2011-09/msg00039.html +https://bugs.gentoo.org/383237 + +should be fixed in next release of bash ... + +--- a/execute_cmd.c ++++ b/execute_cmd.c +@@ -2202,7 +2202,11 @@ + /* If the `lastpipe' option is set with shopt, and job control is not + enabled, execute the last element of non-async pipelines in the + current shell environment. */ +- if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) ++ if (lastpipe_opt && ++#if defined(JOB_CONTROL) ++ job_control == 0 && ++#endif ++ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + { + lstdin = move_to_high_fd (0, 0, 255); + if (lstdin > 0) diff -uNr a/app-shells/bash/files/bash-4.2-no-readline.patch b/app-shells/bash/files/bash-4.2-no-readline.patch --- a/app-shells/bash/files/bash-4.2-no-readline.patch false +++ b/app-shells/bash/files/bash-4.2-no-readline.patch 5ef27f05b40f76fb40f48e2fc5d40184944171451eb065262fb252f591e7d483c20f0aba6740d053c64e3b1fc3089ff6f9a5d32a7739ccbadb5bcbef80a9c93b @@ -0,0 +1,19 @@ +fix building when readline is disabled + +--- a/builtins/complete.def ++++ b/builtins/complete.def +@@ -49,6 +49,8 @@ $END + + #include + ++#ifdef READLINE ++ + #include + + #include "../bashtypes.h" +@@ -867,3 +869,5 @@ compopt_builtin (list) + + return (ret); + } ++ ++#endif diff -uNr a/app-shells/bash/files/bash-4.2-parallel-build.patch b/app-shells/bash/files/bash-4.2-parallel-build.patch --- a/app-shells/bash/files/bash-4.2-parallel-build.patch false +++ b/app-shells/bash/files/bash-4.2-parallel-build.patch ebf301b7e32c7240e4cf41ef7d127ce2900a6b6e5fbbb19a721f9dc6ae27129562fbd178bd9ddd7409318dce959051d4336aec94fb38bbb4b1ad52ef799d816e @@ -0,0 +1,106 @@ +https://lists.gnu.org/archive/html/bug-bash/2011-10/msg00036.html + +the current yacc rules allow multiple runs to generate the same files. usually +this doesn't come up as the generated files are shipped in the tarball, but +when you modify parse.y (applying a patch or developing or whatever), you can +hit this problem. + +simple way of showing this: + make -j y.tab.{c,h} +a correct system would not show the yacc parser running twice :) + +simple patch is to have the .h file depend on the .c file, and have the .h file +itself issue a dummy rule (to avoid make thinking things changed). + +--- a/Makefile.in ++++ b/Makefile.in +@@ -579,16 +579,17 @@ + + # old rules + GRAM_H = parser-built +-y.tab.o: y.tab.c ${GRAM_H} command.h ${BASHINCDIR}/stdc.h input.h ++y.tab.o: y.tab.h y.tab.c ${GRAM_H} command.h ${BASHINCDIR}/stdc.h input.h + ${GRAM_H}: y.tab.h + @-if test -f y.tab.h ; then \ + cmp -s $@ y.tab.h 2>/dev/null || cp -p y.tab.h $@; \ + fi +-y.tab.c y.tab.h: parse.y ++y.tab.c: parse.y + # -if test -f y.tab.h; then mv -f y.tab.h old-y.tab.h; fi + $(YACC) -d $(srcdir)/parse.y + touch parser-built + # -if cmp -s old-y.tab.h y.tab.h; then mv old-y.tab.h y.tab.h; else cp -p y.tab.h ${GRAM_H}; fi ++y.tab.h: y.tab.c ; @true + + # experimental new rules - work with GNU make but not BSD (or OSF) make + #y.tab.o: y.tab.c y.tab.h + +https://lists.gnu.org/archive/html/bug-bash/2011-10/msg00037.html + +the current code generates a bunch of local libraries in subdirs and then +links bash against that. those subdirs sometimes need version.h. so they +have a rule to change back up to the parent dir and build version.h (which is +fine). the trouble is that the top level objects and the subdirs are allowed +to build in parallel, so it's possible for multiple children to see that +version.h is not available and that it needs to be created, so they all do. + +there is even more trouble is that version.h depends on all the top level +sources, some of which are compiled (like syntax.c). so these parallel +children all kick off a job to generate syntax.c which in turn requires the +mksyntax helper executable. obviously multiple processes rm-ing, compiling, +and linking the same files quickly falls apart. + +so tweak the subdirs to all depend on the .build target which in turn depends +on all of these top level files being generated. now the subdirs won't try and +recursively enter the top level. + +(noticed by David James) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -597,6 +598,11 @@ + # $(YACC) -d $(srcdir)/parse.y + # -if cmp -s old-y.tab.h y.tab.h; then mv old-y.tab.h y.tab.h; fi + ++# Subdirs will often times want version.h, so they'll change back up to ++# the top level and try to create it. This causes parallel build issues ++# so just force top level sanity before we descend. ++$(LIBDEP): .build ++ + $(READLINE_LIBRARY): config.h $(READLINE_SOURCE) + @echo making $@ in ${RL_LIBDIR} + @( { test "${RL_LIBDIR}" = "${libdir}" && exit 0; } || \ + +http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00107.html + +the top level Makefile will recurse into the defdir for multiple targets +(libbuiltins.a, common.o, bashgetopt.o, builtext.h), and since these do +not have any declared interdependencies, parallel makes will recurse into +the subdir and build the respective targets. + +nothing depends on common.o or bashgetopt.o, so those targets don't get +used normally. this leaves libbuiltins.a and builtext.h. at a glance, +this shouldn't be a big deal, but when we look closer, there's a subtle +failure lurking. + +most of the objects in the defdir need to be generated which means they +need to build+link the local mkbuiltins helper. the builtext.h header +also needs to be generated by the mkbuiltins helper. so when the top +level launches a child for libbuiltins.a and a child for builtext.h, we +can hit a race condition where the two try to generate mkbuiltins, and +the build randomly fails. + +so update libbuiltins.a to depend on builtext.h. this should be fairly +simple since it's only a single target. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -674,7 +674,7 @@ + $(RM) $@ + ./mksyntax$(EXEEXT) -o $@ + +-$(BUILTINS_LIBRARY): $(BUILTIN_DEFS) $(BUILTIN_C_SRC) config.h ${BASHINCDIR}/memalloc.h version.h ++$(BUILTINS_LIBRARY): $(BUILTIN_DEFS) $(BUILTIN_C_SRC) config.h ${BASHINCDIR}/memalloc.h ${DEFDIR}/builtext.h version.h + @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} libbuiltins.a ) || exit 1 + + # these require special rules to circumvent make builtin rules diff -uNr a/app-shells/bash/files/bash-4.2-read-retry.patch b/app-shells/bash/files/bash-4.2-read-retry.patch --- a/app-shells/bash/files/bash-4.2-read-retry.patch false +++ b/app-shells/bash/files/bash-4.2-read-retry.patch 6b6751ede67d18b201c46dcd43a8e06b4e8e50045e7e420ea1addf1b0459812986c1218f22e79122040cb7cd4523493a90702c40bb34ecc4abbab6df149e2adc @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/447810 + +fix from upstream to workaround broken BSD kernels + +commit 208fdb509e072977ae7a621e916dfcd32c76047d +Author: Chet Ramey +Date: Mon Mar 4 08:09:29 2013 -0500 + + commit bash-20130201 snapshot + +diff --git a/redir.c b/redir.c +index d7da2f3..aa3d16d 100644 +--- a/redir.c ++++ b/redir.c +@@ -650,7 +650,7 @@ redir_open (filename, flags, mode, ri) + int flags, mode; + enum r_instruction ri; + { +- int fd, r; ++ int fd, r, e; + + r = find_string_in_alist (filename, _redir_special_filenames, 1); + if (r >= 0) +@@ -666,7 +666,16 @@ redir_open (filename, flags, mode, ri) + } + else + { +- fd = open (filename, flags, mode); ++ do ++ { ++ fd = open (filename, flags, mode); ++ e = errno; ++ if (fd < 0 && e == EINTR) ++ QUIT; ++ errno = e; ++ } ++ while (fd < 0 && errno == EINTR); ++ + #if defined (AFS) + if ((fd < 0) && (errno == EACCES)) + { diff -uNr a/app-shells/bash/files/bash-4.2-speed-up-read-N.patch b/app-shells/bash/files/bash-4.2-speed-up-read-N.patch --- a/app-shells/bash/files/bash-4.2-speed-up-read-N.patch false +++ b/app-shells/bash/files/bash-4.2-speed-up-read-N.patch 74613bb5aed7baa1266f7c8a4cc35e04397ac28d704867a00c1c560c5be02cc94d444a5b514e5bc83410910d2a8f333796e3b7d6e75ae92c201e3a34b4a61595 @@ -0,0 +1,112 @@ +http://lists.gnu.org/archive/html/bug-bash/2012-11/msg00034.html + +From 530d4988afd68ea9d2cf1b0267d4dc821d0d204f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 19 Nov 2012 17:58:51 -0500 +Subject: [PATCH] bash: speed up `read -N` + +Rather than using 1 byte reads, use the existing cache read logic. +This could be sped up more, but this change is not as invasive and +should (hopefully) be fairly safe. + +Signed-off-by: Mike Frysinger +--- + builtins/read.def | 21 ++++++++++++++++----- + externs.h | 1 + + lib/sh/zread.c | 15 +++++++++++++-- + 3 files changed, 30 insertions(+), 7 deletions(-) + +diff --git a/builtins/read.def b/builtins/read.def +index e32dec7..81a1b3f 100644 +--- a/builtins/read.def ++++ b/builtins/read.def +@@ -457,7 +457,10 @@ read_builtin (list) + interrupt_immediately++; + terminate_immediately++; + +- unbuffered_read = (nchars > 0) || (delim != '\n') || input_is_pipe; ++ if ((nchars > 0) && !input_is_tty && ignore_delim) ++ unbuffered_read = 2; ++ else if ((nchars > 0) || (delim != '\n') || input_is_pipe) ++ unbuffered_read = 1; + + if (prompt && edit == 0) + { +@@ -505,10 +508,18 @@ read_builtin (list) + print_ps2 = 0; + } + +- if (unbuffered_read) +- retval = zread (fd, &c, 1); +- else +- retval = zreadc (fd, &c); ++ switch (unbuffered_read) ++ { ++ case 2: ++ retval = zreadcn (fd, &c, nchars - nr); ++ break; ++ case 1: ++ retval = zread (fd, &c, 1); ++ break; ++ default: ++ retval = zreadc (fd, &c); ++ break; ++ } + + if (retval <= 0) + { +diff --git a/externs.h b/externs.h +index 09244fa..a5ad645 100644 +--- a/externs.h ++++ b/externs.h +@@ -479,6 +479,7 @@ extern ssize_t zread __P((int, char *, size_t)); + extern ssize_t zreadretry __P((int, char *, size_t)); + extern ssize_t zreadintr __P((int, char *, size_t)); + extern ssize_t zreadc __P((int, char *)); ++extern ssize_t zreadcn __P((int, char *, int)); + extern ssize_t zreadcintr __P((int, char *)); + extern void zreset __P((void)); + extern void zsyncfd __P((int)); +diff --git a/lib/sh/zread.c b/lib/sh/zread.c +index 5db21a9..af7d02b 100644 +--- a/lib/sh/zread.c ++++ b/lib/sh/zread.c +@@ -101,15 +101,18 @@ static char lbuf[128]; + static size_t lind, lused; + + ssize_t +-zreadc (fd, cp) ++zreadcn (fd, cp, len) + int fd; + char *cp; ++ int len; + { + ssize_t nr; + + if (lind == lused || lused == 0) + { +- nr = zread (fd, lbuf, sizeof (lbuf)); ++ if (len > sizeof (lbuf)) ++ len = sizeof (lbuf); ++ nr = zread (fd, lbuf, len); + lind = 0; + if (nr <= 0) + { +@@ -123,6 +126,14 @@ zreadc (fd, cp) + return 1; + } + ++ssize_t ++zreadc (fd, cp) ++ int fd; ++ char *cp; ++{ ++ return zreadcn (fd, cp, sizeof (lbuf)); ++} ++ + /* Don't mix calls to zreadc and zreadcintr in the same function, since they + use the same local buffer. */ + ssize_t +-- +1.7.12.4 + diff -uNr a/app-shells/bash/files/bash-4.3-append-process-segfault.patch b/app-shells/bash/files/bash-4.3-append-process-segfault.patch --- a/app-shells/bash/files/bash-4.3-append-process-segfault.patch false +++ b/app-shells/bash/files/bash-4.3-append-process-segfault.patch 8cbeb8770c79503fe79b28ea867b497528c833eab547632591f8d43c004f1fae8221078b133254bc77890283162a081548a6cdc7a50bd917c36d058ddab47b5f @@ -0,0 +1,18 @@ +https://lists.gnu.org/archive/html/bug-bash/2014-08/msg00048.html + +*** ../bash-4.3-patched/execute_cmd.c 2014-07-30 10:26:52.000000000 -0400 +--- execute_cmd.c 2014-08-11 16:55:57.000000000 -0400 +*************** +*** 2406,2410 **** + { + #if defined (JOB_CONTROL) +! append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid); + #endif + lstdin = wait_for (lastpid); +--- 2433,2438 ---- + { + #if defined (JOB_CONTROL) +! if (INVALID_JOB (lastpipe_jid) == 0) +! append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid); + #endif + lstdin = wait_for (lastpid); diff -uNr a/app-shells/bash/files/bash-4.3-arrayfunc.patch b/app-shells/bash/files/bash-4.3-arrayfunc.patch --- a/app-shells/bash/files/bash-4.3-arrayfunc.patch false +++ b/app-shells/bash/files/bash-4.3-arrayfunc.patch 94b2383778d282c898a98a4fe4cbac690a88152a2484e3da47aa33d81e5fb4a03d8465fc2f1c0c9a5cf364e68e710d4d02ac18b9e26f5d0492d828672c66fa02 @@ -0,0 +1,15 @@ +http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00178.html + +diff --git a/arrayfunc.c b/arrayfunc.c +index 804e6da..0f900aa 100644 +--- a/arrayfunc.c ++++ b/arrayfunc.c +@@ -498,7 +498,7 @@ assign_compound_array_list (var, nlist, flags) + + for (list = nlist; list; list = list->next) + { +- iflags = flags; ++ iflags = (flags & ~ASS_APPEND); + w = list->word->word; + + /* We have a word of the form [ind]=value */ diff -uNr a/app-shells/bash/files/bash-4.3-compat-lvl.patch b/app-shells/bash/files/bash-4.3-compat-lvl.patch --- a/app-shells/bash/files/bash-4.3-compat-lvl.patch false +++ b/app-shells/bash/files/bash-4.3-compat-lvl.patch 46d97d0428566479a5a6beaba5653dfe1d52152ad503e290aeda754d083c1cf40a850379be38315d585a8b00d611ca67aac628f1e1603c7cde506f4f59afa1b1 @@ -0,0 +1,13 @@ +https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html + +--- a/builtins/shopt.def ++++ b/builtins/shopt.def +@@ -160,7 +160,7 @@ static struct { + { "compat32", &shopt_compat32, set_compatibility_level }, + { "compat40", &shopt_compat40, set_compatibility_level }, + { "compat41", &shopt_compat41, set_compatibility_level }, +- { "compat42", &shopt_compat41, set_compatibility_level }, ++ { "compat42", &shopt_compat42, set_compatibility_level }, + #if defined (READLINE) + { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, + { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, diff -uNr a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch --- a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch false +++ b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch e9696de37969c9aeed7be66ba75e11ecb0bef3e6f0f8e7cf8ed29b4ba4a7c8f05e48029d6bc70610f9f1e1eed40a041893012f38f2e6a10e95581cde58121433 @@ -0,0 +1,13 @@ +http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00097.html + +--- bash-4.3/builtins/mapfile.def ++++ bash-4.3/builtins/mapfile.def +@@ -339,7 +339,7 @@ + else + array_name = list->word->word; + +- if (legal_identifier (array_name) == 0 && valid_array_reference (array_name) == 0) ++ if (legal_identifier (array_name) == 0) + { + sh_invalidid (array_name); + return (EXECUTION_FAILURE); diff -uNr a/app-shells/bash/files/bash-4.3-protos.patch b/app-shells/bash/files/bash-4.3-protos.patch --- a/app-shells/bash/files/bash-4.3-protos.patch false +++ b/app-shells/bash/files/bash-4.3-protos.patch 381523eb86a9f134daeb6b2380c395b0154222b0e9d1ba387cd930bf4d95e56ecba64be9787f1fafda782e9f392848118140e381ef331c19f9b19fde9e7264ad @@ -0,0 +1,10 @@ +--- a/redir.c ++++ b/redir.c +@@ -31,6 +31,7 @@ + #endif + #include "filecntl.h" + #include "posixstat.h" ++#include "trap.h" + + #if defined (HAVE_UNISTD_H) + # include diff -uNr a/app-shells/bash/files/bash-4.4-jobs_overflow.patch b/app-shells/bash/files/bash-4.4-jobs_overflow.patch --- a/app-shells/bash/files/bash-4.4-jobs_overflow.patch false +++ b/app-shells/bash/files/bash-4.4-jobs_overflow.patch 668053a7425393d0d88588329e12640ba829a83c05b30e00aaba433204b2509efed3e6fd32888e77e7bc1556038b6a89a3651e14e0119757a45c03f9c8eeab0a @@ -0,0 +1,14 @@ +https://lists.gnu.org/archive/html/bug-bash/2017-12/msg00025.html +https://bugs.gentoo.org/644720 + +--- bash-4.4/jobs.c ++++ bash-4.4/jobs.c +@@ -750,7 +750,7 @@ + else + nsize = bgpids.nalloc; + +- while (nsize < js.c_childmax) ++ while (nsize < (ps_index_t)js.c_childmax) + nsize *= 2; + + if (bgpids.nalloc < js.c_childmax) diff -uNr a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch --- a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch false +++ b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch 9e31a3b551a50d29f30b095a126475e727f7990183ec25ffea85463af630cad93a1f3e15ba6da2592f86b78f596a030b9458b67f938ac2a1f63e5f537cc0dc31 @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/600174 +https://lists.gnu.org/archive/html/bug-bash/2016-11/msg00099.html + +*** ../bash-4.4-patched/builtins/pushd.def 2016-01-25 13:31:49.000000000 -0500 +--- builtins/pushd.def 2016-10-28 10:46:49.000000000 -0400 +*************** +*** 366,370 **** + } + +! if (which > directory_list_offset || (directory_list_offset == 0 && which == 0)) + { + pushd_error (directory_list_offset, which_word ? which_word : ""); +--- 366,370 ---- + } + +! if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0)) + { + pushd_error (directory_list_offset, which_word ? which_word : ""); +*************** +*** 388,391 **** +--- 388,396 ---- + of the list into place. */ + i = (direction == '+') ? directory_list_offset - which : which; ++ if (i < 0 || i > directory_list_offset) ++ { ++ pushd_error (directory_list_offset, which_word ? which_word : ""); ++ return (EXECUTION_FAILURE); ++ } + free (pushd_directory_list[i]); + directory_list_offset--; diff -uNr a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch --- a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch false +++ b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch 5bf8a572bb1c6df21c87ae7e7a343340e28f8fe76c4fed5a98bb53a06d741a2cb8b1320b011f35d9bbcbbed9a33d231c03e680fdc2629af7359556941a9bf8c6 @@ -0,0 +1,47 @@ +http://bugs.gentoo.org/310197 +http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html + +fix heredocs handling in `set` output + +*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400 +--- print_cmd.c 2010-03-22 21:15:30.000000000 -0400 +*************** +*** 114,117 **** +--- 114,123 ---- + #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr) + ++ #define PRINT_DEFERRED_HEREDOCS(x) \ ++ do { \ ++ if (deferred_heredocs) \ ++ print_deferred_heredocs (x); \ ++ } while (0) ++ + /* Non-zero means the stuff being printed is inside of a function def. */ + static int inside_function_def; +*************** +*** 561,571 **** + { + print_for_command_head (for_command); +- + cprintf (";"); + newline ("do\n"); + indentation += indentation_amount; + make_command_string_internal (for_command->action); + semicolon (); + indentation -= indentation_amount; + newline ("done"); + } +--- 566,578 ---- + { + print_for_command_head (for_command); + cprintf (";"); + newline ("do\n"); ++ + indentation += indentation_amount; + make_command_string_internal (for_command->action); ++ PRINT_DEFERRED_HEREDOCS (""); + semicolon (); + indentation -= indentation_amount; ++ + newline ("done"); + } diff -uNr a/app-shells/bash/files/bash_logout b/app-shells/bash/files/bash_logout --- a/app-shells/bash/files/bash_logout false +++ b/app-shells/bash/files/bash_logout 153a696e73c379050566ab037a67125aaea870c45fd3ab1dbd173d77376d8bc349d5ed6ac37886e4d7ddd2dfe66ae675112d2f57f5d0b9bf957d77ac1067582a @@ -0,0 +1,9 @@ +# /etc/bash/bash_logout + +# This file is sourced when a login shell terminates. + +# You may wish to clear everyone's screen when they logout. +#clear + +# Or maybe you want to leave a thoughtful note. +#fortune diff -uNr a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc --- a/app-shells/bash/files/bashrc false +++ b/app-shells/bash/files/bashrc c65945c9d91930f77920fbb1c9de64462715bd7a76d93d618c79be9a2d28b85ca7f36661115fdeef5e9fa6eab750a887ed9357bc94c6c9b58df190d65d225dc8 @@ -0,0 +1,109 @@ +# /etc/bash/bashrc +# +# This file is sourced by all *interactive* bash shells on startup, +# including some apparently interactive shells such as scp and rcp +# that can't tolerate any output. So make sure this doesn't display +# anything or bad things will happen ! + + +# Test for an interactive shell. There is no need to set anything +# past this point for scp and rcp, and it's important to refrain from +# outputting anything in those cases. +if [[ $- != *i* ]] ; then + # Shell is non-interactive. Be done now! + return +fi + +# Bash won't get SIGWINCH if another process is in the foreground. +# Enable checkwinsize so that bash will check the terminal size when +# it regains control. #65623 +# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) +shopt -s checkwinsize + +# Disable completion when the input buffer is empty. i.e. Hitting tab +# and waiting a long time for bash to expand all of $PATH. +shopt -s no_empty_cmd_completion + +# Enable history appending instead of overwriting when exiting. #139609 +shopt -s histappend + +# Save each command to the history file as it's executed. #517342 +# This does mean sessions get interleaved when reading later on, but this +# way the history is always up to date. History is not synced across live +# sessions though; that is what `history -n` does. +# Disabled by default due to concerns related to system recovery when $HOME +# is under duress, or lives somewhere flaky (like NFS). Constantly syncing +# the history will halt the shell prompt until it's finished. +#PROMPT_COMMAND='history -a' + +# Change the window title of X terminals +case ${TERM} in + [aEkx]term*|rxvt*|gnome*|konsole*|interix) + PS1='\[\033]0;\u@\h:\w\007\]' + ;; + screen*) + PS1='\[\033k\u@\h:\w\033\\\]' + ;; + *) + unset PS1 + ;; +esac + +# Set colorful PS1 only on colorful terminals. +# dircolors --print-database uses its own built-in database +# instead of using /etc/DIR_COLORS. Try to use the external file +# first to take advantage of user additions. +# We run dircolors directly due to its changes in file syntax and +# terminal name patching. +use_color=false +if type -P dircolors >/dev/null ; then + # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 + LS_COLORS= + if [[ -f ~/.dir_colors ]] ; then + eval "$(dircolors -b ~/.dir_colors)" + elif [[ -f /etc/DIR_COLORS ]] ; then + eval "$(dircolors -b /etc/DIR_COLORS)" + else + eval "$(dircolors -b)" + fi + # Note: We always evaluate the LS_COLORS setting even when it's the + # default. If it isn't set, then `ls` will only colorize by default + # based on file attributes and ignore extensions (even the compiled + # in defaults of dircolors). #583814 + if [[ -n ${LS_COLORS:+set} ]] ; then + use_color=true + else + # Delete it if it's empty as it's useless in that case. + unset LS_COLORS + fi +else + # Some systems (e.g. BSD & embedded) don't typically come with + # dircolors so we need to hardcode some terminals in here. + case ${TERM} in + [aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;; + esac +fi + +if ${use_color} ; then + if [[ ${EUID} == 0 ]] ; then + PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \w \$\[\033[00m\] ' + else + PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' + fi + + #BSD#@export CLICOLOR=1 + #GNU#@alias ls='ls --color=auto' + alias grep='grep --colour=auto' + alias egrep='egrep --colour=auto' + alias fgrep='fgrep --colour=auto' +else + # show root@ when we don't have colors + PS1+='\u@\h \w \$ ' +fi + +for sh in /etc/bash/bashrc.d/* ; do + [[ -r ${sh} ]] && source "${sh}" +done + +# Try to keep environment pollution down, EPA loves us. +unset use_color sh diff -uNr a/app-shells/bash/files/dot-bash_logout b/app-shells/bash/files/dot-bash_logout --- a/app-shells/bash/files/dot-bash_logout false +++ b/app-shells/bash/files/dot-bash_logout 1379104d600cdcda4546d48fec597ec9275d24745d48202b8a116340f2eab866b0b31e5ed03fbc3bc3ba58ae9955b80b73adc7ff45704300dc13f0b53ba1d76f @@ -0,0 +1,6 @@ +# /etc/skel/.bash_logout + +# This file is sourced when a login shell terminates. + +# Clear the screen for security's sake. +clear diff -uNr a/app-shells/bash/files/dot-bash_profile b/app-shells/bash/files/dot-bash_profile --- a/app-shells/bash/files/dot-bash_profile false +++ b/app-shells/bash/files/dot-bash_profile 513656c1ebd322b87860d6a24a441b557561e47f5fee9f41d5849cee799fa77f2bf68a880a57ea9b03d3a34743ae5a10bafea234fd0235ec6ce7a19e83fb43fd @@ -0,0 +1,7 @@ +# /etc/skel/.bash_profile + +# This file is sourced by bash for login shells. The following line +# runs your .bashrc and is recommended by the bash info pages. +if [[ -f ~/.bashrc ]] ; then + . ~/.bashrc +fi diff -uNr a/app-shells/bash/files/dot-bashrc b/app-shells/bash/files/dot-bashrc --- a/app-shells/bash/files/dot-bashrc false +++ b/app-shells/bash/files/dot-bashrc bde5d5348ba7cc9f320ede1a9c8c932688b85f7e497ae52843ba8cd971d583a4cd6bdc70850b789506ddc3d467b71dd63a6a46efa2413f00f1c28c0dc99a8964 @@ -0,0 +1,18 @@ +# /etc/skel/.bashrc +# +# This file is sourced by all *interactive* bash shells on startup, +# including some apparently interactive shells such as scp and rcp +# that can't tolerate any output. So make sure this doesn't display +# anything or bad things will happen ! + + +# Test for an interactive shell. There is no need to set anything +# past this point for scp and rcp, and it's important to refrain from +# outputting anything in those cases. +if [[ $- != *i* ]] ; then + # Shell is non-interactive. Be done now! + return +fi + + +# Put your fun stuff here. diff -uNr a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml --- a/app-shells/bash/metadata.xml false +++ b/app-shells/bash/metadata.xml 8316dbd8d05c648f30ffff9bf811a91e7c4e30f7f16cc5261702e8fad0090d3b918e1077786843afc9c66d0c824f0f9a4e1e7aab481dd37ad28cad9c9f8da2a9 @@ -0,0 +1,19 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + Log ALL commands typed into bash; should ONLY be + used in restricted environments such as honeypots + Build with custom malloc/free overwriting allocated/freed memory + Enable /dev/tcp/host/port redirection + Add support for loading builtins at runtime via + 'enable' + + + cpe:/a:gnu:bash + + diff -uNr a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest --- a/app-text/build-docbook-catalog/Manifest false +++ b/app-text/build-docbook-catalog/Manifest 771bc69c48dfdc564dd514e50102173dee474bfd9f8c2420b90d1bc97d426578fe64d096003db2c785d406cd87f8b22a58be5d225a2663f3665565a55942b5bc @@ -0,0 +1,3 @@ +DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc +EBUILD build-docbook-catalog-1.21.ebuild 1090 BLAKE2B 353dde30a03468cae9cda862842a51a2a6033f49af44ae071676a218cf95ed3f9fdd805c782ee39225c858ea989d91b2de939ae95a6bf2986ee27a6635e2a22e SHA512 a0e597a8b6cb90257d2820ffa21c42df559fb40270d82be3c1f7b0653692c5cebb9a54bdebd47ddc8e7aa8c2b743812a53f9f8a3d837166e0561af76c13783ed +MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff -uNr a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild --- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild false +++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild f4bcf76db961dea97320e6dabe973247343aa94d8c54816543de7d279a0d93ee1cd1939f4e04fa6deda4825e29a0df8a282e4763f2ec4bd7bf1a2fdb7094b823 @@ -0,0 +1,34 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="DocBook XML catalog auto-updater" +HOMEPAGE="https://sources.gentoo.org/gentoo-src/build-docbook-catalog/" +SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~haubi/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND="|| ( sys-apps/util-linux app-misc/getopt ) + ! regen files + build-docbook-catalog +} diff -uNr a/app-text/build-docbook-catalog/metadata.xml b/app-text/build-docbook-catalog/metadata.xml --- a/app-text/build-docbook-catalog/metadata.xml false +++ b/app-text/build-docbook-catalog/metadata.xml 4f2d8e38345ca132e77f691fc6f683b5b29db669d75c372598d70ffcb4bb0074dd266f6b53765cf6b8f471c77be5b88e2881446e7f53c6113723ba7eb1b4e25a @@ -0,0 +1,5 @@ + + + + + diff -uNr a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest --- a/app-text/docbook-xml-dtd/Manifest false +++ b/app-text/docbook-xml-dtd/Manifest bdc972ed6570001da99ce1480aba9970edccdc0f000d65cda1f007a5f22e16d0f57460754dcd8b069c0054f8623e6e5137c7b5a82a501db7c9a19982dbb1d1b0 @@ -0,0 +1,3 @@ +DIST docbkx412.zip 75683 BLAKE2B 1304162d4f432e2f08990d0d3f58d873f7a8782fe5b4e3d6838ffed4ac85fd614a4dd64dca5d2b69f118dea91117d0da288f6db7c89180f730032ba140280d2e SHA512 f700591a671694ca0ac51f5b5b7e825df5c0b3604b20baa6afd3aaafa7ce99470ca1c261781b105b42bfa5485c23217cf3db821b3fcf2ebdae9df07bb8ae4063 +EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1360 BLAKE2B 1a788f3d9a0bbb2828dcdd8661d29845ca885bcc82b4de3715de6ef515e5861747e9aaf2a6942afc7182b1c8fba6c46ed36097ce583823babcac1a886a5ae1cf SHA512 292e22ee2c56ca3a19437774cee409ae6b1e4153a7d17902e9c12242768984dce1514ac3caa657298d49591a4bc88fd988463c01fed43ebf6ba7d7f19cac65c4 +MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff -uNr a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild false +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild c71271b3ac097bfe2a61196c98eeb862e3f7aed86e61a40e8dd89a35e85925756d8881cfc068901767115351fe3c9dc53de2557667d41f8b83b1db1ff5e1e899 @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=0 + +inherit sgml-catalog + +MY_P="docbkx412" +DESCRIPTION="Docbook DTD for XML" +HOMEPAGE="http://www.docbook.org/" +SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip" + +LICENSE="docbook" +SLOT="${PV}" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 + >=app-text/build-docbook-catalog-1.2" +DEPEND=">=app-arch/unzip-5.41" + +sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \ + "/etc/sgml/sgml-docbook.cat" +sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \ + "/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat" + +S=${WORKDIR} + +src_unpack() { + unpack ${A} + + # Prepend OVERRIDE directive + sed -i -e '1i\\OVERRIDE YES' docbook.cat +} + +src_install() { + keepdir /etc/xml + + insinto /usr/share/sgml/docbook/xml-dtd-${PV} + doins *.cat *.dtd *.mod || die + insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent + doins ent/*.ent || die + + dodoc ChangeLog *.txt +} + +pkg_postinst() { + build-docbook-catalog + sgml-catalog_pkg_postinst +} + +pkg_postrm() { + build-docbook-catalog + sgml-catalog_pkg_postrm +} diff -uNr a/app-text/docbook-xml-dtd/metadata.xml b/app-text/docbook-xml-dtd/metadata.xml --- a/app-text/docbook-xml-dtd/metadata.xml false +++ b/app-text/docbook-xml-dtd/metadata.xml 4f2d8e38345ca132e77f691fc6f683b5b29db669d75c372598d70ffcb4bb0074dd266f6b53765cf6b8f471c77be5b88e2881446e7f53c6113723ba7eb1b4e25a @@ -0,0 +1,5 @@ + + + + + diff -uNr a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest --- a/app-text/docbook-xsl-stylesheets/Manifest false +++ b/app-text/docbook-xsl-stylesheets/Manifest f79b0598f4cd16e402519049ed59be8fdf70d0794eeadbd929189088836542b4749a9c2d1b807fdd677f32ee41e3613132f088f7d964dc3ee1865a0ece5080b0 @@ -0,0 +1,4 @@ +AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04 +DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7 +EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2171 BLAKE2B c7720c9f35b56c9302e364dbcd9b9e1d571aecdcf363e2260035bd202bf561b800e2ef7c5f6347c2c6de448ec8cb703b468e3c3b8e2207761156e4e0e2079617 SHA512 0e7a04f68a10a037c2784336c64edae12c6102d44bff00b2eaca64ac76ca4c7ce6a23c0fdcab31a7b65d5c3b3be2a6ded06301685aeac9f161ee7a695b1eff1c +MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892 diff -uNr a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild --- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild false +++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild 6ea76e5f837f30c5750619ad05fad5ec43feff9a4f8382f8f7cbec99541e30275cf035376ca80a276f6f70af0316c82481bbd9e838d21f98ca1cf88ce686588a @@ -0,0 +1,101 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby22 ruby23 ruby24 ruby25" + +inherit ruby-single + +DOCBOOKDIR="/usr/share/sgml/${PN/-//}" +MY_PN="${PN%-stylesheets}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="XSL Stylesheets for Docbook" +HOMEPAGE="https://github.com/docbook/wiki/wiki" +SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="ruby" + +RDEPEND=">=app-text/build-docbook-catalog-1.1 + ruby? ( ${RUBY_DEPS} )" + +S="${WORKDIR}/${MY_P}" + +# Makefile is broken since 1.76.0 +RESTRICT=test + +PATCHES=( + "${FILESDIR}"/nonrecursive-string-subst.patch +) + +src_prepare() { + default + + # Delete the unnecessary Java-related stuff and other tools as they + # bloat the stage3 tarballs massively. See bug #575818. + rm -rv extensions/ tools/ || die + find $ -name build.xml -o -name build.properties $ \ + -printf "removed %p\n" -delete || die + + if ! use ruby; then + rm -rv epub/ || die + fi +} + +# The makefile runs tests, not builds. +src_compile() { :; } + +src_test() { + emake check +} + +src_install() { + # The changelog is now zipped, and copied as the RELEASE-NOTES, so we + # don't need to install it + dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO + + insinto ${DOCBOOKDIR} + doins VERSION VERSION.xsl + + local i + for i in */; do + i=${i%/} + + cd "${S}"/${i} + for doc in ChangeLog README; do + if [ -e "$doc" ]; then + mv ${doc} ${doc}.${i} + dodoc ${doc}.${i} + rm ${doc}.${i} + fi + done + + doins -r "${S}"/${i} + done + + if use ruby; then + local cmd="dbtoepub${MY_PN#docbook-xsl}" + + # we can't use a symlink or it'll look for the library in the + # wrong path. + dodir /usr/bin + cat - > "${D}"/usr/bin/${cmd} < +Bug-Debian: https://bugs.debian.org/750593 + +--- a/lib/lib.xsl ++++ b/lib/lib.xsl +@@ -10,7 +10,10 @@ + This module implements DTD-independent functions + + ******************************************************************** --> +- ++ + + + +@@ -56,6 +59,9 @@ + + + ++ ++ ++ + + + diff -uNr a/app-text/docbook-xsl-stylesheets/metadata.xml b/app-text/docbook-xsl-stylesheets/metadata.xml --- a/app-text/docbook-xsl-stylesheets/metadata.xml false +++ b/app-text/docbook-xsl-stylesheets/metadata.xml 172658c8fa835b8cf5b06c4379b232ce8fd73f2840b44ce3f520a630f2d2bf95f83e1b6b995c51a4f2424af555d46801a274805b8ea2c33258dcab3204af92e6 @@ -0,0 +1,14 @@ + + + + + + + Install the Ruby-based dbtoepub script; requires an interpreter + compatible with app-eselect/eselect-ruby. + + + + docbook + + diff -uNr a/app-text/manpager/Manifest b/app-text/manpager/Manifest --- a/app-text/manpager/Manifest false +++ b/app-text/manpager/Manifest 3f9ae7f6e951a01aeab4b982bae636d6945fba7664335861b9d31cbbee2965183667faddfc5f334463ad1015150037efdeb9f93eae10494d745890e59afa4a50 @@ -0,0 +1,3 @@ +AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2 +EBUILD manpager-1.ebuild 646 BLAKE2B bfb4bd847f6a94f6db1cf5b7536ce4984ac82c8feb12cecdec09a01196a93fd95512717a262532721e2095bff5d043889dcffbb7c47f75495b3920386a4e9e6e SHA512 7e4582eefc9acfc019b6bf4e9601d3efce10c70bc512af5e806b899bc1d7c9d08b5af4e0ae06d791e110b0a1803b53d1248890ede0f625578b7c2139ab3ad74c +MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff -uNr a/app-text/manpager/files/manpager.c b/app-text/manpager/files/manpager.c --- a/app-text/manpager/files/manpager.c false +++ b/app-text/manpager/files/manpager.c f0103655711c91b6fcf94e720322e70aae89d58b5c4cfce94780fc068689d3476997c046c8f053229d4db906a05a1d76509b187524dcb8f40645486391985b18 @@ -0,0 +1,74 @@ +/* + * Wrapper to help enable colorized man page output. + * Only works with PAGER=less + * + * https://bugs.gentoo.org/184604 + * https://unix.stackexchange.com/questions/108699/documentation-on-less-termcap-variables + * + * Copyright 2003-2015 Gentoo Foundation + * Distributed under the terms of the GNU General Public License v2 + */ + +#include +#include +#include +#include + +#define COLOR(c, b) "\e[" #c ";" #b "m" + +#define _SE(termcap, col) setenv("LESS_TERMCAP_" #termcap, col, 0) +#define SE(termcap, c, b) _SE(termcap, COLOR(c, b)) + +static int usage(void) +{ + puts( + "manpager: display man pages with color!\n" + "\n" + "Usage:\n" + "\texport MANPAGER=manpager\n" + "\tman man\n" + "\n" + "To control the colorization, set these env vars:\n" + "\tLESS_TERMCAP_mb - start blinking\n" + "\tLESS_TERMCAP_md - start bolding\n" + "\tLESS_TERMCAP_me - stop bolding\n" + "\tLESS_TERMCAP_us - start underlining\n" + "\tLESS_TERMCAP_ue - stop underlining\n" + "\tLESS_TERMCAP_so - start standout (reverse video)\n" + "\tLESS_TERMCAP_se - stop standout (reverse video)\n" + "\n" + "You can do so by doing:\n" + "\texport LESS_TERMCAP_md=\"$(printf '\\e[1;36m')\"\n" + "\n" + "Run 'less --help' or 'man less' for more info" + ); + return 0; +} + +int main(int argc, char *argv[]) +{ + if (argc == 2 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))) + return usage(); + + /* Blinking. */ + SE(mb, 5, 31); /* Start. */ + + /* Bolding. */ + SE(md, 1, 34); /* Start. */ + SE(me, 0, 0); /* Stop. */ + + /* Underlining. */ + SE(us, 4, 36); /* Start. */ + SE(ue, 0, 0); /* Stop. */ + +#if 0 + /* Standout (reverse video). */ + SE(so, 1, 32); /* Start. */ + SE(se, 0, 0); /* Stop. */ +#endif + + argv[0] = getenv("PAGER") ? : "less"; + execvp(argv[0], argv); + perror("could not launch PAGER"); + return 1; +} diff -uNr a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild --- a/app-text/manpager/manpager-1.ebuild false +++ b/app-text/manpager/manpager-1.ebuild fce880d6d4ce05edb0d3d7b6232f7a1bb00755d90f447869ef9c77cf246ca22d1755d252eee091896b1e33fc5b41afbb85fabe3e4fcc585e6d62ef8b00c0bc27 @@ -0,0 +1,31 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit toolchain-funcs + +DESCRIPTION="Enable colorization of man pages" +HOMEPAGE="https://www.gentoo.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +IUSE="" + +S=${WORKDIR} + +src_compile() { + local cmd=( + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} + "${FILESDIR}"/manpager.c -o ${PN} + ) + echo "${cmd[@]}" + "${cmd[@]}" || die +} + +src_install() { + dobin ${PN} + insinto /etc/env.d + echo "MANPAGER=manpager" | newins - 00manpager +} diff -uNr a/app-text/manpager/metadata.xml b/app-text/manpager/metadata.xml --- a/app-text/manpager/metadata.xml false +++ b/app-text/manpager/metadata.xml c1cc15704207fae53d995d26fa94ebc8fb592f14ab069aeb21afb5a2fefec7fe7eb8cf99f39d287c2ae9c8966132f703727c1964c17a22228765b0c3efc677b0 @@ -0,0 +1,8 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + diff -uNr a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest --- a/app-text/sgml-common/Manifest false +++ b/app-text/sgml-common/Manifest 5be7a6ad10b5b73689f19d49d1cb6c54914f6799aa7fb1dde17801771675de70bbe5a169f037374bdae1d172992f05e183a428fd869d959f14b247fb7aa1f523 @@ -0,0 +1,5 @@ +AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9 +AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef +DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce +EBUILD sgml-common-0.6.3-r6.ebuild 2481 BLAKE2B b4b4945c34f62854ef6db9c1bdaee90ad0814f44e705875a6da1b80956aeff8829d087dfc34939f5dc8edd60d184d8d6d9247a1d4754aec30ad82c7661962b98 SHA512 15d48f36f85740b8fd4c5a056b6483ced6fbe8919b43942928b32fae2c9367a5f07f29eb507918c7d50afb9e403f339e969de16fda5c447e19181a50c461809d +MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff -uNr a/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in b/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in --- a/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in false +++ b/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in 46dfa090ec70c9b928739a44f4486ba48f508c713a14dee2bcebada0bedd058c0cc3e2be1ef9a13781b2be0e3ad019b87003f74379e04e630d0d1f944c81eff2 @@ -0,0 +1,182 @@ +#!@GENTOO_PORTAGE_EPREFIX@/bin/bash +# Script to install a catalog in the centralized SGML catalog +# Send any comments to Eric Bischoff +# This program is under GPL license. See LICENSE file for details. + +# Modified by Gentoo developers to better integrate it to portage. +# + +# Set help message +SGML_HELP_MESSAGE="Usage: `basename $0` [

It works!