From 7ef9302c5539aa6ea229ed1aacca2f07cfeeecdb Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 24 May 2017 10:48:43 +0200 Subject: dev-vcs/git: Replace "libsecret" by "gnome-keyring" USE flag (bug #619484) Package-Manager: Portage-2.3.6, Repoman-2.3.2 --- dev-vcs/git/git-2.12.3.ebuild | 8 ++++---- dev-vcs/git/git-2.13.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 ++++---- dev-vcs/git/metadata.xml | 1 - 7 files changed, 24 insertions(+), 25 deletions(-) (limited to 'dev-vcs/git') diff --git a/dev-vcs/git/git-2.12.3.ebuild b/dev-vcs/git/git-2.12.3.ebuild index e1c531411ace..f58a551ff7bc 100644 --- a/dev-vcs/git/git-2.12.3.ebuild +++ b/dev-vcs/git/git-2.12.3.ebuild @@ -43,13 +43,13 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python 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 +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" + gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) - libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) @@ -359,7 +359,7 @@ src_compile() { cd "${S}" fi - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret git_emake || die "emake git-credential-libsecret failed" fi @@ -454,7 +454,7 @@ src_install() { doexe contrib/contacts/git-contacts dodoc contrib/contacts/git-contacts.txt - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret dobin git-credential-libsecret fi diff --git a/dev-vcs/git/git-2.13.0.ebuild b/dev-vcs/git/git-2.13.0.ebuild index 236e9870a18c..8db4d054f323 100644 --- a/dev-vcs/git/git-2.13.0.ebuild +++ b/dev-vcs/git/git-2.13.0.ebuild @@ -43,13 +43,13 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python 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 +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" + gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) - libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) @@ -359,7 +359,7 @@ src_compile() { cd "${S}" fi - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret git_emake || die "emake git-credential-libsecret failed" fi @@ -454,7 +454,7 @@ src_install() { doexe contrib/contacts/git-contacts dodoc contrib/contacts/git-contacts.txt - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret dobin git-credential-libsecret fi diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 581efda16671..73c3a63eff54 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -42,13 +42,13 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python 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 +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" + gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) - libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) @@ -358,7 +358,7 @@ src_compile() { cd "${S}" fi - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret git_emake || die "emake git-credential-libsecret failed" fi @@ -453,7 +453,7 @@ src_install() { doexe contrib/contacts/git-contacts dodoc contrib/contacts/git-contacts.txt - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret dobin git-credential-libsecret fi diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index f725b2c09472..269086404b39 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -42,13 +42,13 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python 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 +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" + gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) - libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) @@ -358,7 +358,7 @@ src_compile() { cd "${S}" fi - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret git_emake || die "emake git-credential-libsecret failed" fi @@ -453,7 +453,7 @@ src_install() { doexe contrib/contacts/git-contacts dodoc contrib/contacts/git-contacts.txt - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret dobin git-credential-libsecret fi diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 29ed4c46363b..1d5145652541 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -42,13 +42,13 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python 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 +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" + gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) - libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) @@ -358,7 +358,7 @@ src_compile() { cd "${S}" fi - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret git_emake || die "emake git-credential-libsecret failed" fi @@ -453,7 +453,7 @@ src_install() { doexe contrib/contacts/git-contacts dodoc contrib/contacts/git-contacts.txt - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret dobin git-credential-libsecret fi diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index c9be0f22ff20..1d2603cd7495 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -42,13 +42,13 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python 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 +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" + gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) - libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) @@ -358,7 +358,7 @@ src_compile() { cd "${S}" fi - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret git_emake || die "emake git-credential-libsecret failed" fi @@ -453,7 +453,7 @@ src_install() { doexe contrib/contacts/git-contacts dodoc contrib/contacts/git-contacts.txt - if use libsecret ; then + if use gnome-keyring ; then cd "${S}"/contrib/credential/libsecret dobin git-credential-libsecret fi diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml index f7c661156294..4a8fe9f2743b 100644 --- a/dev-vcs/git/metadata.xml +++ b/dev-vcs/git/metadata.xml @@ -29,7 +29,6 @@ Support fetching and pushing (requires webdav too) over http:// and https:// protocols Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime! GitWeb support for app-text/highlight - Enable libsecret support to store login credentials Support pulling and pushing from MediaWiki Add experimental patches for improved MediaWiki support Make use of a bundled routine that is optimized for the PPC arch -- cgit v1.2.3-65-gdbad