Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

profiles: use.desc: Add USE=keyring, replaces gnome-keyring,libsecret,secret et al #31035

Merged
merged 37 commits into from
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
a5aee4d
profiles: use.desc: Add USE=keyring
a17r May 14, 2023
51b7ec3
profiles: targets/desktop/gnome: Set USE=keyring in make.defaults
a17r May 14, 2023
d00707d
profiles: hppa,m68k,s390: Mask keyring where gnome-keyring was masked
a17r May 14, 2023
95811d5
dev-libs/qtkeychain: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
5c3ae0f
dev-libs/qtkeychain: add 0.14.0
a17r May 14, 2023
1b3c726
net-misc/owncloud-client: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
1f6e6c2
app-admin/salt: Drop local USE=keyring description
a17r May 14, 2023
34470c8
net-im/psi: Drop local USE=keyring description
a17r May 14, 2023
22d10c7
app-containers/docker-credential-helpers: USE=gnome-keyring -> keyring
a17r May 14, 2023
a06a561
app-admin/system-config-printer: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
260667b
app-admin/system-config-printer: drop 1.5.18
a17r May 14, 2023
9c3a811
app-crypt/pinentry: USE=gnome-keyring -> keyring, add missing deps
a17r May 14, 2023
a9773cd
app-crypt/pinentry: unkeyword 1.2.1-r1, USE=gnome-keyring -> keyring
a17r May 14, 2023
00a7d74
app-office/gnucash: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
83c9cd4
app-text/atril: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
c9e9e9e
app-text/evince: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
b630f7d
dev-vcs/git: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
7e086ec
dev-vcs/subversion: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
ad0a8e5
gnome-base/gvfs: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
fd1d834
gnome-extra/libgda: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
676f4eb
mail-client/balsa: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
cea139e
mail-mta/msmtp: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
780db08
media-gfx/ahoviewer: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
49f2ab1
media-gfx/darktable: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
ce0b0a1
media-gfx/gthumb: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
2219f82
media-sound/rhythmbox: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
21a0d33
net-fs/smbnetfs: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
f27a417
net-libs/webkit-gtk: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
336a034
net-mail/mpop: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
1bf0b43
net-misc/remmina: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
b70ee46
x11-libs/wxGTK: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
a9d139e
mate-extra/mate-power-manager: Rename USE=libsecret -> keyring
a17r May 14, 2023
68cc8c2
net-p2p/retroshare: Rename USE=autologin -> keyring
a17r May 14, 2023
0abceaa
app-crypt/zulucrypt: Rename USE=gnome -> keyring
a17r May 14, 2023
50d6a61
x11-plugins/wmudmount: EAPI-8 bump, Rename USE=secret -> keyring
a17r May 14, 2023
8e6a173
x11-plugins/wmudmount: drop 3.0-r1
a17r May 14, 2023
bf52489
media-video/vlc: Rename USE=gnome-keyring -> keyring
a17r May 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion app-admin/salt/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ backbone of cloud and data center management.
<flag name="libvirt">Support managing virtual machines with <pkg>app-emulation/libvirt</pkg>.</flag>
<flag name="genshi">Enable support for <pkg>dev-python/genshi</pkg></flag>
<flag name="gnupg">Enable support for gnupg via python-gnupg.</flag>
<flag name="keyring">Enable support for keyrings via python-keyring.</flag>
<flag name="mako">Add support for using the mako template engine for parsing salt states.</flag>
<flag name="mongodb">Support returning data to a mongodb server.</flag>
<flag name="neutron">Support the OpenStack neutron network service.</flag>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 399b3334d6519639cfe7f1c0457e2475b8ee5230 Mon Sep 17 00:00:00 2001
a17r marked this conversation as resolved.
Show resolved Hide resolved
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Thu, 13 Oct 2022 14:03:37 +0200
Subject: [PATCH] Fix debugprint() in options.py (fixes #291)

---
options.py | 2 +-
1 file changed, 1 insertions(+), 1 deletion(-)

diff --git a/options.py b/options.py
index d756f98dc..d7c236deb 100644
--- a/options.py
+++ b/options.py
@@ -423,7 +423,7 @@ def __init__(self, name, value, supported, on_change):
debugprint("Unknown value for %s: %s" % (name, value))
debugprint("Choices: %s" % (supported))
if len(supported) > 0:
- debugprint("Selecting from choices:", supported[0])
+ debugprint("Selecting from choices: %s" % supported[0])
self.selector.set_active(0)
self.selector.connect("changed", self.changed)

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

EAPI=8

PYTHON_COMPAT=( python3_{9..11} )
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
inherit python-single-r1 systemd udev xdg

Expand All @@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="gnome-keyring policykit"
IUSE="keyring policykit"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"

# Needs cups running, bug 284005
Expand Down Expand Up @@ -50,10 +50,12 @@ RDEPEND="${COMMON_DEPEND}
dev-python/requests[${PYTHON_USEDEP}]
dev-python/urllib3[${PYTHON_USEDEP}]
')
gnome-keyring? ( app-crypt/libsecret[introspection] )
keyring? ( app-crypt/libsecret[introspection] )
policykit? ( net-print/cups-pk-helper )
"

PATCHES=( "${FILESDIR}/${P}-fix-debugprint-exception.patch" ) # git master (1.5.19)

pkg_setup() {
python-single-r1_pkg_setup
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

DESCRIPTION="A suite of programs to use native stores to keep Docker credentials safe"
DESCRIPTION="Suite of programs to use native stores to keep Docker credentials safe"
HOMEPAGE="https://github.com/docker/docker-credential-helpers"
EGO_PN=github.com/docker/docker-credential-helpers

Expand All @@ -20,23 +20,20 @@ else
fi
inherit golang-build

IUSE="gnome-keyring pass"
REQUIRED_USE="|| ( gnome-keyring pass )"
IUSE="keyring pass"
REQUIRED_USE="|| ( keyring pass )"
RESTRICT="test"

DEPEND="gnome-keyring? ( app-crypt/libsecret )"

RDEPEND="(
${DEPEND}
DEPEND="keyring? ( app-crypt/libsecret )"
RDEPEND="${DEPEND}
pass? ( app-admin/pass )
)
"

S="${WORKDIR}/${P}/src/${EGO_PN}"

src_compile() {
local -x GOPATH="${WORKDIR}/${P}"
use gnome-keyring && emake secretservice
use keyring && emake secretservice
use pass && emake pass
}

Expand All @@ -46,8 +43,8 @@ src_install() {
}

pkg_postinst() {
if use gnome-keyring; then
elog "For gnome-keyring/kwallet add:\n"
if use keyring; then
elog "For keyring/kwallet add:\n"
elog ' "credStore": "secretservice"'"\n"
fi
if use pass; then
Expand Down
4 changes: 0 additions & 4 deletions app-containers/docker-credential-helpers/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
<name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name="gnome-keyring">
Build secretservice helper which works with gnome-keyring or kwallet
using D-Bus.
</flag>
<flag name="pass">
Build pass helper for the pass utility.
</flag>
Expand Down
8 changes: 4 additions & 4 deletions app-crypt/pinentry/pinentry-1.2.1-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
KEYWORDS="arm hppa ppc ppc64"
IUSE="caps efl emacs keyring gtk ncurses qt5"

DEPEND="
>=dev-libs/libassuan-2.1
>=dev-libs/libgcrypt-1.6.3
>=dev-libs/libgpg-error-1.17
efl? ( dev-libs/efl[X] )
gnome-keyring? ( app-crypt/libsecret )
keyring? ( app-crypt/libsecret )
ncurses? ( sys-libs/ncurses:= )
qt5? (
dev-qt/qtcore:5
Expand Down Expand Up @@ -61,7 +61,7 @@ src_configure() {
local myeconfargs=(
$(use_enable efl pinentry-efl)
$(use_enable emacs pinentry-emacs)
$(use_enable gnome-keyring libsecret)
$(use_enable keyring libsecret)
$(use_enable gtk pinentry-gnome3)
$(use_enable ncurses fallback-curses)
$(use_enable ncurses pinentry-curses)
Expand Down
98 changes: 98 additions & 0 deletions app-crypt/pinentry/pinentry-1.2.1-r2.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
inherit autotools qmake-utils verify-sig

DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
HOMEPAGE="https://gnupg.org/aegypten2"
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~m68k ~mips ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps efl emacs gtk keyring ncurses qt5"

DEPEND="
>=dev-libs/libassuan-2.1
>=dev-libs/libgcrypt-1.6.3
>=dev-libs/libgpg-error-1.17
efl? ( dev-libs/efl[X] )
keyring? ( app-crypt/libsecret )
ncurses? ( sys-libs/ncurses:= )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
kde-frameworks/kwayland:5
x11-libs/libX11
)
"
RDEPEND="${DEPEND}
gtk? ( app-crypt/gcr:0[gtk] )
"
BDEPEND="
sys-devel/gettext
virtual/pkgconfig
verify-sig? ( sec-keys/openpgp-keys-gnupg )
"
IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"

DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )

PATCHES=( "${FILESDIR}/${PN}-1.0.0-AR.patch" )

src_prepare() {
default

unset FLTK_CONFIG

eautoreconf
}

src_configure() {
export PATH="$(qt5_get_bindir):${PATH}"
export QTLIB="$(qt5_get_libdir)"

local myeconfargs=(
$(use_enable efl pinentry-efl)
$(use_enable emacs pinentry-emacs)
$(use_enable keyring libsecret)
$(use_enable gtk pinentry-gnome3)
$(use_enable ncurses fallback-curses)
$(use_enable ncurses pinentry-curses)
$(use_enable qt5 pinentry-qt)

--enable-pinentry-tty
--disable-pinentry-fltk
--disable-pinentry-gtk2

MOC="$(qt5_get_bindir)"/moc
GPG_ERROR_CONFIG="${ESYSROOT}"/usr/bin/${CHOST}-gpg-error-config
LIBASSUAN_CONFIG="${ESYSROOT}"/usr/bin/libassuan-config

$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
)

econf "${myeconfargs[@]}"
}

src_install() {
default

rm "${ED}"/usr/bin/pinentry || die

use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
}

pkg_postinst() {
eselect pinentry update ifunset
}

pkg_postrm() {
eselect pinentry update ifunset
}
3 changes: 0 additions & 3 deletions app-crypt/zulucrypt/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
<pkgmetadata>
<!-- maintainer-needed -->
<use>
<flag name="gnome">
Enable support for the freedesktop.org Secret Service API via <pkg>app-crypt/libsecret</pkg>
</flag>
<flag name="kwallet">
Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg>
</flag>
Expand Down
8 changes: 4 additions & 4 deletions app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7
Expand All @@ -13,13 +13,13 @@ SRC_URI="https://github.com/mhogomchungu/zuluCrypt/archive/${EGIT_COMMIT}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnome kwallet +qt5 udev"
IUSE="keyring kwallet +qt5 udev"
REQUIRED_USE="kwallet? ( qt5 )"

DEPEND="
dev-libs/libgcrypt:0=
sys-fs/cryptsetup:=
gnome? ( app-crypt/libsecret )
keyring? ( app-crypt/libsecret )
qt5? (
dev-libs/libpwquality
dev-qt/qtcore:5
Expand All @@ -39,7 +39,7 @@ PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_configure() {
local mycmakeargs=(
-DLIB_SUFFIX="$(get_libdir)"
-DNOGNOME=$(usex !gnome)
-DNOGNOME=$(usex !keyring)
-DNOKDE=$(usex !kwallet)
-DNOGUI=$(usex !qt5)
-DQT5=true
Expand Down
4 changes: 2 additions & 2 deletions app-office/gnucash/gnucash-4.13.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"

IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes register2 smartcard sqlite test"
IUSE="aqbanking debug doc examples keyring +gui mysql nls ofx postgres python quotes register2 smartcard sqlite test"
RESTRICT="!test? ( test )"

# Examples doesn't build unless GUI is also built
Expand All @@ -43,7 +43,7 @@ RDEPEND="
>=sys-libs/gwenhywfar-4.20.0:=
smartcard? ( sys-libs/libchipcard )
)
gnome-keyring? ( >=app-crypt/libsecret-0.18 )
keyring? ( >=app-crypt/libsecret-0.18 )
gui? (
>=x11-libs/gtk+-3.22.30:3
gnome-base/dconf
Expand Down
6 changes: 3 additions & 3 deletions app-text/atril/atril-1.26.0-r4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ DESCRIPTION="Atril document viewer for MATE"
LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
SLOT="0"

IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring nls +postscript synctex t1lib test tiff xps"
IUSE="caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps"

REQUIRED_USE="t1lib? ( dvi )"

Expand Down Expand Up @@ -47,7 +47,7 @@ COMMON_DEPEND="
dev-libs/mathjax
>=net-libs/webkit-gtk-2.6.0:4
)
gnome-keyring? ( >=app-crypt/libsecret-0.5 )
keyring? ( >=app-crypt/libsecret-0.5 )
introspection? ( >=dev-libs/gobject-introspection-0.6:= )
postscript? ( >=app-text/libspectre-0.2 )
synctex? ( virtual/tex-base )
Expand Down Expand Up @@ -94,7 +94,7 @@ src_configure() {
--enable-pixbuf \
--enable-previewer \
--enable-thumbnailer \
$(use_with gnome-keyring keyring) \
$(use_with keyring) \
$(use_enable caja) \
$(use_enable dbus) \
$(use_enable debug) \
Expand Down
6 changes: 3 additions & 3 deletions app-text/atril/atril-1.26.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ DESCRIPTION="Atril document viewer for MATE"
LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
SLOT="0"

IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring nls +postscript synctex t1lib test tiff xps"
IUSE="caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps"

REQUIRED_USE="t1lib? ( dvi )"

Expand All @@ -44,7 +44,7 @@ COMMON_DEPEND="
dev-libs/mathjax
>=net-libs/webkit-gtk-2.6.0:4.1
)
gnome-keyring? ( >=app-crypt/libsecret-0.5 )
keyring? ( >=app-crypt/libsecret-0.5 )
introspection? ( >=dev-libs/gobject-introspection-0.6:= )
postscript? ( >=app-text/libspectre-0.2 )
synctex? ( virtual/tex-base )
Expand Down Expand Up @@ -96,7 +96,7 @@ src_configure() {
--enable-pixbuf \
--enable-previewer \
--enable-thumbnailer \
$(use_with gnome-keyring keyring) \
$(use_with keyring) \
$(use_enable caja) \
$(use_enable dbus) \
$(use_enable debug) \
Expand Down
6 changes: 3 additions & 3 deletions app-text/evince/evince-44.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
IUSE="cups djvu dvi gstreamer gnome keyring gtk-doc +introspection nautilus postscript spell tiff xps"
REQUIRED_USE="gtk-doc? ( introspection )"

# atk used in libview
Expand All @@ -39,7 +39,7 @@ DEPEND="
media-libs/gst-plugins-base:1.0
media-libs/gst-plugins-good:1.0 )
gnome? ( gnome-base/gnome-desktop:3= )
gnome-keyring? ( >=app-crypt/libsecret-0.5 )
keyring? ( >=app-crypt/libsecret-0.5 )
introspection? ( >=dev-libs/gobject-introspection-1:= )
nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 )
postscript? ( >=app-text/libspectre-0.2:= )
Expand Down Expand Up @@ -99,7 +99,7 @@ src_configure() {
-Duser_doc=true
$(meson_use introspection)
-Ddbus=true
$(meson_feature gnome-keyring keyring)
$(meson_feature keyring)
$(meson_feature cups gtk_unix_print)
$(meson_feature gnome thumbnail_cache)
$(meson_feature gstreamer multimedia)
Expand Down
1 change: 1 addition & 0 deletions dev-libs/qtkeychain/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DIST qtkeychain-0.13.2.tar.gz 43494 BLAKE2B d90799df83e8bed7f4ee9cdf6c7f56c86b1aee7123735963c4e2f858a69bbf28bcd062c6a302f8687626b1884acde61d7f7882b985517b24a1358b57ea13cdcc SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb
DIST qtkeychain-0.14.0.tar.gz 50655 BLAKE2B e79370b6bf2a6e880d281cd4b12106a88a5297e74e56b09a5d2a0cbef17166798a467d045b50beddb61de2a6ffeb75f1bc3f895236bebb01fc1f425ea3dbe309 SHA512 65118198d82f284c1bb914964657e62fccb81050359071b44530574c73c673913d22b5de17cc30e9099feca06ece556bb9329350f017ce331e845ba074d1f078