diff --git a/app-crypt/pinentry-base/Manifest b/app-crypt/pinentry-base/Manifest index 1635c7a3d..178a92c50 100644 --- a/app-crypt/pinentry-base/Manifest +++ b/app-crypt/pinentry-base/Manifest @@ -1,2 +1,2 @@ -DIST pinentry-0.9.1.tar.bz2 482295 SHA256 9cd08e856b395df3adc7124170b53f77c6d5c8bf88e899e818648ec70d3e9695 SHA512 2462d25a471a6053a0d1b67a05d1a828b9d14ca4aeced352376ff16b6aa4d03fd6d1013aee1b07b97f9ee73f218065c48fe2746bbf27f3cb2bd9aa0b9c9c1a50 WHIRLPOOL 2e74e31567b26d0ee1d0d962f9c4dee6bd9c5a8679751dc85a14d3f2d47bc83aa068ac9810261c1e47a08eacb25777926be3de0db9e3d20d3d8348033c6b13c5 DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727 +DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a diff --git a/app-crypt/pinentry-base/pinentry-base-0.9.1.ebuild b/app-crypt/pinentry-base/pinentry-base-0.9.7-r1.ebuild similarity index 72% rename from app-crypt/pinentry-base/pinentry-base-0.9.1.ebuild rename to app-crypt/pinentry-base/pinentry-base-0.9.7-r1.ebuild index ad03afea8..8560ff527 100644 --- a/app-crypt/pinentry-base/pinentry-base-0.9.1.ebuild +++ b/app-crypt/pinentry-base/pinentry-base-0.9.7-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools multilib eutils flag-o-matic qmake-utils +inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs MY_PN=${PN/-base} MY_P=${P/-base} -DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" HOMEPAGE="http://gnupg.org/aegypten2/index.html" SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2" @@ -17,13 +17,21 @@ KEYWORDS="~arm ~amd64 ~x86" IUSE="gtk qt4 caps static" RDEPEND=" - app-eselect/eselect-pinentry + >=dev-libs/libgpg-error-1.17 + >=dev-libs/libassuan-2.1 + >=dev-libs/libgcrypt-1.6.3 + + sys-libs/ncurses:0= caps? ( sys-libs/libcap ) - sys-libs/ncurses - static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) - ppc-aix? ( dev-libs/gnulib ) + + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) + app-eselect/eselect-pinentry +" + +DEPEND="${RDEPEND} + sys-devel/gettext + virtual/pkgconfig " -DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} @@ -36,25 +44,18 @@ src_prepare() { src_configure() { use static && append-ldflags -static - - if [[ ${CHOST} == *-aix* ]] ; then - append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include" - append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)" - append-libs -lgnu - fi + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 econf \ --enable-pinentry-tty \ + --enable-pinentry-emacs \ --disable-pinentry-gtk2 \ --enable-pinentry-curses \ --enable-fallback-curses \ - --disable-pinentry-qt4 \ + --disable-pinentry-qt \ $(use_with caps libcap) \ - MOC="$(qt4_get_bindir)"/moc -} - -src_compile() { - emake AR="$(tc-getAR)" + --disable-libsecret \ + --disable-pinentry-gnome3 } src_install() { @@ -73,6 +74,7 @@ pkg_postinst() { elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" elog "your users." fi + eselect pinentry update ifunset use gtk && elog "If you want pinentry for Gtk+, please install app-crypt/pinentry-gtk." use qt4 && elog "If you want pinentry for Qt4, please install app-crypt/pinentry-qt4." diff --git a/app-crypt/pinentry-gnome/Manifest b/app-crypt/pinentry-gnome/Manifest index 05880b736..178a92c50 100644 --- a/app-crypt/pinentry-gnome/Manifest +++ b/app-crypt/pinentry-gnome/Manifest @@ -1 +1,2 @@ DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727 +DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a diff --git a/app-crypt/pinentry-gnome/pinentry-gnome-0.9.7-r1.ebuild b/app-crypt/pinentry-gnome/pinentry-gnome-0.9.7-r1.ebuild new file mode 100644 index 000000000..26291414b --- /dev/null +++ b/app-crypt/pinentry-gnome/pinentry-gnome-0.9.7-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils flag-o-matic toolchain-funcs + +MY_PN=${PN/-gnome} +MY_P=${P/-gnome} +DESCRIPTION="GNOME 3 frontend for pinentry" +HOMEPAGE="http://gnupg.org/aegypten2/index.html" +SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="caps" + +CDEPEND=" + ~app-crypt/pinentry-base-${PV} + app-crypt/libsecret + caps? ( sys-libs/libcap ) +" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +RDEPEND=" + ${CDEPEND} + app-crypt/gcr +" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + + econf \ + --disable-pinentry-tty \ + --disable-pinentry-emacs \ + --disable-pinentry-gtk2 \ + --disable-pinentry-curses \ + --disable-fallback-curses \ + --disable-pinentry-qt \ + $(use_with caps libcap) \ + --enable-libsecret \ + --enable-pinentry-gnome3 +} + +src_install() { + cd gnome3 || die + emake DESTDIR="${D}" install +} + +pkg_postinst() { + eselect pinentry set pinentry-gnome3 + # eselect pinentry update ifunset + +} + +pkg_postrm() { + eselect pinentry update ifunset +} diff --git a/app-crypt/pinentry-gtk2/Manifest b/app-crypt/pinentry-gtk2/Manifest index 1635c7a3d..178a92c50 100644 --- a/app-crypt/pinentry-gtk2/Manifest +++ b/app-crypt/pinentry-gtk2/Manifest @@ -1,2 +1,2 @@ -DIST pinentry-0.9.1.tar.bz2 482295 SHA256 9cd08e856b395df3adc7124170b53f77c6d5c8bf88e899e818648ec70d3e9695 SHA512 2462d25a471a6053a0d1b67a05d1a828b9d14ca4aeced352376ff16b6aa4d03fd6d1013aee1b07b97f9ee73f218065c48fe2746bbf27f3cb2bd9aa0b9c9c1a50 WHIRLPOOL 2e74e31567b26d0ee1d0d962f9c4dee6bd9c5a8679751dc85a14d3f2d47bc83aa068ac9810261c1e47a08eacb25777926be3de0db9e3d20d3d8348033c6b13c5 DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727 +DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a diff --git a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.9.1.ebuild b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.9.7-r1.ebuild similarity index 70% rename from app-crypt/pinentry-gtk2/pinentry-gtk2-0.9.1.ebuild rename to app-crypt/pinentry-gtk2/pinentry-gtk2-0.9.7-r1.ebuild index 6990806ad..08bcf246e 100644 --- a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.9.1.ebuild +++ b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.9.7-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils flag-o-matic +inherit eutils flag-o-matic toolchain-funcs MY_PN=${PN/-gtk2} MY_P=${P/-gtk2} @@ -22,32 +22,36 @@ RDEPEND=" caps? ( sys-libs/libcap ) x11-libs/gtk+:2 " + DEPEND="${RDEPEND} virtual/pkgconfig" S="${WORKDIR}/${MY_P}" src_configure() { + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + econf \ --disable-pinentry-tty \ + --disable-pinentry-emacs \ --enable-pinentry-gtk2 \ --disable-pinentry-curses \ --disable-fallback-curses \ - --disable-pinentry-qt4 \ - $(use_with caps libcap) -} - -src_compile() { - emake AR="$(tc-getAR)" + --disable-pinentry-qt \ + $(use_with caps libcap) \ + --disable-libsecret \ + --disable-pinentry-gnome3 } src_install() { - cd gtk+-2 && emake DESTDIR="${D}" install + cd gtk+-2 || die + emake DESTDIR="${D}" install } pkg_postinst() { eselect pinentry set pinentry-gtk-2 # eselect pinentry update ifunset + } pkg_postrm() { diff --git a/app-crypt/pinentry-qt4/Manifest b/app-crypt/pinentry-qt4/Manifest index 1635c7a3d..178a92c50 100644 --- a/app-crypt/pinentry-qt4/Manifest +++ b/app-crypt/pinentry-qt4/Manifest @@ -1,2 +1,2 @@ -DIST pinentry-0.9.1.tar.bz2 482295 SHA256 9cd08e856b395df3adc7124170b53f77c6d5c8bf88e899e818648ec70d3e9695 SHA512 2462d25a471a6053a0d1b67a05d1a828b9d14ca4aeced352376ff16b6aa4d03fd6d1013aee1b07b97f9ee73f218065c48fe2746bbf27f3cb2bd9aa0b9c9c1a50 WHIRLPOOL 2e74e31567b26d0ee1d0d962f9c4dee6bd9c5a8679751dc85a14d3f2d47bc83aa068ac9810261c1e47a08eacb25777926be3de0db9e3d20d3d8348033c6b13c5 DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727 +DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a diff --git a/app-crypt/pinentry-qt4/pinentry-qt4-0.9.1.ebuild b/app-crypt/pinentry-qt4/pinentry-qt4-0.9.7-r1.ebuild similarity index 61% rename from app-crypt/pinentry-qt4/pinentry-qt4-0.9.1.ebuild rename to app-crypt/pinentry-qt4/pinentry-qt4-0.9.7-r1.ebuild index 3569dbd0e..2d81de8f8 100644 --- a/app-crypt/pinentry-qt4/pinentry-qt4-0.9.1.ebuild +++ b/app-crypt/pinentry-qt4/pinentry-qt4-0.9.7-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit multilib eutils flag-o-matic qmake-utils +inherit qmake-utils multilib eutils flag-o-matic toolchain-funcs MY_PN=${PN/-qt4} MY_P=${P/-qt4} @@ -19,6 +19,7 @@ IUSE="caps" RDEPEND=" ~app-crypt/pinentry-base-${PV} !app-crypt/pinentry-base[static] + !app-crypt/pinentry-qt5 caps? ( sys-libs/libcap ) >=dev-qt/qtgui-4.4.1:4 " @@ -29,25 +30,35 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} src_configure() { + local myconf=() + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + + QT_MOC="" + myconf+=( --enable-pinentry-qt + --disable-pinentry-qt5 + ) + QT_MOC="$(qt4_get_bindir)"/moc # Issues finding qt on multilib systems - export QTLIB="${QTDIR}/$(get_libdir)" + export QTLIB="$(qt4_get_libdir)" econf \ --disable-pinentry-tty \ + --disable-pinentry-emacs \ --disable-pinentry-gtk2 \ --disable-pinentry-curses \ --disable-fallback-curses \ - --enable-pinentry-qt4 \ $(use_with caps libcap) \ - MOC="$(qt4_get_bindir)"/moc -} - -src_compile() { - emake AR="$(tc-getAR)" + --disable-libsecret \ + --disable-pinentry-gnome3 \ + "${myconf[@]}" \ + MOC="${QT_MOC}" } src_install() { - cd qt4 && emake DESTDIR="${D}" install + cd qt || die + emake DESTDIR="${D}" install + + dosym pinentry-qt /usr/bin/pinentry-qt4 } pkg_postinst() { diff --git a/app-crypt/pinentry/pinentry-0.9.1.ebuild b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild similarity index 56% rename from app-crypt/pinentry/pinentry-0.9.1.ebuild rename to app-crypt/pinentry/pinentry-0.9.7-r1.ebuild index dc20d5a4c..aa61e1c72 100644 --- a/app-crypt/pinentry/pinentry-0.9.1.ebuild +++ b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -DESCRIPTION="Collection of simple PIN/passphrase entry dialogs which utilize the Assuan protocol (meta package)" +DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol (meta package)" HOMEPAGE="http://gnupg.org/aegypten2/index.html" SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="~arm ~amd64 ~x86" -# ncurses use flag is fake, used to mimic portage ebuild USE flags -IUSE="gtk ncurses qt4 caps static" +# ncurses and emacs use flags are fake, used to mimic portage ebuild USE flags +# same for qt5, not supported yet +IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static" RDEPEND=" ~app-crypt/pinentry-base-${PV} caps? ( ~app-crypt/pinentry-base-${PV}[caps] ) + gnome-keyring? ( ~app-crypt/pinentry-gnome-${PV} ) gtk? ( ~app-crypt/pinentry-gtk2-${PV} ) qt4? ( ~app-crypt/pinentry-qt4-${PV} ) static? ( ~app-crypt/pinentry-base-${PV}[static] )" @@ -26,4 +28,6 @@ REQUIRED_USE=" gtk? ( !static ) qt4? ( !static ) static? ( ncurses ) + ?? ( qt4 qt5 ) " +# add qt5 when supported