cleanups

9 files changed, 9 insertions, 191 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index e8671d0c02d0..9880998c0464 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,13 +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.16 2003/06/30 17:01:03 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.17 2003/06/30 17:09:35 scandium Exp $
+
+  30 Jun 2003; Rainer Groesslinger <scandium@gentoo.org> psi-0.9.ebuild:
+  mark stable on x86, removing older versions
 
   30 Jun 2003; Sascha Schwabbauer <cybersystem@gentoo.org> psi-0.9.ebuild:
   marked stable on ppc
 
-  30 Jun 2003; Rainer Groesslinger <scandium@gentoo.org> psi-0.9.ebuild:
-  mark stable on x86
-
 *psi-0.9 (18 Jun 2003)
 
   18 Jun 2003; Rainer Groesslinger <scandium@gentoo.org> psi-0.9.ebuild:
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index b85a20159c17..800b858878ff 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,9 +1,4 @@
-MD5 e0bbb05aa0e57f5a87768f1bfaa02f73 ChangeLog 2520
-MD5 fd8f74bce661a15e27e82d46e533a0bb psi-0.8.7-r1.ebuild 1548
-MD5 ff846a08ccf1b11ef79650c3b99da985 psi-0.8.7.ebuild 1436
-MD5 cba3c55231af9ec17ee7335de8f86488 psi-0.9.ebuild 1480
-MD5 896d01f56380f7fb991f3f19f4165542 files/0.8.7-shutdown.patch 375
-MD5 f53c32fcb3dcafee69c54352e27202f4 files/digest-psi-0.8.7 122
-MD5 f53c32fcb3dcafee69c54352e27202f4 files/digest-psi-0.8.7-r1 122
+MD5 befec3097f16fb908198d95f0f4b52be ChangeLog 2542
+MD5 5f15f6163a8806b8cd5b1ed789e08661 psi-0.9.ebuild 1475
 MD5 e4acc00d7ae1d10a2788e5db6ba73dbc files/digest-psi-0.9 119
-MD5 83db3cef4d81d6fa30bc81db011776de files/gen2-branding-0.8.7.patch 407
+MD5 83db3cef4d81d6fa30bc81db011776de files/gen2-branding-0.9.patch 407
diff --git a/net-im/psi/files/0.8.7-shutdown.patch b/net-im/psi/files/0.8.7-shutdown.patch
deleted file mode 100644
index da5834c4b7a5..000000000000
--- a/net-im/psi/files/0.8.7-shutdown.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 b/net-im/psi/files/digest-psi-0.8.7
deleted file mode 100644
index 92d3a50c3f39..000000000000
--- a/net-im/psi/files/digest-psi-0.8.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4e18ea341dca70556d0dc1baf026ef86 psi-0.8.7.tar.bz2 465036
-MD5 7dd4e476536fb65d001baad6e440d9d4 qssl-1.0.tar.bz2 13032
diff --git a/net-im/psi/files/digest-psi-0.8.7-r1 b/net-im/psi/files/digest-psi-0.8.7-r1
deleted file mode 100644
index 92d3a50c3f39..000000000000
--- a/net-im/psi/files/digest-psi-0.8.7-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4e18ea341dca70556d0dc1baf026ef86 psi-0.8.7.tar.bz2 465036
-MD5 7dd4e476536fb65d001baad6e440d9d4 qssl-1.0.tar.bz2 13032
diff --git a/net-im/psi/files/gen2-branding-0.8.7.patch b/net-im/psi/files/gen2-branding-0.9.patch
index f7a3c640ee91..f7a3c640ee91 100644
--- a/net-im/psi/files/gen2-branding-0.8.7.patch
+++ b/net-im/psi/files/gen2-branding-0.9.patch
diff --git a/net-im/psi/psi-0.8.7-r1.ebuild b/net-im/psi/psi-0.8.7-r1.ebuild
deleted file mode 100644
index 73f33091d585..000000000000
--- a/net-im/psi/psi-0.8.7-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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
-
-}
diff --git a/net-im/psi/psi-0.8.7.ebuild b/net-im/psi/psi-0.8.7.ebuild
deleted file mode 100644
index d3cb9201f793..000000000000
--- a/net-im/psi/psi-0.8.7.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.ebuild,v 1.6 2003/02/13 14:12:35 vapier 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
-
-}
-
-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
-
-}
diff --git a/net-im/psi/psi-0.9.ebuild b/net-im/psi/psi-0.9.ebuild
index 35fb18992ff4..f95f48ae1270 100644
--- a/net-im/psi/psi-0.9.ebuild
+++ b/net-im/psi/psi-0.9.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.3 2003/06/30 17:01:03 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.ebuild,v 1.4 2003/06/30 17:09:35 scandium Exp $
 inherit kde-functions
 
 IUSE="ssl crypt"
@@ -26,7 +26,7 @@ src_unpack() {
 	unpack ${P}.tar.bz2
 	unpack qssl-${QV}.tar.bz2
 	cd ${S}/src
-	patch -p0 < ${FILESDIR}/gen2-branding-0.8.7.patch
+	patch -p0 < ${FILESDIR}/gen2-branding-0.9.patch
 }
 
 src_compile() {