Version bump + some corrections from cvs

Package-Manager: portage-2.1.4
RepoMan-Options: --force

5 files changed, 266 insertions, 5 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index 1ea31b4fffb3..469dd03758be 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/gpgme
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.128 2008/01/02 18:26:44 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.129 2008/01/15 18:26:02 alonbl Exp $
+
+*gpgme-1.1.6 (15 Jan 2008)
+
+  15 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gpgme-1.1.6-cvs.patch, +gpgme-1.1.6.ebuild:
+  Version bump + some corrections from cvs
 
   02 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> gpgme-0.3.14-r1.ebuild,
   gpgme-1.1.2-r1.ebuild, gpgme-1.1.5.ebuild:
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index d9360b0dfc45..4cf575555f3d 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -2,6 +2,10 @@ AUX gpgme-1.1.2-fbsd.patch 984 RMD160 dfe4d16c5b8c4256fef9344d0616cf2111a0d3ac S
 MD5 03ead303494786d8b8933e7e61b651b5 files/gpgme-1.1.2-fbsd.patch 984
 RMD160 dfe4d16c5b8c4256fef9344d0616cf2111a0d3ac files/gpgme-1.1.2-fbsd.patch 984
 SHA256 3da2df975c1dc3d26cb7927489d9c5c610a953864b7cb3be6bebbf410eeeab58 files/gpgme-1.1.2-fbsd.patch 984
+AUX gpgme-1.1.6-cvs.patch 6683 RMD160 81247a6a691aac302d10c469805a4a1c15401739 SHA1 7f3a01a31c0708bd7df473173904f7bc47050897 SHA256 2a47856e3164ce107c7e6c7c8a835abf5864995d2f9ce8bc6d16f6c0fbff4ddd
+MD5 e2184e2bc1854ea4171f0f4a81fdc302 files/gpgme-1.1.6-cvs.patch 6683
+RMD160 81247a6a691aac302d10c469805a4a1c15401739 files/gpgme-1.1.6-cvs.patch 6683
+SHA256 2a47856e3164ce107c7e6c7c8a835abf5864995d2f9ce8bc6d16f6c0fbff4ddd files/gpgme-1.1.6-cvs.patch 6683
 AUX gpgme3.m4.patch 482 RMD160 bab51943a422da3e9eeeacfc6536e8480cb11afc SHA1 2a42c91ea4636fab5b1087ba5542e9c79ca143b0 SHA256 8e71df251cbbed19cfb2e929c0781adb92b02fb32759349c62408ab108bcc2c3
 MD5 afc6d9e463f4b389eb085af310f8b74f files/gpgme3.m4.patch 482
 RMD160 bab51943a422da3e9eeeacfc6536e8480cb11afc files/gpgme3.m4.patch 482
@@ -9,6 +13,7 @@ SHA256 8e71df251cbbed19cfb2e929c0781adb92b02fb32759349c62408ab108bcc2c3 files/gp
 DIST gpgme-0.3.14.tar.gz 655474 RMD160 96d1db35441611d0ddc3e2e8824e2b1d673b9837 SHA1 c97a4fdca455acc70c6b3a106da07389db4d50ed SHA256 4e822b5bb4f8d3269ab9d205e714ed9463b951c77e8ac0ffc0cf8ba7667bdc88
 DIST gpgme-1.1.2.tar.gz 881432 RMD160 ae30dc9a3e1f482206cf7cf76aae7c9b9e25b4a8 SHA1 336d94e3bf2facedd06c52bd016bce647667c347 SHA256 644f7391887d9d63462d4137c21f333409ce0ccdd52daab9806a98ca6dfbecc5
 DIST gpgme-1.1.5.tar.gz 929270 RMD160 54520e0bcacecc337e33b92e6dac6d1ced8a30af SHA1 428d0faee47509e69ce95620d5075579296cb884 SHA256 4ffb19d69b7cf9179252fa7f0a5f0db9064417024da260770d959dcf7bc3492a
+DIST gpgme-1.1.6.tar.gz 961286 RMD160 b761fed5ad88ef4b467c981bcc0ef95317c11ac1 SHA1 8dee551f362fc428c25c9bd542ce944ac916347d SHA256 7cf6cd9dfc1f02488eab8cb8a64d3904c71df9a04b1e9614beeec72dbde3f49f
 EBUILD gpgme-0.3.14-r1.ebuild 2456 RMD160 b947885da17faed5c8f0628dc5c2e6f0a9aacefc SHA1 3e9ff2a0df2e6ac3235c4726e2564c579781abb2 SHA256 ff38cd88268167da541376588b69a9b40f9d869003d5e4d299b6543d7f22ae0b
 MD5 5d5106451f96c04700b4970e629ef492 gpgme-0.3.14-r1.ebuild 2456
 RMD160 b947885da17faed5c8f0628dc5c2e6f0a9aacefc gpgme-0.3.14-r1.ebuild 2456
@@ -21,10 +26,14 @@ EBUILD gpgme-1.1.5.ebuild 1100 RMD160 46d5bf59729e2e61c5f1b529384d4def34036d7f S
 MD5 12d83c6542446c082eb61fd6da1f3d31 gpgme-1.1.5.ebuild 1100
 RMD160 46d5bf59729e2e61c5f1b529384d4def34036d7f gpgme-1.1.5.ebuild 1100
 SHA256 f73a3c61431f03b4d5b08c3fa363de84a0d867b92b95b8bec6669280bade8f38 gpgme-1.1.5.ebuild 1100
-MISC ChangeLog 18985 RMD160 3a1fa5093195ae97def3703e040ef73c51de1ebc SHA1 7b4a5c70d6f0dd53518db485ef26e7600bc17c6f SHA256 4d10672096cd2a5c5085391afae534f5eacb69996986fba435359e4835287b82
-MD5 5791744b09e8056e4ed6b62fc5784290 ChangeLog 18985
-RMD160 3a1fa5093195ae97def3703e040ef73c51de1ebc ChangeLog 18985
-SHA256 4d10672096cd2a5c5085391afae534f5eacb69996986fba435359e4835287b82 ChangeLog 18985
+EBUILD gpgme-1.1.6.ebuild 1200 RMD160 bc111af2bb0b8e082254bd86dfc46dac164741a5 SHA1 9e726216e5f7f2d94a684b5951bb8483d91b7499 SHA256 e7e3ebd35dbec5751d5a97cff70f01aa638851db2200851d81bebdd6a26e0ff3
+MD5 ab61b0c327cb18654109f15223c682d2 gpgme-1.1.6.ebuild 1200
+RMD160 bc111af2bb0b8e082254bd86dfc46dac164741a5 gpgme-1.1.6.ebuild 1200
+SHA256 e7e3ebd35dbec5751d5a97cff70f01aa638851db2200851d81bebdd6a26e0ff3 gpgme-1.1.6.ebuild 1200
+MISC ChangeLog 19158 RMD160 42b6ac10d781e5f09f60806f019c276566c62574 SHA1 f0b8fa9d337e391f78a156092dd74affc0ebbb5b SHA256 69a36f7fab2245b1ac7c8fba56962b8b6a35160417dc3ad1f30828ffc34f5161
+MD5 aa001e3cd3f5b4a3b164edc81b8677c8 ChangeLog 19158
+RMD160 42b6ac10d781e5f09f60806f019c276566c62574 ChangeLog 19158
+SHA256 69a36f7fab2245b1ac7c8fba56962b8b6a35160417dc3ad1f30828ffc34f5161 ChangeLog 19158
 MISC metadata.xml 314 RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a SHA1 ac00fbb2fc2f2de37d5dda93c775ef53f979eb28 SHA256 e80fd4c62ac2351fda3e7d6322e17edcb04fa5001d55e7b55bc19ece8ca89649
 MD5 ce0db60fd655ade98789a1643d4fdd9d metadata.xml 314
 RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a metadata.xml 314
@@ -38,3 +47,6 @@ SHA256 2f33bdd8584b0943156f8f0538da536f7de767916ed5b30599a6e10367cbb98a files/di
 MD5 a6d76b873d0404a6194b72c1b2e50398 files/digest-gpgme-1.1.5 235
 RMD160 a982c6236863ab4d3b33d240b91e8b7e2e07fed6 files/digest-gpgme-1.1.5 235
 SHA256 a15195518e3621f01d84b6a418e1d04c73ade367a80ed6205c8cf453c06a0c5c files/digest-gpgme-1.1.5 235
+MD5 a1818cad1a06cd2a3dd94f51cd270e6f files/digest-gpgme-1.1.6 235
+RMD160 6b6caa2b4826d8c388d89b1a617a29f3d3f5056e files/digest-gpgme-1.1.6 235
+SHA256 1f391fddbc162077da53b7dbddd932900df45b74facda926a60d6094c9a4dc6b files/digest-gpgme-1.1.6 235
diff --git a/app-crypt/gpgme/files/digest-gpgme-1.1.6 b/app-crypt/gpgme/files/digest-gpgme-1.1.6
new file mode 100644
index 000000000000..e7030c71fdf7
--- /dev/null
+++ b/app-crypt/gpgme/files/digest-gpgme-1.1.6
@@ -0,0 +1,3 @@
+MD5 df7ab717bf9b0189bd76b06c0c8a2509 gpgme-1.1.6.tar.gz 961286
+RMD160 b761fed5ad88ef4b467c981bcc0ef95317c11ac1 gpgme-1.1.6.tar.gz 961286
+SHA256 7cf6cd9dfc1f02488eab8cb8a64d3904c71df9a04b1e9614beeec72dbde3f49f gpgme-1.1.6.tar.gz 961286
diff --git a/app-crypt/gpgme/files/gpgme-1.1.6-cvs.patch b/app-crypt/gpgme/files/gpgme-1.1.6-cvs.patch
new file mode 100644
index 000000000000..a9ef27a64694
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.1.6-cvs.patch
@@ -0,0 +1,192 @@
+diff -urNp gpgme-1.1.6.org/assuan/assuan-pipe-connect.c gpgme.svn/assuan/assuan-pipe-connect.c
+--- gpgme-1.1.6.org/assuan/assuan-pipe-connect.c	2007-09-27 15:00:05.000000000 +0200
++++ gpgme.svn/assuan/assuan-pipe-connect.c	2008-01-04 18:06:42.000000000 +0200
+@@ -39,6 +39,14 @@
+ 
+ #include "assuan-defs.h"
+ 
++#ifdef _ASSUAN_IN_GPGME_BUILD_ASSUAN
++
++int _gpgme_io_pipe (int filedes[2], int inherit_idx);
++int _gpgme_io_spawn (const char *path, char **argv,
++		     struct spawn_fd_item_s *fd_child_list,
++		     struct spawn_fd_item_s *fd_parent_list);
++#endif
++
+ /* Hacks for Slowaris.  */
+ #ifndef PF_LOCAL
+ # ifdef PF_UNIX
+diff -urNp gpgme-1.1.6.org/gpgme/engine-gpgconf.c gpgme.svn/gpgme/engine-gpgconf.c
+--- gpgme-1.1.6.org/gpgme/engine-gpgconf.c	2008-01-04 16:17:15.000000000 +0200
++++ gpgme.svn/gpgme/engine-gpgconf.c	2008-01-14 19:34:21.000000000 +0200
+@@ -313,8 +310,8 @@ gpgconf_config_load_cb (void *hook, char
+ 
+   if (fields >= 3)
+     {
+-      comp->description = strdup (field[2]);
+-      if (!comp->description)
++      comp->program_name = strdup (field[2]);
++      if (!comp->program_name)
+ 	return gpg_error_from_syserror ();
+     }
+ 
+@@ -457,9 +454,18 @@ gpgconf_config_load_cb2 (void *hook, cha
+ 	return gpg_error_from_syserror ();
+     }
+ 
+-  err = gpgconf_parse_option (opt, &opt->no_arg_value, field[8]);
+-  if (err)
+-    return err;
++  if (opt->flags & GPGME_CONF_NO_ARG_DESC)
++    {
++      opt->no_arg_description = strdup (field[8]);
++      if (!opt->no_arg_description)
++	return gpg_error_from_syserror ();
++    }
++  else
++    {
++      err = gpgconf_parse_option (opt, &opt->no_arg_value, field[8]);
++      if (err)
++	return err;
++    }
+ 
+   err = gpgconf_parse_option (opt, &opt->value, field[9]);
+   if (err)
+diff -urNp gpgme-1.1.6.org/gpgme/kdpipeiodevice.cpp gpgme.svn/gpgme/kdpipeiodevice.cpp
+--- gpgme-1.1.6.org/gpgme/kdpipeiodevice.cpp	2007-11-12 13:21:58.000000000 +0200
++++ gpgme.svn/gpgme/kdpipeiodevice.cpp	2008-01-10 15:38:34.000000000 +0200
+@@ -329,11 +329,14 @@ void KDPipeIODevice::Private::emitReadyR
+     emit q->readyRead();
+ 
+     if ( !thisPointer )
+-	return;
+-    qDebug( "KDPipeIODevice::Private::emitReadyRead %p, %d: locking reader (CONSUMER THREAD)", this, counter );
+-    synchronized( reader ) {
+-        qDebug( "KDPipeIODevice::Private::emitReadyRead %p, %d: locked reader (CONSUMER THREAD)", this, counter );
+-        reader->readyReadSentCondition.wakeAll();
++        return;
++    
++    if ( reader ) {
++        qDebug( "KDPipeIODevice::Private::emitReadyRead %p, %d: locking reader (CONSUMER THREAD)", this, counter );
++        synchronized( reader ) {
++            qDebug( "KDPipeIODevice::Private::emitReadyRead %p, %d: locked reader (CONSUMER THREAD)", this, counter );
++            reader->readyReadSentCondition.wakeAll();
++        }
+     }
+     qDebug( "KDPipeIODevice::Private::emitReadyRead %p leaving %d", this, counter );
+ 
+@@ -704,7 +707,7 @@ void Reader::run() {
+  
+         while ( !cancel && !error && bufferFull() ) {
+             notifyReadyRead();
+-            if ( bufferFull() ) {
++            if ( !cancel && bufferFull() ) {
+                 qDebug( "%p: Reader::run: buffer is full, going to sleep", this );
+ 	        bufferNotFullCondition.wait( &mutex );
+ 	    }
+diff -urNp gpgme-1.1.6.org/tests/gpg/Makefile.am gpgme.svn/tests/gpg/Makefile.am
+--- gpgme-1.1.6.org/tests/gpg/Makefile.am	2008-01-04 16:25:18.000000000 +0200
++++ gpgme.svn/tests/gpg/Makefile.am	2008-01-10 06:40:25.000000000 +0200
+@@ -38,10 +38,10 @@ TESTS = t-encrypt t-encrypt-sym t-encryp
+ 	t-encrypt-large t-file-name t-gpgconf $(tests_unix)
+ 
+ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf
+-DISTCLEANFILES = pubring.gpg~ random_seed gpg.conf
++DISTCLEANFILES = pubring.gpg~ random_seed gpg.conf gpg-agent.conf
+ 
+ EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
+-	geheim.txt pubkey-1.asc seckey-1.asc
++	geheim.txt pubkey-1.asc seckey-1.asc pinentry
+ 
+ INCLUDES = -I$(top_srcdir)/gpgme
+ 
+@@ -55,7 +55,7 @@ noinst_PROGRAMS = $(TESTS) t-genkey
+ clean-local:
+ 	$(srcdir)/mkdemodirs --clean
+ 
+-all-local: ./pubring.gpg ./gpg.conf
++all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf
+ 
+ ./pubring.gpg: $(srcdir)/pubdemo.asc ./Alpha/Secret.gpg 
+ 	$(GPG) --homedir . --import $(srcdir)/pubdemo.asc
+@@ -68,3 +68,7 @@ all-local: ./pubring.gpg ./gpg.conf
+ ./gpg.conf:
+ # This is required for t-sig-notations.
+ 	echo no-force-v3-sigs > ./gpg.conf
++
++./gpg-agent.conf:
++# This is required for gpg2, which does not support command fd.
++	echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf
+diff -urNp gpgme-1.1.6.org/tests/gpg/pinentry gpgme.svn/tests/gpg/pinentry
+--- gpgme-1.1.6.org/tests/gpg/pinentry	1970-01-01 02:00:00.000000000 +0200
++++ gpgme.svn/tests/gpg/pinentry	2008-01-10 06:33:34.000000000 +0200
+@@ -0,0 +1,22 @@
++#! /bin/bash
++# Dummy pinentry
++# 
++# Copyright 2008 g10 Code GmbH
++# 
++# This file is free software; as a special exception the author gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++# 
++# This file is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
++# PURPOSE.
++
++echo OK Your orders please
++
++while read cmd; do
++  case $cmd in
++    GETPIN) echo D abc; echo OK;;
++    *) echo OK;;
++  esac
++done
+diff -urNp gpgme-1.1.6.org/tests/gpg/t-gpgconf.c gpgme.svn/tests/gpg/t-gpgconf.c
+--- gpgme-1.1.6.org/tests/gpg/t-gpgconf.c	2008-01-04 16:17:15.000000000 +0200
++++ gpgme.svn/tests/gpg/t-gpgconf.c	2008-01-10 06:54:16.000000000 +0200
+@@ -254,6 +254,11 @@ main (int argc, char **argv)
+   gpgme_conf_comp_t conf;
+   gpgme_conf_comp_t comp;
+   int first;
++
++#ifndef ENABLE_GPGCONF
++  return 0;
++#endif
++
+   init_gpgme (GPGME_PROTOCOL_GPGCONF);
+ 
+   err = gpgme_new (&ctx);
+@@ -287,15 +292,23 @@ main (int argc, char **argv)
+     comp = conf;
+     while (comp && strcmp (comp->name, "dirmngr"))
+       comp = comp->next;
+-    opt = comp->options;
+-    while (opt && strcmp (opt->name, "verbose"))
+-      opt = opt->next;
+ 
+-    err = gpgme_conf_opt_change (opt, 0, arg);
+-    fail_if_err (err);
+-
+-    err = gpgme_op_conf_save (ctx, comp);
+-    fail_if_err (err);
++    if (comp)
++      {
++	opt = comp->options;
++	while (opt && strcmp (opt->name, "verbose"))
++	  opt = opt->next;
++	
++	/* Allow for the verbose option not to be there.  */
++	if (opt)
++	  {
++	    err = gpgme_conf_opt_change (opt, 0, arg);
++	    fail_if_err (err);
++	    
++	    err = gpgme_op_conf_save (ctx, comp);
++	    fail_if_err (err);
++	  }
++      }
+   }
+ #endif
+ 
diff --git a/app-crypt/gpgme/gpgme-1.1.6.ebuild b/app-crypt/gpgme/gpgme-1.1.6.ebuild
new file mode 100644
index 000000000000..07e6a137f56c
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.1.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.6.ebuild,v 1.1 2008/01/15 18:26:02 alonbl Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-libs/libgpg-error-1.4
+	>=dev-libs/pth-1.2
+	>=app-crypt/gnupg-1.9.20-r1"
+
+RDEPEND="${DEPEND}
+	dev-libs/libgcrypt"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-cvs.patch"
+	chmod a+x "tests/gpg/pinentry"
+	eautoreconf
+
+	# We need to call elibtoolize so that we get sane .so versioning on fbsd.
+	#elibtoolize
+}
+
+src_compile() {
+	econf \
+		--with-pth=yes \
+		--includedir=/usr/include/gpgme \
+		--with-gpg=/usr/bin/gpg \
+		--with-gpgsm=/usr/bin/gpgsm \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO VERSION
+}