diff --git a/app-crypt/pinentry-base/Manifest b/app-crypt/pinentry-base/Manifest new file mode 100644 index 000000000..160bbda84 --- /dev/null +++ b/app-crypt/pinentry-base/Manifest @@ -0,0 +1,2 @@ +DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab +EBUILD pinentry-base-0.7.6.ebuild 1697 RMD160 00b3b1efb7b6887a01f6b744ff494ef6758e3bc3 SHA1 0e95cac354f1b5d36f38b270cfcff0a390126c05 SHA256 3afd79623cb757add94623afc732dabe725a68851680f323231f3fa16a49a9ea diff --git a/app-crypt/pinentry-base/pinentry-base-0.7.6.ebuild b/app-crypt/pinentry-base/pinentry-base-0.7.6.ebuild new file mode 100644 index 000000000..6523a6430 --- /dev/null +++ b/app-crypt/pinentry-base/pinentry-base-0.7.6.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +inherit multilib eutils + +DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +HOMEPAGE="http://www.gnupg.org/aegypten/" +SRC_URI="mirror://gnupg/${PN/-base}/${P/-base}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="caps" + +DEPEND="sys-libs/ncurses sys-libs/libcap" +RDEPEND="${DEPEND}" +S="${WORKDIR}/${P/-base}" + +src_configure() { + + econf \ + --disable-dependency-tracking \ + --enable-maintainer-mode \ + --disable-pinentry-gtk \ + --disable-pinentry-gtk2 \ + --disable-pinentry-qt \ + --enable-pinentry-curses \ + --enable-fallback-curses \ + --disable-pinentry-qt4 \ + $(use_with caps libcap) +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed" +} + +pkg_postinst() { + elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes." + elog "The soft resource limit for memory locking specifies the limit an" + elog "unprivileged process may lock into memory. You can also use POSIX" + elog "capabilities to allow pinentry to lock memory. To do so activate the caps" + elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" + elog "your users." + elog "If you want pinentry for GTK, please install app-crypt/pinentry-gtk." + elog "If you want pinentry for Qt4, please install app-crypt/pinentry-qt4." +} diff --git a/app-crypt/pinentry-gtk/Manifest b/app-crypt/pinentry-gtk2/Manifest similarity index 66% rename from app-crypt/pinentry-gtk/Manifest rename to app-crypt/pinentry-gtk2/Manifest index 9d10ec160..5f87bbe16 100644 --- a/app-crypt/pinentry-gtk/Manifest +++ b/app-crypt/pinentry-gtk2/Manifest @@ -1,3 +1,3 @@ AUX pinentry-0.7.5-grab.patch 536 RMD160 66f86ff0c8c208ec62de1dea2b2c3edeca41d0fb SHA1 cbb4a01242ce73ebb18c38d9541f03017691a265 SHA256 149fadfa505e55fa4f4e1fb5536066b87290566df4d890e6f4087d86f213188a DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab -EBUILD pinentry-gtk-0.7.6.ebuild 1081 RMD160 6ca5f880f8b3c32181d4bc58fcf7d1fd91d2bf2d SHA1 18ddd41fdc1fa9eccd48cd22a22e0bd4ed12b1ea SHA256 7c70b15efc3232115b210945f22eef19e957c2ba8edef89022acc8ff7b6982d4 +EBUILD pinentry-gtk2-0.7.6.ebuild 1097 RMD160 69aab43af745ec9b2d3dcee74f74ed69460f1536 SHA1 c982fbfd8f542ad99c24ccb71b6e1b6d5b24fdb6 SHA256 77b9363829c77ba9ec51d242c0863d4b8cb5dd93236fcd509eed525c04d1a90c diff --git a/app-crypt/pinentry-gtk/files/pinentry-0.7.5-grab.patch b/app-crypt/pinentry-gtk2/files/pinentry-0.7.5-grab.patch similarity index 100% rename from app-crypt/pinentry-gtk/files/pinentry-0.7.5-grab.patch rename to app-crypt/pinentry-gtk2/files/pinentry-0.7.5-grab.patch diff --git a/app-crypt/pinentry-gtk/pinentry-gtk-0.7.6.ebuild b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.7.6.ebuild similarity index 82% rename from app-crypt/pinentry-gtk/pinentry-gtk-0.7.6.ebuild rename to app-crypt/pinentry-gtk2/pinentry-gtk2-0.7.6.ebuild index a47e437dd..e68f2e7e0 100644 --- a/app-crypt/pinentry-gtk/pinentry-gtk-0.7.6.ebuild +++ b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.7.6.ebuild @@ -8,19 +8,19 @@ inherit multilib eutils DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol (GTK 2 frontend)" HOMEPAGE="http://www.gnupg.org/aegypten/" -SRC_URI="mirror://gnupg/${PN/-gtk}/${P/-gtk}.tar.gz" +SRC_URI="mirror://gnupg/${PN/-gtk2}/${P/-gtk2}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="" -DEPEND="app-crypt/pinentry x11-libs/gtk+:2" +DEPEND="~app-crypt/pinentry-base-${PV} x11-libs/gtk+:2" RDEPEND="${DEPEND}" -S="${WORKDIR}/${P/-gtk}" +S="${WORKDIR}/${P/-gtk2}" src_prepare() { - epatch "${FILESDIR}/${PN/-gtk}-0.7.5-grab.patch" + epatch "${FILESDIR}/${PN/-gtk2}-0.7.5-grab.patch" } src_configure() { diff --git a/app-crypt/pinentry-qt4/Manifest b/app-crypt/pinentry-qt4/Manifest index 290e442db..730f88c90 100644 --- a/app-crypt/pinentry-qt4/Manifest +++ b/app-crypt/pinentry-qt4/Manifest @@ -1,2 +1,2 @@ DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab -EBUILD pinentry-qt4-0.7.6.ebuild 1259 RMD160 ae19510d0a431e3acc7139d694e8571f80134cf2 SHA1 dc90f34c25d24713459495fe3f9ee6385d23ed19 SHA256 0a49231714b2705f392ca60fd1f482542031de0b8f1c5630df8bfacee008c8f0 +EBUILD pinentry-qt4-0.7.6.ebuild 1271 RMD160 168b35f1d066b674469f5f4931c95706cb162fef SHA1 628562591e0d7ee443ea8e5673f3b50d6c025083 SHA256 5b9f28d6502e4bff7c1b47febf2bc9647da6e0875c9dcedf3674bb935c9f8734 diff --git a/app-crypt/pinentry-qt4/pinentry-qt4-0.7.6.ebuild b/app-crypt/pinentry-qt4/pinentry-qt4-0.7.6.ebuild index df92a4c87..d677e40ee 100644 --- a/app-crypt/pinentry-qt4/pinentry-qt4-0.7.6.ebuild +++ b/app-crypt/pinentry-qt4/pinentry-qt4-0.7.6.ebuild @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="caps" -DEPEND="app-crypt/pinentry >=x11-libs/qt-gui-4.4.1" +DEPEND="~app-crypt/pinentry-base-${PV} >=x11-libs/qt-gui-4.4.1" RDEPEND="${DEPEND}" S="${WORKDIR}/${P/-qt4}" diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest index e68c973d4..19b1701d1 100644 --- a/app-crypt/pinentry/Manifest +++ b/app-crypt/pinentry/Manifest @@ -1,2 +1,2 @@ -DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab -EBUILD pinentry-0.7.6.ebuild 1659 RMD160 4bd10fe153699e3eb3ce4313a113acbd071aaffd SHA1 1880ce68c0cac1e6632710ace3446f7f62d8e4d4 SHA256 c6b1af5f61379de7eebef4ad11a627c967670bd711cb8350183968647fca84e0 +EBUILD pinentry-0.7.6.ebuild 720 RMD160 dbfad9d51ce24e3daaead1047fae2a216fe26b48 SHA1 e81b098846fe7c1bcf5c5933f69e1cf1f80237da SHA256 7d5cfa857c0c9a3af30cfd77443faab705d0be426fbb550add3de211b4f28e83 +MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548 diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml new file mode 100644 index 000000000..991608adb --- /dev/null +++ b/app-crypt/pinentry/metadata.xml @@ -0,0 +1,9 @@ + + + + no-herd + + swegener@gentoo.org + Primary Maintainer + + diff --git a/app-crypt/pinentry/pinentry-0.7.6.ebuild b/app-crypt/pinentry/pinentry-0.7.6.ebuild index 9ec68b9ac..2d48b69bc 100644 --- a/app-crypt/pinentry/pinentry-0.7.6.ebuild +++ b/app-crypt/pinentry/pinentry-0.7.6.ebuild @@ -4,46 +4,18 @@ EAPI=3 -inherit multilib eutils +inherit multilib eutils flag-o-matic -DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol (meta-package)" HOMEPAGE="http://www.gnupg.org/aegypten/" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz" +SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="caps" +IUSE="gtk qt4" -DEPEND="sys-libs/ncurses sys-libs/libcap" +DEPEND="~app-crypt/pinentry-base-${PV} + gtk? ( ~app-crypt/pinentry-gtk2-${PV} ) + qt4? ( ~app-crypt/pinentry-qt4-${PV} )" RDEPEND="${DEPEND}" - -src_configure() { - - econf \ - --disable-dependency-tracking \ - --enable-maintainer-mode \ - --disable-pinentry-gtk \ - --disable-pinentry-gtk2 \ - --disable-pinentry-qt \ - --enable-pinentry-curses \ - --enable-fallback-curses \ - --disable-pinentry-qt4 \ - $(use_with caps libcap) -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed" -} - -pkg_postinst() { - elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes." - elog "The soft resource limit for memory locking specifies the limit an" - elog "unprivileged process may lock into memory. You can also use POSIX" - elog "capabilities to allow pinentry to lock memory. To do so activate the caps" - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" - elog "your users." - elog "If you want pinentry for GTK, please install app-crypt/pinentry-gtk." - elog "If you want pinentry for Qt4, please install app-crypt/pinentry-qt4." -}