fix for latest gnupg version

5 files changed, 147 insertions, 2 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index d0e7d584f256..0f6480590f0f 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/psi
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.18 2003/10/21 00:56:16 luke-jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.19 2003/10/24 16:50:42 hanno Exp $
+
+*psi-0.9-r1 (24 Oct 2003)
+
+  24 Oct 2003; Hanno Boeck <hanno@gentoo.org> psi-0.9-r1.ebuild,
+  files/psi_gpg_fix:
+  Fix for latest gnupg versions, provided by Martin Ehmsen in bug 27359.
 
   21 Oct 2003; Luke-Jr <luke-jr@gentoo.org> psi-0.9.ebuild,
   files/gen2-branding-0.9.patch:
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index fa9cb179e0d6..1d97ee85d003 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,3 +1,6 @@
-MD5 01eebb3a6177070d75eeaa5bb66f711a ChangeLog 2693
+MD5 aeef5fefa9340dd4c0027b137940d71d ChangeLog 2878
 MD5 4fe6d7f752a608f7661319dd93442c1f psi-0.9.ebuild 1350
+MD5 4de9e209ee7c74cfc568944ab8b69c38 psi-0.9-r1.ebuild 1451
+MD5 c43f1bfd60e72f69346f0a67288c62e8 files/psi_gpg_fix 1193
+MD5 e4acc00d7ae1d10a2788e5db6ba73dbc files/digest-psi-0.9-r1 119
 MD5 e4acc00d7ae1d10a2788e5db6ba73dbc files/digest-psi-0.9 119
diff --git a/net-im/psi/files/digest-psi-0.9-r1 b/net-im/psi/files/digest-psi-0.9-r1
new file mode 100644
index 000000000000..8b13928a5f68
--- /dev/null
+++ b/net-im/psi/files/digest-psi-0.9-r1
@@ -0,0 +1,2 @@
+MD5 bf3aaa7fa8a1efdff9f96fa718366aa8 psi-0.9.tar.bz2 968348
+MD5 2593eb1e979070edcd07e10442f117dc qssl-2.0.tar.bz2 8317
diff --git a/net-im/psi/files/psi_gpg_fix b/net-im/psi/files/psi_gpg_fix
new file mode 100644
index 000000000000..b1420e1c557e
--- /dev/null
+++ b/net-im/psi/files/psi_gpg_fix
@@ -0,0 +1,57 @@
+--- psi-0.9-orig/cutestuff/openpgp/gpgop.cpp	2003-05-26 19:40:28.000000000 +0200
++++ psi-0.9/cutestuff/openpgp/gpgop.cpp	2003-08-28 00:20:59.000000000 +0200
+@@ -543,18 +543,33 @@
+ 		return false;
+ 
+ 	QStringList::ConstIterator it = lines.begin();
++	QString keyring;
++	int ver = 0;
+ 
+-	// first line is keyring file
+-	QString keyring = *(it++);
+-
+-	// skip past the divider
++	// check if gnupg version is 1.2.3 or below
+ 	for(; it != lines.end(); ++it) {
+-		if((*it).at(0) == '-')
+-			break;
++	   if((*it).at(0) == '-') {
++	      ver = 1;
++	      break;
++	   }
++	}
++
++	it = lines.begin();
++
++	// if gnupg version is 1.2.2 and below first line is keyring
++	if(ver) {
++	   // first line is keyring file
++	   keyring = *(it++);
++
++	   // skip past the divider
++	   for(; it != lines.end(); ++it) {
++	      if((*it).at(0) == '-')
++		 break;
++	   }
++	   if(it == lines.end())
++	      return false;
++	   ++it;
+ 	}
+-	if(it == lines.end())
+-		return false;
+-	++it;
+ 
+ 	OpenPGP::Key *k = 0;
+ 	for(; it != lines.end(); ++it) {
+@@ -620,8 +635,9 @@
+ 
+ 	if(_keylist)
+ 		*_keylist = keyList;
+-	if(_keyring)
+-		*_keyring = keyring;
++	if(ver)
++	   if(_keyring)
++	      *_keyring = keyring;
+ 
+ 	return true;
+ }
diff --git a/net-im/psi/psi-0.9-r1.ebuild b/net-im/psi/psi-0.9-r1.ebuild
new file mode 100644
index 000000000000..69bc27a25e63
--- /dev/null
+++ b/net-im/psi/psi-0.9-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9-r1.ebuild,v 1.1 2003/10/24 16:50:42 hanno Exp $
+inherit kde-functions
+
+IUSE="ssl crypt"
+
+S=${WORKDIR}/${P}
+QV="2.0"
+SRC_URI="mirror://sourceforge/psi/${P}.tar.bz2
+	mirror://sourceforge/psi/qssl-${QV}.tar.bz2"
+DESCRIPTION="QT 3.x Jabber Client, with Licq-like interface"
+HOMEPAGE="http://psi.affinix.com"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+need-qt 3
+
+newdepend "ssl? ( >=dev-libs/openssl-0.9.6c )
+	crypt? ( >=app-crypt/gnupg-1.2.2 )"
+
+src_unpack() {
+
+	unpack ${P}.tar.bz2
+	unpack qssl-${QV}.tar.bz2
+	cd ${S}
+	epatch ${FILESDIR}/psi_gpg_fix
+	cd ${S}/src
+	epatch ${FILESDIR}/gen2-branding-0.9.patch
+}
+
+src_compile() {
+	./configure --prefix=/usr || die
+	make || die
+	mv src/psi psi
+
+	if [ "`use ssl`" ]; then
+		cd ${WORKDIR}/qssl-${QV}
+		qmake qssl.pro
+		make
+	fi
+}
+
+src_install() {
+
+	export PREFIX=${D}/usr
+	export BINDIR=$PREFIX/bin
+	export LIBDIR=$PREFIX/share/psi
+
+	dodir /usr/share/psi
+	echo [Installing Psi]
+
+	mkdir -p $BINDIR
+	mkdir -p $LIBDIR
+
+	echo Copying program to $BINDIR
+	cp ./psi $BINDIR
+
+	echo Copying additional files to $LIBDIR
+	cp -r ./image $LIBDIR
+	cp -r ./iconsets $LIBDIR
+	cp -r ./sound $LIBDIR
+	cp -r ./certs $LIBDIR
+
+	dodoc README COPYING
+
+
+
+	if [ "`use ssl`" ]; then
+		cd ${WORKDIR}/qssl-${QV}
+		cp libqssl.so ${D}/usr/share/psi
+		cd ${S}
+	fi
+
+}