[patch] pinentry-1.1.0-r3.ebuild.patch v2

pinentry-1.1.0-r3.ebuild.patch (text/plain), 1.67 KB, created by Liam Shepherd on 2019-08-20 12:14:11 UTC

--- /var/portage/repos/gentoo/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild	2019-05-04 13:08:33.435949781 +0100
+++ pinentry-1.1.0-r3.ebuild	2019-08-20 13:10:49.834566916 +0100
@@ -12,7 +12,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
+IUSE="caps emacs gnome-keyring fltk gtk gtk2 gtk3 ncurses qt5 static"
 
 DEPEND="
 	app-eselect/eselect-pinentry
@@ -22,7 +22,8 @@
 	caps? ( sys-libs/libcap )
 	fltk? ( x11-libs/fltk )
 	gnome-keyring? ( app-crypt/libsecret )
-	gtk? ( x11-libs/gtk+:2 )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	ncurses? ( sys-libs/ncurses:0= )
 	qt5? (
 		dev-qt/qtcore:5
@@ -32,7 +33,7 @@
 	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
 "
 RDEPEND="${DEPEND}
-	gnome-keyring? ( app-crypt/gcr )
+	gtk3? ( app-crypt/gcr )
 "
 BDEPEND="
 	sys-devel/gettext
@@ -40,7 +41,10 @@
 "
 
 REQUIRED_USE="
-	gtk? ( !static )
+	gtk? ( || ( gtk2 gtk3 ) )
+	gnome-keyring? ( gtk3 )
+	gtk2? ( !static )
+	gtk3? ( !static )
 	qt5? ( !static )
 "
 
@@ -66,8 +70,8 @@
 		$(use_enable emacs pinentry-emacs) \
 		$(use_enable fltk pinentry-fltk) \
 		$(use_enable gnome-keyring libsecret) \
-		$(use_enable gnome-keyring pinentry-gnome3) \
-		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable gtk2 pinentry-gtk2) \
+		$(use_enable gtk3 pinentry-gnome3) \
 		$(use_enable ncurses fallback-curses) \
 		$(use_enable ncurses pinentry-curses) \
 		$(use_enable qt5 pinentry-qt) \