Version bump, CVS snapshot with gtk+-2 support. Closes bug #73704.

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index fd582de7d6bc3cfa45e4d9fafdca69bd52601323..4b3673f45d161d1de45d57e858cfd85a0706242f 100644 (file)
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.16 2004/10/05 11:46:56 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.17 2004/12/07 22:43:03 swegener Exp $
+
+*pinentry-0.7.1_p20041207 (07 Dec 2004)
+
+  07 Dec 2004; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  -pinentry-0.7.0.ebuild, +pinentry-0.7.1_p20041207.ebuild:
+  Version bump, CVS snapshot with gtk+-2 support. Closes bug #73704.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   pinentry-0.7.0.ebuild, pinentry-0.7.1-r1.ebuild:

diff --git a/app-crypt/pinentry/files/digest-pinentry-0.7.0 b/app-crypt/pinentry/files/digest-pinentry-0.7.0
deleted file mode 100644 (file)
index ccf204a..0000000
--- a/app-crypt/pinentry/files/digest-pinentry-0.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50275634b3481a231f3319e062a0bd87 pinentry-0.7.0.tar.gz 344261

diff --git a/app-crypt/pinentry/files/digest-pinentry-0.7.1_p20041207 b/app-crypt/pinentry/files/digest-pinentry-0.7.1_p20041207
new file mode 100644 (file)
index 0000000..db58f06
--- /dev/null
+++ b/app-crypt/pinentry/files/digest-pinentry-0.7.1_p20041207
@@ -0,0 +1 @@
+MD5 70b7df2b981af0576067ca722228ba4e pinentry-0.7.1_p20041207.tar.bz2 307869

diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml
index d8b96be3c5cd34ef10346690f4c871a3c235ccb7..991608adbe1fffcaaff94b78954ad712014e31ee 100644 (file)
--- a/app-crypt/pinentry/metadata.xml
+++ b/app-crypt/pinentry/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
        <herd>no-herd</herd>
        <maintainer>
-               <email>bug-wranglers@gentoo.org</email>
-               <description>This package lacks a primary herd or maintainer.</description>
+               <email>swegener@gentoo.org</email>
+               <description>Primary Maintainer</description>
        </maintainer>
 </pkgmetadata>

diff --git a/app-crypt/pinentry/pinentry-0.7.0.ebuild b/app-crypt/pinentry/pinentry-0.7.0.ebuild
deleted file mode 100644 (file)
index 0b1517e..0000000
--- a/app-crypt/pinentry/pinentry-0.7.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.0.ebuild,v 1.5 2004/10/05 11:46:56 pvdabeel Exp $
-
-DESCRIPTION="collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="http://www.gnupg.org/aegypten/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/pinentry/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="qt gtk ncurses"
-
-DEPEND="gtk? ( x11-libs/gtk+ )
-       ncurses? ( sys-libs/ncurses )
-       qt? ( x11-libs/qt )
-       !gtk? ( !qt? ( !ncurses? ( sys-libs/ncurses ) ) )"
-
-src_compile() {
-       local myconf=""
-       if ! use qt && ! use gtk && ! use ncurses ; then
-               myconf="--enable-pinentry-curses --enable-fallback-curses"
-       fi
-       econf \
-               `use_enable qt pinentry-qt` \
-               `use_enable gtk pinentry-gtk` \
-               `use_enable ncurses pinentry-curses` \
-               `use_enable ncurses fallback-curses` \
-               --disable-dependency-tracking \
-               ${myconf} \
-               || die
-       make || die
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die
-       dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-       # The other two pinentries don't spit out an insecure memory warning when
-       # not suid root, and gtk refuses to start if pinentry-gtk is suid root.
-       fperms +s /usr/bin/pinentry-qt
-}
-
-pkg_postinst() {
-       einfo "pinentry-qt is installed SUID root to make use of protected memory space"
-       einfo "This is needed in order to have a secure place to store your passphrases,"
-       einfo "etc. at runtime but may make some sysadmins nervous"
-}

diff --git a/app-crypt/pinentry/pinentry-0.7.1_p20041207.ebuild b/app-crypt/pinentry/pinentry-0.7.1_p20041207.ebuild
new file mode 100644 (file)
index 0000000..7281f03
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.7.1_p20041207.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.1_p20041207.ebuild,v 1.1 2004/12/07 22:43:03 swegener Exp $
+
+inherit 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://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~swegener/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="qt gtk gtk2 ncurses"
+
+DEPEND="gtk? (
+               !gtk2? ( =x11-libs/gtk+-1* )
+               gtk2? ( =x11-libs/gtk+-2* )
+       )
+       ncurses? ( sys-libs/ncurses )
+       qt? ( x11-libs/qt )
+       !gtk? ( !qt? ( !ncurses? ( sys-libs/ncurses ) ) )"
+
+src_compile() {
+       local myconf=""
+
+       if ! ( use qt || use gtk || use ncurses ) ; then
+               myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk --disable-pinentry-gtk2"
+       elif use gtk && use gtk2 ; then
+               myconf="--enable-pinentry-gtk2 --disable-pinentry-gtk"
+       elif use gtk ; then
+               myconf="--enable-pinentry-gtk --disable-pinentry-gtk2"
+       else
+               myconf="--disable-pinentry-gtk --disable-pinentry-gtk2"
+       fi
+
+       append-ldflags -Wl,-z,now
+
+       econf \
+               $(use_enable qt pinentry-qt) \
+               $(use_enable ncurses pinentry-curses) \
+               $(use_enable ncurses fallback-curses) \
+               --disable-dependency-tracking \
+               --enable-maintainer-mode \
+               ${myconf} \
+               || die "econf failed"
+       emake || die "emake failed"
+}
+
+src_install() {
+       make DESTDIR=${D} install || die "make install failed"
+       dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
+
+       # gtk versions of pinentry refuse to start when suid root
+       for x in curses qt
+       do
+               [ -f ${D}/usr/bin/pinentry-${x} ] && fperms +s /usr/bin/pinentry-${x}
+       done
+}
+
+pkg_postinst() {
+       einfo "pinentry-curses and pinentry-qt are installed SUID root to make use of"
+       einfo "protected memory space. This is needed in order to have a secure place"
+       einfo "to store your passphrases, etc. at runtime but may make some sysadmins"
+       einfo "nervous."
+}