Version bump

Package-Manager: portage-2.1.1

5 files changed, 156 insertions, 5 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index d8818f968096..d38b8bc66ff2 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.241 2006/10/24 18:32:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.242 2006/10/29 20:27:13 alonbl Exp $
+
+  29 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnupg-1.9.94-fbsd.patch, +gnupg-1.9.94.ebuild:
+  Version bump
+
+*gnupg-1.9.94 (29 Oct 2006)
 
   24 Oct 2006; Fabian Groffen <grobian@gentoo.org> gnupg-1.4.2.2.ebuild,
   gnupg-1.4.4.ebuild, gnupg-1.4.5.ebuild, gnupg-1.4.5-r1.ebuild,
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 4b7a76c0179f..46befb748543 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -58,6 +58,10 @@ AUX gnupg-1.9.20-fbsd.patch 901 RMD160 bfc0dc40a8c42130ecac8e8e9b038949720ff115
 MD5 f7c457e0e98e73e3b29bb770c45dd47c files/gnupg-1.9.20-fbsd.patch 901
 RMD160 bfc0dc40a8c42130ecac8e8e9b038949720ff115 files/gnupg-1.9.20-fbsd.patch 901
 SHA256 049c13bf96998298c8ff74e62ab1f112357d8e0efce2da8ae8daa11cf1a81eb3 files/gnupg-1.9.20-fbsd.patch 901
+AUX gnupg-1.9.94-fbsd.patch 926 RMD160 d16364fef0f594485afc74c3dab28c4f8ee3ee47 SHA1 cd1f05c2f168699777536cf96c667913052b0e7d SHA256 25d3777d6cf545e4a6ba1c1b52dc261a80265f2247e32444f45d506eec763422
+MD5 2235abfce9dd112a3fd402d5363aeb23 files/gnupg-1.9.94-fbsd.patch 926
+RMD160 d16364fef0f594485afc74c3dab28c4f8ee3ee47 files/gnupg-1.9.94-fbsd.patch 926
+SHA256 25d3777d6cf545e4a6ba1c1b52dc261a80265f2247e32444f45d506eec763422 files/gnupg-1.9.94-fbsd.patch 926
 DIST gnupg-1.4.0-ecc0.1.6.diff.bz2 16703 RMD160 1d98f70f2f13e96eed4482be9c3646342b46cf4d SHA1 cf868cfc93951b5ee662ef8ce52e66338013a7a8 SHA256 9bb0b4b7b2fdc757410c332fbf6e41049169d5ee67a06f1b347dbd21cd583ce5
 DIST gnupg-1.4.2.2.tar.bz2 3034652 RMD160 cbbf3ffafa51fdf985c2562ecafccd72bc36ea0d SHA1 f5559ddb004e0638f6bd9efe2bac00134c5065ba SHA256 174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
 DIST gnupg-1.4.4-ecc0.1.6.diff.bz2 16931 RMD160 30af14d212c50c56d7f170b6697a9148d086bb5a SHA1 15831b5d4cbccdca3c005199d510700ee862fbc5 SHA256 023e1da2837a06e9c92785184f31c6ecb31c0a328446100ab2c6dcf819c1f5be
@@ -66,6 +70,7 @@ DIST gnupg-1.4.5.tar.bz2 3089617 RMD160 f27447b3aec1423ac10c3a5b4745ea3b13c5a5e5
 DIST gnupg-1.9.20.tar.bz2 1810059 RMD160 3501de32f1526f64510a77fe3cc0905dd7fc8854 SHA1 557be26c21c114a3b345ce6b177fcb088883f827 SHA256 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e
 DIST gnupg-1.9.21.tar.bz2 1901908 RMD160 f522125f30a29fd2bcacca5894958242946de430 SHA1 f7c9dea1049dfd3da6d66838005def26898d06e2 SHA256 7dfaa7867427dd44ac3277026dec3602626b657d95952b7a5bdeb9e567b5d34c
 DIST gnupg-1.9.22.tar.bz2 1908546 RMD160 43b3e8a17d5e116f5fa0c34bc3beaf68250ec3c3 SHA1 10b2a5c256598d9ed25c84d55ea111710b3f8906 SHA256 2e4472e00c14c881ee1f93deddbe91d3c520311839f30d336ca48a51939e45cf
+DIST gnupg-1.9.94.tar.bz2 3870728 RMD160 eee1af2d2c5fea01010979a81e426cac2d288192 SHA1 3dae940f596690a047620685ee3148ad4320e666 SHA256 0647fe9599a43019b4afbd0c63dc6f44546b8475890cc36012f353288693d487
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
 EBUILD gnupg-1.4.2.2.ebuild 6952 RMD160 6c4ee97a516163a15bf99d9084db232aaf5b2c9b SHA1 a9c3f5f9334629af7ca57e00ddafab1180948326 SHA256 b8898624a107f20c9cb6a0848f3f881dac0e5bf222e6ad03e0291399fe26d5ae
 MD5 4bda7e46532c63ee27e9c51ef4ec7fba gnupg-1.4.2.2.ebuild 6952
@@ -103,10 +108,14 @@ EBUILD gnupg-1.9.22.ebuild 2709 RMD160 de0a8839b11b058884ac8b85183f3e1cbc1495ce
 MD5 51a9acfa59dd8cda02989ece4fdf2091 gnupg-1.9.22.ebuild 2709
 RMD160 de0a8839b11b058884ac8b85183f3e1cbc1495ce gnupg-1.9.22.ebuild 2709
 SHA256 4486a698417687a6e3299a86b0dc5824b22927b3720543ac09a33008802a1ac4 gnupg-1.9.22.ebuild 2709
-MISC ChangeLog 37802 RMD160 d4da2ccb1ee042070b8bba225106a3de76c4f5f7 SHA1 3ef718bed0f0864b4814754ffaefc07deaa6ae0f SHA256 a9d5f57a883f3acc5edf655a4d7906ffa71cd7e713ead36582367baba8a088fa
-MD5 5d1e8c61f5ca5ae731f976f21a1c5f19 ChangeLog 37802
-RMD160 d4da2ccb1ee042070b8bba225106a3de76c4f5f7 ChangeLog 37802
-SHA256 a9d5f57a883f3acc5edf655a4d7906ffa71cd7e713ead36582367baba8a088fa ChangeLog 37802
+EBUILD gnupg-1.9.94.ebuild 2655 RMD160 04f4f0112470827db2779daa727e64f7d0b4c61b SHA1 b91d7cc4fced6c81219b79475bed340edca3dfc0 SHA256 0bae90e7f8fc75d1799c2ae7bb98b22512045a12c28952801a757cebd5ebdd74
+MD5 aaebca8cef20d78c5a6c7169067da7bd gnupg-1.9.94.ebuild 2655
+RMD160 04f4f0112470827db2779daa727e64f7d0b4c61b gnupg-1.9.94.ebuild 2655
+SHA256 0bae90e7f8fc75d1799c2ae7bb98b22512045a12c28952801a757cebd5ebdd74 gnupg-1.9.94.ebuild 2655
+MISC ChangeLog 37950 RMD160 bdde46f057ed260748fab8a50be35bafbfe3c4fc SHA1 56842b4ab2b7b057f70ba3175d79ebe1b861cc50 SHA256 d4e799ee4598b427c64493cd0af76a8b3d059bfc0f0ddc41e48d49d4ee20c4a1
+MD5 c6ee2ec5ab359b8865a599f96a0da33b ChangeLog 37950
+RMD160 bdde46f057ed260748fab8a50be35bafbfe3c4fc ChangeLog 37950
+SHA256 d4e799ee4598b427c64493cd0af76a8b3d059bfc0f0ddc41e48d49d4ee20c4a1 ChangeLog 37950
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -138,3 +147,6 @@ SHA256 c07e9079f783809952704276a2cc8cded8ee07fa0a1f803d3cd5257fc9e62f76 files/di
 MD5 c71d54c953041094fb93419fa49f39ce files/digest-gnupg-1.9.22 244
 RMD160 7ffd8abec034311fff60408839c73c6b6732d5d4 files/digest-gnupg-1.9.22 244
 SHA256 e8c7e316349c08cb0016be462482519b309a38f3bc92d0d88de752795005beda files/digest-gnupg-1.9.22 244
+MD5 484202a1d02759840bf80a57a2b2d79e files/digest-gnupg-1.9.94 244
+RMD160 87f4dca9729422331d55c113b08c98fcf7d641c0 files/digest-gnupg-1.9.94 244
+SHA256 8648c6ff6070284e92d5ab95911132a7f84a89ad2afdd32e09e972708d576b17 files/digest-gnupg-1.9.94 244
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.94 b/app-crypt/gnupg/files/digest-gnupg-1.9.94
new file mode 100644
index 000000000000..2447627903cf
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.9.94
@@ -0,0 +1,3 @@
+MD5 1da8c928948800efa2a13d4aecb8d013 gnupg-1.9.94.tar.bz2 3870728
+RMD160 eee1af2d2c5fea01010979a81e426cac2d288192 gnupg-1.9.94.tar.bz2 3870728
+SHA256 0647fe9599a43019b4afbd0c63dc6f44546b8475890cc36012f353288693d487 gnupg-1.9.94.tar.bz2 3870728
diff --git a/app-crypt/gnupg/files/gnupg-1.9.94-fbsd.patch b/app-crypt/gnupg/files/gnupg-1.9.94-fbsd.patch
new file mode 100644
index 000000000000..68752011ae69
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-1.9.94-fbsd.patch
@@ -0,0 +1,26 @@
+diff -urNp gnupg-1.9.94.org/configure.ac gnupg-1.9.94/configure.ac
+--- gnupg-1.9.94.org/configure.ac	2006-10-24 13:59:42.000000000 +0200
++++ gnupg-1.9.94/configure.ac	2006-10-29 21:52:03.000000000 +0200
+@@ -875,7 +875,7 @@ fi
+ # Checks for header files.
+ #
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h])
++AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h pty.h])
+ AC_CHECK_HEADERS([pwd.h inttypes.h])
+ 
+ 
+diff -urNp gnupg-1.9.94.org/tools/symcryptrun.c gnupg-1.9.94/tools/symcryptrun.c
+--- gnupg-1.9.94.org/tools/symcryptrun.c	2006-06-20 19:32:13.000000000 +0300
++++ gnupg-1.9.94/tools/symcryptrun.c	2006-10-29 21:52:45.000000000 +0200
+@@ -72,7 +72,10 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/signal.h>
++#ifdef HAVE_PTY_H
+ #include <pty.h>
++#endif
+ #include <utmp.h>
+ #include <ctype.h>
+ #ifdef HAVE_LOCALE_H
diff --git a/app-crypt/gnupg/gnupg-1.9.94.ebuild b/app-crypt/gnupg/gnupg-1.9.94.ebuild
new file mode 100644
index 000000000000..a7476aed96c6
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.9.94.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.94.ebuild,v 1.1 2006/10/29 20:27:13 alonbl Exp $
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/alpha/gnupg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X gpg2-experimental doc ldap nls openct pcsc-lite smartcard selinux"
+
+COMMON_DEPEND="
+	virtual/libc
+	>=dev-libs/pth-1.3.7
+	>=dev-libs/libgcrypt-1.1.94
+	>=dev-libs/libksba-0.9.15
+	>=dev-libs/libgpg-error-1.3
+	>=dev-libs/libassuan-0.9.2
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+	openct? ( >=dev-libs/openct-0.5.0 )
+	ldap? ( net-nds/openldap )"
+# Needs sh and arm to be keyworded on pinentry
+#	X? ( app-crypt/pinentry )
+
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-crypt/gpg-agent
+	=app-crypt/gnupg-1.4*
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+	virtual/mta
+	selinux? ( sec-policy/selinux-gnupg )
+	nls? ( virtual/libintl )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c || die "PIC patching failed"
+
+	# this warning is only available on gcc4!
+	sed -i -e '/AM_CFLAGS/s!-Wno-pointer-sign!!g' ${S}/g10/Makefile.am
+	sed -i -e '/AM_CFLAGS/s!-Wno-pointer-sign!!g' ${S}/g10/Makefile.in
+
+	epatch "${FILESDIR}/${P}-fbsd.patch"
+	AT_M4DIR="m4 gl/m4" eautoreconf
+}
+
+src_compile() {
+	local myconf=""
+
+	if use X; then
+		local viewer
+		if has_version 'media-gfx/xloadimage'; then
+			viewer=/usr/bin/xloadimage
+		else
+			viewer=/usr/bin/xli
+		fi
+		myconf="${myconf} --with-photo-viewer=${viewer}"
+	else
+		myconf="${myconf} --disable-photo-viewers"
+	fi
+
+	append-ldflags $(bindnow-flags)
+
+	econf \
+		--enable-agent \
+		--enable-symcryptrun \
+		$(use_enable gpg2-experimental gpg) \
+		--enable-gpgsm \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable nls) \
+		$(use_enable ldap) \
+		--disable-capabilities \
+		${myconf} \
+		|| die
+	emake || die
+	if use doc; then
+		cd doc
+		emake html || die
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog NEWS README THANKS TODO VERSION
+
+	# neither of these should really be needed, please check
+	use gpg2-experimental && fperms u+s,go-r /usr/bin/gpg2
+	fperms u+s,go-r /usr/bin/gpg-agent
+
+	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
+}
+
+pkg_postinst() {
+	einfo
+	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	einfo
+}