diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-08-29 23:06:48 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-08-29 23:06:48 +0000 |
| commit | 19f73518cb41df66ea89f6d69268ea941f6f6526 (patch) | |
| tree | 8d149aae25cf46e11e9a636558d27e4796f3b648 | |
| parent | 2021-08-29 22:51:40 UTC (diff) | |
| parent | linux-info.eclass: Replace bit-shift arithmetic by ver_test (diff) | |
| download | gentoo-19f73518cb41df66ea89f6d69268ea941f6f6526.tar.gz gentoo-19f73518cb41df66ea89f6d69268ea941f6f6526.tar.bz2 gentoo-19f73518cb41df66ea89f6d69268ea941f6f6526.zip | |
Merge updates from master
| -rw-r--r-- | eclass/kernel-2.eclass | 9 | ||||
| -rw-r--r-- | eclass/linux-info.eclass | 9 | ||||
| -rw-r--r-- | sci-geosciences/josm/josm-99999.ebuild | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 8c1740998272..05c07c4d153e 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -560,7 +560,7 @@ kernel_is() { [[ ${n} -eq 1 ]] && detect_version # Now we can continue - local operator test value + local operator case ${1#-} in lt) operator="-lt"; shift;; @@ -572,9 +572,10 @@ kernel_is() { 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} ] + ver_test \ + "${KV_MAJOR:-0}.${KV_MINOR:-0}.${KV_PATCH:-0}" \ + "${operator}" \ + "${1:-${KV_MAJOR:-0}}.${2:-${KV_MINOR:-0}}.${3:-${KV_PATCH:-0}}" } # Capture the sources type and set DEPENDs diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 124fb70e78ad..8edd17c317d4 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -395,7 +395,7 @@ kernel_is() { linux-info_get_any_version # Now we can continue - local operator test value + local operator case ${1#-} in lt) operator="-lt"; shift;; @@ -407,9 +407,10 @@ kernel_is() { 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} ] + ver_test \ + "${KV_MAJOR:-0}.${KV_MINOR:-0}.${KV_PATCH:-0}" \ + "${operator}" \ + "${1:-${KV_MAJOR:-0}}.${2:-${KV_MINOR:-0}}.${3:-${KV_PATCH:-0}}" } get_localversion() { diff --git a/sci-geosciences/josm/josm-99999.ebuild b/sci-geosciences/josm/josm-99999.ebuild index fb12e465c397..58def9eb19e5 100644 --- a/sci-geosciences/josm/josm-99999.ebuild +++ b/sci-geosciences/josm/josm-99999.ebuild @@ -45,6 +45,6 @@ src_install() { java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed" java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed" - newicon images/logo.png josm.png || die "newicon failed" + newicon images/logo.svg josm.svg || die "newicon failed" make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience" } |