house cleaning

Package-Manager: portage-2.0.51.22-r1

7 files changed, 10 insertions, 141 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index b58c16448254..1d10b614a977 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/psi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.66 2005/06/26 15:02:24 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.67 2005/06/26 15:12:31 humpback Exp $
+
+  26 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>; -files/psi_gpg_fix,
+  -psi-0.9.2.ebuild, -psi-0.9.2-r1.ebuild:
+  All KEYWORDS that were present in 0.9.2 are in some 0.9.3 package so time to
+  do some house cleaning.
 
 *psi-0.9.3-r4 (26 Jun 2005)
 
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 83df9f803f65..633d89599da2 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,16 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9990168ac7d4759e8404e6d43fa5f2f8 ChangeLog 8269
+MD5 35b7276920fb343dc86d609db2b6a12a ChangeLog 8495
 MD5 9b91ead14acbf0da98d3b33e75c67e79 metadata.xml 306
-MD5 27eca0b6299f5b4772be31cdef6cd3d3 psi-0.9.2-r1.ebuild 1141
-MD5 7a62550ce4fcae4f3c0eabd2acf58760 psi-0.9.2.ebuild 829
 MD5 c411b408430456074b6fda7ae9160ede psi-0.9.3-r1.ebuild 8115
 MD5 2c3cf9e33f87d196370c7f8e30c9d096 psi-0.9.3-r2.ebuild 9403
 MD5 851dc4656b475e721d464892241f681c psi-0.9.3-r3.ebuild 9803
 MD5 dd5012d93cf1acb49068f381c6bf8539 psi-0.9.3-r4.ebuild 9003
-MD5 dab2c4d26326cec55a905a1a38351d51 files/digest-psi-0.9.2 63
-MD5 dab2c4d26326cec55a905a1a38351d51 files/digest-psi-0.9.2-r1 63
 MD5 fc8fae7a49b592b4f2c2914c21494c11 files/digest-psi-0.9.3-r1 1924
 MD5 db2a4c5b68dbb0147392a4657f2dbc92 files/digest-psi-0.9.3-r2 2132
 MD5 839e6fa5502e1f03a660918bc30e48b5 files/digest-psi-0.9.3-r3 2211
@@ -21,11 +17,10 @@ MD5 5fa629c5177a7b1c5090428e22b7ec30 files/psi-emergency.png 295
 MD5 0d5cafd17325fc912c4855252d73378f files/psi-indicator.png 300
 MD5 76f5cc28b75698adddaa068e5f4593f5 files/psi-pathfix.patch 462
 MD5 893421922de588e6a40fbe8357976279 files/psi-reverse_trayicon.patch 937
-MD5 c43f1bfd60e72f69346f0a67288c62e8 files/psi_gpg_fix 1193
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCvsJU8zY1VwezZiERAoDhAJsETjARu8RNCtiXmkqygTIW2SRpHQCfS1r3
-sGu1Klt9rzA/E+Cwo3WQtXM=
-=hp9J
+iD8DBQFCvsSv8zY1VwezZiERAtegAJ9VpkIlkq/trAtBGP3tGMZO5YxYcQCgmagu
+Kg427lsIl4InQyvhrHjHyn4=
+=cL24
 -----END PGP SIGNATURE-----
diff --git a/net-im/psi/files/digest-psi-0.9.2 b/net-im/psi/files/digest-psi-0.9.2
deleted file mode 100644
index 675424f904aa..000000000000
--- a/net-im/psi/files/digest-psi-0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e29f90aea7d839f2a70e4a6e77e95a70 psi-0.9.2.tar.bz2 1154392
diff --git a/net-im/psi/files/digest-psi-0.9.2-r1 b/net-im/psi/files/digest-psi-0.9.2-r1
deleted file mode 100644
index 675424f904aa..000000000000
--- a/net-im/psi/files/digest-psi-0.9.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e29f90aea7d839f2a70e4a6e77e95a70 psi-0.9.2.tar.bz2 1154392
diff --git a/net-im/psi/files/psi_gpg_fix b/net-im/psi/files/psi_gpg_fix
deleted file mode 100644
index b1420e1c557e..000000000000
--- a/net-im/psi/files/psi_gpg_fix
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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.2-r1.ebuild b/net-im/psi/psi-0.9.2-r1.ebuild
deleted file mode 100644
index 4c113f32158c..000000000000
--- a/net-im/psi/psi-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.2-r1.ebuild,v 1.5 2005/01/11 12:11:20 gmsoft Exp $
-
-IUSE="kde ssl crypt"
-RESTRICT="nomirror"
-QV="2.0"
-SRC_URI="mirror://sourceforge/psi/${P}.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 hppa ~amd64 ~sparc"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c >=app-crypt/qca-tls-1.0 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	>=x11-libs/qt-3"
-
-src_compile() {
-	use kde || myconf="${myconf} --disable-kde"
-	./configure --prefix=/usr $myconf || die
-	# for CXXFLAGS from make.conf
-	qmake psi.pro \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE_RPATH=
-
-	addwrite "$HOME/.qt"
-	addwrite "$QTDIR/etc/settings"
-	emake || die
-}
-
-src_install() {
-	dodoc README TODO
-	make INSTALL_ROOT="${D}" install
-	#this away the docs will also be installed in the standard gentoo dir
-	for i in roster system emoticons; do
-		newdoc ${S}/iconsets/${i}/README README.${i}
-	done;
-	newdoc certs/README README.certs
-}
diff --git a/net-im/psi/psi-0.9.2.ebuild b/net-im/psi/psi-0.9.2.ebuild
deleted file mode 100644
index 64f90b250a03..000000000000
--- a/net-im/psi/psi-0.9.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.2.ebuild,v 1.9 2005/01/04 20:32:14 humpback Exp $
-
-IUSE="kde ssl crypt"
-RESTRICT="nomirror"
-QV="2.0"
-SRC_URI="mirror://sourceforge/psi/${P}.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 hppa amd64"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c >=app-crypt/qca-tls-1.0 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	>=x11-libs/qt-3"
-
-src_compile() {
-	use kde || myconf="${myconf} --disable-kde"
-	./configure --prefix=/usr $myconf || die
-	addwrite "$HOME/.qt"
-	addwrite "$QTDIR/etc/settings"
-	emake || die
-}
-
-src_install() {
-	dodoc README TODO
-	make INSTALL_ROOT="${D}" install
-}