Add new psi-0.11 ebuild, using a svn snapshot.

(Portage version: 2.1.2_pre3-r5)

6 files changed, 151 insertions, 7 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 3c8ddd8af007..1efa9ef55442 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/psi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.98 2006/09/28 22:19:00 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.99 2006/10/21 00:10:13 genstef Exp $
+
+*psi-0.11_pre20061020 (21 Oct 2006)
+
+  21 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/psi-jingle-gcc4.patch, +psi-0.11_pre20061020.ebuild:
+  Add new psi-0.11 ebuild, using a svn snapshot.
 
 *psi-0.10-r1 (29 Sep 2006)
 
diff --git a/net-im/psi/files/digest-psi-0.10 b/net-im/psi/files/digest-psi-0.10
index ee91add373e4..5b569b1fd973 100644
--- a/net-im/psi/files/digest-psi-0.10
+++ b/net-im/psi/files/digest-psi-0.10
@@ -1,9 +1,9 @@
 MD5 4aacc2de659a5a551e9b47382af83c35 gentoo-psi-0.10.tar.bz2 211538
 RMD160 35b7c7c45420ee18917f3b073e063ef3b046ef3a gentoo-psi-0.10.tar.bz2 211538
 SHA256 1d499ecb693401a69600d48c62bc3cbd3f4eed7605729655959d13af981d72bd gentoo-psi-0.10.tar.bz2 211538
-MD5 f0fd4ccf077f7b24e236f71c22649b7b psi-0.10.tar.bz2 1430929
-RMD160 b8be1490cd02f61cf86f09f2dc9f29716ea4c186 psi-0.10.tar.bz2 1430929
-SHA256 e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1 psi-0.10.tar.bz2 1430929
+MD5 d600f2821d1ac19f99254563d437d4c8 psi-0.10.tar.bz2 2880
+RMD160 e3e140c2dd819d762c84f4a8d1e55b0bdc7fd5cf psi-0.10.tar.bz2 2880
+SHA256 1891c16939cf7a2925651aa87c6eac68dc44484112d1911177a0fcbd1c8842bc psi-0.10.tar.bz2 2880
 MD5 2885ffd0943e95edc0b8521309b01d32 psi_ar-0.9.3.tar.bz2 31466
 RMD160 c592e630fda60f097dc8df0079b0fb72380fd996 psi_ar-0.9.3.tar.bz2 31466
 SHA256 5108803f55a6c71b15b90d76ca20040970349ee89edc2613d96379d6c61f04a9 psi_ar-0.9.3.tar.bz2 31466
diff --git a/net-im/psi/files/digest-psi-0.10-r1 b/net-im/psi/files/digest-psi-0.10-r1
index a25cba4b1c1d..9dc6f43e5fa5 100644
--- a/net-im/psi/files/digest-psi-0.10-r1
+++ b/net-im/psi/files/digest-psi-0.10-r1
@@ -1,9 +1,9 @@
 MD5 4aacc2de659a5a551e9b47382af83c35 gentoo-psi-0.10.tar.bz2 211538
 RMD160 35b7c7c45420ee18917f3b073e063ef3b046ef3a gentoo-psi-0.10.tar.bz2 211538
 SHA256 1d499ecb693401a69600d48c62bc3cbd3f4eed7605729655959d13af981d72bd gentoo-psi-0.10.tar.bz2 211538
-MD5 f0fd4ccf077f7b24e236f71c22649b7b psi-0.10.tar.bz2 1430929
-RMD160 b8be1490cd02f61cf86f09f2dc9f29716ea4c186 psi-0.10.tar.bz2 1430929
-SHA256 e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1 psi-0.10.tar.bz2 1430929
+MD5 d600f2821d1ac19f99254563d437d4c8 psi-0.10.tar.bz2 2880
+RMD160 e3e140c2dd819d762c84f4a8d1e55b0bdc7fd5cf psi-0.10.tar.bz2 2880
+SHA256 1891c16939cf7a2925651aa87c6eac68dc44484112d1911177a0fcbd1c8842bc psi-0.10.tar.bz2 2880
 MD5 2885ffd0943e95edc0b8521309b01d32 psi_ar-0.9.3.tar.bz2 31466
 RMD160 c592e630fda60f097dc8df0079b0fb72380fd996 psi_ar-0.9.3.tar.bz2 31466
 SHA256 5108803f55a6c71b15b90d76ca20040970349ee89edc2613d96379d6c61f04a9 psi_ar-0.9.3.tar.bz2 31466
diff --git a/net-im/psi/files/digest-psi-0.11_pre20061020 b/net-im/psi/files/digest-psi-0.11_pre20061020
new file mode 100644
index 000000000000..0c060051a0da
--- /dev/null
+++ b/net-im/psi/files/digest-psi-0.11_pre20061020
@@ -0,0 +1,3 @@
+MD5 73ca47a8703776ff1f45d6084022a88f psi-dev-snapshot-2006-10-20.tar.bz2 2309206
+RMD160 b753aad95031d6f4f14fb263b963bd7a1065b131 psi-dev-snapshot-2006-10-20.tar.bz2 2309206
+SHA256 e738f52d33a7e59d1a80edfa936b32783edbe23b8032229ccb3e95efa76081dd psi-dev-snapshot-2006-10-20.tar.bz2 2309206
diff --git a/net-im/psi/files/psi-jingle-gcc4.patch b/net-im/psi/files/psi-jingle-gcc4.patch
new file mode 100644
index 000000000000..c2c50e48b64c
--- /dev/null
+++ b/net-im/psi/files/psi-jingle-gcc4.patch
@@ -0,0 +1,56 @@
+Nur in psi-dev-snapshot-2006-10-16.fixed: conf.log.
+Nur in psi-dev-snapshot-2006-10-16.fixed: conf.pri.
+Nur in psi-dev-snapshot-2006-10-16.fixed: Makefile.
+Nur in psi-dev-snapshot-2006-10-16.fixed: psi.
+Nur in psi-dev-snapshot-2006-10-16.fixed/src: config.h.
+Nur in psi-dev-snapshot-2006-10-16.fixed/src: Makefile.
+Nur in psi-dev-snapshot-2006-10-16.fixed/src: .moc.
+Nur in psi-dev-snapshot-2006-10-16.fixed/src: .obj.
+Nur in psi-dev-snapshot-2006-10-16.fixed/src: psi.
+Nur in psi-dev-snapshot-2006-10-16.fixed/src: .rcc.
+Nur in psi-dev-snapshot-2006-10-16.fixed/src: .ui.
+Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle: liblibjingle.a.
+Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle: Makefile.
+Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle: .obj.
+diff -aurp psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/base64.h psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/base64.h
+--- psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/base64.h	2006-10-16 06:30:14.000000000 +0200
++++ psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/base64.h	2006-10-16 20:44:28.000000000 +0200
+@@ -22,8 +22,8 @@ public:
+   static string decode(const string & data);
+   static string encodeFromArray(const char * data, size_t len);
+ private:
+-  static const string Base64::Base64Table;
+-  static const string::size_type Base64::DecodeTable[];
++  static const string Base64Table;
++  static const string::size_type DecodeTable[];
+ };
+ 
+ #endif
+diff -aurp psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/stringutils.h psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/stringutils.h
+--- psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/base/stringutils.h	2006-10-16 06:30:14.000000000 +0200
++++ psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/base/stringutils.h	2006-10-16 20:45:25.000000000 +0200
+@@ -255,7 +255,7 @@ size_t asccpyn(wchar_t* buffer, size_t b
+ template<>
+ struct Traits<char> {
+   typedef std::string string;
+-  inline static const char* Traits<char>::empty_str() { return ""; }
++  inline static const char* empty_str() { return ""; }
+ };
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+diff -aurp psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/xmpp/xmppclient.h psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/xmpp/xmppclient.h
+--- psi-dev-snapshot-2006-10-16/third-party/libjingle/talk/xmpp/xmppclient.h	2006-10-16 06:30:14.000000000 +0200
++++ psi-dev-snapshot-2006-10-16.fixed/third-party/libjingle/talk/xmpp/xmppclient.h	2006-10-16 21:12:38.000000000 +0200
+@@ -133,7 +133,7 @@ private:
+     }
+   }
+ 
+-  std::string XmppClient::GetStateName(int state) const {
++  std::string GetStateName(int state) const {
+     switch (state) {
+       case STATE_PRE_XMPP_LOGIN:      return "PRE_XMPP_LOGIN";
+       case STATE_START_XMPP_LOGIN:  return "START_XMPP_LOGIN";
+Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: libqca.a.
+Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: Makefile.
+Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: .moc.
+Nur in psi-dev-snapshot-2006-10-16.fixed/third-party/qca: .obj.
diff --git a/net-im/psi/psi-0.11_pre20061020.ebuild b/net-im/psi/psi-0.11_pre20061020.ebuild
new file mode 100644
index 000000000000..44553c82dbd0
--- /dev/null
+++ b/net-im/psi/psi-0.11_pre20061020.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.11_pre20061020.ebuild,v 1.1 2006/10/21 00:10:13 genstef Exp $
+
+inherit eutils qt4
+
+MY_PV="${PV:8:4}-${PV:12:2}-${PV:14:2}"
+MY_P="${PN}-dev-snapshot-${MY_PV}"
+
+HTTPMIRR="http://vivid.dat.pl/psi"
+IUSE="sasl spell ssl xscreensaver"
+
+DESCRIPTION="QT 4.x Jabber Client, with Licq-like interface"
+HOMEPAGE="http:/psi-im.org/"
+# translations from http://tanoshi.net/language.html
+# polish translation contains special texts for patches from extras-version
+SRC_URI="http://psi-im.org/files/snapshot/${MY_P}.tar.bz2"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="$(qt4_min_version 4.2)
+	spell? ( app-text/aspell )
+	sasl? ( dev-libs/cyrus-sasl )
+	dev-libs/expat
+	dev-libs/glib
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	~net-libs/ortp-0.7.1
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	ssl? ( dev-libs/openssl )
+	media-libs/libpng
+	sys-libs/zlib
+	xscreensaver? ( x11-misc/xscreensaver )"
+
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	epatch ${FILESDIR}/psi-jingle-gcc4.patch
+	# growl is mac osx extension only - maybe someday we will want this
+	local myconf="--disable-growl"
+
+	use xscreensaver || myconf="${myconf} --disable-xss"
+	use sasl || myconf="${myconf} --disable-cyrussasl"
+	use spell || myconf="${myconf} --disable-aspell"
+	use ssl || myconf="${myconf} --disable-openssl"
+
+	chmod a+x configure-jingle
+	QTDIR=/usr/lib ./configure-jingle \
+		--prefix=/usr \
+		--enable-jingle \
+		--enable-plugins \
+		${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+
+	#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 ChangeLog README TODO
+}