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

Package-Manager: portage-2.1.2_pre3-r5

7 files changed, 174 insertions, 28 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/Manifest b/net-im/psi/Manifest
index 19432c6967e8..9ea6bbc86e9a 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX psi-desktop2.patch 508 RMD160 50037b740407ec36e5d01386f145f5f055e4eae0 SHA1 71ddba6d8cafa8b7de218620dd7373758cc064d9 SHA256 b4045dafc0bc00b0167449693fc3e9b2f53041a070a93954f8939ee0866efa8e
 MD5 73fdd72109e3a7469c80d96ed5f5d410 files/psi-desktop2.patch 508
 RMD160 50037b740407ec36e5d01386f145f5f055e4eae0 files/psi-desktop2.patch 508
@@ -9,6 +6,10 @@ AUX psi-indicator.png 300 RMD160 507ab090f82276492bbf6af23eab78e2f8c8ccf2 SHA1 2
 MD5 0d5cafd17325fc912c4855252d73378f files/psi-indicator.png 300
 RMD160 507ab090f82276492bbf6af23eab78e2f8c8ccf2 files/psi-indicator.png 300
 SHA256 a0e9adcd0409d23c9033170ceb8f22980ba6d5e14f19234630f9986bfb94bce2 files/psi-indicator.png 300
+AUX psi-jingle-gcc4.patch 3220 RMD160 6c7b6f7874d7ddea19847a94608bee790314be7d SHA1 654e0ce48b3dabbb5be264f479c852227087242b SHA256 b8fc648ec149acba256a4ca406095a6c134a8b1862430375f39d56aa739f2b74
+MD5 a0ce27e0edfbf558e4e3f97a6d012147 files/psi-jingle-gcc4.patch 3220
+RMD160 6c7b6f7874d7ddea19847a94608bee790314be7d files/psi-jingle-gcc4.patch 3220
+SHA256 b8fc648ec149acba256a4ca406095a6c134a8b1862430375f39d56aa739f2b74 files/psi-jingle-gcc4.patch 3220
 AUX psi-pathfix2.patch 364 RMD160 029db596437aba9d85a8cbde30d8f1247f6cf050 SHA1 43165fa61e08b6a60249efed830c58b1693b879f SHA256 2f9e94219e858f8ea9a8771adac90430dc6199d6f8de2cc6778288583580d0d8
 MD5 0dacabdec9ce29cc56faadeeff01ec3b files/psi-pathfix2.patch 364
 RMD160 029db596437aba9d85a8cbde30d8f1247f6cf050 files/psi-pathfix2.patch 364
@@ -22,7 +23,8 @@ MD5 a96f53fe37411dbd916cbb45df230ba5 files/psi-taskbar_flashing.patch 2196
 RMD160 3b8b9f9acfc779986a3c1c361e6bd6a708dc4259 files/psi-taskbar_flashing.patch 2196
 SHA256 b406da0b26dbc3f15aeff196b4a349d9441c7531d930a7e949cd53cec15649d5 files/psi-taskbar_flashing.patch 2196
 DIST gentoo-psi-0.10.tar.bz2 211538 RMD160 35b7c7c45420ee18917f3b073e063ef3b046ef3a SHA1 96723e8172c581c5e21f5e245658382ded49e6f1 SHA256 1d499ecb693401a69600d48c62bc3cbd3f4eed7605729655959d13af981d72bd
-DIST psi-0.10.tar.bz2 1430929 RMD160 b8be1490cd02f61cf86f09f2dc9f29716ea4c186 SHA1 f1687f8b93338f47cb1c8fa363e4b4f58628f167 SHA256 e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1
+DIST psi-0.10.tar.bz2 2880 RMD160 e3e140c2dd819d762c84f4a8d1e55b0bdc7fd5cf SHA1 01035ba9dbd5387f256d946316b0f3d05d8864a2 SHA256 1891c16939cf7a2925651aa87c6eac68dc44484112d1911177a0fcbd1c8842bc
+DIST psi-dev-snapshot-2006-10-20.tar.bz2 2309206 RMD160 b753aad95031d6f4f14fb263b963bd7a1065b131 SHA1 76409f1c4c4b25af1e1430a68347950cfd9299d7 SHA256 e738f52d33a7e59d1a80edfa936b32783edbe23b8032229ccb3e95efa76081dd
 DIST psi_ar-0.9.3.tar.bz2 31466 RMD160 c592e630fda60f097dc8df0079b0fb72380fd996 SHA1 8aedb3f8cfdda29ccf5a59c9b0f84462fcd3b649 SHA256 5108803f55a6c71b15b90d76ca20040970349ee89edc2613d96379d6c61f04a9
 DIST psi_bg-0.10-a.tar.bz2 33464 RMD160 7d01bdf8776a86a23443309755ae51648387f289 SHA1 74d5b455706fb6079773e17e47143043af30eb74 SHA256 b1b090af4286aabb9343373add9c33799452bd36435f4c5f97b2960d723a04cf
 DIST psi_bg-0.10-b.tar.bz2 34424 RMD160 59f5b2f211a94d1b6bcafafc1743358cdc4b777d SHA1 3c1ef9e0d689ca6598342d1309433f7ba5f838d5 SHA256 9aa835049a69e461cdc7d0d4ca2d6e8c280f0df9c1da42f563fa27abb42f7f18
@@ -72,24 +74,24 @@ EBUILD psi-0.10.ebuild 11012 RMD160 671e03b9c2f0062ab95e1418a4c508a3e7708ced SHA
 MD5 547247397d4497084b1074c103faaa46 psi-0.10.ebuild 11012
 RMD160 671e03b9c2f0062ab95e1418a4c508a3e7708ced psi-0.10.ebuild 11012
 SHA256 bea5ef25e4541162e73995fb0c046dbac2774e9c63770c86554de5b0ed4ea3fd psi-0.10.ebuild 11012
-MISC ChangeLog 13082 RMD160 15663d499aa10e21085d309dbac5a7590976ebd2 SHA1 a1ad77228493623752bbd7c8659ac754e5ab07e0 SHA256 c351542c7261aaeef88b958099ed7a162037e87233fc20dc1fb05835eacded1b
-MD5 a872374f98bd5731f6f041a19b9a0b04 ChangeLog 13082
-RMD160 15663d499aa10e21085d309dbac5a7590976ebd2 ChangeLog 13082
-SHA256 c351542c7261aaeef88b958099ed7a162037e87233fc20dc1fb05835eacded1b ChangeLog 13082
+EBUILD psi-0.11_pre20061020.ebuild 2147 RMD160 3884a5b59e8f104c98ff7d3735ab7a97b27db9c9 SHA1 5ff03f3e54310f0fcf6a84dd90d48298cf9a8a2f SHA256 bb556dbfdabf95014340781db28d7a3ca53031f6295414a282b1ba36909a3dde
+MD5 83cff58c7943b1eca411c2d18cded0dc psi-0.11_pre20061020.ebuild 2147
+RMD160 3884a5b59e8f104c98ff7d3735ab7a97b27db9c9 psi-0.11_pre20061020.ebuild 2147
+SHA256 bb556dbfdabf95014340781db28d7a3ca53031f6295414a282b1ba36909a3dde psi-0.11_pre20061020.ebuild 2147
+MISC ChangeLog 13286 RMD160 d7232e381b8d50d23c77dfea2afe59a2fcf3483f SHA1 c18b265816587c6de2a25285d55f455fbdc859c0 SHA256 d6eecf601a3ec8482b5f32bcbe931b062d9285855a734c945d518072f02057a2
+MD5 09bb7a57a3f5fd1a756b8a4a0710e425 ChangeLog 13286
+RMD160 d7232e381b8d50d23c77dfea2afe59a2fcf3483f ChangeLog 13286
+SHA256 d6eecf601a3ec8482b5f32bcbe931b062d9285855a734c945d518072f02057a2 ChangeLog 13286
 MISC metadata.xml 303 RMD160 deecd227e21d24af6eae6f787e0efd65765741e6 SHA1 a379c487e73d24f68f1036f913c745775a6e9846 SHA256 ea6a7b120f076cc2fa66725d5361639a74895eeb3adc404a887da3be921dfb92
 MD5 5436d288bb839d51d856765357e80098 metadata.xml 303
 RMD160 deecd227e21d24af6eae6f787e0efd65765741e6 metadata.xml 303
 SHA256 ea6a7b120f076cc2fa66725d5361639a74895eeb3adc404a887da3be921dfb92 metadata.xml 303
-MD5 1485e90cedf387a4cdf0510c23dcf0af files/digest-psi-0.10 7245
-RMD160 787c8e171822d8c8cb1adcbc0483b28e3533e1a7 files/digest-psi-0.10 7245
-SHA256 83e7a43300883f75bb7c3d264d1729fe9c04f754a7b04583730b0a2b3f5d95db files/digest-psi-0.10 7245
-MD5 97ac99b9072ef653238d8cee764c5bec files/digest-psi-0.10-r1 7239
-RMD160 8c2cca20279406280f655d61977ecc38b09b6d9b files/digest-psi-0.10-r1 7239
-SHA256 0a9166b260368cbbd4f938ec33415251d77f6b78fc29b85b3036767f0344e077 files/digest-psi-0.10-r1 7239
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFFHGYzexDpKttj3ykRAuHgAJ4jQfiUzcFlmBBFeuQBAA80a46nTwCeJtir
-EfNsMihhxZhRkjDrpwq22eg=
-=Rd2M
------END PGP SIGNATURE-----
+MD5 33bc8ade325b83c9617b7a720d68e01d files/digest-psi-0.10 7236
+RMD160 f90ab54e5feaf2e3757424bf15807c75fd7df6b4 files/digest-psi-0.10 7236
+SHA256 eee83e3437c71072619dc223115fa6295eaa9e252cc724e29ee82f37f4cd8457 files/digest-psi-0.10 7236
+MD5 6f1a88d32efb2ff2966204ea91613b21 files/digest-psi-0.10-r1 7230
+RMD160 39e7a2b21f23365757ebd6fdb72991cd98be0222 files/digest-psi-0.10-r1 7230
+SHA256 4f5cba1f46b192aadc26011711d6a81faf612e27f3dba5a56892bbc463d991da files/digest-psi-0.10-r1 7230
+MD5 49516d300367642d695cf1adf251fc69 files/digest-psi-0.11_pre20061020 289
+RMD160 463d5484052357a2eb161abb612d0a55743d87f4 files/digest-psi-0.11_pre20061020 289
+SHA256 4b7dfc96525e882206189535074551525c1493e038dd8de94deac4bf5f86aa13 files/digest-psi-0.11_pre20061020 289
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
+}