Incorporating a small fix from cvs allowing kde to shutdown

5 files changed, 107 insertions, 3 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 3dbc1dc1b22f..50891f3a60e0 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2003/02/12 08:03:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.12 2003/05/21 14:08:34 pauldv Exp $
+
+*psi-0.8.7-r1 (21 May 2003)
+
+  21 May 2003; Paul de Vrieze <pauldv@gentoo.org> psi-0.8.7-r1.ebuild,
+  files/0.8.7-shutdown.patch:
+  Get a patch from psi cvs (one line) that fixes its shutdown behaviour, so that
+  kde will shut down when psi is running.
 
   01 Feb 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 54c9713a51f3..878298ff2f91 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,6 +1,6 @@
-MD5 25e0e2192e8154a18c41b350fd8f76ff ChangeLog 1871
+MD5 91149ce6f41da17eaf9b5afd3a6eeca6 ChangeLog 2125
 MD5 ff846a08ccf1b11ef79650c3b99da985 psi-0.8.7.ebuild 1436
-MD5 1fac83bde0a66e90795db859361ed827 psi-0.8.7-r1.ebuild 1545
+MD5 fd8f74bce661a15e27e82d46e533a0bb psi-0.8.7-r1.ebuild 1548
 MD5 f53c32fcb3dcafee69c54352e27202f4 files/digest-psi-0.8.7 122
 MD5 83db3cef4d81d6fa30bc81db011776de files/gen2-branding-0.8.7.patch 407
 MD5 896d01f56380f7fb991f3f19f4165542 files/0.8.7-shutdown.patch 375
diff --git a/net-im/psi/files/0.8.7-shutdown.patch b/net-im/psi/files/0.8.7-shutdown.patch
new file mode 100644
index 000000000000..da5834c4b7a5
--- /dev/null
+++ b/net-im/psi/files/0.8.7-shutdown.patch
@@ -0,0 +1,16 @@
+Index: mainwin.cpp
+===================================================================
+RCS file: /home/cvs/psi/src/mainwin.cpp,v
+retrieving revision 1.12
+retrieving revision 1.13
+diff -u -r1.12 -r1.13
+--- mainwin.cpp	3 Apr 2003 06:25:26 -0000	1.12
++++ mainwin.cpp	9 Apr 2003 01:03:30 -0000	1.13
+@@ -559,6 +559,7 @@
+ {
+ 	if(tray) {
+ 		hide();
++		e->accept();
+ 		return;
+ 	}
+ 
diff --git a/net-im/psi/files/digest-psi-0.8.7-r1 b/net-im/psi/files/digest-psi-0.8.7-r1
new file mode 100644
index 000000000000..92d3a50c3f39
--- /dev/null
+++ b/net-im/psi/files/digest-psi-0.8.7-r1
@@ -0,0 +1,2 @@
+MD5 4e18ea341dca70556d0dc1baf026ef86 psi-0.8.7.tar.bz2 465036
+MD5 7dd4e476536fb65d001baad6e440d9d4 qssl-1.0.tar.bz2 13032
diff --git a/net-im/psi/psi-0.8.7-r1.ebuild b/net-im/psi/psi-0.8.7-r1.ebuild
new file mode 100644
index 000000000000..73f33091d585
--- /dev/null
+++ b/net-im/psi/psi-0.8.7-r1.ebuild
@@ -0,0 +1,79 @@
+# 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.8.7-r1.ebuild,v 1.1 2003/05/21 14:08:34 pauldv Exp $
+inherit kde-functions
+
+IUSE="ssl"
+
+S=${WORKDIR}/${P}
+QV="1.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 )"
+
+src_unpack() {
+
+	unpack ${P}.tar.bz2
+	unpack qssl-${QV}.tar.bz2
+	cd ${S}/src
+	patch -p0 < ${FILESDIR}/gen2-branding-0.8.7.patch
+	# A patch from cvs that fixes psi not shutting down with kde
+	patch -p0 < ${FILESDIR}/0.8.7-shutdown.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
+
+}