[gentoo-commits] repo/gentoo:master commit in: eclass/

[James Le Cuirot]

commit:     af9620f533d988afa6fd7f0759390aca571bceef
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 21:43:55 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 21:43:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af9620f5

java-utils-2.eclass: Fix java-pkg_gen-cp regex for chained PV suffixes

 eclass/java-utils-2.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index a09a8c951e8..25e35c33dd2 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|,)"