mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-vcs/git: Synced live ebuilds
Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user