| 1 |
commit: d7455f0512b07d24eb8622c50ae1049dd01c6d8b |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 25 00:38:13 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 25 00:38:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7455f05 |
| 7 |
|
| 8 |
dev-vcs/git: Synced live ebuild. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-vcs/git/git-9999-r1.ebuild | 30 +++++++++++++++++------------- |
| 14 |
dev-vcs/git/git-9999-r2.ebuild | 30 +++++++++++++++++------------- |
| 15 |
dev-vcs/git/git-9999-r3.ebuild | 30 +++++++++++++++++------------- |
| 16 |
dev-vcs/git/git-9999.ebuild | 30 +++++++++++++++++------------- |
| 17 |
4 files changed, 68 insertions(+), 52 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 20 |
index c26c4f8ee32..ad2cb1dae85 100644 |
| 21 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 22 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 23 |
@@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then |
| 24 |
esac |
| 25 |
fi |
| 26 |
|
| 27 |
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 28 |
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 29 |
|
| 30 |
MY_PV="${PV/_rc/.rc}" |
| 31 |
MY_P="${PN}-${MY_PV}" |
| 32 |
@@ -194,7 +194,7 @@ exportmakeopts() { |
| 33 |
) |
| 34 |
|
| 35 |
# For svn-fe |
| 36 |
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
| 37 |
+ extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) |
| 38 |
|
| 39 |
# can't define this to null, since the entire makefile depends on it |
| 40 |
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die |
| 41 |
@@ -202,13 +202,13 @@ exportmakeopts() { |
| 42 |
if use pcre; then |
| 43 |
if use pcre-jit; then |
| 44 |
myopts+=( USE_LIBPCRE2=YesPlease ) |
| 45 |
- extlibs+=" -lpcre2-8" |
| 46 |
+ extlibs+=( -lpcre2-8 ) |
| 47 |
else |
| 48 |
myopts+=( |
| 49 |
USE_LIBPCRE1=YesPlease |
| 50 |
NO_LIBPCRE1_JIT=YesPlease |
| 51 |
) |
| 52 |
- extlibs+=" -lpcre" |
| 53 |
+ extlibs+=( -lpcre ) |
| 54 |
fi |
| 55 |
fi |
| 56 |
# Disabled until ~m68k-mint can be keyworded again |
| 57 |
@@ -233,7 +233,7 @@ exportmakeopts() { |
| 58 |
NEEDS_LIBICONV=YesPlease |
| 59 |
HAVE_CLOCK_MONOTONIC=1 |
| 60 |
) |
| 61 |
- grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ |
| 62 |
+ grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ |
| 63 |
myopts+=( HAVE_GETDELIM=1 ) |
| 64 |
fi |
| 65 |
|
| 66 |
@@ -246,7 +246,7 @@ exportmakeopts() { |
| 67 |
myopts+=( NO_NSEC=YesPlease ) |
| 68 |
|
| 69 |
export MY_MAKEOPTS="${myopts[@]}" |
| 70 |
- export EXTLIBS="${extlibs}" |
| 71 |
+ export EXTLIBS="${extlibs[@]}" |
| 72 |
} |
| 73 |
|
| 74 |
src_unpack() { |
| 75 |
@@ -359,12 +359,14 @@ src_compile() { |
| 76 |
pushd contrib/svn-fe &>/dev/null || die |
| 77 |
# by defining EXTLIBS we override the detection for libintl and |
| 78 |
# libiconv, bug #516168 |
| 79 |
- local nlsiconv= |
| 80 |
- use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 81 |
- use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 82 |
- git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 83 |
+ local nlsiconv=() |
| 84 |
+ use nls && use !elibc_glibc && nlsiconv+=( -lintl ) |
| 85 |
+ use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) |
| 86 |
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ |
| 87 |
+ || die "emake svn-fe failed" |
| 88 |
if use doc ; then |
| 89 |
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 90 |
+ git_emake svn-fe.{1,html} \ |
| 91 |
+ || die "emake svn-fe.1 svn-fe.html failed" |
| 92 |
fi |
| 93 |
popd &>/dev/null || die |
| 94 |
fi |
| 95 |
@@ -407,6 +409,7 @@ src_install() { |
| 96 |
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 97 |
dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 98 |
use doc && dodir /usr/share/doc/${PF}/html |
| 99 |
+ local d |
| 100 |
for d in / /howto/ /technical/ ; do |
| 101 |
docinto ${d} |
| 102 |
dodoc Documentation${d}*.txt |
| 103 |
@@ -432,7 +435,7 @@ src_install() { |
| 104 |
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
| 105 |
# don't add automatically to the load-path, so the sitefile |
| 106 |
# can do a conditional loading |
| 107 |
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
| 108 |
+ touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" |
| 109 |
elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
| 110 |
fi |
| 111 |
|
| 112 |
@@ -515,6 +518,7 @@ src_install() { |
| 113 |
stats |
| 114 |
workdir |
| 115 |
) |
| 116 |
+ local i |
| 117 |
for i in "${contrib_objects[@]}" ; do |
| 118 |
cp -rf \ |
| 119 |
"${S}"/contrib/${i} \ |
| 120 |
@@ -535,7 +539,7 @@ src_install() { |
| 121 |
newdoc "${S}"/gitweb/README README.gitweb |
| 122 |
|
| 123 |
for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do |
| 124 |
- if test -d "$d" ; then find "$d" \ |
| 125 |
+ if test -d "${d}" ; then find "${d}" \ |
| 126 |
-name .packlist \ |
| 127 |
-delete || die |
| 128 |
fi |
| 129 |
|
| 130 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 131 |
index c26c4f8ee32..ad2cb1dae85 100644 |
| 132 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 133 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 134 |
@@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then |
| 135 |
esac |
| 136 |
fi |
| 137 |
|
| 138 |
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 139 |
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 140 |
|
| 141 |
MY_PV="${PV/_rc/.rc}" |
| 142 |
MY_P="${PN}-${MY_PV}" |
| 143 |
@@ -194,7 +194,7 @@ exportmakeopts() { |
| 144 |
) |
| 145 |
|
| 146 |
# For svn-fe |
| 147 |
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
| 148 |
+ extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) |
| 149 |
|
| 150 |
# can't define this to null, since the entire makefile depends on it |
| 151 |
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die |
| 152 |
@@ -202,13 +202,13 @@ exportmakeopts() { |
| 153 |
if use pcre; then |
| 154 |
if use pcre-jit; then |
| 155 |
myopts+=( USE_LIBPCRE2=YesPlease ) |
| 156 |
- extlibs+=" -lpcre2-8" |
| 157 |
+ extlibs+=( -lpcre2-8 ) |
| 158 |
else |
| 159 |
myopts+=( |
| 160 |
USE_LIBPCRE1=YesPlease |
| 161 |
NO_LIBPCRE1_JIT=YesPlease |
| 162 |
) |
| 163 |
- extlibs+=" -lpcre" |
| 164 |
+ extlibs+=( -lpcre ) |
| 165 |
fi |
| 166 |
fi |
| 167 |
# Disabled until ~m68k-mint can be keyworded again |
| 168 |
@@ -233,7 +233,7 @@ exportmakeopts() { |
| 169 |
NEEDS_LIBICONV=YesPlease |
| 170 |
HAVE_CLOCK_MONOTONIC=1 |
| 171 |
) |
| 172 |
- grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ |
| 173 |
+ grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ |
| 174 |
myopts+=( HAVE_GETDELIM=1 ) |
| 175 |
fi |
| 176 |
|
| 177 |
@@ -246,7 +246,7 @@ exportmakeopts() { |
| 178 |
myopts+=( NO_NSEC=YesPlease ) |
| 179 |
|
| 180 |
export MY_MAKEOPTS="${myopts[@]}" |
| 181 |
- export EXTLIBS="${extlibs}" |
| 182 |
+ export EXTLIBS="${extlibs[@]}" |
| 183 |
} |
| 184 |
|
| 185 |
src_unpack() { |
| 186 |
@@ -359,12 +359,14 @@ src_compile() { |
| 187 |
pushd contrib/svn-fe &>/dev/null || die |
| 188 |
# by defining EXTLIBS we override the detection for libintl and |
| 189 |
# libiconv, bug #516168 |
| 190 |
- local nlsiconv= |
| 191 |
- use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 192 |
- use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 193 |
- git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 194 |
+ local nlsiconv=() |
| 195 |
+ use nls && use !elibc_glibc && nlsiconv+=( -lintl ) |
| 196 |
+ use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) |
| 197 |
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ |
| 198 |
+ || die "emake svn-fe failed" |
| 199 |
if use doc ; then |
| 200 |
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 201 |
+ git_emake svn-fe.{1,html} \ |
| 202 |
+ || die "emake svn-fe.1 svn-fe.html failed" |
| 203 |
fi |
| 204 |
popd &>/dev/null || die |
| 205 |
fi |
| 206 |
@@ -407,6 +409,7 @@ src_install() { |
| 207 |
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 208 |
dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 209 |
use doc && dodir /usr/share/doc/${PF}/html |
| 210 |
+ local d |
| 211 |
for d in / /howto/ /technical/ ; do |
| 212 |
docinto ${d} |
| 213 |
dodoc Documentation${d}*.txt |
| 214 |
@@ -432,7 +435,7 @@ src_install() { |
| 215 |
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
| 216 |
# don't add automatically to the load-path, so the sitefile |
| 217 |
# can do a conditional loading |
| 218 |
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
| 219 |
+ touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" |
| 220 |
elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
| 221 |
fi |
| 222 |
|
| 223 |
@@ -515,6 +518,7 @@ src_install() { |
| 224 |
stats |
| 225 |
workdir |
| 226 |
) |
| 227 |
+ local i |
| 228 |
for i in "${contrib_objects[@]}" ; do |
| 229 |
cp -rf \ |
| 230 |
"${S}"/contrib/${i} \ |
| 231 |
@@ -535,7 +539,7 @@ src_install() { |
| 232 |
newdoc "${S}"/gitweb/README README.gitweb |
| 233 |
|
| 234 |
for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do |
| 235 |
- if test -d "$d" ; then find "$d" \ |
| 236 |
+ if test -d "${d}" ; then find "${d}" \ |
| 237 |
-name .packlist \ |
| 238 |
-delete || die |
| 239 |
fi |
| 240 |
|
| 241 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 242 |
index d1579f747e3..ad2cb1dae85 100644 |
| 243 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 244 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 245 |
@@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then |
| 246 |
esac |
| 247 |
fi |
| 248 |
|
| 249 |
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 250 |
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 251 |
|
| 252 |
MY_PV="${PV/_rc/.rc}" |
| 253 |
MY_P="${PN}-${MY_PV}" |
| 254 |
@@ -194,7 +194,7 @@ exportmakeopts() { |
| 255 |
) |
| 256 |
|
| 257 |
# For svn-fe |
| 258 |
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
| 259 |
+ extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) |
| 260 |
|
| 261 |
# can't define this to null, since the entire makefile depends on it |
| 262 |
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die |
| 263 |
@@ -202,13 +202,13 @@ exportmakeopts() { |
| 264 |
if use pcre; then |
| 265 |
if use pcre-jit; then |
| 266 |
myopts+=( USE_LIBPCRE2=YesPlease ) |
| 267 |
- extlibs+=" -lpcre2-8" |
| 268 |
+ extlibs+=( -lpcre2-8 ) |
| 269 |
else |
| 270 |
myopts+=( |
| 271 |
USE_LIBPCRE1=YesPlease |
| 272 |
NO_LIBPCRE1_JIT=YesPlease |
| 273 |
) |
| 274 |
- extlibs+=" -lpcre" |
| 275 |
+ extlibs+=( -lpcre ) |
| 276 |
fi |
| 277 |
fi |
| 278 |
# Disabled until ~m68k-mint can be keyworded again |
| 279 |
@@ -233,7 +233,7 @@ exportmakeopts() { |
| 280 |
NEEDS_LIBICONV=YesPlease |
| 281 |
HAVE_CLOCK_MONOTONIC=1 |
| 282 |
) |
| 283 |
- grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ |
| 284 |
+ grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ |
| 285 |
myopts+=( HAVE_GETDELIM=1 ) |
| 286 |
fi |
| 287 |
|
| 288 |
@@ -246,7 +246,7 @@ exportmakeopts() { |
| 289 |
myopts+=( NO_NSEC=YesPlease ) |
| 290 |
|
| 291 |
export MY_MAKEOPTS="${myopts[@]}" |
| 292 |
- export EXTLIBS="${extlibs}" |
| 293 |
+ export EXTLIBS="${extlibs[@]}" |
| 294 |
} |
| 295 |
|
| 296 |
src_unpack() { |
| 297 |
@@ -359,12 +359,14 @@ src_compile() { |
| 298 |
pushd contrib/svn-fe &>/dev/null || die |
| 299 |
# by defining EXTLIBS we override the detection for libintl and |
| 300 |
# libiconv, bug #516168 |
| 301 |
- local nlsiconv= |
| 302 |
- use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 303 |
- use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 304 |
- git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 305 |
+ local nlsiconv=() |
| 306 |
+ use nls && use !elibc_glibc && nlsiconv+=( -lintl ) |
| 307 |
+ use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) |
| 308 |
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ |
| 309 |
+ || die "emake svn-fe failed" |
| 310 |
if use doc ; then |
| 311 |
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 312 |
+ git_emake svn-fe.{1,html} \ |
| 313 |
+ || die "emake svn-fe.1 svn-fe.html failed" |
| 314 |
fi |
| 315 |
popd &>/dev/null || die |
| 316 |
fi |
| 317 |
@@ -407,6 +409,7 @@ src_install() { |
| 318 |
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 319 |
dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 320 |
use doc && dodir /usr/share/doc/${PF}/html |
| 321 |
+ local d |
| 322 |
for d in / /howto/ /technical/ ; do |
| 323 |
docinto ${d} |
| 324 |
dodoc Documentation${d}*.txt |
| 325 |
@@ -432,7 +435,7 @@ src_install() { |
| 326 |
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
| 327 |
# don't add automatically to the load-path, so the sitefile |
| 328 |
# can do a conditional loading |
| 329 |
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
| 330 |
+ touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" |
| 331 |
elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
| 332 |
fi |
| 333 |
|
| 334 |
@@ -515,6 +518,7 @@ src_install() { |
| 335 |
stats |
| 336 |
workdir |
| 337 |
) |
| 338 |
+ local i |
| 339 |
for i in "${contrib_objects[@]}" ; do |
| 340 |
cp -rf \ |
| 341 |
"${S}"/contrib/${i} \ |
| 342 |
@@ -535,7 +539,7 @@ src_install() { |
| 343 |
newdoc "${S}"/gitweb/README README.gitweb |
| 344 |
|
| 345 |
for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do |
| 346 |
- if test -d "$d" ; then find "${d}" \ |
| 347 |
+ if test -d "${d}" ; then find "${d}" \ |
| 348 |
-name .packlist \ |
| 349 |
-delete || die |
| 350 |
fi |
| 351 |
|
| 352 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 353 |
index b12a7d47ad1..f9e6cd3fae0 100644 |
| 354 |
--- a/dev-vcs/git/git-9999.ebuild |
| 355 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 356 |
@@ -26,7 +26,7 @@ if [[ ${PV} == *9999 ]]; then |
| 357 |
esac |
| 358 |
fi |
| 359 |
|
| 360 |
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 361 |
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 362 |
|
| 363 |
MY_PV="${PV/_rc/.rc}" |
| 364 |
MY_P="${PN}-${MY_PV}" |
| 365 |
@@ -197,7 +197,7 @@ exportmakeopts() { |
| 366 |
) |
| 367 |
|
| 368 |
# For svn-fe |
| 369 |
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
| 370 |
+ extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) |
| 371 |
|
| 372 |
# can't define this to null, since the entire makefile depends on it |
| 373 |
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die |
| 374 |
@@ -205,13 +205,13 @@ exportmakeopts() { |
| 375 |
if use pcre; then |
| 376 |
if use pcre-jit; then |
| 377 |
myopts+=( USE_LIBPCRE2=YesPlease ) |
| 378 |
- extlibs+=" -lpcre2-8" |
| 379 |
+ extlibs+=( -lpcre2-8 ) |
| 380 |
else |
| 381 |
myopts+=( |
| 382 |
USE_LIBPCRE1=YesPlease |
| 383 |
NO_LIBPCRE1_JIT=YesPlease |
| 384 |
) |
| 385 |
- extlibs+=" -lpcre" |
| 386 |
+ extlibs+=( -lpcre ) |
| 387 |
fi |
| 388 |
fi |
| 389 |
# Disabled until ~m68k-mint can be keyworded again |
| 390 |
@@ -236,7 +236,7 @@ exportmakeopts() { |
| 391 |
NEEDS_LIBICONV=YesPlease |
| 392 |
HAVE_CLOCK_MONOTONIC=1 |
| 393 |
) |
| 394 |
- grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ |
| 395 |
+ grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ |
| 396 |
myopts+=( HAVE_GETDELIM=1 ) |
| 397 |
fi |
| 398 |
|
| 399 |
@@ -249,7 +249,7 @@ exportmakeopts() { |
| 400 |
myopts+=( NO_NSEC=YesPlease ) |
| 401 |
|
| 402 |
export MY_MAKEOPTS="${myopts[@]}" |
| 403 |
- export EXTLIBS="${extlibs}" |
| 404 |
+ export EXTLIBS="${extlibs[@]}" |
| 405 |
} |
| 406 |
|
| 407 |
src_unpack() { |
| 408 |
@@ -362,12 +362,14 @@ src_compile() { |
| 409 |
pushd contrib/svn-fe &>/dev/null || die |
| 410 |
# by defining EXTLIBS we override the detection for libintl and |
| 411 |
# libiconv, bug #516168 |
| 412 |
- local nlsiconv= |
| 413 |
- use nls && use !elibc_glibc && nlsiconv+=" -lintl" |
| 414 |
- use iconv && use !elibc_glibc && nlsiconv+=" -liconv" |
| 415 |
- git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" |
| 416 |
+ local nlsiconv=() |
| 417 |
+ use nls && use !elibc_glibc && nlsiconv+=( -lintl ) |
| 418 |
+ use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) |
| 419 |
+ git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ |
| 420 |
+ || die "emake svn-fe failed" |
| 421 |
if use doc ; then |
| 422 |
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
| 423 |
+ git_emake svn-fe.{1,html} \ |
| 424 |
+ || die "emake svn-fe.1 svn-fe.html failed" |
| 425 |
fi |
| 426 |
popd &>/dev/null || die |
| 427 |
fi |
| 428 |
@@ -410,6 +412,7 @@ src_install() { |
| 429 |
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 430 |
dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 431 |
use doc && dodir /usr/share/doc/${PF}/html |
| 432 |
+ local d |
| 433 |
for d in / /howto/ /technical/ ; do |
| 434 |
docinto ${d} |
| 435 |
dodoc Documentation${d}*.txt |
| 436 |
@@ -435,7 +438,7 @@ src_install() { |
| 437 |
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
| 438 |
# don't add automatically to the load-path, so the sitefile |
| 439 |
# can do a conditional loading |
| 440 |
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
| 441 |
+ touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" |
| 442 |
elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
| 443 |
fi |
| 444 |
|
| 445 |
@@ -518,6 +521,7 @@ src_install() { |
| 446 |
stats |
| 447 |
workdir |
| 448 |
) |
| 449 |
+ local i |
| 450 |
for i in "${contrib_objects[@]}" ; do |
| 451 |
cp -rf \ |
| 452 |
"${S}"/contrib/${i} \ |
| 453 |
@@ -538,7 +542,7 @@ src_install() { |
| 454 |
newdoc "${S}"/gitweb/README README.gitweb |
| 455 |
|
| 456 |
for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do |
| 457 |
- if test -d "$d" ; then find "$d" \ |
| 458 |
+ if test -d "${d}" ; then find "${d}" \ |
| 459 |
-name .packlist \ |
| 460 |
-delete || die |
| 461 |
fi |
Archives