From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 18A9C1381F3 for ; Fri, 16 Nov 2012 14:41:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38147E0602; Fri, 16 Nov 2012 14:41:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5A27E0602 for ; Fri, 16 Nov 2012 14:41:39 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9BCC033D9AC for ; Fri, 16 Nov 2012 14:41:38 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 625F720C65; Fri, 16 Nov 2012 14:41:37 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-crypt/pinentry: pinentry-0.8.2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: pinentry-0.8.2.ebuild ChangeLog X-VCS-Directories: app-crypt/pinentry X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121116144137.625F720C65@flycatcher.gentoo.org> Date: Fri, 16 Nov 2012 14:41:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3bb1f503-1cbf-419c-82fa-6ef4fd92c05a X-Archives-Hash: e21f4bab203ccba66774b98df727651a scarabeus 12/11/16 14:41:37 Modified: pinentry-0.8.2.ebuild ChangeLog Log: Bump eapi in the ebuild and solve the log message print. Wrt bug#440540. (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8) Revision Changes Path 1.3 app-crypt/pinentry/pinentry-0.8.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild?r1=1.2&r2=1.3 Index: pinentry-0.8.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pinentry-0.8.2.ebuild 3 Sep 2012 13:53:02 -0000 1.2 +++ pinentry-0.8.2.ebuild 16 Nov 2012 14:41:37 -0000 1.3 @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild,v 1.2 2012/09/03 13:53:02 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild,v 1.3 2012/11/16 14:41:37 scarabeus Exp $ -EAPI=3 +EAPI=5 inherit multilib eutils flag-o-matic @@ -15,50 +15,38 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="gtk ncurses qt4 caps static" -RDEPEND="app-admin/eselect-pinentry +RDEPEND=" + app-admin/eselect-pinentry + caps? ( sys-libs/libcap ) + gtk? ( x11-libs/gtk+:2 ) + ncurses? ( sys-libs/ncurses ) + qt4? ( >=x11-libs/qt-gui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs] ) - !static? ( - gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses ) - qt4? ( >=x11-libs/qt-gui-4.4.1:4 ) - !gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) ) - ) - caps? ( sys-libs/libcap )" +" DEPEND="${RDEPEND} - !static? ( - gtk? ( virtual/pkgconfig ) - qt4? ( virtual/pkgconfig ) - )" + gtk? ( virtual/pkgconfig ) + qt4? ( virtual/pkgconfig ) +" +REQUIRED_USE=" + || ( ncurses gtk qt4 ) + gtk? ( !static ) + qt4? ( !static ) + static? ( ncurses ) +" -pkg_setup() { - use static && append-ldflags -static - - if use static && { use gtk || use qt4; }; then - ewarn - ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt4 USE flags." - ewarn - fi -} +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) src_prepare() { if use qt4; then - local file - for file in qt4/*.moc; do - "${EPREFIX}"/usr/bin/moc ${file/.moc/.h} > ${file} || die + local f + for f in qt4/*.moc; do + "${EPREFIX}"/usr/bin/moc ${f/.moc/.h} > ${f} || die done fi } src_configure() { - local myconf="" - - if ! { use qt4 || use gtk || use ncurses; } - then - myconf="--enable-pinentry-curses --enable-fallback-curses" - elif use static - then - myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk2 --disable-pinentry-qt4" - fi + use static && append-ldflags -static # Issues finding qt on multilib systems export QTLIB="${QTDIR}/$(get_libdir)" @@ -73,24 +61,24 @@ $(use_enable ncurses fallback-curses) \ $(use_enable qt4 pinentry-qt4) \ $(use_with caps libcap) \ - --without-x \ - ${myconf} + --without-x } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README THANKS TODO + default rm -f "${ED}"/usr/bin/pinentry || die } pkg_postinst() { - elog "We no longer install pinentry-curses and pinentry-qt SUID root by default." - 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." + if ! has_version 'app-crypt/pinentry' || has_version '=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." + fi eselect pinentry update ifunset } 1.129 app-crypt/pinentry/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/pinentry/ChangeLog?rev=1.129&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/pinentry/ChangeLog?rev=1.129&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/pinentry/ChangeLog?r1=1.128&r2=1.129 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- ChangeLog 29 Oct 2012 10:52:56 -0000 1.128 +++ ChangeLog 16 Nov 2012 14:41:37 -0000 1.129 @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/pinentry # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.128 2012/10/29 10:52:56 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.129 2012/11/16 14:41:37 scarabeus Exp $ + + 16 Nov 2012; Tomáš Chvátal pinentry-0.8.2.ebuild: + Bump eapi in the ebuild and solve the log message print. Wrt bug#440540. 29 Oct 2012; Tomáš Chvátal -files/pinentry-0.7.5-grab.patch, -files/pinentry-0.8.0-qt-fix.patch,