[gentoo-commits] repo/gentoo:master commit in: net-misc/icaclient/

[Lars Wendler]

commit:     bbab7382d8d22c161dc7c2eb4933628bc0a9253a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  7 12:00:59 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Mar  7 12:01:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbab7382

net-misc/icaclient: ebuild improvements.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../icaclient/icaclient-13.8.0.10299729-r1.ebuild  | 27 +++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild 
b/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
index 32ceff38130..2099a68e420 100644
--- a/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
+++ b/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
@@ -64,9 +64,7 @@ pkg_nofetch() {
        elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
 }
 
-src_unpack() {
-       default
-
+pkg_setup() {
        case ${ARCH} in
                amd64)
                        ICAARCH=linuxx64
@@ -117,7 +115,7 @@ src_install() {
        for tmpl in {appsrv,wfclient}.template ; do
                newins nls/en/${tmpl} ${tmpl/template/ini}
        done
-       touch "${ED}/${ICAROOT}"/config/.server || die
+       touch "${ED%/}/${ICAROOT}"/config/.server || die
 
        insinto "${ICAROOT}"/gtk
        doins gtk/*
@@ -133,14 +131,14 @@ src_install() {
        insinto "${ICAROOT}"/config/usertemplate
        doins config/usertemplate/*
 
-       LANGCODES="en"
-       use l10n_de && LANGCODES+=" de"
-       use l10n_es && LANGCODES+=" es"
-       use l10n_fr && LANGCODES+=" fr"
-       use l10n_ja && LANGCODES+=" ja"
-       use l10n_zh_CN && LANGCODES+=" zh_CN"
+       local lang LANGCODES=( en )
+       use l10n_de && LANGCODES+=( de )
+       use l10n_es && LANGCODES+=( es )
+       use l10n_fr && LANGCODES+=( fr )
+       use l10n_ja && LANGCODES+=( ja )
+       use l10n_zh_CN && LANGCODES+=( zh_CN )
 
-       for lang in ${LANGCODES} ; do
+       for lang in ${LANGCODES[@]} ; do
                insinto "${ICAROOT}"/nls/${lang}
                doins nls/${lang}/*
 
@@ -154,8 +152,8 @@ src_install() {
                dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
 
                for tmpl in {appsrv,wfclient}.template ; do
-                       cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
-                               
"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+                       cp "${ED%/}/${ICAROOT}"/nls/${lang}/${tmpl} \
+                               
"${ED%/}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
                                || die
                done
        done
@@ -181,7 +179,8 @@ src_install() {
        make_wrapper wfica "${ICAROOT}"/wfica . "${ICAROOT}"
 
        dodir /etc/revdep-rebuild/
-       echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" > 
"${D}"/etc/revdep-rebuild/70icaclient
+       echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
+               > "${ED%/}"/etc/revdep-rebuild/70icaclient
 }
 
 pkg_preinst() {