Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 598288 | Differences between
and this patch

Collapse All | Expand All

(-)a/app-crypt/pinentry/pinentry-1.0.0.ebuild (-28 / +6 lines)
Lines 12-18 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" Link Here
12
LICENSE="GPL-2"
12
LICENSE="GPL-2"
13
SLOT="0"
13
SLOT="0"
14
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
14
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
15
IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
15
IUSE="emacs gtk ncurses qt5 caps gnome-keyring static"
16
16
17
CDEPEND="
17
CDEPEND="
18
	>=dev-libs/libgpg-error-1.17
18
	>=dev-libs/libgpg-error-1.17
Lines 20-28 CDEPEND=" Link Here
20
	>=dev-libs/libgcrypt-1.6.3
20
	>=dev-libs/libgcrypt-1.6.3
21
	ncurses? ( sys-libs/ncurses:0= )
21
	ncurses? ( sys-libs/ncurses:0= )
22
	gtk? ( x11-libs/gtk+:2 )
22
	gtk? ( x11-libs/gtk+:2 )
23
	qt4? (
24
		>=dev-qt/qtgui-4.4.1:4
25
	     )
26
	qt5? (
23
	qt5? (
27
		dev-qt/qtgui:5
24
		dev-qt/qtgui:5
28
		dev-qt/qtwidgets:5
25
		dev-qt/qtwidgets:5
Lines 44-55 RDEPEND=" Link Here
44
"
41
"
45
42
46
REQUIRED_USE="
43
REQUIRED_USE="
47
	|| ( ncurses gtk qt4 qt5 )
44
	|| ( ncurses gtk qt5 )
48
	gtk? ( !static )
45
	gtk? ( !static )
49
	qt4? ( !static )
50
	qt5? ( !static )
46
	qt5? ( !static )
51
	static? ( ncurses )
47
	static? ( ncurses )
52
	?? ( qt4 qt5 )
53
"
48
"
54
49
55
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
50
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
Lines 65-88 src_prepare() { Link Here
65
}
60
}
66
61
67
src_configure() {
62
src_configure() {
68
	local myconf=()
69
	use static && append-ldflags -static
63
	use static && append-ldflags -static
70
	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
64
	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
71
65
72
	if use qt4; then
66
	export QTLIB="$(qt5_get_libdir)"
73
		myconf+=(
74
			--enable-pinentry-qt
75
			--disable-pinentry-qt5
76
		)
77
		export MOC="$(qt4_get_bindir)"/moc
78
		export QTLIB="$(qt4_get_libdir)"
79
	elif use qt5; then
80
		myconf+=( --enable-pinentry-qt )
81
		export MOC="$(qt5_get_bindir)"/moc
82
		export QTLIB="$(qt5_get_libdir)"
83
	else
84
		myconf+=( --disable-pinentry-qt )
85
	fi
86
67
87
	econf \
68
	econf \
88
		--enable-pinentry-tty \
69
		--enable-pinentry-tty \
Lines 93-108 src_configure() { Link Here
93
		$(use_with caps libcap) \
74
		$(use_with caps libcap) \
94
		$(use_enable gnome-keyring libsecret) \
75
		$(use_enable gnome-keyring libsecret) \
95
		$(use_enable gnome-keyring pinentry-gnome3) \
76
		$(use_enable gnome-keyring pinentry-gnome3) \
96
		"${myconf[@]}"
77
		$(use_enable qt5 pinentry-qt) \
78
		MOC="$(qt5_get_bindir)"/moc
97
}
79
}
98
80
99
src_install() {
81
src_install() {
100
	default
82
	default
101
	rm -f "${ED}"/usr/bin/pinentry || die
83
	rm -f "${ED}"/usr/bin/pinentry || die
102
84
103
	if use qt4 || use qt5; then
85
	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4
104
		dosym pinentry-qt /usr/bin/pinentry-qt4
105
	fi
106
}
86
}
107
87
108
pkg_postinst() {
88
pkg_postinst() {
109
- 
110
--
111
app-crypt/pinentry/pinentry-1.0.0.ebuild | 25 +++++++++++--------------
89
app-crypt/pinentry/pinentry-1.0.0.ebuild | 25 +++++++++++--------------
112
1 file changed, 11 insertions(+), 14 deletions(-)
90
1 file changed, 11 insertions(+), 14 deletions(-)
(-)a/app-crypt/pinentry/pinentry-1.0.0.ebuild (-16 / +11 lines)
Lines 12-42 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" Link Here
12
LICENSE="GPL-2"
12
LICENSE="GPL-2"
13
SLOT="0"
13
SLOT="0"
14
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
14
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
15
IUSE="emacs gtk ncurses qt5 caps gnome-keyring static"
15
IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
16
16
17
CDEPEND="
17
CDEPEND="
18
	>=dev-libs/libgpg-error-1.17
18
	app-eselect/eselect-pinentry
19
	>=dev-libs/libassuan-2.1
19
	>=dev-libs/libassuan-2.1
20
	>=dev-libs/libgcrypt-1.6.3
20
	>=dev-libs/libgcrypt-1.6.3
21
	ncurses? ( sys-libs/ncurses:0= )
21
	>=dev-libs/libgpg-error-1.17
22
	caps? ( sys-libs/libcap )
23
	gnome-keyring? ( app-crypt/libsecret )
22
	gtk? ( x11-libs/gtk+:2 )
24
	gtk? ( x11-libs/gtk+:2 )
25
	ncurses? ( sys-libs/ncurses:0= )
23
	qt5? (
26
	qt5? (
24
		dev-qt/qtgui:5
27
		dev-qt/qtgui:5
25
		dev-qt/qtwidgets:5
28
		dev-qt/qtwidgets:5
26
	     )
29
	)
27
	caps? ( sys-libs/libcap )
28
	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
30
	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
29
	app-eselect/eselect-pinentry
30
	gnome-keyring? ( app-crypt/libsecret )
31
"
31
"
32
33
DEPEND="${CDEPEND}
32
DEPEND="${CDEPEND}
34
	sys-devel/gettext
33
	sys-devel/gettext
35
	virtual/pkgconfig
34
	virtual/pkgconfig
36
"
35
"
37
36
RDEPEND="${CDEPEND}
38
RDEPEND="
39
	${CDEPEND}
40
	gnome-keyring? ( app-crypt/gcr )
37
	gnome-keyring? ( app-crypt/gcr )
41
"
38
"
42
39
Lines 67-79 src_configure() { Link Here
67
64
68
	econf \
65
	econf \
69
		--enable-pinentry-tty \
66
		--enable-pinentry-tty \
67
		$(use_with caps libcap) \
70
		$(use_enable emacs pinentry-emacs) \
68
		$(use_enable emacs pinentry-emacs) \
69
		$(use_enable gnome-keyring libsecret) \
70
		$(use_enable gnome-keyring pinentry-gnome3) \
71
		$(use_enable gtk pinentry-gtk2) \
71
		$(use_enable gtk pinentry-gtk2) \
72
		$(use_enable ncurses pinentry-curses) \
72
		$(use_enable ncurses pinentry-curses) \
73
		$(use_enable ncurses fallback-curses) \
73
		$(use_enable ncurses fallback-curses) \
74
		$(use_with caps libcap) \
75
		$(use_enable gnome-keyring libsecret) \
76
		$(use_enable gnome-keyring pinentry-gnome3) \
77
		$(use_enable qt5 pinentry-qt) \
74
		$(use_enable qt5 pinentry-qt) \
78
		MOC="$(qt5_get_bindir)"/moc
75
		MOC="$(qt5_get_bindir)"/moc
79
}
76
}
80
- 
81
--
82
app-crypt/pinentry/pinentry-1.0.0.ebuild | 2 +-
77
app-crypt/pinentry/pinentry-1.0.0.ebuild | 2 +-
83
1 file changed, 1 insertion(+), 1 deletion(-)
78
1 file changed, 1 insertion(+), 1 deletion(-)
(-)a/app-crypt/pinentry/pinentry-1.0.0.ebuild (-3 / +1 lines)
Lines 6-12 EAPI=6 Link Here
6
inherit autotools qmake-utils multilib flag-o-matic toolchain-funcs
6
inherit autotools qmake-utils multilib flag-o-matic toolchain-funcs
7
7
8
DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
8
DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
9
HOMEPAGE="http://gnupg.org/aegypten2/index.html"
9
HOMEPAGE="https://gnupg.org/aegypten2/index.html"
10
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
10
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
11
11
12
LICENSE="GPL-2"
12
LICENSE="GPL-2"
13
- 
14
--
15
app-crypt/pinentry/pinentry-1.0.0.ebuild | 2 +-
13
app-crypt/pinentry/pinentry-1.0.0.ebuild | 2 +-
16
1 file changed, 1 insertion(+), 1 deletion(-)
14
1 file changed, 1 insertion(+), 1 deletion(-)
(-)a/app-crypt/pinentry/pinentry-1.0.0.ebuild (-3 / +1 lines)
Lines 3-9 Link Here
3
3
4
EAPI=6
4
EAPI=6
5
5
6
inherit autotools qmake-utils multilib flag-o-matic toolchain-funcs
6
inherit autotools flag-o-matic qmake-utils toolchain-funcs
7
7
8
DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
8
DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
9
HOMEPAGE="https://gnupg.org/aegypten2/index.html"
9
HOMEPAGE="https://gnupg.org/aegypten2/index.html"
10
- 
11
--
12
app-crypt/pinentry/pinentry-1.0.0.ebuild | 1 +
10
app-crypt/pinentry/pinentry-1.0.0.ebuild | 1 +
13
1 file changed, 1 insertion(+)
11
1 file changed, 1 insertion(+)
(-)a/app-crypt/pinentry/pinentry-1.0.0.ebuild (-1 / +1 lines)
Lines 24-29 CDEPEND=" Link Here
24
	gtk? ( x11-libs/gtk+:2 )
24
	gtk? ( x11-libs/gtk+:2 )
25
	ncurses? ( sys-libs/ncurses:0= )
25
	ncurses? ( sys-libs/ncurses:0= )
26
	qt5? (
26
	qt5? (
27
		dev-qt/qtcore:5
27
		dev-qt/qtgui:5
28
		dev-qt/qtgui:5
28
		dev-qt/qtwidgets:5
29
		dev-qt/qtwidgets:5
29
	)
30
	)
30
- 

Return to bug 598288