From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 30609139695 for ; Sun, 6 Aug 2017 00:12:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58E6DE0C75; Sun, 6 Aug 2017 00:12:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 25382E0C75 for ; Sun, 6 Aug 2017 00:12:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E87163417DA for ; Sun, 6 Aug 2017 00:12:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FCEE75F2 for ; Sun, 6 Aug 2017 00:12:26 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1501978340.541e9759ca8143d7e446de7cc353417dd45f5a71.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/git-2.14.0-r1.ebuild dev-vcs/git/git-2.14.0.ebuild dev-vcs/git/git-9999-r1.ebuild dev-vcs/git/git-9999-r2.ebuild dev-vcs/git/git-9999-r3.ebuild dev-vcs/git/git-9999.ebuild dev-vcs/git/metadata.xml X-VCS-Directories: dev-vcs/git/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 541e9759ca8143d7e446de7cc353417dd45f5a71 X-VCS-Branch: master Date: Sun, 6 Aug 2017 00:12:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: eaa2f96e-fbf7-4c11-aadf-bcdce5046df4 X-Archives-Hash: c439d30ed6d8a2387afc378e37d4884e commit: 541e9759ca8143d7e446de7cc353417dd45f5a71 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Aug 6 00:04:59 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Aug 6 00:12:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541e9759 dev-vcs/git: switch to PCRE2-JIT per upstream. Upstream Git is switching to PCRE2 w/ JIT by default, because of the performance boost. An optional non-JIT PCRE is available in PCRE1 code path, for arches where dev-libs/libpcre2[jit] is not available (alpha, ia64, hppa as of this commit). Closes: https://bugs.gentoo.org/show_bug.cgi?id=627088 Bug: https://bugs.gentoo.org/show_bug.cgi?id=627088 Package-Manager: portage-2.3.6 .../git/{git-2.14.0.ebuild => git-2.14.0-r1.ebuild} | 21 ++++++++++++++++----- dev-vcs/git/git-2.14.0.ebuild | 2 +- dev-vcs/git/git-9999-r1.ebuild | 21 ++++++++++++++++----- dev-vcs/git/git-9999-r2.ebuild | 21 ++++++++++++++++----- dev-vcs/git/git-9999-r3.ebuild | 21 ++++++++++++++++----- dev-vcs/git/git-9999.ebuild | 21 ++++++++++++++++----- dev-vcs/git/metadata.xml | 1 + 7 files changed, 82 insertions(+), 26 deletions(-) diff --git a/dev-vcs/git/git-2.14.0.ebuild b/dev-vcs/git/git-2.14.0-r1.ebuild similarity index 97% copy from dev-vcs/git/git-2.14.0.ebuild copy to dev-vcs/git/git-2.14.0-r1.ebuild index 2b0d92a449d..492ea3ac973 100644 --- a/dev-vcs/git/git-2.14.0.ebuild +++ b/dev-vcs/git/git-2.14.0-r1.ebuild @@ -43,7 +43,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -51,7 +51,10 @@ CDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( dev-libs/libpcre ) + pcre? ( + pcre-jit? ( dev-libs/libpcre2[jit(+)] ) + !pcre-jit? ( dev-libs/libpcre[-jit(-)] ) + ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -108,6 +111,7 @@ REQUIRED_USE=" mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) + pcre-jit? ( pcre ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -173,9 +177,16 @@ exportmakeopts() { || myopts+=" NO_GETTEXT=YesPlease" use tk \ || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" + if use pcre; then + if use pcre-jit; then + myopts+=" USE_LIBPCRE2=YesPlease" + extlibs+=" -lpcre2-8" + else + myopts+=" USE_LIBPCRE1=YesPlease" + myopts+=" NO_LIBPCRE1_JIT=YesPlease" + extlibs+=" -lpcre" + fi + fi use perl \ && myopts+=" INSTALLDIRS=vendor" \ || myopts+=" NO_PERL=YesPlease" diff --git a/dev-vcs/git/git-2.14.0.ebuild b/dev-vcs/git/git-2.14.0.ebuild index 2b0d92a449d..5d492f0abc0 100644 --- a/dev-vcs/git/git-2.14.0.ebuild +++ b/dev-vcs/git/git-2.14.0.ebuild @@ -174,7 +174,7 @@ exportmakeopts() { use tk \ || myopts+=" NO_TCLTK=YesPlease" use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ + && myopts+=" USE_LIBPCRE1=yes" \ && extlibs+=" -lpcre" use perl \ && myopts+=" INSTALLDIRS=vendor" \ diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index e61e4dbc350..d5d419248fd 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -43,7 +43,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -51,7 +51,10 @@ CDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( dev-libs/libpcre ) + pcre? ( + pcre-jit? ( dev-libs/libpcre2[jit(+)] ) + !pcre-jit? ( dev-libs/libpcre[-jit(-)] ) + ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -108,6 +111,7 @@ REQUIRED_USE=" mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) + pcre-jit? ( pcre ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -173,9 +177,16 @@ exportmakeopts() { || myopts+=" NO_GETTEXT=YesPlease" use tk \ || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" + if use pcre; then + if use pcre-jit; then + myopts+=" USE_LIBPCRE2=YesPlease" + extlibs+=" -lpcre2-8" + else + myopts+=" USE_LIBPCRE1=YesPlease" + myopts+=" NO_LIBPCRE1_JIT=YesPlease" + extlibs+=" -lpcre" + fi + fi use perl \ && myopts+=" INSTALLDIRS=vendor" \ || myopts+=" NO_PERL=YesPlease" diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 7c6c767ea6e..d097d9be3f9 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -43,7 +43,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -51,7 +51,10 @@ CDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( dev-libs/libpcre ) + pcre? ( + pcre-jit? ( dev-libs/libpcre2[jit(+)] ) + !pcre-jit? ( dev-libs/libpcre[-jit(-)] ) + ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -108,6 +111,7 @@ REQUIRED_USE=" mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) + pcre-jit? ( pcre ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -173,9 +177,16 @@ exportmakeopts() { || myopts+=" NO_GETTEXT=YesPlease" use tk \ || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" + if use pcre; then + if use pcre-jit; then + myopts+=" USE_LIBPCRE2=YesPlease" + extlibs+=" -lpcre2-8" + else + myopts+=" USE_LIBPCRE1=YesPlease" + myopts+=" NO_LIBPCRE1_JIT=YesPlease" + extlibs+=" -lpcre" + fi + fi use perl \ && myopts+=" INSTALLDIRS=vendor" \ || myopts+=" NO_PERL=YesPlease" diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index f2270d9140f..5f87faa86de 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -43,7 +43,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -51,7 +51,10 @@ CDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( dev-libs/libpcre ) + pcre? ( + pcre-jit? ( dev-libs/libpcre2[jit(+)] ) + !pcre-jit? ( dev-libs/libpcre[-jit(-)] ) + ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -108,6 +111,7 @@ REQUIRED_USE=" mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) + pcre-jit? ( pcre ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -173,9 +177,16 @@ exportmakeopts() { || myopts+=" NO_GETTEXT=YesPlease" use tk \ || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" + if use pcre; then + if use pcre-jit; then + myopts+=" USE_LIBPCRE2=YesPlease" + extlibs+=" -lpcre2-8" + else + myopts+=" USE_LIBPCRE1=YesPlease" + myopts+=" NO_LIBPCRE1_JIT=YesPlease" + extlibs+=" -lpcre" + fi + fi use perl \ && myopts+=" INSTALLDIRS=vendor" \ || myopts+=" NO_PERL=YesPlease" diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 1c670f22bcd..4a0448a0496 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -43,7 +43,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -51,7 +51,10 @@ CDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( dev-libs/libpcre ) + pcre? ( + pcre-jit? ( dev-libs/libpcre2[jit(+)] ) + !pcre-jit? ( dev-libs/libpcre[-jit(-)] ) + ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -108,6 +111,7 @@ REQUIRED_USE=" mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) + pcre-jit? ( pcre ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -173,9 +177,16 @@ exportmakeopts() { || myopts+=" NO_GETTEXT=YesPlease" use tk \ || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" + if use pcre; then + if use pcre-jit; then + myopts+=" USE_LIBPCRE2=YesPlease" + extlibs+=" -lpcre2-8" + else + myopts+=" USE_LIBPCRE1=YesPlease" + myopts+=" NO_LIBPCRE1_JIT=YesPlease" + extlibs+=" -lpcre" + fi + fi use perl \ && myopts+=" INSTALLDIRS=vendor" \ || myopts+=" NO_PERL=YesPlease" diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml index 4a8fe9f2743..f7690883557 100644 --- a/dev-vcs/git/metadata.xml +++ b/dev-vcs/git/metadata.xml @@ -31,6 +31,7 @@ GitWeb support for app-text/highlight Support pulling and pushing from MediaWiki Add experimental patches for improved MediaWiki support + Enable JIT for pcre Make use of a bundled routine that is optimized for the PPC arch Include git-svn for dev-vcs/subversion support Include the 'gitk' and 'git gui' tools