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

Collapse All | Expand All

(-)pinentry-0.9.6-r6.ebuild (-17 / +10 lines)
Lines 21-33 Link Here
21
	>=dev-libs/libgcrypt-1.6.3
21
	>=dev-libs/libgcrypt-1.6.3
22
	ncurses? ( sys-libs/ncurses:0= )
22
	ncurses? ( sys-libs/ncurses:0= )
23
	gtk? ( x11-libs/gtk+:2 )
23
	gtk? ( x11-libs/gtk+:2 )
24
	qt4? (
24
	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
25
		>=dev-qt/qtgui-4.4.1:4
26
	     )
27
	qt5? (
25
	qt5? (
28
		dev-qt/qtgui:5
26
		dev-qt/qtgui:5
29
		dev-qt/qtwidgets:5
27
		dev-qt/qtwidgets:5
30
	     )
28
	)
31
	caps? ( sys-libs/libcap )
29
	caps? ( sys-libs/libcap )
32
	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
30
	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
33
	app-eselect/eselect-pinentry
31
	app-eselect/eselect-pinentry
Lines 39-46 Link Here
39
	virtual/pkgconfig
37
	virtual/pkgconfig
40
"
38
"
41
39
42
RDEPEND="
40
RDEPEND="${CDEPEND}
43
	${CDEPEND}
44
	gnome-keyring? ( app-crypt/gcr )
41
	gnome-keyring? ( app-crypt/gcr )
45
"
42
"
46
43
Lines 57-85 Link Here
57
54
58
src_prepare() {
55
src_prepare() {
59
	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
56
	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
60
	epatch "${FILESDIR}/${P}-add-disable-pinentry-qt5-option.patch"
61
	eautoreconf
57
	eautoreconf
62
}
58
}
63
59
64
src_configure() {
60
src_configure() {
65
	local myconf=()
66
	use static && append-ldflags -static
61
	use static && append-ldflags -static
67
	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
62
	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
68
63
69
	QT_MOC=""
64
	QT_MOC=""
70
	if use qt4; then
65
	if use qt4; then
71
		myconf+=( --enable-pinentry-qt
72
			  --disable-pinentry-qt5
73
			)
74
		QT_MOC="$(qt4_get_bindir)"/moc
66
		QT_MOC="$(qt4_get_bindir)"/moc
75
		# Issues finding qt on multilib systems
67
		# Issues finding qt on multilib systems
76
		export QTLIB="$(qt4_get_libdir)"
68
		export QTLIB="$(qt4_get_libdir)"
77
	elif use qt5; then
69
	elif use qt5; then
78
		myconf+=( --enable-pinentry-qt )
79
		QT_MOC="$(qt5_get_bindir)"/moc
70
		QT_MOC="$(qt5_get_bindir)"/moc
80
		export QTLIB="$(qt5_get_libdir)"
71
		export QTLIB="$(qt5_get_libdir)"
81
	else
82
		myconf+=( --disable-pinentry-qt )
83
	fi
72
	fi
84
73
85
	econf \
74
	econf \
Lines 88-106 Link Here
88
		$(use_enable gtk pinentry-gtk2) \
77
		$(use_enable gtk pinentry-gtk2) \
89
		$(use_enable ncurses pinentry-curses) \
78
		$(use_enable ncurses pinentry-curses) \
90
		$(use_enable ncurses fallback-curses) \
79
		$(use_enable ncurses fallback-curses) \
80
		$(use qt4 || use qt5 && \
81
			echo --enable-pinentry-qt || echo --disable-pinentry-qt) \
82
		$(use_enable qt5 pinentry-qt5) \
91
		$(use_with caps libcap) \
83
		$(use_with caps libcap) \
92
		$(use_enable gnome-keyring libsecret) \
84
		$(use_enable gnome-keyring libsecret) \
93
		$(use_enable gnome-keyring pinentry-gnome3) \
85
		$(use_enable gnome-keyring pinentry-gnome3) \
94
		"${myconf[@]}" \
95
		MOC="${QT_MOC}"
86
		MOC="${QT_MOC}"
96
}
87
}
97
88
98
src_install() {
89
src_install() {
99
	default
90
	default
100
	rm -f "${ED}"/usr/bin/pinentry || die
91
	rm "${ED}"usr/bin/pinentry || die
101
92
102
	if use qt4 || use qt5; then
93
	if use qt4 ; then
103
		dosym pinentry-qt /usr/bin/pinentry-qt4
94
		dosym pinentry-qt /usr/bin/pinentry-qt4
95
	elif use qt5 ; then
96
		dosym pinentry-qt /usr/bin/pinentry-qt5
104
	fi
97
	fi
105
}
98
}
106
99

Return to bug 568172