newer extras

(Portage version: 2.0.51.19)

5 files changed, 304 insertions, 5 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index dcccea9bc8c0..7d7e625a77b3 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.59 2005/04/02 15:03:22 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.60 2005/04/17 19:07:18 humpback Exp $
+
+*psi-0.9.3-r3 (17 Apr 2005)
+
+  17 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  files/psi-desktop.patch, +psi-0.9.3-r3.ebuild:
+  Przemek continues to bring us some very nice extras, and now he even codes
+  his own. Lets hope colored chat's get accepted upstream.
 
   02 Apr 2005; Jason Wever <weeve@gentoo.org> psi-0.9.3-r1.ebuild:
   Stable on SPARC.
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index fecf19b39142..5fb6cd697c60 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,14 +1,16 @@
 MD5 e4701480fb74ac6b7fe2e0c2e24fd330 ChangeLog 7649
 MD5 9b91ead14acbf0da98d3b33e75c67e79 metadata.xml 306
-MD5 7a62550ce4fcae4f3c0eabd2acf58760 psi-0.9.2.ebuild 829
 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 106836f4c68e913373ce7174989d4b58 psi-0.9.3-r2.ebuild 9409
+MD5 5a7add657ed3831bc72f5d5147f4d245 psi-0.9.3-r3.ebuild 9800
 MD5 dab2c4d26326cec55a905a1a38351d51 files/digest-psi-0.9.2 63
 MD5 dab2c4d26326cec55a905a1a38351d51 files/digest-psi-0.9.2-r1 63
-MD5 c43f1bfd60e72f69346f0a67288c62e8 files/psi_gpg_fix 1193
 MD5 fc8fae7a49b592b4f2c2914c21494c11 files/digest-psi-0.9.3-r1 1924
 MD5 db2a4c5b68dbb0147392a4657f2dbc92 files/digest-psi-0.9.3-r2 2132
-MD5 5765c2029b335e7aacda89f4417b1f7b files/psi-desktop.patch 473
+MD5 839e6fa5502e1f03a660918bc30e48b5 files/digest-psi-0.9.3-r3 2211
+MD5 1c741813b6d820d43475058dbfab3100 files/psi-desktop.patch 492
 MD5 4195bf9d000383fae25545249a3f8709 files/psi-desktop_file_and_icons_directories.patch 1454
 MD5 70151bfc9706b2d763cc7ed9c9b03b9f files/psi-pathfix.patch 224
+MD5 c43f1bfd60e72f69346f0a67288c62e8 files/psi_gpg_fix 1193
diff --git a/net-im/psi/files/digest-psi-0.9.3-r3 b/net-im/psi/files/digest-psi-0.9.3-r3
new file mode 100644
index 000000000000..48bf860bf945
--- /dev/null
+++ b/net-im/psi/files/digest-psi-0.9.3-r3
@@ -0,0 +1,33 @@
+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 b87b7ae232b06dea36fc2c826075bc62 psi-0.9.3-gentoo-extras-0.3.tar.bz2 29429
+MD5 f340105940d4e2ce9d5e1682e805572e psi-0.9.3-gentoo-extras-0.4.tar.bz2 60319
+MD5 2885ffd0943e95edc0b8521309b01d32 psi_ar-0.9.3.tar.bz2 31466
+MD5 874f8f0aebcdc1294748546a59ddaefb psi_ca-0.9.3.tar.bz2 15750
+MD5 990dea4e96f093d07c5d5523c9875c6a psi_cs-0.9.3-a.tar.bz2 35212
+MD5 208ed7a4f2c8b0aa870beb806c025b6e psi_da-0.9.3.tar.bz2 30325
+MD5 b3bd808955398db752759d92186704f4 psi_de-0.9.3-c.tar.bz2 33169
+MD5 15446ce6e4e0ea87f92b06cd523ff0c9 psi_ee-0.9.3_rc1.tar.bz2 30213
+MD5 8a659618968a698ba7a5cd76b46be6f2 psi_el-0.9.3-a.tar.bz2 34891
+MD5 620bc429c65c223b886ed90f7f7b7bbb psi_eo-0.9.3-c.tar.bz2 32457
+MD5 e55e63f3230e2373c502ced04299b918 psi_es-0.9.3-a.tar.bz2 32347
+MD5 ef5f0d73b59d65fb1edcb42d698f64a9 psi_et-0.9.3-a.tar.bz2 30124
+MD5 d41e102a476ed319f0bcca4c516b4938 psi_fi-0.9.3.tar.bz2 23718
+MD5 22c3fe13e5c0fdaa33d8ef1fc2a2d560 psi_fr-0.9.3-a.tar.bz2 34898
+MD5 e7aeef2ed3f743a2937599e1f123adc6 psi_it-0.9.3.tar.bz2 15759
+MD5 6be3b0fc9ed02ef7f8cef70852ee1369 psi_jp-0.9.3.tar.bz2 25159
+MD5 9491e2c753cec234a99dd8ab4752bbcd psi_mk-0.9.3-a.tar.bz2 32472
+MD5 1e136c01250d3d52e888cdd5d6fe4c15 psi_nl-0.9.3-b.tar.bz2 33224
+MD5 f270e6ed02653bcf9c638b273b50a7cb psi_pl-0.9.3-1.tar.bz2 36619
+MD5 9246dadd5a8481d060c1336ffabf3ef7 psi_pt-0.9.3.tar.bz2 15746
+MD5 788ef1ad0f1212836865033e35ec917a psi_ptbr-0.9.3.tar.bz2 35934
+MD5 5e20def73cdfdee2b9af6798fa75417b psi_ru-0.9.3-a.tar.bz2 33201
+MD5 01bf0c623a576e2d9f4ff30942c50a29 psi_se-0.9.3_rc1.tar.bz2 15726
+MD5 f3bdd1aafbc7690628cf9df4214b5af3 psi_sk-0.9.3-a.tar.bz2 34654
+MD5 eccc3cb77801eb36208765325e8977cd psi_sl-0.9.3-a.tar.bz2 32850
+MD5 1857fe75dd81c85db90fb195b32c8bd0 psi_sr-0.9.3.tar.bz2 15754
+MD5 2773bbf4585e054e7c0ca472b5723014 psi_sv-0.9.3.tar.bz2 35122
+MD5 df93122447366aef362bafde0ed67618 psi_sw-0.9.3.tar.bz2 32917
+MD5 1dcc37d4fd5c598f269fffc3b04bde6a psi_vi-0.9.3-a.tar.bz2 34188
+MD5 6ef95100b9ff08b86f4404f32694d451 psi_zh-0.9.3-a.tar.bz2 31925
diff --git a/net-im/psi/files/psi-desktop.patch b/net-im/psi/files/psi-desktop.patch
index 571ebaaf77c0..173cf552ee4f 100644
--- a/net-im/psi/files/psi-desktop.patch
+++ b/net-im/psi/files/psi-desktop.patch
@@ -1,6 +1,6 @@
 --- psi.desktop.orig	2004-11-30 03:12:57.000000000 +0000
 +++ psi.desktop	2004-11-30 03:16:28.920204528 +0000
-@@ -1,10 +1,9 @@
+@@ -1,10 +1,10 @@
  [Desktop Entry]
 -Encoding=UTF-8
  Name=Psi
@@ -18,3 +18,4 @@
 +Terminal=false
 +Categories=Qt;Network;InstantMessaging;
 +Encoding=UTF-8
++Type=Application
diff --git a/net-im/psi/psi-0.9.3-r3.ebuild b/net-im/psi/psi-0.9.3-r3.ebuild
new file mode 100644
index 000000000000..6f692f6eda0c
--- /dev/null
+++ b/net-im/psi/psi-0.9.3-r3.ebuild
@@ -0,0 +1,256 @@
+# 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-r3.ebuild,v 1.1 2005/04/17 19:07:18 humpback Exp $
+
+inherit eutils
+
+VER="0.9.3"
+REV=""
+MY_PV="${VER}${REV}"
+MY_P="${PN}-${MY_PV}"
+HTTPMIRR="http://gentoo-pt.org/~humpback/psi"
+IUSE="kde ssl crypt extras"
+#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
+# polish translation contains special texts for patches from extras-version
+SRC_URI="mirror://sourceforge/psi/${MY_P}.tar.bz2
+		extras?	( http://gentoo-pt.org/~humpback/${PN}-${VER}-gentoo-extras-0.1.tar.bz2
+		http://gentoo-pt.org/~humpback/${PN}-${VER}-gentoo-extras-0.2.tar.bz2
+		http://gentoo-pt.org/~humpback/${PN}-${VER}-gentoo-extras-0.3.tar.bz2 
+		http://gentoo-pt.org/~humpback/${PN}-${VER}-gentoo-extras-0.4.tar.bz2 )
+		linguas_ar? ( ${HTTPMIRR}/psi_ar-0.9.3.tar.bz2 )
+		linguas_ca? ( ${HTTPMIRR}/psi_ca-0.9.3.tar.bz2 )
+		linguas_cs? ( ${HTTPMIRR}/psi_cs-0.9.3-a.tar.bz2 )
+		linguas_da? ( ${HTTPMIRR}/psi_da-0.9.3.tar.bz2 )
+		linguas_de? ( ${HTTPMIRR}/psi_de-0.9.3-c.tar.bz2 )
+		linguas_ee? ( ${HTTPMIRR}/psi_ee-0.9.3_rc1.tar.bz2 )
+		linguas_el? ( ${HTTPMIRR}/psi_el-0.9.3-a.tar.bz2 )
+		linguas_eo? ( ${HTTPMIRR}/psi_eo-0.9.3-c.tar.bz2 )
+		linguas_es? ( ${HTTPMIRR}/psi_es-0.9.3-a.tar.bz2 )
+		linguas_et? ( ${HTTPMIRR}/psi_et-0.9.3-a.tar.bz2 )
+		linguas_fi? ( ${HTTPMIRR}/psi_fi-0.9.3.tar.bz2 )
+		linguas_fr? ( ${HTTPMIRR}/psi_fr-0.9.3-a.tar.bz2 )
+		linguas_it? ( ${HTTPMIRR}/psi_it-0.9.3.tar.bz2 )
+		linguas_jp? ( ${HTTPMIRR}/psi_jp-0.9.3.tar.bz2 )
+		linguas_mk? ( ${HTTPMIRR}/psi_mk-0.9.3-a.tar.bz2 )
+		linguas_nl? ( ${HTTPMIRR}/psi_nl-0.9.3-b.tar.bz2 )
+		linguas_pl? ( ${HTTPMIRR}/psi_pl-0.9.3-1.tar.bz2 )
+		linguas_pt? ( ${HTTPMIRR}/psi_pt-0.9.3.tar.bz2 )
+		linguas_ptBR? ( ${HTTPMIRR}/psi_ptbr-0.9.3.tar.bz2 )
+		linguas_ru? ( ${HTTPMIRR}/psi_ru-0.9.3-a.tar.bz2 )
+		linguas_se? ( ${HTTPMIRR}/psi_se-0.9.3_rc1.tar.bz2 )
+		linguas_sk? ( ${HTTPMIRR}/psi_sk-0.9.3-a.tar.bz2 )
+		linguas_sl? ( ${HTTPMIRR}/psi_sl-0.9.3-a.tar.bz2 )
+		linguas_sr? ( ${HTTPMIRR}/psi_sr-0.9.3.tar.bz2 )
+		linguas_sv? ( ${HTTPMIRR}/psi_sv-0.9.3.tar.bz2 )
+		linguas_sw? ( ${HTTPMIRR}/psi_sw-0.9.3.tar.bz2 )
+		linguas_vi? ( ${HTTPMIRR}/psi_vi-0.9.3-a.tar.bz2 )
+		linguas_zh? ( ${HTTPMIRR}/psi_zh-0.9.3-a.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=">=app-crypt/qca-1.0-r2
+	>=x11-libs/qt-3.3.1"
+
+RDEPEND="ssl? ( >=app-crypt/qca-tls-1.0-r2 )
+		crypt? ( >=app-crypt/gnupg-1.2.2 )"
+
+PATCHBASE="${WORKDIR}"
+PATCHDIR="${PATCHBASE}/${VER}"
+
+src_unpack() {
+		unpack ${A}
+
+		cd ${S}
+		epatch ${FILESDIR}/psi-pathfix.patch
+		epatch ${FILESDIR}/psi-desktop.patch
+		epatch ${FILESDIR}/psi-desktop_file_and_icons_directories.patch
+
+		if !(use extras); then
+			ewarn "You are going to install the original psi version. You might want to"
+			ewarn "try the version with extra unsuported patches by adding 'extras' to"
+			ewarn "your use flags."
+		else
+			ebeep
+			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 '-extras' to "
+			ewarn "your USE flags."
+		#	epause 10
+
+			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.8-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
+			epatch ${PATCHDIR}/psi-url_emoticon-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
+			# 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-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
+
+			# from http://www.cs.kuleuven.ac.be/~remko/psi/rc/
+			epatch ${PATCHDIR}/adhoc+rc.diff
+
+			# from http://machekku.uaznia.net/jabber/psi/patches/
+			epatch ${PATCHDIR}/psi-machekku-autocopy_on_select-0.2.diff
+			epatch ${PATCHDIR}/psi-machekku-enable_thread_in_messages.diff
+			epatch ${PATCHDIR}/psi-machekku-contact_icons_at_top-for_psi-psz.diff
+			epatch ${PATCHDIR}/psi-machekku-linkify_fix.diff
+			epatch ${PATCHDIR}/psi-machekku-new_headings_gui_resurrection.diff
+
+			# from http://home.unclassified.de/files/psi/patches/
+			epatch ${PATCHDIR}/statusdlg-enterkey.diff
+			epatch ${PATCHDIR}/hide-no-resource-from-contextmenu.diff
+			epatch ${PATCHDIR}/fix-window-flashing.diff
+			epatch ${PATCHDIR}/fix-min-window-notify.diff
+			epatch ${PATCHDIR}/contact-icon-space.diff
+			epatch ${PATCHDIR}/fix-rich-roster.diff
+			epatch ${PATCHDIR}/custom-sound-popup.diff
+			epatch ${PATCHDIR}/offline-contact-animation.diff
+
+			# from bugs.gentoo.org
+			epatch ${PATCHDIR}/psi-add-status-history.patch
+
+			# from http://www.uni-bonn.de/~nieuwenh/
+			epatch ${PATCHDIR}/libTeXFormula.diff
+
+			# from http://www.cs.kuleuven.ac.be/~remko/psi/
+			epatch ${PATCHDIR}/caps_broadcast.diff
+
+			# few more goodies :)
+			epatch ${PATCHDIR}/psi-richroster-status_default_on.patch
+			epatch ${PATCHDIR}/psi-richroster-status_gui_on_off.patch
+			epatch ${PATCHDIR}/psi-roster_right_align_group_names.patch
+			epatch ${PATCHDIR}/psi-chatdlg_messages_colors_distinguishes.patch
+			epatch ${PATCHDIR}/psi-gentoo-version.patch
+			epatch ${PATCHDIR}/psi-reverse_trayicon.patch
+			epatch ${PATCHDIR}/psi-messages_color_backgrounds_in_chat.patch
+
+			# upstream patches from psi-flyspray
+			epatch ${PATCHDIR}/psi-fix_groupsortingstyle_toggles.patch
+			epatch ${PATCHDIR}/psi-multiple_account_groups.diff
+		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,qm}$"` ; do
+			mv $i langs
+		done
+}
+
+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() {
+	make INSTALL_ROOT="${D}" install
+
+	#this way 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
+	dodoc README TODO README.rich-roster
+
+	#Install language packs
+	cp ${WORKDIR}/langs/psi_*.qm ${D}/usr/share/psi/
+}
+