diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-12 06:32:46 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-12 06:32:46 +0100 |
| commit | 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (patch) | |
| tree | e75bce604750fb72e53ed3684059e2e5d2094509 /eclass | |
| parent | f625b9919a60a30f1bd860f7d1b2eac183ced593 (diff) | |
gentoo resync : 12.08.2018
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38051 -> 38062 bytes | |||
| -rw-r--r-- | eclass/desktop.eclass | 26 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 6 | ||||
| -rw-r--r-- | eclass/scsh.eclass | 5 | ||||
| -rw-r--r-- | eclass/systemd.eclass | 8 |
5 files changed, 27 insertions, 18 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex aa062f43edd1..d93b4085e700 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass index 91521b85a821..6fc72ab8ec03 100644 --- a/eclass/desktop.eclass +++ b/eclass/desktop.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: desktop.eclass @@ -174,7 +174,7 @@ make_desktop_entry() { icon=${icon%.*} fi - cat <<-EOF > "${desktop}" + cat <<-EOF > "${desktop}" || die [Desktop Entry] Name=${name} Type=Application @@ -190,7 +190,9 @@ make_desktop_entry() { ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}" fields="Path=${fields}" fi - [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}" + if [[ -n ${fields} ]]; then + printf '%b\n' "${fields}" >> "${desktop}" || die + fi ( # wrap the env here so that the 'insinto' call @@ -217,7 +219,7 @@ make_session_desktop() { local desktop=${T}/${wm:-${PN}}.desktop shift 2 - cat <<-EOF > "${desktop}" + cat <<-EOF > "${desktop}" || die [Desktop Entry] Name=${title} Comment=This session logs you into ${title} @@ -244,20 +246,16 @@ domenu() { ( # wrap the env here so that the 'insinto' call # doesn't corrupt the env of the caller - local i j ret=0 + local i ret=0 insopts -m 0644 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 + if [[ -d ${i} ]] ; then + doins "${i}"/*.desktop + ((ret|=$?)) else - ((++ret)) + doins "${i}" + ((ret|=$?)) fi done exit ${ret} diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 0345061631a5..e1fe9755be47 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -599,10 +599,12 @@ if [[ ${ETYPE} == sources ]]; then >=sys-devel/binutils-2.11.90.0.31 )" RDEPEND="!build? ( - >=sys-libs/ncurses-5.2 - sys-devel/make dev-lang/perl sys-devel/bc + sys-devel/bison + sys-devel/flex + sys-devel/make + >=sys-libs/ncurses-5.2 virtual/libelf )" diff --git a/eclass/scsh.eclass b/eclass/scsh.eclass index 181bbd1e413f..3444aa1c1800 100644 --- a/eclass/scsh.eclass +++ b/eclass/scsh.eclass @@ -2,6 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # +# @DEAD +# Joonas Niilola <juippis@gmail.com> (08 Aug 2018) +# Unused, judging from history unmaintained and lacks documentation. +# bugs #658284, #637876. Removal in ~30 days. + inherit eutils multilib SLOT="0" diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass index 72f4845efc45..a870624014b1 100644 --- a/eclass/systemd.eclass +++ b/eclass/systemd.eclass @@ -26,11 +26,15 @@ inherit toolchain-funcs case ${EAPI:-0} in - 0|1|2|3|4|5|6) ;; + 0|1|2|3|4|5|6|7) ;; *) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established." esac -DEPEND="virtual/pkgconfig" +if [[ ${EAPI:-0} == [0123456] ]]; then + DEPEND="virtual/pkgconfig" +else + BDEPEND="virtual/pkgconfig" +fi # @FUNCTION: _systemd_get_dir # @USAGE: <variable-name> <fallback-directory> |