removing older versions (test releases) and adding final 0.9.3 version

6 files changed, 37 insertions, 238 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 8e0e853cf204..ad88780cbd2d 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.49 2005/01/04 20:33:33 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.50 2005/01/09 20:26:13 humpback Exp $
+
+*psi-0.9.3 (09 Jan 2005)
+
+  09 Jan 2005; Gustavo Felisberto <humpback@gentoo.org>; +psi-0.9.3.ebuild:
+  Adding 0.9.3 final version
 
 *psi-0.9.3_rc2 (04 Jan 2005)
 
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 11eee0cba804..0ea9a6133b6c 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,23 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 bea24eed94bc555bcaef1449754067fc ChangeLog 6487
+MD5 9b91ead14acbf0da98d3b33e75c67e79 metadata.xml 306
 MD5 2997845ce6e1b39c6da2f0dc0ee05a08 psi-0.9.1.ebuild 818
-MD5 c83e39834a37bd24c17955810672e0cf psi-0.9.3_rc1-r1.ebuild 7471
-MD5 9b2f72f5179825909f9359120aac3975 psi-0.9.3_rc2.ebuild 7576
 MD5 d66412f41ec5498ec97e04a684bce75f psi-0.9.2-r1.ebuild 1144
-MD5 e474ca6f3e3f9ba869d5d8c289f62001 ChangeLog 6355
-MD5 9b91ead14acbf0da98d3b33e75c67e79 metadata.xml 306
 MD5 7a62550ce4fcae4f3c0eabd2acf58760 psi-0.9.2.ebuild 829
-MD5 dab2c4d26326cec55a905a1a38351d51 files/digest-psi-0.9.2-r1 63
-MD5 920173d41ff06b130059720310855c30 files/digest-psi-0.9.3_rc1-r1 1851
-MD5 d252a44be696d4fdee947391657554f4 files/digest-psi-0.9.3_rc2 1930
+MD5 4c486af294277de99e27d15bf6434a00 psi-0.9.3.ebuild 7925
 MD5 d27222ab1b988a3cb4364e0a66b7ff2a files/digest-psi-0.9.1 62
 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 1924
 MD5 c43f1bfd60e72f69346f0a67288c62e8 files/psi_gpg_fix 1193
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB21BGI1lqEGTUzyQRAp3oAJ4g3kHliZ7l1bVRCdjRtlYQuveAEgCgt06t
-s8JV83TVCfI1mlbnKmXNkho=
-=+jGD
+iD8DBQFB4ZL78zY1VwezZiERAnetAJ9lmyR8EKMfDnyLg3J0emzYZDfVowCgkKbd
+xqOyl+kJBvKgPPOcJ2May9g=
+=0Idd
 -----END PGP SIGNATURE-----
diff --git a/net-im/psi/files/digest-psi-0.9.3_rc2 b/net-im/psi/files/digest-psi-0.9.3
index 2c55e922d7a5..bc1aa41efeac 100644
--- a/net-im/psi/files/digest-psi-0.9.3_rc2
+++ b/net-im/psi/files/digest-psi-0.9.3
@@ -1,4 +1,4 @@
-MD5 da72d85efde0acec40aadf5f6a753615 psi-0.9.3-test2.tar.bz2 1423089
+MD5 d20f3bb530235a246bc2d92308089744 psi-0.9.3.tar.bz2 1423322
 MD5 91c765b93225f8070abcf0f857aca13a psi-0.9.3-gentoo-extras-0.1.tar.bz2 55281
 MD5 4e3f6c24dd28bd45787aa73dca486b0d psi-0.9.3-gentoo-extras-0.2.tar.bz2 14804
 MD5 2264152accdad0a5ea3e9ca62a6bd5ed psi_ar-0.9.3_rc1.tar.bz2 31326
diff --git a/net-im/psi/files/digest-psi-0.9.3_rc1-r1 b/net-im/psi/files/digest-psi-0.9.3_rc1-r1
deleted file mode 100644
index 1ea53e991aae..000000000000
--- a/net-im/psi/files/digest-psi-0.9.3_rc1-r1
+++ /dev/null
@@ -1,27 +0,0 @@
-MD5 a942b749c9fed685d2f64cc7958d783a psi-0.9.3-test1.tar.bz2 1314007
-MD5 91c765b93225f8070abcf0f857aca13a psi-0.9.3-gentoo-extras-0.1.tar.bz2 55281
-MD5 2264152accdad0a5ea3e9ca62a6bd5ed psi_ar-0.9.3_rc1.tar.bz2 31326
-MD5 002dfbdea4c25ac45e8d8b04d7fac2b1 psi_ca-0.9.3_rc1.tar.bz2 15735
-MD5 33ef8b42616a7c1616d62a06714b943e psi_cs-0.9.3_rc1.tar.bz2 15710
-MD5 aaa87e761485ee9efc61aaf4bc86c71a psi_da-0.9.3_rc1.tar.bz2 30110
-MD5 84ba5e4952a1670bee636a5e42b47da4 psi_de-0.9.3_rc1.tar.bz2 37399
-MD5 15446ce6e4e0ea87f92b06cd523ff0c9 psi_ee-0.9.3_rc1.tar.bz2 30213
-MD5 25cd449465483f79b71cd1cb0cb296e0 psi_el-0.9.3_rc1.tar.bz2 36724
-MD5 e2d9a27f82623963b963cef24bb16176 psi_en-0.9.3_rc1.tar.bz2 15693
-MD5 1b5c8b84fbd8d1b85dcef4207e87a405 psi_eo-0.9.3_rc1.tar.bz2 15710
-MD5 26fa492527b9037cee4322660c013ea7 psi_es-0.9.3_rc1.tar.bz2 40701
-MD5 7ba4734b8a28f12fa3505776343ff4f6 psi_fi-0.9.3_rc1.tar.bz2 23694
-MD5 a2a1d416ad74dc6574a39ce08aaa4cd0 psi_fr-0.9.3_rc1.tar.bz2 32141
-MD5 b904dc9d81f8bf69218d0d80f3d87264 psi_jp-0.9.3_rc1.tar.bz2 25079
-MD5 f1dceb0dd6e8203c78fbd11c9bfb284f psi_mk-0.9.3_rc1.tar.bz2 35129
-MD5 066e4f2e269c86b8a62511d630daba55 psi_nl-0.9.3_rc1.tar.bz2 37794
-MD5 f270e6ed02653bcf9c638b273b50a7cb psi_pl-0.9.3_rc1.tar.bz2 36619
-MD5 42065d749ded7c76ad44744bef15a838 psi_pt-0.9.3_rc1.tar.bz2 15735
-MD5 a575e52172db8d978fa9c226ab191307 psi_pt_BR-0.9.3_rc1.tar.bz2 15712
-MD5 13d449a8bd9906c4609625c9a3cd611c psi_ru-0.9.3_rc1.tar.bz2 37849
-MD5 01bf0c623a576e2d9f4ff30942c50a29 psi_se-0.9.3_rc1.tar.bz2 15726
-MD5 167e8546991af7ee88c45ca585e06223 psi_sk-0.9.3_rc1.tar.bz2 35586
-MD5 d2f4e705ceefde040bc6111b56ec63a5 psi_sr-0.9.3_rc1.tar.bz2 15715
-MD5 5690daf361cc713536b3ea2822a5cf0f psi_sw-0.9.3_rc1.tar.bz2 32799
-MD5 61d769cad0dd7ec7cadd51a4c6bb7941 psi_vi-0.9.3_rc1.tar.bz2 31462
-MD5 e2b27bfe9e1e8b3d49e664b67d4cf0aa psi_zh-0.9.3_rc1.tar.bz2 29352
diff --git a/net-im/psi/psi-0.9.3_rc2.ebuild b/net-im/psi/psi-0.9.3.ebuild
index 4111f36b7990..be2185d66511 100644
--- a/net-im/psi/psi-0.9.3_rc2.ebuild
+++ b/net-im/psi/psi-0.9.3.ebuild
@@ -1,11 +1,11 @@
 # 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.3_rc2.ebuild,v 1.1 2005/01/04 20:32:14 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3.ebuild,v 1.1 2005/01/09 20:26:13 humpback Exp $
 
 inherit eutils
 
 VER="0.9.3"
-REV="-test2"
+REV=""
 MY_PV="${VER}${REV}"
 MY_P="${PN}-${MY_PV}"
 LANGVER="${VER}_rc1"
@@ -17,7 +17,7 @@ QV="2.0"
 DESCRIPTION="QT 3.x Jabber Client, with Licq-like interface"
 HOMEPAGE="http://psi.affinix.com"
 # translations from http://tanoshi.net/language.html
-SRC_URI="http://people.ex.ac.uk/kismith/psi/${MY_P}.tar.bz2
+SRC_URI="mirror://sourceforge/psi/${MY_P}.tar.bz2
 		!vanilla?	( http://gentoo-pt.org/~humpback/${PN}-${VER}-gentoo-extras-${EXTRAPATCH_VER}.tar.bz2
 		http://gentoo-pt.org/~humpback/${PN}-${VER}-gentoo-extras-0.2.tar.bz2 )
 		linguas_ar? ( ${HTTPMIRR}/psi_ar-${LANGVER}.tar.bz2 )
@@ -156,9 +156,25 @@ src_unpack() {
 			epatch ${PATCHDIR}/psi-desktop.patch
 			epatch ${PATCHDIR}/psi-richroster-status_default_on.patch
 			epatch ${PATCHDIR}/psi-richroster-status_gui_on_off.patch
-			epatch ${PATCHDIR}/psi-gentoo-version.patch
+			#epatch ${FILESDIR}/psi-gentoo-version.patch
 			epatch ${PATCHDIR}/psi-reverse_trayicon.patch
 		fi
+		einfo ""
+		einfo "Unpacking language files, you must have linguas_* in USE where"
+		einfo "* is the language files you wish. English is always available"
+		einfo ""
+		cd ${WORKDIR}
+		if ! [ -d langs ] ; then
+			mkdir langs
+		fi
+		local i
+		for i in  `ls -c1 | grep "\.ts$"` ; do
+			mv $i langs
+		done
+		for i in  `ls -c1 | grep "\.qm$"` ; do
+			mv $i langs
+		done
+
 }
 
 
@@ -176,7 +192,7 @@ src_compile() {
 	emake || die "Make failed"
 	einfo "Building language packs"
 	cd ${WORKDIR}/langs
-	for i in `ls -c1 | grep "\.ts$"`; do
+	for i in `ls -c1 | grep "\.ts$"` ; do
 		lrelease $i
 	done;
 
diff --git a/net-im/psi/psi-0.9.3_rc1-r1.ebuild b/net-im/psi/psi-0.9.3_rc1-r1.ebuild
deleted file mode 100644
index f24dd4da91eb..000000000000
--- a/net-im/psi/psi-0.9.3_rc1-r1.ebuild
+++ /dev/null
@@ -1,193 +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.3_rc1-r1.ebuild,v 1.3 2005/01/04 20:32:14 humpback Exp $
-
-inherit eutils
-
-VER="0.9.3"
-REV="-test1"
-MY_PV="${VER}${REV}"
-MY_P="${PN}-${MY_PV}"
-LANGVER="${VER}_rc1"
-HTTPMIRR="http://gentoo-pt.org/~humpback/psi"
-EXTRAPATCH_VER=0.1
-IUSE="kde ssl crypt vanilla"
-#RESTRICT="nomirror"
-QV="2.0"
-DESCRIPTION="QT 3.x Jabber Client, with Licq-like interface"
-HOMEPAGE="http://psi.affinix.com"
-# translations from http://tanoshi.net/language.html
-SRC_URI="http://people.ex.ac.uk/kismith/psi/${MY_P}.tar.bz2
-		!vanilla?	( http://gentoo-pt.org/~humpback/${PN}-${VER}-gentoo-extras-${EXTRAPATCH_VER}.tar.bz2 )
-		linguas_ar? ( ${HTTPMIRR}/psi_ar-${LANGVER}.tar.bz2 )
-		linguas_ca? ( ${HTTPMIRR}/psi_ca-${LANGVER}.tar.bz2 )
-		linguas_cs? ( ${HTTPMIRR}/psi_cs-${LANGVER}.tar.bz2 )
-		linguas_da? ( ${HTTPMIRR}/psi_da-${LANGVER}.tar.bz2 )
-		linguas_de? ( ${HTTPMIRR}/psi_de-${LANGVER}.tar.bz2 )
-		linguas_ee? ( ${HTTPMIRR}/psi_ee-${LANGVER}.tar.bz2 )
-		linguas_el? ( ${HTTPMIRR}/psi_el-${LANGVER}.tar.bz2 )
-		linguas_en? ( ${HTTPMIRR}/psi_en-${LANGVER}.tar.bz2 )
-		linguas_eo? ( ${HTTPMIRR}/psi_eo-${LANGVER}.tar.bz2 )
-		linguas_es? ( ${HTTPMIRR}/psi_es-${LANGVER}.tar.bz2 )
-		linguas_fi? ( ${HTTPMIRR}/psi_fi-${LANGVER}.tar.bz2 )
-		linguas_fr? ( ${HTTPMIRR}/psi_fr-${LANGVER}.tar.bz2 )
-		linguas_jp? ( ${HTTPMIRR}/psi_jp-${LANGVER}.tar.bz2 )
-		linguas_mk? ( ${HTTPMIRR}/psi_mk-${LANGVER}.tar.bz2 )
-		linguas_nl? ( ${HTTPMIRR}/psi_nl-${LANGVER}.tar.bz2 )
-		linguas_pl? ( ${HTTPMIRR}/psi_pl-${LANGVER}.tar.bz2 )
-		linguas_pt? ( ${HTTPMIRR}/psi_pt-${LANGVER}.tar.bz2 )
-		linguas_ptBR? ( ${HTTPMIRR}/psi_pt_BR-${LANGVER}.tar.bz2 )
-		linguas_ru? ( ${HTTPMIRR}/psi_ru-${LANGVER}.tar.bz2 )
-		linguas_se? ( ${HTTPMIRR}/psi_se-${LANGVER}.tar.bz2 )
-		linguas_sk? ( ${HTTPMIRR}/psi_sk-${LANGVER}.tar.bz2 )
-		linguas_sr? ( ${HTTPMIRR}/psi_sr-${LANGVER}.tar.bz2 )
-		linguas_sw? ( ${HTTPMIRR}/psi_sw-${LANGVER}.tar.bz2 )
-		linguas_vi? ( ${HTTPMIRR}/psi_vi-${LANGVER}.tar.bz2 )
-		linguas_zh? ( ${HTTPMIRR}/psi_zh-${LANGVER}.tar.bz2 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~hppa ~amd64 ~sparc"
-
-#After final relase we do not need this
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c
-	>=app-crypt/qca-1.0
-	>=app-crypt/qca-tls-1.0 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	>=x11-libs/qt-3"
-
-PATCHBASE="${WORKDIR}"
-PATCHDIR="${PATCHBASE}/${VER}"
-
-src_unpack() {
-		unpack ${A}
-		if !(use vanilla);
-			then
-			ewarn "You are about to build a version of Psi with extra unsuported patches."
-			ewarn "Patched psi versions will not be supported by the Gentoo devs or the psi"
-			ewarn "development team."
-			ewarn "If you do not want that please press Control-C now and add 'vanilla' to "
-			ewarn "your USE flags."
-			sleep 5
-			cd ${S}
-			# from http://www.cs.kuleuven.ac.be/~remko/psi/
-			epatch ${PATCHDIR}/avatars_psi.diff
-			epatch ${PATCHDIR}/jep8-avatars_psi.diff
-			epatch ${PATCHDIR}/jep8-avatars_iris.diff
-			epatch ${PATCHDIR}/rosteritems_psi.diff
-			epatch ${PATCHDIR}/rosteritems_iris.diff
-			epatch ${PATCHDIR}/menubar_psi.diff
-
-			# from http://machekku.uaznia.net/jabber/psi/patches/
-			epatch ${PATCHDIR}/psi-machekku-smart_reply_and_forward.diff
-			epatch ${PATCHDIR}/psi-machekku-quote_emoticons.diff
-			epatch ${PATCHDIR}/psi-machekku-keep_message_in_auto_away_status.diff
-			epatch ${PATCHDIR}/psi-machekku-emoticons_advanced_toggle.diff
-
-			# from ftp://ftp.patryk.one.pl/pub/psi/skazi/patches/
-			epatch ${PATCHDIR}/psi-weather_agent_icons-add.diff
-			epatch ${PATCHDIR}/psi-rich_contactview-0.7-add.diff
-			epatch ${PATCHDIR}/psi-status_indicator++-add.diff
-			epatch ${PATCHDIR}/psi-options_resize-fix.diff
-			epatch ${PATCHDIR}/psi-settoggles-fix.diff
-			epatch ${PATCHDIR}/psi-line_in_options-mod.diff
-			epatch ${PATCHDIR}/psi-empty_group-fix.diff
-			epatch ${PATCHDIR}/psi-gnome_toolwindow-mod.diff
-			epatch ${PATCHDIR}/psi-no_online_status-mod.diff
-			epatch ${PATCHDIR}/psi-status_history-add.diff
-			epatch ${PATCHDIR}/psi-icon_buttons_big_return-mod.diff
-			epatch ${PATCHDIR}/psi-nicechats-mod.diff
-			epatch ${PATCHDIR}/psi-framechecks-mod.diff
-			epatch ${PATCHDIR}/psi-thin_borders-mod.diff
-
-			# indicator icon
-			cp ${PATCHBASE}/psi-indicator.png ${S}/iconsets/roster/default/indicator.png
-			# additional files
-			cp ${PATCHBASE}/psi-richlistview.cpp ${S}/src/richlistview.cpp
-			cp ${PATCHBASE}/psi-richlistview.h ${S}/src/richlistview.h
-			cp ${PATCHBASE}/psi-roster-rich.README ${S}/README.rich-roster
-
-			# from http://machekku.uaznia.net/jabber/psi/patches/
-			epatch ${PATCHDIR}/psi-machekku-emoticons_advanced_toggle-add_richroster.diff
-
-			# from ftp://ftp.patryk.one.pl/pub/psi/selfmade/patches/
-			epatch ${PATCHDIR}/psi-group_openclose_single_click_not_only_arrow-mod.diff
-
-			# from pld-linux.org
-			epatch ${PATCHDIR}/psi-certs.patch
-			epatch ${PATCHDIR}/psi-customos.patch
-			epatch ${PATCHDIR}/psi-icondef.xml_status_indicator.patch
-
-			# from http://mrulik.dyndns.info/psi/
-			epatch ${PATCHDIR}/filetransfer.diff
-			epatch ${PATCHDIR}/FT_port_already_bound.diff
-			epatch ${PATCHDIR}/emergency_button.diff
-			epatch ${PATCHDIR}/offline_statuses_in_roster.diff
-			# emergency icon
-			cp ${PATCHBASE}/psi-emergency.png ${S}/iconsets/system/default/emergency.png
-
-			# from ftp://ftp.patryk.one.pl/pub/psi/patches/
-			epatch ${PATCHDIR}/psi-psz-chatdlg_typed_msgs_history.diff
-			epatch ${PATCHDIR}/psi-psz-global_hotkeys.diff
-
-			# from http://kg.alternatywa.info/psi/patche/
-			epatch ${PATCHDIR}/psi-status-timeout-kfix.diff
-			epatch ${PATCHDIR}/psi-kg-spoof.diff
-			epatch ${PATCHDIR}/psi-kg-individual_status_add.diff.no
-			epatch ${PATCHDIR}/psi-kg-new-transports-icons.diff
-			epatch ${PATCHDIR}/psi-kg-pl-specific-clients-avatars.diff
-			epatch ${PATCHDIR}/psi-kg-says_mod.diff
-			epatch ${PATCHDIR}/psi-psz-srv_lookup_enable-kfix.diff
-			epatch ${PATCHDIR}/psi-subs_reason-recv.diff
-			epatch ${PATCHDIR}/psi-subs_reason-send-kfix.diff
-			epatch ${PATCHDIR}/psi-machekku-contact_icons_at_top-for_psi-psz.diff
-			epatch ${PATCHDIR}/psi-machekku-linkify_fix.diff
-			epatch ${PATCHDIR}/psi-apa-invite_reason2-add.diff
-			epatch ${PATCHDIR}/psi-kg-hide-disabled-emottoolbutton.diff
-
-			# from http://michalj.alternatywa.info/psi/patches/
-			epatch ${PATCHDIR}/psi-emots-mod.diff
-
-			# few more goodies :)
-			epatch ${PATCHDIR}/psi-desktop.patch
-			epatch ${PATCHDIR}/psi-richroster-status_default_on.patch
-			epatch ${PATCHDIR}/psi-richroster-status_gui_on_off.patch
-			epatch ${PATCHDIR}/psi-gentoo-version.patch
-			epatch ${PATCHDIR}/psi-reverse_trayicon.patch
-		fi
-}
-
-
-src_compile() {
-	use kde || myconf="${myconf} --disable-kde"
-	./configure --prefix=/usr $myconf || die "Configure failed"
-	# for CXXFLAGS from make.conf
-	qmake psi.pro \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE_RPATH= \
-		|| die "Qmake failed"
-
-	addwrite "$HOME/.qt"
-	addwrite "$QTDIR/etc/settings"
-	emake || die "Make failed"
-	einfo "Building language packs"
-	cd ${WORKDIR}/langs
-	for i in `ls -c1 | grep "\.ts$"`; do
-		lrelease $i
-	done;
-
-}
-
-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;
-	#Install language packs
-	cp ${WORKDIR}/langs/psi_*.qm ${D}/usr/share/psi/
-	newdoc certs/README README.certs
-}