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 6B7CE1381F3 for ; Mon, 19 Oct 2020 14:59:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F203E083D; Mon, 19 Oct 2020 14:59:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 2C10BE083D for ; Mon, 19 Oct 2020 14:59:45 +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 7D940340DD5 for ; Mon, 19 Oct 2020 14:59:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB6B2398 for ; Mon, 19 Oct 2020 14:59:41 +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: <1603119579.8af591c77e70ec71148e701be8c769da59c4ff4a.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-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: 8af591c77e70ec71148e701be8c769da59c4ff4a X-VCS-Branch: master Date: Mon, 19 Oct 2020 14:59:41 +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: e1bbd594-fd28-441d-87a0-c854729d0fdf X-Archives-Hash: 5702a32ee0c99551650b0a813541b59a commit: 8af591c77e70ec71148e701be8c769da59c4ff4a Author: Lars Wendler gentoo org> AuthorDate: Mon Oct 19 14:59:19 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Oct 19 14:59:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af591c7 dev-vcs/git: Synced live ebuilds Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> dev-vcs/git/git-9999-r1.ebuild | 58 ++---------------------------------------- dev-vcs/git/git-9999-r2.ebuild | 58 ++---------------------------------------- dev-vcs/git/git-9999-r3.ebuild | 58 ++---------------------------------------- dev-vcs/git/git-9999.ebuild | 58 ++---------------------------------------- 4 files changed, 8 insertions(+), 224 deletions(-) diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index f50e94d2e74..7808906c93a 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 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 test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -93,11 +93,6 @@ 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} ) " @@ -131,7 +126,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) @@ -143,18 +137,11 @@ PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) 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 @@ -173,7 +160,6 @@ 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) ) @@ -202,9 +188,6 @@ exportmakeopts() { NO_EXTERNAL_GREP= ) - # For svn-fe - extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) - # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die @@ -299,7 +282,7 @@ src_prepare() { -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die + Makefile || die # Fix docbook2texi command sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ @@ -368,25 +351,6 @@ src_compile() { fi popd &>/dev/null || die - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv=() - use nls && use !elibc_glibc && nlsiconv+=( -lintl ) - use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ - || die "emake svn-fe failed" - if use doc ; then - # svn-fe.1 requires the full USE=doc dependency stack - git_emake svn-fe.1 \ - || die "emake svn-fe.1 failed" - git_emake svn-fe.html \ - || die "svn-fe.html failed" - fi - popd &>/dev/null || die - fi - if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die git_emake || die "emake git-credential-libsecret failed" @@ -497,19 +461,6 @@ src_install() { popd &>/dev/null || die fi - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - dobin svn-fe - dodoc svn-fe.txt - if use doc ; then - # Do not move svn-fe.1 outside USE=doc! - doman svn-fe.1 - docinto html - dodoc svn-fe.html - fi - popd &>/dev/null || die - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -565,11 +516,6 @@ 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 f50e94d2e74..7808906c93a 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 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 test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -93,11 +93,6 @@ 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} ) " @@ -131,7 +126,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) @@ -143,18 +137,11 @@ PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) 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 @@ -173,7 +160,6 @@ 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) ) @@ -202,9 +188,6 @@ exportmakeopts() { NO_EXTERNAL_GREP= ) - # For svn-fe - extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) - # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die @@ -299,7 +282,7 @@ src_prepare() { -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die + Makefile || die # Fix docbook2texi command sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ @@ -368,25 +351,6 @@ src_compile() { fi popd &>/dev/null || die - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv=() - use nls && use !elibc_glibc && nlsiconv+=( -lintl ) - use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ - || die "emake svn-fe failed" - if use doc ; then - # svn-fe.1 requires the full USE=doc dependency stack - git_emake svn-fe.1 \ - || die "emake svn-fe.1 failed" - git_emake svn-fe.html \ - || die "svn-fe.html failed" - fi - popd &>/dev/null || die - fi - if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die git_emake || die "emake git-credential-libsecret failed" @@ -497,19 +461,6 @@ src_install() { popd &>/dev/null || die fi - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - dobin svn-fe - dodoc svn-fe.txt - if use doc ; then - # Do not move svn-fe.1 outside USE=doc! - doman svn-fe.1 - docinto html - dodoc svn-fe.html - fi - popd &>/dev/null || die - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -565,11 +516,6 @@ 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 f50e94d2e74..7808906c93a 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 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 test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -93,11 +93,6 @@ 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} ) " @@ -131,7 +126,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) @@ -143,18 +137,11 @@ PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) 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 @@ -173,7 +160,6 @@ 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) ) @@ -202,9 +188,6 @@ exportmakeopts() { NO_EXTERNAL_GREP= ) - # For svn-fe - extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) - # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die @@ -299,7 +282,7 @@ src_prepare() { -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die + Makefile || die # Fix docbook2texi command sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ @@ -368,25 +351,6 @@ src_compile() { fi popd &>/dev/null || die - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv=() - use nls && use !elibc_glibc && nlsiconv+=( -lintl ) - use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ - || die "emake svn-fe failed" - if use doc ; then - # svn-fe.1 requires the full USE=doc dependency stack - git_emake svn-fe.1 \ - || die "emake svn-fe.1 failed" - git_emake svn-fe.html \ - || die "svn-fe.html failed" - fi - popd &>/dev/null || die - fi - if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die git_emake || die "emake git-credential-libsecret failed" @@ -497,19 +461,6 @@ src_install() { popd &>/dev/null || die fi - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - dobin svn-fe - dodoc svn-fe.txt - if use doc ; then - # Do not move svn-fe.1 outside USE=doc! - doman svn-fe.1 - docinto html - dodoc svn-fe.html - fi - popd &>/dev/null || die - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -565,11 +516,6 @@ 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 f50e94d2e74..7808906c93a 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 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 test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -93,11 +93,6 @@ 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} ) " @@ -131,7 +126,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) @@ -143,18 +137,11 @@ PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) 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 @@ -173,7 +160,6 @@ 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) ) @@ -202,9 +188,6 @@ exportmakeopts() { NO_EXTERNAL_GREP= ) - # For svn-fe - extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) - # can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die @@ -299,7 +282,7 @@ src_prepare() { -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die + Makefile || die # Fix docbook2texi command sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ @@ -368,25 +351,6 @@ src_compile() { fi popd &>/dev/null || die - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv=() - use nls && use !elibc_glibc && nlsiconv+=( -lintl ) - use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ - || die "emake svn-fe failed" - if use doc ; then - # svn-fe.1 requires the full USE=doc dependency stack - git_emake svn-fe.1 \ - || die "emake svn-fe.1 failed" - git_emake svn-fe.html \ - || die "svn-fe.html failed" - fi - popd &>/dev/null || die - fi - if use gnome-keyring ; then pushd contrib/credential/libsecret &>/dev/null || die git_emake || die "emake git-credential-libsecret failed" @@ -497,19 +461,6 @@ src_install() { popd &>/dev/null || die fi - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - dobin svn-fe - dodoc svn-fe.txt - if use doc ; then - # Do not move svn-fe.1 outside USE=doc! - doman svn-fe.1 - docinto html - dodoc svn-fe.html - fi - popd &>/dev/null || die - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -565,11 +516,6 @@ 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