diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2020-10-26 18:07:41 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-10-26 18:08:34 +0100 |
| commit | dccdb05ac31e273edc433c9c9213c928e7c5dfb4 (patch) | |
| tree | 3b3d0d83bbbccf06d24d16d85deb2786e5f7cbfc /dev-vcs/git/git-9999-r3.ebuild | |
| parent | dev-libs/libfmt: Cleanup old version (diff) | |
| download | gentoo-dccdb05ac31e273edc433c9c9213c928e7c5dfb4.tar.gz gentoo-dccdb05ac31e273edc433c9c9213c928e7c5dfb4.tar.bz2 gentoo-dccdb05ac31e273edc433c9c9213c928e7c5dfb4.zip | |
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 <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-vcs/git/git-9999-r3.ebuild')
| -rw-r--r-- | dev-vcs/git/git-9999-r3.ebuild | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 7808906c93a3..6e5c5a74a12c 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 |