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 E05D7138335 for ; Fri, 16 Aug 2019 22:58:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C287BE08AA; Fri, 16 Aug 2019 22:58:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 9CF0BE08AA for ; Fri, 16 Aug 2019 22:58:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7EBA3349A79 for ; Fri, 16 Aug 2019 22:58:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37BB8266 for ; Fri, 16 Aug 2019 22:58:23 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1565996285.a83ca7c3fe8c4e0c700386a12066da5c2f8b4107.mattst88@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.21.0-r2.ebuild dev-vcs/git/git-2.22.0.ebuild dev-vcs/git/git-2.22.1.ebuild dev-vcs/git/git-2.23.0_rc2.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: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a83ca7c3fe8c4e0c700386a12066da5c2f8b4107 X-VCS-Branch: master Date: Fri, 16 Aug 2019 22:58:23 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1f5025c-1c45-48d5-90b6-7a9316b72567 X-Archives-Hash: 152811756f6c909e70eeca6f1b360105 commit: a83ca7c3fe8c4e0c700386a12066da5c2f8b4107 Author: Matt Turner gentoo org> AuthorDate: Tue Aug 13 01:33:51 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Aug 16 22:58:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83ca7c3 dev-vcs/git: Replace USE=+python with USE=perforce Acked by Lars Wendler on IRC. Closes: https://bugs.gentoo.org/692030 Signed-off-by: Matt Turner gentoo.org> dev-vcs/git/git-2.21.0-r2.ebuild | 12 ++++++------ dev-vcs/git/git-2.22.0.ebuild | 12 ++++++------ dev-vcs/git/git-2.22.1.ebuild | 12 ++++++------ dev-vcs/git/git-2.23.0_rc2.ebuild | 12 ++++++------ dev-vcs/git/git-9999-r1.ebuild | 12 ++++++------ dev-vcs/git/git-9999-r2.ebuild | 12 ++++++------ dev-vcs/git/git-9999-r3.ebuild | 12 ++++++------ dev-vcs/git/git-9999.ebuild | 10 +++++----- dev-vcs/git/metadata.xml | 1 + 9 files changed, 48 insertions(+), 47 deletions(-) diff --git a/dev-vcs/git/git-2.21.0-r2.ebuild b/dev-vcs/git/git-2.21.0-r2.ebuild index 533c6f7f3ee..ec6edbb41bd 100644 --- a/dev-vcs/git/git-2.21.0-r2.ebuild +++ b/dev-vcs/git/git-2.21.0-r2.ebuild @@ -50,7 +50,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 +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 perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -98,7 +98,7 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${PYTHON_DEPS} ) " # This is how info docs are created with Git: @@ -132,7 +132,7 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " PATCHES=( @@ -151,7 +151,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -166,7 +166,7 @@ exportmakeopts() { $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) @@ -301,7 +301,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ diff --git a/dev-vcs/git/git-2.22.0.ebuild b/dev-vcs/git/git-2.22.0.ebuild index d691700475c..f3b738828c1 100644 --- a/dev-vcs/git/git-2.22.0.ebuild +++ b/dev-vcs/git/git-2.22.0.ebuild @@ -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 +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 perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${PYTHON_DEPS} ) " # This is how info docs are created with Git: @@ -133,7 +133,7 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " PATCHES=( @@ -152,7 +152,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -167,7 +167,7 @@ exportmakeopts() { $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) @@ -302,7 +302,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ diff --git a/dev-vcs/git/git-2.22.1.ebuild b/dev-vcs/git/git-2.22.1.ebuild index d691700475c..f3b738828c1 100644 --- a/dev-vcs/git/git-2.22.1.ebuild +++ b/dev-vcs/git/git-2.22.1.ebuild @@ -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 +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 perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${PYTHON_DEPS} ) " # This is how info docs are created with Git: @@ -133,7 +133,7 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " PATCHES=( @@ -152,7 +152,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -167,7 +167,7 @@ exportmakeopts() { $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) @@ -302,7 +302,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ diff --git a/dev-vcs/git/git-2.23.0_rc2.ebuild b/dev-vcs/git/git-2.23.0_rc2.ebuild index d691700475c..f3b738828c1 100644 --- a/dev-vcs/git/git-2.23.0_rc2.ebuild +++ b/dev-vcs/git/git-2.23.0_rc2.ebuild @@ -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 +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 perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${PYTHON_DEPS} ) " # This is how info docs are created with Git: @@ -133,7 +133,7 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " PATCHES=( @@ -152,7 +152,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -167,7 +167,7 @@ exportmakeopts() { $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) @@ -302,7 +302,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index d691700475c..f3b738828c1 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -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 +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 perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${PYTHON_DEPS} ) " # This is how info docs are created with Git: @@ -133,7 +133,7 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " PATCHES=( @@ -152,7 +152,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -167,7 +167,7 @@ exportmakeopts() { $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) @@ -302,7 +302,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index d691700475c..f3b738828c1 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -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 +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 perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${PYTHON_DEPS} ) " # This is how info docs are created with Git: @@ -133,7 +133,7 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " PATCHES=( @@ -152,7 +152,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -167,7 +167,7 @@ exportmakeopts() { $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) @@ -302,7 +302,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index d691700475c..f3b738828c1 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -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 +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 perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${PYTHON_DEPS} ) " # This is how info docs are created with Git: @@ -133,7 +133,7 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " PATCHES=( @@ -152,7 +152,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -167,7 +167,7 @@ exportmakeopts() { $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) @@ -302,7 +302,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index ce8ae004896..72cfc9203c0 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -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 +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 perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${PYTHON_DEPS} ) " # This is how info docs are created with Git: @@ -152,7 +152,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -167,7 +167,7 @@ exportmakeopts() { $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) @@ -302,7 +302,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml index f7690883557..53353adb386 100644 --- a/dev-vcs/git/metadata.xml +++ b/dev-vcs/git/metadata.xml @@ -32,6 +32,7 @@ Support pulling and pushing from MediaWiki Add experimental patches for improved MediaWiki support Enable JIT for pcre + Add support for Perforce version control system (requires manual installation of Perforce client) 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