diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-vcs/git/git-9999.ebuild | |
parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) |
gentoo resync : 20.03.2021
Diffstat (limited to 'dev-vcs/git/git-9999.ebuild')
-rw-r--r-- | dev-vcs/git/git-9999.ebuild | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 564bb8b7b751..ef8a11391cf3 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -13,7 +13,7 @@ inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python- PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation # In order of stability: @@ -51,7 +51,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -59,10 +59,7 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) + pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -132,7 +129,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) subversion? ( perl ) webdav? ( curl ) @@ -206,16 +202,8 @@ exportmakeopts() { sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) fi if [[ ${CHOST} == *-solaris* ]]; then myopts+=( @@ -272,6 +260,11 @@ src_prepare() { default + if use prefix ; then + # bug #757309 + eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + fi + sed -i \ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ |