public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-crypt/pinentry: ChangeLog pinentry-0.7.6.ebuild
@ 2009-07-04 17:42 Sven Wegener (swegener)
  0 siblings, 0 replies; 2+ messages in thread
From: Sven Wegener (swegener) @ 2009-07-04 17:42 UTC (permalink / raw
  To: gentoo-commits

swegener    09/07/04 17:42:16

  Modified:             ChangeLog
  Added:                pinentry-0.7.6.ebuild
  Log:
  Version bump, bug #274999 by Lars Wendler.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.94                 app-crypt/pinentry/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/ChangeLog?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/ChangeLog?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/ChangeLog?r1=1.93&r2=1.94

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ChangeLog	2 May 2009 20:33:05 -0000	1.93
+++ ChangeLog	4 Jul 2009 17:42:15 -0000	1.94
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.93 2009/05/02 20:33:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.94 2009/07/04 17:42:15 swegener Exp $
+
+*pinentry-0.7.6 (04 Jul 2009)
+
+  04 Jul 2009; Sven Wegener <swegener@gentoo.org> +pinentry-0.7.6.ebuild,
+  +files/pinentry-0.7.6-qt4-moc-fix.diff:
+  Version bump, bug #274999 by Lars Wendler.
 
   02 May 2009; Sven Wegener <swegener@gentoo.org> pinentry-0.7.5.ebuild,
   pinentry-0.7.5-r1.ebuild:



1.1                  app-crypt/pinentry/pinentry-0.7.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild?rev=1.1&content-type=text/plain

Index: pinentry-0.7.6.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild,v 1.1 2009/07/04 17:42:15 swegener Exp $

EAPI="1"

inherit qt3 multilib eutils flag-o-matic

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}/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="gtk ncurses qt3 qt4 caps static"

DEPEND="static? ( sys-libs/ncurses )
	!static? (
		gtk? ( x11-libs/gtk+:2 )
		ncurses? ( sys-libs/ncurses )
		qt3? ( x11-libs/qt:3 )
		qt4? ( >=x11-libs/qt-gui-4.4.1 )
		!gtk? ( !qt4? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) ) )
	)
	caps? ( sys-libs/libcap )"
RDEPEND="${DEPEND}"

pkg_setup() {
	use static && append-ldflags -static

	if use static && ( use gtk || use qt3 )
	then
		ewarn
		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt3 USE flags."
		ewarn
	fi
}

src_unpack() {
	unpack ${A}
	cd "${S}"

	epatch "${FILESDIR}/${PN}-0.7.5-grab.patch"
	epatch "${FILESDIR}/${PN}-0.7.6-qt4-moc-fix.diff"
}

src_compile() {
	local myconf=""

	if ! ( use qt3 || 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-qt"
	fi

	# Issues finding qt on multilib systems
	export QTLIB="${QTDIR}/$(get_libdir)"

	econf \
		--disable-dependency-tracking \
		--enable-maintainer-mode \
		--disable-pinentry-gtk \
		$(use_enable gtk pinentry-gtk2) \
		$(use_enable qt3 pinentry-qt) \
		$(use_enable ncurses pinentry-curses) \
		$(use_enable ncurses fallback-curses) \
		$(use_enable qt4 pinentry-qt4) \
		$(use_with caps libcap) \
		${myconf} \
		|| die "econf failed"
	emake || die "emake failed"
}

src_install() {
	emake DESTDIR="${D}" install || die "make install failed"
	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
}

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."
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-crypt/pinentry: ChangeLog pinentry-0.7.6.ebuild
@ 2009-07-15 21:04 Arfrever Frehtes Taifersar Arahesis (arfrever)
  0 siblings, 0 replies; 2+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2009-07-15 21:04 UTC (permalink / raw
  To: gentoo-commits

arfrever    09/07/15 21:04:10

  Modified:             ChangeLog pinentry-0.7.6.ebuild
  Log:
  Disable support for Qt-4 when "static" USE flag is enabled (bug #277963).
  (Portage version: 13827-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.96                 app-crypt/pinentry/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/ChangeLog?r1=1.95&r2=1.96

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog	4 Jul 2009 18:35:11 -0000	1.95
+++ ChangeLog	15 Jul 2009 21:04:10 -0000	1.96
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.95 2009/07/04 18:35:11 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.96 2009/07/15 21:04:10 arfrever Exp $
+
+  15 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pinentry-0.7.6.ebuild:
+  Disable support for Qt-4 when "static" USE flag is enabled (bug #277963).
 
   04 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pinentry-0.7.6.ebuild, -files/pinentry-0.7.6-qt4-moc-fix.diff:



1.3                  app-crypt/pinentry/pinentry-0.7.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild?r1=1.2&r2=1.3

Index: pinentry-0.7.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pinentry-0.7.6.ebuild	4 Jul 2009 18:35:11 -0000	1.2
+++ pinentry-0.7.6.ebuild	15 Jul 2009 21:04:10 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild,v 1.2 2009/07/04 18:35:11 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild,v 1.3 2009/07/15 21:04:10 arfrever Exp $
 
 EAPI="1"
 
@@ -29,10 +29,10 @@
 pkg_setup() {
 	use static && append-ldflags -static
 
-	if use static && ( use gtk || use qt3 )
+	if use static && { use gtk || use qt3 || use qt4; }
 	then
 		ewarn
-		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt3 USE flags."
+		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk, qt3 and qt4 USE flags."
 		ewarn
 	fi
 }
@@ -54,12 +54,12 @@
 src_compile() {
 	local myconf=""
 
-	if ! ( use qt3 || use gtk || use ncurses )
+	if ! { use qt3 || 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-qt"
+		myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk2 --disable-pinentry-qt --disable-pinentry-qt4"
 	fi
 
 	# Issues finding qt on multilib systems
@@ -75,8 +75,7 @@
 		$(use_enable ncurses fallback-curses) \
 		$(use_enable qt4 pinentry-qt4) \
 		$(use_with caps libcap) \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 	emake || die "emake failed"
 }
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-07-15 21:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-04 17:42 [gentoo-commits] gentoo-x86 commit in app-crypt/pinentry: ChangeLog pinentry-0.7.6.ebuild Sven Wegener (swegener)
  -- strict thread matches above, loose matches on Subject: below --
2009-07-15 21:04 Arfrever Frehtes Taifersar Arahesis (arfrever)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox