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 DC7BC138359 for ; Mon, 26 Oct 2020 17:08:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 243E1E080E; Mon, 26 Oct 2020 17:08:43 +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 EFDA6E080E for ; Mon, 26 Oct 2020 17:08:42 +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 E7DE133FE60 for ; Mon, 26 Oct 2020 17:08:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 743733B3 for ; Mon, 26 Oct 2020 17:08:40 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1603732114.dccdb05ac31e273edc433c9c9213c928e7c5dfb4.polynomial-c@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.29.1-r1.ebuild dev-vcs/git/git-2.29.1.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 X-VCS-Directories: dev-vcs/git/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: dccdb05ac31e273edc433c9c9213c928e7c5dfb4 X-VCS-Branch: master Date: Mon, 26 Oct 2020 17:08:40 +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: 549ceee5-795d-4773-baad-aba10e389c35 X-Archives-Hash: 8070649c9de22cd75a751482f330725d commit: dccdb05ac31e273edc433c9c9213c928e7c5dfb4 Author: Lars Wendler gentoo org> AuthorDate: Mon Oct 26 17:07:41 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Oct 26 17:08:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccdb05a dev-vcs/git: Re-added "subversion" USE flag. Upstream only killed svn-fe, not the svn perl module. Bug: https://bugs.gentoo.org/751079 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> .../{git-2.29.1.ebuild => git-2.29.1-r1.ebuild} | 22 ++++++++++++++++++++-- dev-vcs/git/git-9999-r1.ebuild | 22 ++++++++++++++++++++-- dev-vcs/git/git-9999-r2.ebuild | 22 ++++++++++++++++++++-- dev-vcs/git/git-9999-r3.ebuild | 22 ++++++++++++++++++++-- dev-vcs/git/git-9999.ebuild | 22 ++++++++++++++++++++-- 5 files changed, 100 insertions(+), 10 deletions(-) diff --git a/dev-vcs/git/git-2.29.1.ebuild b/dev-vcs/git/git-2.29.1-r1.ebuild similarity index 96% rename from dev-vcs/git/git-2.29.1.ebuild rename to dev-vcs/git/git-2.29.1-r1.ebuild index 7808906c93a..6e5c5a74a12 100644 --- a/dev-vcs/git/git-2.29.1.ebuild +++ b/dev-vcs/git/git-2.29.1-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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs test" +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" # Common to both DEPEND and RDEPEND DEPEND=" @@ -93,6 +93,11 @@ RDEPEND="${DEPEND} dev-perl/HTML-Tree dev-perl/MediaWiki-API ) + subversion? ( + dev-vcs/subversion[-dso(-),perl] + dev-perl/libwww-perl + dev-perl/TermReadKey + ) ) perforce? ( ${PYTHON_DEPS} ) " @@ -126,9 +131,10 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) + subversion? ( perl ) + webdav? ( curl ) " RESTRICT="!test? ( test )" @@ -142,6 +148,12 @@ PATCHES=( ) pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]" ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use perforce ; then python-single-r1_pkg_setup fi @@ -160,6 +172,7 @@ exportmakeopts() { $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex perforce '' NO_PYTHON=YesPlease) + $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREADS=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -516,6 +529,11 @@ src_install() { rm -rf "${ED}"/usr/share/gitweb fi + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + if use xinetd ; then insinto /etc/xinetd.d newins "${FILESDIR}"/git-daemon.xinetd git-daemon diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 7808906c93a..6e5c5a74a12 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs test" +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" # Common to both DEPEND and RDEPEND DEPEND=" @@ -93,6 +93,11 @@ RDEPEND="${DEPEND} dev-perl/HTML-Tree dev-perl/MediaWiki-API ) + subversion? ( + dev-vcs/subversion[-dso(-),perl] + dev-perl/libwww-perl + dev-perl/TermReadKey + ) ) perforce? ( ${PYTHON_DEPS} ) " @@ -126,9 +131,10 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) + subversion? ( perl ) + webdav? ( curl ) " RESTRICT="!test? ( test )" @@ -142,6 +148,12 @@ PATCHES=( ) pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]" ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use perforce ; then python-single-r1_pkg_setup fi @@ -160,6 +172,7 @@ exportmakeopts() { $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex perforce '' NO_PYTHON=YesPlease) + $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREADS=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -516,6 +529,11 @@ src_install() { rm -rf "${ED}"/usr/share/gitweb fi + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + if use xinetd ; then insinto /etc/xinetd.d newins "${FILESDIR}"/git-daemon.xinetd git-daemon diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 7808906c93a..6e5c5a74a12 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs test" +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" # Common to both DEPEND and RDEPEND DEPEND=" @@ -93,6 +93,11 @@ RDEPEND="${DEPEND} dev-perl/HTML-Tree dev-perl/MediaWiki-API ) + subversion? ( + dev-vcs/subversion[-dso(-),perl] + dev-perl/libwww-perl + dev-perl/TermReadKey + ) ) perforce? ( ${PYTHON_DEPS} ) " @@ -126,9 +131,10 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) + subversion? ( perl ) + webdav? ( curl ) " RESTRICT="!test? ( test )" @@ -142,6 +148,12 @@ PATCHES=( ) pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]" ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use perforce ; then python-single-r1_pkg_setup fi @@ -160,6 +172,7 @@ exportmakeopts() { $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex perforce '' NO_PYTHON=YesPlease) + $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREADS=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -516,6 +529,11 @@ src_install() { rm -rf "${ED}"/usr/share/gitweb fi + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + if use xinetd ; then insinto /etc/xinetd.d newins "${FILESDIR}"/git-daemon.xinetd git-daemon diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 7808906c93a..6e5c5a74a12 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs test" +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" # Common to both DEPEND and RDEPEND DEPEND=" @@ -93,6 +93,11 @@ RDEPEND="${DEPEND} dev-perl/HTML-Tree dev-perl/MediaWiki-API ) + subversion? ( + dev-vcs/subversion[-dso(-),perl] + dev-perl/libwww-perl + dev-perl/TermReadKey + ) ) perforce? ( ${PYTHON_DEPS} ) " @@ -126,9 +131,10 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) + subversion? ( perl ) + webdav? ( curl ) " RESTRICT="!test? ( test )" @@ -142,6 +148,12 @@ PATCHES=( ) pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]" ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use perforce ; then python-single-r1_pkg_setup fi @@ -160,6 +172,7 @@ exportmakeopts() { $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex perforce '' NO_PYTHON=YesPlease) + $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREADS=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -516,6 +529,11 @@ src_install() { rm -rf "${ED}"/usr/share/gitweb fi + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + if use xinetd ; then insinto /etc/xinetd.d newins "${FILESDIR}"/git-daemon.xinetd git-daemon diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 7808906c93a..6e5c5a74a12 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs test" +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" # Common to both DEPEND and RDEPEND DEPEND=" @@ -93,6 +93,11 @@ RDEPEND="${DEPEND} dev-perl/HTML-Tree dev-perl/MediaWiki-API ) + subversion? ( + dev-vcs/subversion[-dso(-),perl] + dev-perl/libwww-perl + dev-perl/TermReadKey + ) ) perforce? ( ${PYTHON_DEPS} ) " @@ -126,9 +131,10 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) + subversion? ( perl ) + webdav? ( curl ) " RESTRICT="!test? ( test )" @@ -142,6 +148,12 @@ PATCHES=( ) pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]" ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use perforce ; then python-single-r1_pkg_setup fi @@ -160,6 +172,7 @@ exportmakeopts() { $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex perforce '' NO_PYTHON=YesPlease) + $(usex subversion '' NO_SVN_TESTS=YesPlease) $(usex threads '' NO_PTHREADS=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -516,6 +529,11 @@ src_install() { rm -rf "${ED}"/usr/share/gitweb fi + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + if use xinetd ; then insinto /etc/xinetd.d newins "${FILESDIR}"/git-daemon.xinetd git-daemon