| 1 |
commit: 4eb26372c9499ce5a05072110634213c657192aa |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 29 20:10:24 2016 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 29 20:11:30 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb26372 |
| 7 |
|
| 8 |
dev-vcs/git: sync 9999 builds (one for each upstream integration branch) with EAPI6 improvements. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
dev-vcs/git/git-2.8.0.ebuild | 17 +++-- |
| 13 |
dev-vcs/git/git-9999-r1.ebuild | 157 ++++++++++++++++++++++++---------------- |
| 14 |
dev-vcs/git/git-9999-r2.ebuild | 157 ++++++++++++++++++++++++---------------- |
| 15 |
dev-vcs/git/git-9999-r3.ebuild | 158 ++++++++++++++++++++++++----------------- |
| 16 |
dev-vcs/git/git-9999.ebuild | 157 ++++++++++++++++++++++++---------------- |
| 17 |
5 files changed, 392 insertions(+), 254 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-vcs/git/git-2.8.0.ebuild b/dev-vcs/git/git-2.8.0.ebuild |
| 20 |
index d8bf7cd..2497aa5 100644 |
| 21 |
--- a/dev-vcs/git/git-2.8.0.ebuild |
| 22 |
+++ b/dev-vcs/git/git-2.8.0.ebuild |
| 23 |
@@ -8,9 +8,16 @@ GENTOO_DEPEND_ON_PERL=no |
| 24 |
|
| 25 |
# bug #329479: git-remote-testgit is not multiple-version aware |
| 26 |
PYTHON_COMPAT=( python2_7 ) |
| 27 |
-[[ ${PV} == *9999 ]] && SCM="git-2" |
| 28 |
+[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 29 |
+# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. |
| 30 |
+# See https://git-scm.com/docs/gitworkflows#_graduation |
| 31 |
+# In order of stability: |
| 32 |
+# 9999-r0: maint |
| 33 |
+# 9999-r1: master |
| 34 |
+# 9999-r2: next |
| 35 |
+# 9999-r3: pu |
| 36 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
| 37 |
-EGIT_MASTER=pu |
| 38 |
+EGIT_BRANCH=pu |
| 39 |
PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" |
| 40 |
|
| 41 |
inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 42 |
@@ -205,6 +212,8 @@ exportmakeopts() { |
| 43 |
fi |
| 44 |
if [[ ${CHOST} == *-solaris* ]]; then |
| 45 |
myopts+=" NEEDS_LIBICONV=YesPlease" |
| 46 |
+ myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 47 |
+ myopts+=" HAVE_GETDELIM=1" |
| 48 |
fi |
| 49 |
|
| 50 |
has_version '>=app-text/asciidoc-8.0' \ |
| 51 |
@@ -230,7 +239,7 @@ src_unpack() { |
| 52 |
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 53 |
cd "${S}" |
| 54 |
else |
| 55 |
- git-2_src_unpack |
| 56 |
+ git-r3_src_unpack |
| 57 |
cd "${S}" |
| 58 |
#cp "${FILESDIR}"/GIT-VERSION-GEN . |
| 59 |
fi |
| 60 |
@@ -382,7 +391,7 @@ src_install() { |
| 61 |
# manpages may exist in either OR both of these directories. |
| 62 |
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
| 63 |
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 64 |
- dodoc README.md Documentation/{SubmittingPatches,CodingGuidelines} |
| 65 |
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 66 |
use doc && dodir /usr/share/doc/${PF}/html |
| 67 |
for d in / /howto/ /technical/ ; do |
| 68 |
docinto ${d} |
| 69 |
|
| 70 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 71 |
index 2720fa3..9064287 100644 |
| 72 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 73 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 74 |
@@ -2,17 +2,25 @@ |
| 75 |
# Distributed under the terms of the GNU General Public License v2 |
| 76 |
# $Id$ |
| 77 |
|
| 78 |
-EAPI=5 |
| 79 |
+EAPI=6 |
| 80 |
|
| 81 |
GENTOO_DEPEND_ON_PERL=no |
| 82 |
|
| 83 |
# bug #329479: git-remote-testgit is not multiple-version aware |
| 84 |
PYTHON_COMPAT=( python2_7 ) |
| 85 |
-[[ ${PV} == *9999 ]] && SCM="git-2" |
| 86 |
+[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 87 |
+# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. |
| 88 |
+# See https://git-scm.com/docs/gitworkflows#_graduation |
| 89 |
+# In order of stability: |
| 90 |
+# 9999-r0: maint |
| 91 |
+# 9999-r1: master |
| 92 |
+# 9999-r2: next |
| 93 |
+# 9999-r3: pu |
| 94 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
| 95 |
-EGIT_MASTER=maint |
| 96 |
+EGIT_BRANCH=master |
| 97 |
+PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" |
| 98 |
|
| 99 |
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 100 |
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 101 |
|
| 102 |
MY_PV="${PV/_rc/.rc}" |
| 103 |
MY_P="${PN}-${MY_PV}" |
| 104 |
@@ -38,15 +46,16 @@ fi |
| 105 |
|
| 106 |
LICENSE="GPL-2" |
| 107 |
SLOT="0" |
| 108 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 109 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 110 |
|
| 111 |
# Common to both DEPEND and RDEPEND |
| 112 |
CDEPEND=" |
| 113 |
- dev-libs/openssl:0 |
| 114 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 115 |
+ libressl? ( dev-libs/libressl:= ) |
| 116 |
sys-libs/zlib |
| 117 |
pcre? ( dev-libs/libpcre ) |
| 118 |
perl? ( dev-lang/perl:=[-build(-)] ) |
| 119 |
- tk? ( dev-lang/tk:0 ) |
| 120 |
+ tk? ( dev-lang/tk:0= ) |
| 121 |
curl? ( |
| 122 |
net-misc/curl |
| 123 |
webdav? ( dev-libs/expat ) |
| 124 |
@@ -80,7 +89,6 @@ RDEPEND="${CDEPEND} |
| 125 |
# .xml/docbook --(docbook2texi.pl)--> .texi |
| 126 |
# .texi --(makeinfo)---------> .info |
| 127 |
DEPEND="${CDEPEND} |
| 128 |
- app-arch/cpio |
| 129 |
doc? ( |
| 130 |
app-text/asciidoc |
| 131 |
app-text/docbook2X |
| 132 |
@@ -110,6 +118,20 @@ REQUIRED_USE=" |
| 133 |
python? ( ${PYTHON_REQUIRED_USE} ) |
| 134 |
" |
| 135 |
|
| 136 |
+PATCHES=( |
| 137 |
+ # bug #350330 - automagic CVS when we don't want it is bad. |
| 138 |
+ "${FILESDIR}"/git-2.2.2-optional-cvs.patch |
| 139 |
+ |
| 140 |
+ # install mediawiki perl modules also in vendor_dir |
| 141 |
+ # hack, needs better upstream solution |
| 142 |
+ "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 143 |
+ |
| 144 |
+ "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch |
| 145 |
+ |
| 146 |
+ # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. |
| 147 |
+ "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch |
| 148 |
+) |
| 149 |
+ |
| 150 |
pkg_setup() { |
| 151 |
if use subversion && has_version "dev-vcs/subversion[dso]"; then |
| 152 |
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 153 |
@@ -127,24 +149,24 @@ exportmakeopts() { |
| 154 |
local myopts |
| 155 |
|
| 156 |
if use blksha1 ; then |
| 157 |
- myopts="${myopts} BLK_SHA1=YesPlease" |
| 158 |
+ myopts+=" BLK_SHA1=YesPlease" |
| 159 |
elif use ppcsha1 ; then |
| 160 |
- myopts="${myopts} PPC_SHA1=YesPlease" |
| 161 |
+ myopts+=" PPC_SHA1=YesPlease" |
| 162 |
fi |
| 163 |
|
| 164 |
if use curl ; then |
| 165 |
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
| 166 |
+ use webdav || myopts+=" NO_EXPAT=YesPlease" |
| 167 |
else |
| 168 |
- myopts="${myopts} NO_CURL=YesPlease" |
| 169 |
+ myopts+=" NO_CURL=YesPlease" |
| 170 |
fi |
| 171 |
|
| 172 |
# broken assumptions, because of broken build system ... |
| 173 |
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 174 |
- myopts="${myopts} INSTALL=install TAR=tar" |
| 175 |
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" |
| 176 |
- myopts="${myopts} SANE_TOOL_PATH=" |
| 177 |
- myopts="${myopts} OLD_ICONV=" |
| 178 |
- myopts="${myopts} NO_EXTERNAL_GREP=" |
| 179 |
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 180 |
+ myopts+=" INSTALL=install TAR=tar" |
| 181 |
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 182 |
+ myopts+=" SANE_TOOL_PATH=" |
| 183 |
+ myopts+=" OLD_ICONV=" |
| 184 |
+ myopts+=" NO_EXTERNAL_GREP=" |
| 185 |
|
| 186 |
# For svn-fe |
| 187 |
extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
| 188 |
@@ -153,53 +175,55 @@ exportmakeopts() { |
| 189 |
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
| 190 |
|
| 191 |
use iconv \ |
| 192 |
- || myopts="${myopts} NO_ICONV=YesPlease" |
| 193 |
+ || myopts+=" NO_ICONV=YesPlease" |
| 194 |
use nls \ |
| 195 |
- || myopts="${myopts} NO_GETTEXT=YesPlease" |
| 196 |
+ || myopts+=" NO_GETTEXT=YesPlease" |
| 197 |
use tk \ |
| 198 |
- || myopts="${myopts} NO_TCLTK=YesPlease" |
| 199 |
+ || myopts+=" NO_TCLTK=YesPlease" |
| 200 |
use pcre \ |
| 201 |
- && myopts="${myopts} USE_LIBPCRE=yes" \ |
| 202 |
- && extlibs="${extlibs} -lpcre" |
| 203 |
+ && myopts+=" USE_LIBPCRE=yes" \ |
| 204 |
+ && extlibs+=" -lpcre" |
| 205 |
use perl \ |
| 206 |
- && myopts="${myopts} INSTALLDIRS=vendor" \ |
| 207 |
- || myopts="${myopts} NO_PERL=YesPlease" |
| 208 |
+ && myopts+=" INSTALLDIRS=vendor" \ |
| 209 |
+ || myopts+=" NO_PERL=YesPlease" |
| 210 |
use python \ |
| 211 |
- || myopts="${myopts} NO_PYTHON=YesPlease" |
| 212 |
+ || myopts+=" NO_PYTHON=YesPlease" |
| 213 |
use subversion \ |
| 214 |
- || myopts="${myopts} NO_SVN_TESTS=YesPlease" |
| 215 |
+ || myopts+=" NO_SVN_TESTS=YesPlease" |
| 216 |
use threads \ |
| 217 |
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ |
| 218 |
- || myopts="${myopts} NO_PTHREADS=YesPlease" |
| 219 |
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ |
| 220 |
+ || myopts+=" NO_PTHREADS=YesPlease" |
| 221 |
use cvs \ |
| 222 |
- || myopts="${myopts} NO_CVS=YesPlease" |
| 223 |
+ || myopts+=" NO_CVS=YesPlease" |
| 224 |
# Disabled until ~m68k-mint can be keyworded again |
| 225 |
# if [[ ${CHOST} == *-mint* ]] ; then |
| 226 |
-# myopts="${myopts} NO_MMAP=YesPlease" |
| 227 |
-# myopts="${myopts} NO_IPV6=YesPlease" |
| 228 |
-# myopts="${myopts} NO_STRLCPY=YesPlease" |
| 229 |
-# myopts="${myopts} NO_MEMMEM=YesPlease" |
| 230 |
-# myopts="${myopts} NO_MKDTEMP=YesPlease" |
| 231 |
-# myopts="${myopts} NO_MKSTEMPS=YesPlease" |
| 232 |
+# myopts+=" NO_MMAP=YesPlease" |
| 233 |
+# myopts+=" NO_IPV6=YesPlease" |
| 234 |
+# myopts+=" NO_STRLCPY=YesPlease" |
| 235 |
+# myopts+=" NO_MEMMEM=YesPlease" |
| 236 |
+# myopts+=" NO_MKDTEMP=YesPlease" |
| 237 |
+# myopts+=" NO_MKSTEMPS=YesPlease" |
| 238 |
# fi |
| 239 |
if [[ ${CHOST} == ia64-*-hpux* ]]; then |
| 240 |
- myopts="${myopts} NO_NSEC=YesPlease" |
| 241 |
+ myopts+=" NO_NSEC=YesPlease" |
| 242 |
fi |
| 243 |
if [[ ${CHOST} == *-*-aix* ]]; then |
| 244 |
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" |
| 245 |
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" |
| 246 |
fi |
| 247 |
if [[ ${CHOST} == *-solaris* ]]; then |
| 248 |
- myopts="${myopts} NEEDS_LIBICONV=YesPlease" |
| 249 |
+ myopts+=" NEEDS_LIBICONV=YesPlease" |
| 250 |
+ myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 251 |
+ myopts+=" HAVE_GETDELIM=1" |
| 252 |
fi |
| 253 |
|
| 254 |
has_version '>=app-text/asciidoc-8.0' \ |
| 255 |
- && myopts="${myopts} ASCIIDOC8=YesPlease" |
| 256 |
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" |
| 257 |
+ && myopts+=" ASCIIDOC8=YesPlease" |
| 258 |
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease" |
| 259 |
|
| 260 |
# Bug 290465: |
| 261 |
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
| 262 |
[[ "${CHOST}" == *-uclibc* ]] && \ |
| 263 |
- myopts="${myopts} NO_NSEC=YesPlease" |
| 264 |
+ myopts+=" NO_NSEC=YesPlease" |
| 265 |
|
| 266 |
export MY_MAKEOPTS="${myopts}" |
| 267 |
export EXTLIBS="${extlibs}" |
| 268 |
@@ -215,7 +239,7 @@ src_unpack() { |
| 269 |
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 270 |
cd "${S}" |
| 271 |
else |
| 272 |
- git-2_src_unpack |
| 273 |
+ git-r3_src_unpack |
| 274 |
cd "${S}" |
| 275 |
#cp "${FILESDIR}"/GIT-VERSION-GEN . |
| 276 |
fi |
| 277 |
@@ -223,24 +247,17 @@ src_unpack() { |
| 278 |
} |
| 279 |
|
| 280 |
src_prepare() { |
| 281 |
- # bug #350330 - automagic CVS when we don't want it is bad. |
| 282 |
- epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch |
| 283 |
- |
| 284 |
- # install mediawiki perl modules also in vendor_dir |
| 285 |
- # hack, needs better upstream solution |
| 286 |
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 287 |
- |
| 288 |
# add experimental patches to improve mediawiki support |
| 289 |
# see patches for origin |
| 290 |
if use mediawiki-experimental ; then |
| 291 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
| 292 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
| 293 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
| 294 |
+ PATCHES+=( |
| 295 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
| 296 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
| 297 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
| 298 |
+ ) |
| 299 |
fi |
| 300 |
|
| 301 |
- epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch |
| 302 |
- |
| 303 |
- epatch_user |
| 304 |
+ default |
| 305 |
|
| 306 |
sed -i \ |
| 307 |
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
| 308 |
@@ -308,8 +325,8 @@ src_compile() { |
| 309 |
|
| 310 |
if use perl && use cgi ; then |
| 311 |
git_emake \ |
| 312 |
- gitweb/gitweb.cgi \ |
| 313 |
- || die "emake gitweb/gitweb.cgi failed" |
| 314 |
+ gitweb \ |
| 315 |
+ || die "emake gitweb (cgi) failed" |
| 316 |
fi |
| 317 |
|
| 318 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 319 |
@@ -374,13 +391,15 @@ src_install() { |
| 320 |
# manpages may exist in either OR both of these directories. |
| 321 |
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
| 322 |
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 323 |
- |
| 324 |
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
| 325 |
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 326 |
use doc && dodir /usr/share/doc/${PF}/html |
| 327 |
for d in / /howto/ /technical/ ; do |
| 328 |
docinto ${d} |
| 329 |
dodoc Documentation${d}*.txt |
| 330 |
- use doc && dohtml -p ${d} Documentation${d}*.html |
| 331 |
+ if use doc ; then |
| 332 |
+ docinto ${d}/html |
| 333 |
+ dodoc Documentation${d}*.html |
| 334 |
+ fi |
| 335 |
done |
| 336 |
docinto / |
| 337 |
# Upstream does not ship this pre-built :-( |
| 338 |
@@ -453,7 +472,11 @@ src_install() { |
| 339 |
cd "${S}"/contrib/svn-fe |
| 340 |
dobin svn-fe |
| 341 |
dodoc svn-fe.txt |
| 342 |
- use doc && doman svn-fe.1 && dohtml svn-fe.html |
| 343 |
+ if use doc ; then |
| 344 |
+ doman svn-fe.1 |
| 345 |
+ docinto html |
| 346 |
+ dodoc svn-fe.html |
| 347 |
+ fi |
| 348 |
cd "${S}" |
| 349 |
fi |
| 350 |
|
| 351 |
@@ -521,6 +544,16 @@ src_install() { |
| 352 |
fi |
| 353 |
|
| 354 |
perl_delete_localpod |
| 355 |
+ |
| 356 |
+ # Remove disabled linguas |
| 357 |
+ # we could remove sources in src_prepare, but install does not |
| 358 |
+ # handle missing locale dir well |
| 359 |
+ rm_loc() { |
| 360 |
+ if [[ -e "${ED}/usr/share/locale/${1}" ]]; then |
| 361 |
+ rm -r "${ED}/usr/share/locale/${1}" || die |
| 362 |
+ fi |
| 363 |
+ } |
| 364 |
+ l10n_for_each_disabled_locale_do rm_loc |
| 365 |
} |
| 366 |
|
| 367 |
src_test() { |
| 368 |
|
| 369 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 370 |
index 3303ae8..56b5b6b 100644 |
| 371 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 372 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 373 |
@@ -2,17 +2,25 @@ |
| 374 |
# Distributed under the terms of the GNU General Public License v2 |
| 375 |
# $Id$ |
| 376 |
|
| 377 |
-EAPI=5 |
| 378 |
+EAPI=6 |
| 379 |
|
| 380 |
GENTOO_DEPEND_ON_PERL=no |
| 381 |
|
| 382 |
# bug #329479: git-remote-testgit is not multiple-version aware |
| 383 |
PYTHON_COMPAT=( python2_7 ) |
| 384 |
-[[ ${PV} == *9999 ]] && SCM="git-2" |
| 385 |
+[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 386 |
+# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. |
| 387 |
+# See https://git-scm.com/docs/gitworkflows#_graduation |
| 388 |
+# In order of stability: |
| 389 |
+# 9999-r0: maint |
| 390 |
+# 9999-r1: master |
| 391 |
+# 9999-r2: next |
| 392 |
+# 9999-r3: pu |
| 393 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
| 394 |
-EGIT_MASTER=next |
| 395 |
+EGIT_BRANCH=next |
| 396 |
+PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" |
| 397 |
|
| 398 |
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 399 |
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 400 |
|
| 401 |
MY_PV="${PV/_rc/.rc}" |
| 402 |
MY_P="${PN}-${MY_PV}" |
| 403 |
@@ -38,15 +46,16 @@ fi |
| 404 |
|
| 405 |
LICENSE="GPL-2" |
| 406 |
SLOT="0" |
| 407 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 408 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 409 |
|
| 410 |
# Common to both DEPEND and RDEPEND |
| 411 |
CDEPEND=" |
| 412 |
- dev-libs/openssl:0 |
| 413 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 414 |
+ libressl? ( dev-libs/libressl:= ) |
| 415 |
sys-libs/zlib |
| 416 |
pcre? ( dev-libs/libpcre ) |
| 417 |
perl? ( dev-lang/perl:=[-build(-)] ) |
| 418 |
- tk? ( dev-lang/tk:0 ) |
| 419 |
+ tk? ( dev-lang/tk:0= ) |
| 420 |
curl? ( |
| 421 |
net-misc/curl |
| 422 |
webdav? ( dev-libs/expat ) |
| 423 |
@@ -80,7 +89,6 @@ RDEPEND="${CDEPEND} |
| 424 |
# .xml/docbook --(docbook2texi.pl)--> .texi |
| 425 |
# .texi --(makeinfo)---------> .info |
| 426 |
DEPEND="${CDEPEND} |
| 427 |
- app-arch/cpio |
| 428 |
doc? ( |
| 429 |
app-text/asciidoc |
| 430 |
app-text/docbook2X |
| 431 |
@@ -110,6 +118,20 @@ REQUIRED_USE=" |
| 432 |
python? ( ${PYTHON_REQUIRED_USE} ) |
| 433 |
" |
| 434 |
|
| 435 |
+PATCHES=( |
| 436 |
+ # bug #350330 - automagic CVS when we don't want it is bad. |
| 437 |
+ "${FILESDIR}"/git-2.2.2-optional-cvs.patch |
| 438 |
+ |
| 439 |
+ # install mediawiki perl modules also in vendor_dir |
| 440 |
+ # hack, needs better upstream solution |
| 441 |
+ "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 442 |
+ |
| 443 |
+ "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch |
| 444 |
+ |
| 445 |
+ # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. |
| 446 |
+ "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch |
| 447 |
+) |
| 448 |
+ |
| 449 |
pkg_setup() { |
| 450 |
if use subversion && has_version "dev-vcs/subversion[dso]"; then |
| 451 |
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 452 |
@@ -127,24 +149,24 @@ exportmakeopts() { |
| 453 |
local myopts |
| 454 |
|
| 455 |
if use blksha1 ; then |
| 456 |
- myopts="${myopts} BLK_SHA1=YesPlease" |
| 457 |
+ myopts+=" BLK_SHA1=YesPlease" |
| 458 |
elif use ppcsha1 ; then |
| 459 |
- myopts="${myopts} PPC_SHA1=YesPlease" |
| 460 |
+ myopts+=" PPC_SHA1=YesPlease" |
| 461 |
fi |
| 462 |
|
| 463 |
if use curl ; then |
| 464 |
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
| 465 |
+ use webdav || myopts+=" NO_EXPAT=YesPlease" |
| 466 |
else |
| 467 |
- myopts="${myopts} NO_CURL=YesPlease" |
| 468 |
+ myopts+=" NO_CURL=YesPlease" |
| 469 |
fi |
| 470 |
|
| 471 |
# broken assumptions, because of broken build system ... |
| 472 |
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 473 |
- myopts="${myopts} INSTALL=install TAR=tar" |
| 474 |
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" |
| 475 |
- myopts="${myopts} SANE_TOOL_PATH=" |
| 476 |
- myopts="${myopts} OLD_ICONV=" |
| 477 |
- myopts="${myopts} NO_EXTERNAL_GREP=" |
| 478 |
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 479 |
+ myopts+=" INSTALL=install TAR=tar" |
| 480 |
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 481 |
+ myopts+=" SANE_TOOL_PATH=" |
| 482 |
+ myopts+=" OLD_ICONV=" |
| 483 |
+ myopts+=" NO_EXTERNAL_GREP=" |
| 484 |
|
| 485 |
# For svn-fe |
| 486 |
extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
| 487 |
@@ -153,53 +175,55 @@ exportmakeopts() { |
| 488 |
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
| 489 |
|
| 490 |
use iconv \ |
| 491 |
- || myopts="${myopts} NO_ICONV=YesPlease" |
| 492 |
+ || myopts+=" NO_ICONV=YesPlease" |
| 493 |
use nls \ |
| 494 |
- || myopts="${myopts} NO_GETTEXT=YesPlease" |
| 495 |
+ || myopts+=" NO_GETTEXT=YesPlease" |
| 496 |
use tk \ |
| 497 |
- || myopts="${myopts} NO_TCLTK=YesPlease" |
| 498 |
+ || myopts+=" NO_TCLTK=YesPlease" |
| 499 |
use pcre \ |
| 500 |
- && myopts="${myopts} USE_LIBPCRE=yes" \ |
| 501 |
- && extlibs="${extlibs} -lpcre" |
| 502 |
+ && myopts+=" USE_LIBPCRE=yes" \ |
| 503 |
+ && extlibs+=" -lpcre" |
| 504 |
use perl \ |
| 505 |
- && myopts="${myopts} INSTALLDIRS=vendor" \ |
| 506 |
- || myopts="${myopts} NO_PERL=YesPlease" |
| 507 |
+ && myopts+=" INSTALLDIRS=vendor" \ |
| 508 |
+ || myopts+=" NO_PERL=YesPlease" |
| 509 |
use python \ |
| 510 |
- || myopts="${myopts} NO_PYTHON=YesPlease" |
| 511 |
+ || myopts+=" NO_PYTHON=YesPlease" |
| 512 |
use subversion \ |
| 513 |
- || myopts="${myopts} NO_SVN_TESTS=YesPlease" |
| 514 |
+ || myopts+=" NO_SVN_TESTS=YesPlease" |
| 515 |
use threads \ |
| 516 |
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ |
| 517 |
- || myopts="${myopts} NO_PTHREADS=YesPlease" |
| 518 |
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ |
| 519 |
+ || myopts+=" NO_PTHREADS=YesPlease" |
| 520 |
use cvs \ |
| 521 |
- || myopts="${myopts} NO_CVS=YesPlease" |
| 522 |
+ || myopts+=" NO_CVS=YesPlease" |
| 523 |
# Disabled until ~m68k-mint can be keyworded again |
| 524 |
# if [[ ${CHOST} == *-mint* ]] ; then |
| 525 |
-# myopts="${myopts} NO_MMAP=YesPlease" |
| 526 |
-# myopts="${myopts} NO_IPV6=YesPlease" |
| 527 |
-# myopts="${myopts} NO_STRLCPY=YesPlease" |
| 528 |
-# myopts="${myopts} NO_MEMMEM=YesPlease" |
| 529 |
-# myopts="${myopts} NO_MKDTEMP=YesPlease" |
| 530 |
-# myopts="${myopts} NO_MKSTEMPS=YesPlease" |
| 531 |
+# myopts+=" NO_MMAP=YesPlease" |
| 532 |
+# myopts+=" NO_IPV6=YesPlease" |
| 533 |
+# myopts+=" NO_STRLCPY=YesPlease" |
| 534 |
+# myopts+=" NO_MEMMEM=YesPlease" |
| 535 |
+# myopts+=" NO_MKDTEMP=YesPlease" |
| 536 |
+# myopts+=" NO_MKSTEMPS=YesPlease" |
| 537 |
# fi |
| 538 |
if [[ ${CHOST} == ia64-*-hpux* ]]; then |
| 539 |
- myopts="${myopts} NO_NSEC=YesPlease" |
| 540 |
+ myopts+=" NO_NSEC=YesPlease" |
| 541 |
fi |
| 542 |
if [[ ${CHOST} == *-*-aix* ]]; then |
| 543 |
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" |
| 544 |
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" |
| 545 |
fi |
| 546 |
if [[ ${CHOST} == *-solaris* ]]; then |
| 547 |
- myopts="${myopts} NEEDS_LIBICONV=YesPlease" |
| 548 |
+ myopts+=" NEEDS_LIBICONV=YesPlease" |
| 549 |
+ myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 550 |
+ myopts+=" HAVE_GETDELIM=1" |
| 551 |
fi |
| 552 |
|
| 553 |
has_version '>=app-text/asciidoc-8.0' \ |
| 554 |
- && myopts="${myopts} ASCIIDOC8=YesPlease" |
| 555 |
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" |
| 556 |
+ && myopts+=" ASCIIDOC8=YesPlease" |
| 557 |
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease" |
| 558 |
|
| 559 |
# Bug 290465: |
| 560 |
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
| 561 |
[[ "${CHOST}" == *-uclibc* ]] && \ |
| 562 |
- myopts="${myopts} NO_NSEC=YesPlease" |
| 563 |
+ myopts+=" NO_NSEC=YesPlease" |
| 564 |
|
| 565 |
export MY_MAKEOPTS="${myopts}" |
| 566 |
export EXTLIBS="${extlibs}" |
| 567 |
@@ -215,7 +239,7 @@ src_unpack() { |
| 568 |
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 569 |
cd "${S}" |
| 570 |
else |
| 571 |
- git-2_src_unpack |
| 572 |
+ git-r3_src_unpack |
| 573 |
cd "${S}" |
| 574 |
#cp "${FILESDIR}"/GIT-VERSION-GEN . |
| 575 |
fi |
| 576 |
@@ -223,24 +247,17 @@ src_unpack() { |
| 577 |
} |
| 578 |
|
| 579 |
src_prepare() { |
| 580 |
- # bug #350330 - automagic CVS when we don't want it is bad. |
| 581 |
- epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch |
| 582 |
- |
| 583 |
- # install mediawiki perl modules also in vendor_dir |
| 584 |
- # hack, needs better upstream solution |
| 585 |
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 586 |
- |
| 587 |
# add experimental patches to improve mediawiki support |
| 588 |
# see patches for origin |
| 589 |
if use mediawiki-experimental ; then |
| 590 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
| 591 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
| 592 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
| 593 |
+ PATCHES+=( |
| 594 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
| 595 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
| 596 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
| 597 |
+ ) |
| 598 |
fi |
| 599 |
|
| 600 |
- epatch "${FILESDIR}"/${PN}-2.2.0-svn-fe-linking.patch |
| 601 |
- |
| 602 |
- epatch_user |
| 603 |
+ default |
| 604 |
|
| 605 |
sed -i \ |
| 606 |
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
| 607 |
@@ -308,8 +325,8 @@ src_compile() { |
| 608 |
|
| 609 |
if use perl && use cgi ; then |
| 610 |
git_emake \ |
| 611 |
- gitweb/gitweb.cgi \ |
| 612 |
- || die "emake gitweb/gitweb.cgi failed" |
| 613 |
+ gitweb \ |
| 614 |
+ || die "emake gitweb (cgi) failed" |
| 615 |
fi |
| 616 |
|
| 617 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 618 |
@@ -374,13 +391,15 @@ src_install() { |
| 619 |
# manpages may exist in either OR both of these directories. |
| 620 |
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
| 621 |
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 622 |
- |
| 623 |
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
| 624 |
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 625 |
use doc && dodir /usr/share/doc/${PF}/html |
| 626 |
for d in / /howto/ /technical/ ; do |
| 627 |
docinto ${d} |
| 628 |
dodoc Documentation${d}*.txt |
| 629 |
- use doc && dohtml -p ${d} Documentation${d}*.html |
| 630 |
+ if use doc ; then |
| 631 |
+ docinto ${d}/html |
| 632 |
+ dodoc Documentation${d}*.html |
| 633 |
+ fi |
| 634 |
done |
| 635 |
docinto / |
| 636 |
# Upstream does not ship this pre-built :-( |
| 637 |
@@ -453,7 +472,11 @@ src_install() { |
| 638 |
cd "${S}"/contrib/svn-fe |
| 639 |
dobin svn-fe |
| 640 |
dodoc svn-fe.txt |
| 641 |
- use doc && doman svn-fe.1 && dohtml svn-fe.html |
| 642 |
+ if use doc ; then |
| 643 |
+ doman svn-fe.1 |
| 644 |
+ docinto html |
| 645 |
+ dodoc svn-fe.html |
| 646 |
+ fi |
| 647 |
cd "${S}" |
| 648 |
fi |
| 649 |
|
| 650 |
@@ -521,6 +544,16 @@ src_install() { |
| 651 |
fi |
| 652 |
|
| 653 |
perl_delete_localpod |
| 654 |
+ |
| 655 |
+ # Remove disabled linguas |
| 656 |
+ # we could remove sources in src_prepare, but install does not |
| 657 |
+ # handle missing locale dir well |
| 658 |
+ rm_loc() { |
| 659 |
+ if [[ -e "${ED}/usr/share/locale/${1}" ]]; then |
| 660 |
+ rm -r "${ED}/usr/share/locale/${1}" || die |
| 661 |
+ fi |
| 662 |
+ } |
| 663 |
+ l10n_for_each_disabled_locale_do rm_loc |
| 664 |
} |
| 665 |
|
| 666 |
src_test() { |
| 667 |
|
| 668 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 669 |
index 876bc8d..2497aa5 100644 |
| 670 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 671 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 672 |
@@ -2,17 +2,25 @@ |
| 673 |
# Distributed under the terms of the GNU General Public License v2 |
| 674 |
# $Id$ |
| 675 |
|
| 676 |
-EAPI=5 |
| 677 |
+EAPI=6 |
| 678 |
|
| 679 |
GENTOO_DEPEND_ON_PERL=no |
| 680 |
|
| 681 |
# bug #329479: git-remote-testgit is not multiple-version aware |
| 682 |
PYTHON_COMPAT=( python2_7 ) |
| 683 |
-[[ ${PV} == *9999 ]] && SCM="git-2" |
| 684 |
+[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 685 |
+# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. |
| 686 |
+# See https://git-scm.com/docs/gitworkflows#_graduation |
| 687 |
+# In order of stability: |
| 688 |
+# 9999-r0: maint |
| 689 |
+# 9999-r1: master |
| 690 |
+# 9999-r2: next |
| 691 |
+# 9999-r3: pu |
| 692 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
| 693 |
-EGIT_MASTER=pu |
| 694 |
+EGIT_BRANCH=pu |
| 695 |
+PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" |
| 696 |
|
| 697 |
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 698 |
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 699 |
|
| 700 |
MY_PV="${PV/_rc/.rc}" |
| 701 |
MY_P="${PN}-${MY_PV}" |
| 702 |
@@ -42,12 +50,12 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libre |
| 703 |
|
| 704 |
# Common to both DEPEND and RDEPEND |
| 705 |
CDEPEND=" |
| 706 |
- !libressl? ( dev-libs/openssl:0 ) |
| 707 |
- libressl? ( dev-libs/libressl ) |
| 708 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 709 |
+ libressl? ( dev-libs/libressl:= ) |
| 710 |
sys-libs/zlib |
| 711 |
pcre? ( dev-libs/libpcre ) |
| 712 |
perl? ( dev-lang/perl:=[-build(-)] ) |
| 713 |
- tk? ( dev-lang/tk:0 ) |
| 714 |
+ tk? ( dev-lang/tk:0= ) |
| 715 |
curl? ( |
| 716 |
net-misc/curl |
| 717 |
webdav? ( dev-libs/expat ) |
| 718 |
@@ -81,7 +89,6 @@ RDEPEND="${CDEPEND} |
| 719 |
# .xml/docbook --(docbook2texi.pl)--> .texi |
| 720 |
# .texi --(makeinfo)---------> .info |
| 721 |
DEPEND="${CDEPEND} |
| 722 |
- app-arch/cpio |
| 723 |
doc? ( |
| 724 |
app-text/asciidoc |
| 725 |
app-text/docbook2X |
| 726 |
@@ -111,6 +118,20 @@ REQUIRED_USE=" |
| 727 |
python? ( ${PYTHON_REQUIRED_USE} ) |
| 728 |
" |
| 729 |
|
| 730 |
+PATCHES=( |
| 731 |
+ # bug #350330 - automagic CVS when we don't want it is bad. |
| 732 |
+ "${FILESDIR}"/git-2.2.2-optional-cvs.patch |
| 733 |
+ |
| 734 |
+ # install mediawiki perl modules also in vendor_dir |
| 735 |
+ # hack, needs better upstream solution |
| 736 |
+ "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 737 |
+ |
| 738 |
+ "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch |
| 739 |
+ |
| 740 |
+ # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. |
| 741 |
+ "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch |
| 742 |
+) |
| 743 |
+ |
| 744 |
pkg_setup() { |
| 745 |
if use subversion && has_version "dev-vcs/subversion[dso]"; then |
| 746 |
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 747 |
@@ -128,24 +149,24 @@ exportmakeopts() { |
| 748 |
local myopts |
| 749 |
|
| 750 |
if use blksha1 ; then |
| 751 |
- myopts="${myopts} BLK_SHA1=YesPlease" |
| 752 |
+ myopts+=" BLK_SHA1=YesPlease" |
| 753 |
elif use ppcsha1 ; then |
| 754 |
- myopts="${myopts} PPC_SHA1=YesPlease" |
| 755 |
+ myopts+=" PPC_SHA1=YesPlease" |
| 756 |
fi |
| 757 |
|
| 758 |
if use curl ; then |
| 759 |
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
| 760 |
+ use webdav || myopts+=" NO_EXPAT=YesPlease" |
| 761 |
else |
| 762 |
- myopts="${myopts} NO_CURL=YesPlease" |
| 763 |
+ myopts+=" NO_CURL=YesPlease" |
| 764 |
fi |
| 765 |
|
| 766 |
# broken assumptions, because of broken build system ... |
| 767 |
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 768 |
- myopts="${myopts} INSTALL=install TAR=tar" |
| 769 |
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" |
| 770 |
- myopts="${myopts} SANE_TOOL_PATH=" |
| 771 |
- myopts="${myopts} OLD_ICONV=" |
| 772 |
- myopts="${myopts} NO_EXTERNAL_GREP=" |
| 773 |
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 774 |
+ myopts+=" INSTALL=install TAR=tar" |
| 775 |
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 776 |
+ myopts+=" SANE_TOOL_PATH=" |
| 777 |
+ myopts+=" OLD_ICONV=" |
| 778 |
+ myopts+=" NO_EXTERNAL_GREP=" |
| 779 |
|
| 780 |
# For svn-fe |
| 781 |
extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
| 782 |
@@ -154,55 +175,55 @@ exportmakeopts() { |
| 783 |
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
| 784 |
|
| 785 |
use iconv \ |
| 786 |
- || myopts="${myopts} NO_ICONV=YesPlease" |
| 787 |
+ || myopts+=" NO_ICONV=YesPlease" |
| 788 |
use nls \ |
| 789 |
- || myopts="${myopts} NO_GETTEXT=YesPlease" |
| 790 |
+ || myopts+=" NO_GETTEXT=YesPlease" |
| 791 |
use tk \ |
| 792 |
- || myopts="${myopts} NO_TCLTK=YesPlease" |
| 793 |
+ || myopts+=" NO_TCLTK=YesPlease" |
| 794 |
use pcre \ |
| 795 |
- && myopts="${myopts} USE_LIBPCRE=yes" \ |
| 796 |
- && extlibs="${extlibs} -lpcre" |
| 797 |
+ && myopts+=" USE_LIBPCRE=yes" \ |
| 798 |
+ && extlibs+=" -lpcre" |
| 799 |
use perl \ |
| 800 |
- && myopts="${myopts} INSTALLDIRS=vendor" \ |
| 801 |
- || myopts="${myopts} NO_PERL=YesPlease" |
| 802 |
+ && myopts+=" INSTALLDIRS=vendor" \ |
| 803 |
+ || myopts+=" NO_PERL=YesPlease" |
| 804 |
use python \ |
| 805 |
- || myopts="${myopts} NO_PYTHON=YesPlease" |
| 806 |
+ || myopts+=" NO_PYTHON=YesPlease" |
| 807 |
use subversion \ |
| 808 |
- || myopts="${myopts} NO_SVN_TESTS=YesPlease" |
| 809 |
+ || myopts+=" NO_SVN_TESTS=YesPlease" |
| 810 |
use threads \ |
| 811 |
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ |
| 812 |
- || myopts="${myopts} NO_PTHREADS=YesPlease" |
| 813 |
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ |
| 814 |
+ || myopts+=" NO_PTHREADS=YesPlease" |
| 815 |
use cvs \ |
| 816 |
- || myopts="${myopts} NO_CVS=YesPlease" |
| 817 |
+ || myopts+=" NO_CVS=YesPlease" |
| 818 |
# Disabled until ~m68k-mint can be keyworded again |
| 819 |
# if [[ ${CHOST} == *-mint* ]] ; then |
| 820 |
-# myopts="${myopts} NO_MMAP=YesPlease" |
| 821 |
-# myopts="${myopts} NO_IPV6=YesPlease" |
| 822 |
-# myopts="${myopts} NO_STRLCPY=YesPlease" |
| 823 |
-# myopts="${myopts} NO_MEMMEM=YesPlease" |
| 824 |
-# myopts="${myopts} NO_MKDTEMP=YesPlease" |
| 825 |
-# myopts="${myopts} NO_MKSTEMPS=YesPlease" |
| 826 |
+# myopts+=" NO_MMAP=YesPlease" |
| 827 |
+# myopts+=" NO_IPV6=YesPlease" |
| 828 |
+# myopts+=" NO_STRLCPY=YesPlease" |
| 829 |
+# myopts+=" NO_MEMMEM=YesPlease" |
| 830 |
+# myopts+=" NO_MKDTEMP=YesPlease" |
| 831 |
+# myopts+=" NO_MKSTEMPS=YesPlease" |
| 832 |
# fi |
| 833 |
if [[ ${CHOST} == ia64-*-hpux* ]]; then |
| 834 |
- myopts="${myopts} NO_NSEC=YesPlease" |
| 835 |
+ myopts+=" NO_NSEC=YesPlease" |
| 836 |
fi |
| 837 |
if [[ ${CHOST} == *-*-aix* ]]; then |
| 838 |
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" |
| 839 |
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" |
| 840 |
fi |
| 841 |
if [[ ${CHOST} == *-solaris* ]]; then |
| 842 |
- myopts="${myopts} NEEDS_LIBICONV=YesPlease" |
| 843 |
- myopts="${myopts} HAVE_CLOCK_MONOTONIC=1" |
| 844 |
- myopts="${myopts} HAVE_GETDELIM=1" |
| 845 |
+ myopts+=" NEEDS_LIBICONV=YesPlease" |
| 846 |
+ myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 847 |
+ myopts+=" HAVE_GETDELIM=1" |
| 848 |
fi |
| 849 |
|
| 850 |
has_version '>=app-text/asciidoc-8.0' \ |
| 851 |
- && myopts="${myopts} ASCIIDOC8=YesPlease" |
| 852 |
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" |
| 853 |
+ && myopts+=" ASCIIDOC8=YesPlease" |
| 854 |
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease" |
| 855 |
|
| 856 |
# Bug 290465: |
| 857 |
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
| 858 |
[[ "${CHOST}" == *-uclibc* ]] && \ |
| 859 |
- myopts="${myopts} NO_NSEC=YesPlease" |
| 860 |
+ myopts+=" NO_NSEC=YesPlease" |
| 861 |
|
| 862 |
export MY_MAKEOPTS="${myopts}" |
| 863 |
export EXTLIBS="${extlibs}" |
| 864 |
@@ -218,7 +239,7 @@ src_unpack() { |
| 865 |
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 866 |
cd "${S}" |
| 867 |
else |
| 868 |
- git-2_src_unpack |
| 869 |
+ git-r3_src_unpack |
| 870 |
cd "${S}" |
| 871 |
#cp "${FILESDIR}"/GIT-VERSION-GEN . |
| 872 |
fi |
| 873 |
@@ -226,24 +247,17 @@ src_unpack() { |
| 874 |
} |
| 875 |
|
| 876 |
src_prepare() { |
| 877 |
- # bug #350330 - automagic CVS when we don't want it is bad. |
| 878 |
- epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch |
| 879 |
- |
| 880 |
- # install mediawiki perl modules also in vendor_dir |
| 881 |
- # hack, needs better upstream solution |
| 882 |
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 883 |
- |
| 884 |
# add experimental patches to improve mediawiki support |
| 885 |
# see patches for origin |
| 886 |
if use mediawiki-experimental ; then |
| 887 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
| 888 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
| 889 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
| 890 |
+ PATCHES+=( |
| 891 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
| 892 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
| 893 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
| 894 |
+ ) |
| 895 |
fi |
| 896 |
|
| 897 |
- epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch |
| 898 |
- |
| 899 |
- epatch_user |
| 900 |
+ default |
| 901 |
|
| 902 |
sed -i \ |
| 903 |
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
| 904 |
@@ -311,8 +325,8 @@ src_compile() { |
| 905 |
|
| 906 |
if use perl && use cgi ; then |
| 907 |
git_emake \ |
| 908 |
- gitweb/gitweb.cgi \ |
| 909 |
- || die "emake gitweb/gitweb.cgi failed" |
| 910 |
+ gitweb \ |
| 911 |
+ || die "emake gitweb (cgi) failed" |
| 912 |
fi |
| 913 |
|
| 914 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 915 |
@@ -377,13 +391,15 @@ src_install() { |
| 916 |
# manpages may exist in either OR both of these directories. |
| 917 |
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
| 918 |
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 919 |
- |
| 920 |
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
| 921 |
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 922 |
use doc && dodir /usr/share/doc/${PF}/html |
| 923 |
for d in / /howto/ /technical/ ; do |
| 924 |
docinto ${d} |
| 925 |
dodoc Documentation${d}*.txt |
| 926 |
- use doc && dohtml -p ${d} Documentation${d}*.html |
| 927 |
+ if use doc ; then |
| 928 |
+ docinto ${d}/html |
| 929 |
+ dodoc Documentation${d}*.html |
| 930 |
+ fi |
| 931 |
done |
| 932 |
docinto / |
| 933 |
# Upstream does not ship this pre-built :-( |
| 934 |
@@ -456,7 +472,11 @@ src_install() { |
| 935 |
cd "${S}"/contrib/svn-fe |
| 936 |
dobin svn-fe |
| 937 |
dodoc svn-fe.txt |
| 938 |
- use doc && doman svn-fe.1 && dohtml svn-fe.html |
| 939 |
+ if use doc ; then |
| 940 |
+ doman svn-fe.1 |
| 941 |
+ docinto html |
| 942 |
+ dodoc svn-fe.html |
| 943 |
+ fi |
| 944 |
cd "${S}" |
| 945 |
fi |
| 946 |
|
| 947 |
@@ -524,6 +544,16 @@ src_install() { |
| 948 |
fi |
| 949 |
|
| 950 |
perl_delete_localpod |
| 951 |
+ |
| 952 |
+ # Remove disabled linguas |
| 953 |
+ # we could remove sources in src_prepare, but install does not |
| 954 |
+ # handle missing locale dir well |
| 955 |
+ rm_loc() { |
| 956 |
+ if [[ -e "${ED}/usr/share/locale/${1}" ]]; then |
| 957 |
+ rm -r "${ED}/usr/share/locale/${1}" || die |
| 958 |
+ fi |
| 959 |
+ } |
| 960 |
+ l10n_for_each_disabled_locale_do rm_loc |
| 961 |
} |
| 962 |
|
| 963 |
src_test() { |
| 964 |
|
| 965 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 966 |
index 0ed6ae9..5fbd631 100644 |
| 967 |
--- a/dev-vcs/git/git-9999.ebuild |
| 968 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 969 |
@@ -2,17 +2,25 @@ |
| 970 |
# Distributed under the terms of the GNU General Public License v2 |
| 971 |
# $Id$ |
| 972 |
|
| 973 |
-EAPI=5 |
| 974 |
+EAPI=6 |
| 975 |
|
| 976 |
GENTOO_DEPEND_ON_PERL=no |
| 977 |
|
| 978 |
# bug #329479: git-remote-testgit is not multiple-version aware |
| 979 |
PYTHON_COMPAT=( python2_7 ) |
| 980 |
-[[ ${PV} == *9999 ]] && SCM="git-2" |
| 981 |
+[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 982 |
+# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. |
| 983 |
+# See https://git-scm.com/docs/gitworkflows#_graduation |
| 984 |
+# In order of stability: |
| 985 |
+# 9999-r0: maint |
| 986 |
+# 9999-r1: master |
| 987 |
+# 9999-r2: next |
| 988 |
+# 9999-r3: pu |
| 989 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
| 990 |
-EGIT_MASTER=master |
| 991 |
+EGIT_BRANCH=maint |
| 992 |
+PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN" |
| 993 |
|
| 994 |
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 995 |
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
| 996 |
|
| 997 |
MY_PV="${PV/_rc/.rc}" |
| 998 |
MY_P="${PN}-${MY_PV}" |
| 999 |
@@ -38,15 +46,16 @@ fi |
| 1000 |
|
| 1001 |
LICENSE="GPL-2" |
| 1002 |
SLOT="0" |
| 1003 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 1004 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 1005 |
|
| 1006 |
# Common to both DEPEND and RDEPEND |
| 1007 |
CDEPEND=" |
| 1008 |
- dev-libs/openssl:0 |
| 1009 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 1010 |
+ libressl? ( dev-libs/libressl:= ) |
| 1011 |
sys-libs/zlib |
| 1012 |
pcre? ( dev-libs/libpcre ) |
| 1013 |
perl? ( dev-lang/perl:=[-build(-)] ) |
| 1014 |
- tk? ( dev-lang/tk:0 ) |
| 1015 |
+ tk? ( dev-lang/tk:0= ) |
| 1016 |
curl? ( |
| 1017 |
net-misc/curl |
| 1018 |
webdav? ( dev-libs/expat ) |
| 1019 |
@@ -80,7 +89,6 @@ RDEPEND="${CDEPEND} |
| 1020 |
# .xml/docbook --(docbook2texi.pl)--> .texi |
| 1021 |
# .texi --(makeinfo)---------> .info |
| 1022 |
DEPEND="${CDEPEND} |
| 1023 |
- app-arch/cpio |
| 1024 |
doc? ( |
| 1025 |
app-text/asciidoc |
| 1026 |
app-text/docbook2X |
| 1027 |
@@ -110,6 +118,20 @@ REQUIRED_USE=" |
| 1028 |
python? ( ${PYTHON_REQUIRED_USE} ) |
| 1029 |
" |
| 1030 |
|
| 1031 |
+PATCHES=( |
| 1032 |
+ # bug #350330 - automagic CVS when we don't want it is bad. |
| 1033 |
+ "${FILESDIR}"/git-2.2.2-optional-cvs.patch |
| 1034 |
+ |
| 1035 |
+ # install mediawiki perl modules also in vendor_dir |
| 1036 |
+ # hack, needs better upstream solution |
| 1037 |
+ "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 1038 |
+ |
| 1039 |
+ "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch |
| 1040 |
+ |
| 1041 |
+ # Bug #493306, where FreeBSD 10.x merged libiconv into its libc. |
| 1042 |
+ "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch |
| 1043 |
+) |
| 1044 |
+ |
| 1045 |
pkg_setup() { |
| 1046 |
if use subversion && has_version "dev-vcs/subversion[dso]"; then |
| 1047 |
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
| 1048 |
@@ -127,24 +149,24 @@ exportmakeopts() { |
| 1049 |
local myopts |
| 1050 |
|
| 1051 |
if use blksha1 ; then |
| 1052 |
- myopts="${myopts} BLK_SHA1=YesPlease" |
| 1053 |
+ myopts+=" BLK_SHA1=YesPlease" |
| 1054 |
elif use ppcsha1 ; then |
| 1055 |
- myopts="${myopts} PPC_SHA1=YesPlease" |
| 1056 |
+ myopts+=" PPC_SHA1=YesPlease" |
| 1057 |
fi |
| 1058 |
|
| 1059 |
if use curl ; then |
| 1060 |
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
| 1061 |
+ use webdav || myopts+=" NO_EXPAT=YesPlease" |
| 1062 |
else |
| 1063 |
- myopts="${myopts} NO_CURL=YesPlease" |
| 1064 |
+ myopts+=" NO_CURL=YesPlease" |
| 1065 |
fi |
| 1066 |
|
| 1067 |
# broken assumptions, because of broken build system ... |
| 1068 |
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 1069 |
- myopts="${myopts} INSTALL=install TAR=tar" |
| 1070 |
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" |
| 1071 |
- myopts="${myopts} SANE_TOOL_PATH=" |
| 1072 |
- myopts="${myopts} OLD_ICONV=" |
| 1073 |
- myopts="${myopts} NO_EXTERNAL_GREP=" |
| 1074 |
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 1075 |
+ myopts+=" INSTALL=install TAR=tar" |
| 1076 |
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 1077 |
+ myopts+=" SANE_TOOL_PATH=" |
| 1078 |
+ myopts+=" OLD_ICONV=" |
| 1079 |
+ myopts+=" NO_EXTERNAL_GREP=" |
| 1080 |
|
| 1081 |
# For svn-fe |
| 1082 |
extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
| 1083 |
@@ -153,53 +175,55 @@ exportmakeopts() { |
| 1084 |
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
| 1085 |
|
| 1086 |
use iconv \ |
| 1087 |
- || myopts="${myopts} NO_ICONV=YesPlease" |
| 1088 |
+ || myopts+=" NO_ICONV=YesPlease" |
| 1089 |
use nls \ |
| 1090 |
- || myopts="${myopts} NO_GETTEXT=YesPlease" |
| 1091 |
+ || myopts+=" NO_GETTEXT=YesPlease" |
| 1092 |
use tk \ |
| 1093 |
- || myopts="${myopts} NO_TCLTK=YesPlease" |
| 1094 |
+ || myopts+=" NO_TCLTK=YesPlease" |
| 1095 |
use pcre \ |
| 1096 |
- && myopts="${myopts} USE_LIBPCRE=yes" \ |
| 1097 |
- && extlibs="${extlibs} -lpcre" |
| 1098 |
+ && myopts+=" USE_LIBPCRE=yes" \ |
| 1099 |
+ && extlibs+=" -lpcre" |
| 1100 |
use perl \ |
| 1101 |
- && myopts="${myopts} INSTALLDIRS=vendor" \ |
| 1102 |
- || myopts="${myopts} NO_PERL=YesPlease" |
| 1103 |
+ && myopts+=" INSTALLDIRS=vendor" \ |
| 1104 |
+ || myopts+=" NO_PERL=YesPlease" |
| 1105 |
use python \ |
| 1106 |
- || myopts="${myopts} NO_PYTHON=YesPlease" |
| 1107 |
+ || myopts+=" NO_PYTHON=YesPlease" |
| 1108 |
use subversion \ |
| 1109 |
- || myopts="${myopts} NO_SVN_TESTS=YesPlease" |
| 1110 |
+ || myopts+=" NO_SVN_TESTS=YesPlease" |
| 1111 |
use threads \ |
| 1112 |
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ |
| 1113 |
- || myopts="${myopts} NO_PTHREADS=YesPlease" |
| 1114 |
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ |
| 1115 |
+ || myopts+=" NO_PTHREADS=YesPlease" |
| 1116 |
use cvs \ |
| 1117 |
- || myopts="${myopts} NO_CVS=YesPlease" |
| 1118 |
+ || myopts+=" NO_CVS=YesPlease" |
| 1119 |
# Disabled until ~m68k-mint can be keyworded again |
| 1120 |
# if [[ ${CHOST} == *-mint* ]] ; then |
| 1121 |
-# myopts="${myopts} NO_MMAP=YesPlease" |
| 1122 |
-# myopts="${myopts} NO_IPV6=YesPlease" |
| 1123 |
-# myopts="${myopts} NO_STRLCPY=YesPlease" |
| 1124 |
-# myopts="${myopts} NO_MEMMEM=YesPlease" |
| 1125 |
-# myopts="${myopts} NO_MKDTEMP=YesPlease" |
| 1126 |
-# myopts="${myopts} NO_MKSTEMPS=YesPlease" |
| 1127 |
+# myopts+=" NO_MMAP=YesPlease" |
| 1128 |
+# myopts+=" NO_IPV6=YesPlease" |
| 1129 |
+# myopts+=" NO_STRLCPY=YesPlease" |
| 1130 |
+# myopts+=" NO_MEMMEM=YesPlease" |
| 1131 |
+# myopts+=" NO_MKDTEMP=YesPlease" |
| 1132 |
+# myopts+=" NO_MKSTEMPS=YesPlease" |
| 1133 |
# fi |
| 1134 |
if [[ ${CHOST} == ia64-*-hpux* ]]; then |
| 1135 |
- myopts="${myopts} NO_NSEC=YesPlease" |
| 1136 |
+ myopts+=" NO_NSEC=YesPlease" |
| 1137 |
fi |
| 1138 |
if [[ ${CHOST} == *-*-aix* ]]; then |
| 1139 |
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" |
| 1140 |
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" |
| 1141 |
fi |
| 1142 |
if [[ ${CHOST} == *-solaris* ]]; then |
| 1143 |
- myopts="${myopts} NEEDS_LIBICONV=YesPlease" |
| 1144 |
+ myopts+=" NEEDS_LIBICONV=YesPlease" |
| 1145 |
+ myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 1146 |
+ myopts+=" HAVE_GETDELIM=1" |
| 1147 |
fi |
| 1148 |
|
| 1149 |
has_version '>=app-text/asciidoc-8.0' \ |
| 1150 |
- && myopts="${myopts} ASCIIDOC8=YesPlease" |
| 1151 |
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" |
| 1152 |
+ && myopts+=" ASCIIDOC8=YesPlease" |
| 1153 |
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease" |
| 1154 |
|
| 1155 |
# Bug 290465: |
| 1156 |
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
| 1157 |
[[ "${CHOST}" == *-uclibc* ]] && \ |
| 1158 |
- myopts="${myopts} NO_NSEC=YesPlease" |
| 1159 |
+ myopts+=" NO_NSEC=YesPlease" |
| 1160 |
|
| 1161 |
export MY_MAKEOPTS="${myopts}" |
| 1162 |
export EXTLIBS="${extlibs}" |
| 1163 |
@@ -215,7 +239,7 @@ src_unpack() { |
| 1164 |
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 1165 |
cd "${S}" |
| 1166 |
else |
| 1167 |
- git-2_src_unpack |
| 1168 |
+ git-r3_src_unpack |
| 1169 |
cd "${S}" |
| 1170 |
#cp "${FILESDIR}"/GIT-VERSION-GEN . |
| 1171 |
fi |
| 1172 |
@@ -223,24 +247,17 @@ src_unpack() { |
| 1173 |
} |
| 1174 |
|
| 1175 |
src_prepare() { |
| 1176 |
- # bug #350330 - automagic CVS when we don't want it is bad. |
| 1177 |
- epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch |
| 1178 |
- |
| 1179 |
- # install mediawiki perl modules also in vendor_dir |
| 1180 |
- # hack, needs better upstream solution |
| 1181 |
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 1182 |
- |
| 1183 |
# add experimental patches to improve mediawiki support |
| 1184 |
# see patches for origin |
| 1185 |
if use mediawiki-experimental ; then |
| 1186 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
| 1187 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
| 1188 |
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
| 1189 |
+ PATCHES+=( |
| 1190 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
| 1191 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
| 1192 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
| 1193 |
+ ) |
| 1194 |
fi |
| 1195 |
|
| 1196 |
- epatch "${FILESDIR}"/${PN}-2.2.0-svn-fe-linking.patch |
| 1197 |
- |
| 1198 |
- epatch_user |
| 1199 |
+ default |
| 1200 |
|
| 1201 |
sed -i \ |
| 1202 |
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
| 1203 |
@@ -308,8 +325,8 @@ src_compile() { |
| 1204 |
|
| 1205 |
if use perl && use cgi ; then |
| 1206 |
git_emake \ |
| 1207 |
- gitweb/gitweb.cgi \ |
| 1208 |
- || die "emake gitweb/gitweb.cgi failed" |
| 1209 |
+ gitweb \ |
| 1210 |
+ || die "emake gitweb (cgi) failed" |
| 1211 |
fi |
| 1212 |
|
| 1213 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 1214 |
@@ -374,13 +391,15 @@ src_install() { |
| 1215 |
# manpages may exist in either OR both of these directories. |
| 1216 |
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
| 1217 |
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
| 1218 |
- |
| 1219 |
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
| 1220 |
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
| 1221 |
use doc && dodir /usr/share/doc/${PF}/html |
| 1222 |
for d in / /howto/ /technical/ ; do |
| 1223 |
docinto ${d} |
| 1224 |
dodoc Documentation${d}*.txt |
| 1225 |
- use doc && dohtml -p ${d} Documentation${d}*.html |
| 1226 |
+ if use doc ; then |
| 1227 |
+ docinto ${d}/html |
| 1228 |
+ dodoc Documentation${d}*.html |
| 1229 |
+ fi |
| 1230 |
done |
| 1231 |
docinto / |
| 1232 |
# Upstream does not ship this pre-built :-( |
| 1233 |
@@ -453,7 +472,11 @@ src_install() { |
| 1234 |
cd "${S}"/contrib/svn-fe |
| 1235 |
dobin svn-fe |
| 1236 |
dodoc svn-fe.txt |
| 1237 |
- use doc && doman svn-fe.1 && dohtml svn-fe.html |
| 1238 |
+ if use doc ; then |
| 1239 |
+ doman svn-fe.1 |
| 1240 |
+ docinto html |
| 1241 |
+ dodoc svn-fe.html |
| 1242 |
+ fi |
| 1243 |
cd "${S}" |
| 1244 |
fi |
| 1245 |
|
| 1246 |
@@ -521,6 +544,16 @@ src_install() { |
| 1247 |
fi |
| 1248 |
|
| 1249 |
perl_delete_localpod |
| 1250 |
+ |
| 1251 |
+ # Remove disabled linguas |
| 1252 |
+ # we could remove sources in src_prepare, but install does not |
| 1253 |
+ # handle missing locale dir well |
| 1254 |
+ rm_loc() { |
| 1255 |
+ if [[ -e "${ED}/usr/share/locale/${1}" ]]; then |
| 1256 |
+ rm -r "${ED}/usr/share/locale/${1}" || die |
| 1257 |
+ fi |
| 1258 |
+ } |
| 1259 |
+ l10n_for_each_disabled_locale_do rm_loc |
| 1260 |
} |
| 1261 |
|
| 1262 |
src_test() { |
Archives