From aa39b852da422996f1759c9bda09b5e5b35f1e09 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 6 Nov 2019 09:20:58 +0100 Subject: [PATCH] dev-vcs/git: Adjusted dependencies in EAPI-7 ebuilds Thanks-to: Arfrever Frehtes Taifersar Arahesis Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler --- dev-vcs/git/git-2.24.0.ebuild | 8 +++----- dev-vcs/git/git-9999-r1.ebuild | 8 +++----- dev-vcs/git/git-9999-r2.ebuild | 8 +++----- dev-vcs/git/git-9999-r3.ebuild | 8 +++----- dev-vcs/git/git-9999.ebuild | 8 +++----- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/dev-vcs/git/git-2.24.0.ebuild b/dev-vcs/git/git-2.24.0.ebuild index 9e71c152786e..4bee6fa6ca97 100644 --- a/dev-vcs/git/git-2.24.0.ebuild +++ b/dev-vcs/git/git-2.24.0.ebuild @@ -54,7 +54,7 @@ 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" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -73,7 +73,7 @@ CDEPEND=" iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error @@ -106,9 +106,6 @@ RDEPEND="${CDEPEND} # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - test? ( app-crypt/gnupg )" - BDEPEND=" doc? ( app-text/asciidoc @@ -117,6 +114,7 @@ BDEPEND=" sys-apps/texinfo ) nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) " # Live ebuild builds man pages and HTML docs, additionally diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 9e71c152786e..4bee6fa6ca97 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -54,7 +54,7 @@ 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" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -73,7 +73,7 @@ CDEPEND=" iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error @@ -106,9 +106,6 @@ RDEPEND="${CDEPEND} # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - test? ( app-crypt/gnupg )" - BDEPEND=" doc? ( app-text/asciidoc @@ -117,6 +114,7 @@ BDEPEND=" sys-apps/texinfo ) nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) " # Live ebuild builds man pages and HTML docs, additionally diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 9e71c152786e..4bee6fa6ca97 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -54,7 +54,7 @@ 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" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -73,7 +73,7 @@ CDEPEND=" iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error @@ -106,9 +106,6 @@ RDEPEND="${CDEPEND} # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - test? ( app-crypt/gnupg )" - BDEPEND=" doc? ( app-text/asciidoc @@ -117,6 +114,7 @@ BDEPEND=" sys-apps/texinfo ) nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) " # Live ebuild builds man pages and HTML docs, additionally diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 9e71c152786e..4bee6fa6ca97 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -54,7 +54,7 @@ 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" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -73,7 +73,7 @@ CDEPEND=" iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error @@ -106,9 +106,6 @@ RDEPEND="${CDEPEND} # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - test? ( app-crypt/gnupg )" - BDEPEND=" doc? ( app-text/asciidoc @@ -117,6 +114,7 @@ BDEPEND=" sys-apps/texinfo ) nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) " # Live ebuild builds man pages and HTML docs, additionally diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 9e71c152786e..4bee6fa6ca97 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -54,7 +54,7 @@ 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" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -73,7 +73,7 @@ CDEPEND=" iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error @@ -106,9 +106,6 @@ RDEPEND="${CDEPEND} # .txt/asciidoc --(asciidoc)---------> .xml/docbook # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - test? ( app-crypt/gnupg )" - BDEPEND=" doc? ( app-text/asciidoc @@ -117,6 +114,7 @@ BDEPEND=" sys-apps/texinfo ) nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) " # Live ebuild builds man pages and HTML docs, additionally -- 2.26.2