diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-30 01:11:30 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-30 01:11:30 +0000 |
| commit | 76dfef0cec9170000357d2f354e412daf48941fc (patch) | |
| tree | 56647120c0ee20ab3494475c86722034cd194b02 /eclass | |
| parent | ccf84bcd604130256d1377cd58f0a634ae6ee20f (diff) | |
gentoo resync : 30.12.2017
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 41531 -> 41533 bytes | |||
| -rw-r--r-- | eclass/elisp.eclass | 6 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex aa3f066a0e2f..d98c528f47d9 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 078a7994d00c..67459730aa61 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: elisp.eclass @@ -68,11 +68,11 @@ inherit elisp-common case ${EAPI:-0} in 0|1) - inherit eutils + inherit epatch EXPORT_FUNCTIONS src_{unpack,compile,install} \ pkg_{setup,postinst,postrm} ;; 2|3|4|5) - inherit eutils + inherit epatch EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \ pkg_{setup,postinst,postrm} ;; 6) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index a09a8c951e8e..25e35c33dd21 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2907,7 +2907,7 @@ java-pkg_gen-cp() { local atom for atom in ${CP_DEPEND}; do - if [[ ${atom} =~ /(([[:alnum:]+_-]+)-[0-9]+(\.[0-9]+)*[a-z]?(_[[:alnum:]]+)?(-r[0-9]*)?|[[:alnum:]+_-]+):([[:alnum:]+_.-]+) ]]; then + 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|,)" |