dev-vcs/git: Sync with Gentoo

It's from Gentoo commit d4e7658a9488679258dc7ebf75d5b30bd4460ea3.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2025-11-17 07:08:25 +00:00 committed by Krzesimir Nowak
parent deee27250e
commit 4c10ec104b
9 changed files with 12 additions and 24 deletions

View File

@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perfo
# Common to both DEPEND and RDEPEND
DEPEND="
dev-libs/openssl:=
sys-libs/zlib
virtual/zlib:=
curl? (
net-misc/curl
webdav? ( dev-libs/expat )

View File

@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perfo
# Common to both DEPEND and RDEPEND
DEPEND="
dev-libs/openssl:=
sys-libs/zlib
virtual/zlib:=
curl? (
net-misc/curl
webdav? ( dev-libs/expat )

View File

@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
# Common to both DEPEND and RDEPEND
DEPEND="
dev-libs/openssl:=
sys-libs/zlib
virtual/zlib:=
curl? (
net-misc/curl
webdav? ( dev-libs/expat )

View File

@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
# Common to both DEPEND and RDEPEND
DEPEND="
dev-libs/openssl:=
sys-libs/zlib
virtual/zlib:=
curl? (
net-misc/curl
webdav? ( dev-libs/expat )

View File

@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
# Common to both DEPEND and RDEPEND
DEPEND="
dev-libs/openssl:=
sys-libs/zlib
virtual/zlib:=
curl? (
net-misc/curl
webdav? ( dev-libs/expat )

View File

@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
# Common to both DEPEND and RDEPEND
DEPEND="
dev-libs/openssl:=
sys-libs/zlib
virtual/zlib:=
curl? (
net-misc/curl
webdav? ( dev-libs/expat )
@ -245,6 +245,7 @@ src_configure() {
if [[ ${PV} == *9999 ]] || use doc ; then
emesonargs+=(
-Ddocs="man$(usev doc ',html')"
-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
)
fi
@ -334,11 +335,6 @@ src_test() {
src_install() {
meson_src_install
if use doc ; then
cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
rm -rf "${ED}"/usr/share/doc/git-doc/ || die
fi
# Depending on the tarball and manual rebuild of the documentation, the
# manpages may exist in either OR both of these directories.
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]

View File

@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
# Common to both DEPEND and RDEPEND
DEPEND="
dev-libs/openssl:=
sys-libs/zlib
virtual/zlib:=
curl? (
net-misc/curl
webdav? ( dev-libs/expat )
@ -245,6 +245,7 @@ src_configure() {
if [[ ${PV} == *9999 ]] || use doc ; then
emesonargs+=(
-Ddocs="man$(usev doc ',html')"
-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
)
fi
@ -334,11 +335,6 @@ src_test() {
src_install() {
meson_src_install
if use doc ; then
cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
rm -rf "${ED}"/usr/share/doc/git-doc/ || die
fi
# Depending on the tarball and manual rebuild of the documentation, the
# manpages may exist in either OR both of these directories.
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]

View File

@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
# Common to both DEPEND and RDEPEND
DEPEND="
dev-libs/openssl:=
sys-libs/zlib
virtual/zlib:=
curl? (
net-misc/curl
webdav? ( dev-libs/expat )
@ -245,6 +245,7 @@ src_configure() {
if [[ ${PV} == *9999 ]] || use doc ; then
emesonargs+=(
-Ddocs="man$(usev doc ',html')"
-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
)
fi
@ -334,11 +335,6 @@ src_test() {
src_install() {
meson_src_install
if use doc ; then
cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
rm -rf "${ED}"/usr/share/doc/git-doc/ || die
fi
# Depending on the tarball and manual rebuild of the documentation, the
# manpages may exist in either OR both of these directories.
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]

View File

@ -63,7 +63,7 @@ IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce +perl
# Common to both DEPEND and RDEPEND
DEPEND="
dev-libs/openssl:=
sys-libs/zlib
virtual/zlib:=
curl? (
net-misc/curl
webdav? ( dev-libs/expat )