From 1e353bf25f15740ecdac0814b55aff2f6bb9bb97 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sun, 9 Sep 2007 15:38:02 +0200 Subject: [PATCH] Updated net-im/psi snapshot. Removed the older version and patches that have been merged upstream. --- net-im/psi/Manifest | 32 ++++++++-------------- net-im/psi/files/digest-psi-0.11_pre20070830 | 3 -- net-im/psi/files/digest-psi-0.11_pre20070909 | 3 ++ net-im/psi/files/psi-fix-update.patch | 12 -------- net-im/psi/files/psi-qca-2.0_rc2.patch | 12 -------- net-im/psi/files/psi-simplesasl.patch | 17 ------------ ...20070830.ebuild => psi-0.11_pre20070909.ebuild} | 19 ++++--------- 7 files changed, 21 insertions(+), 77 deletions(-) rewrite net-im/psi/Manifest (100%) delete mode 100644 net-im/psi/files/digest-psi-0.11_pre20070830 create mode 100644 net-im/psi/files/digest-psi-0.11_pre20070909 delete mode 100644 net-im/psi/files/psi-fix-update.patch delete mode 100644 net-im/psi/files/psi-qca-2.0_rc2.patch delete mode 100644 net-im/psi/files/psi-simplesasl.patch rename net-im/psi/{psi-0.11_pre20070830.ebuild => psi-0.11_pre20070909.ebuild} (83%) diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest dissimilarity index 100% index 2dcb65f..2c4b6c6 100644 --- a/net-im/psi/Manifest +++ b/net-im/psi/Manifest @@ -1,20 +1,12 @@ -AUX psi-fix-update.patch 639 RMD160 1e463f45ae310c5a04abdf41880d45baf0bfeae4 SHA1 0d3c913d38872eac7134d37651f93a532195837e SHA256 afbc233e9c3cff6b4f59b7dc9bd67c0c74b5c222b19b48d8b2635775f26ccc88 -MD5 23c71c72bd39b114146fc5e9bfbac02e files/psi-fix-update.patch 639 -RMD160 1e463f45ae310c5a04abdf41880d45baf0bfeae4 files/psi-fix-update.patch 639 -SHA256 afbc233e9c3cff6b4f59b7dc9bd67c0c74b5c222b19b48d8b2635775f26ccc88 files/psi-fix-update.patch 639 -AUX psi-qca-2.0_rc2.patch 598 RMD160 d716e456c07973fcb1fa1ed08915989713681aaf SHA1 c3aed183ddb64720c0805eb7cf402a23759556bd SHA256 5168e413c08eac14f3bd9f11b4c30a777fd99f55604276666918f0a58ac37121 -MD5 090ce36f83cf62d118132ae6c1b44313 files/psi-qca-2.0_rc2.patch 598 -RMD160 d716e456c07973fcb1fa1ed08915989713681aaf files/psi-qca-2.0_rc2.patch 598 -SHA256 5168e413c08eac14f3bd9f11b4c30a777fd99f55604276666918f0a58ac37121 files/psi-qca-2.0_rc2.patch 598 -AUX psi-simplesasl.patch 573 RMD160 884f1c36e9e5de591a8116956b62c7faa1a8c4be SHA1 02a2b6673f3b7dcc2bd75d3409ef088d79435851 SHA256 719b18f2372f1e7eecb93f741b6fa4d98382c48be87a893e66baa51601bbefa8 -MD5 bd879b9f92e2baf67ca0b6a45b4efbfa files/psi-simplesasl.patch 573 -RMD160 884f1c36e9e5de591a8116956b62c7faa1a8c4be files/psi-simplesasl.patch 573 -SHA256 719b18f2372f1e7eecb93f741b6fa4d98382c48be87a893e66baa51601bbefa8 files/psi-simplesasl.patch 573 -DIST psi-dev-snapshot-2007-08-30.tar.bz2 2470526 RMD160 9030c1f930ab6e5871e03763e1eab23fbcb1ad35 SHA1 275d059c77e50d3c70cc1c005a53cfbcbf4a617e SHA256 e8ce17fb1a121d2f542f03d86fa3d02f8b434e3d9edff9112911d490220bf60e -EBUILD psi-0.11_pre20070830.ebuild 2221 RMD160 2781eda19bd986f4f46476c9a072e9864b024748 SHA1 cb19aa577e3eb0ebcc5b1718cff3d64cdfff07d7 SHA256 ea724571713669d82663c7e6d8de974cc9392233d2afc5491b9bd727e4d8dfc2 -MD5 d184af827103188c14fa12bfc1974e48 psi-0.11_pre20070830.ebuild 2221 -RMD160 2781eda19bd986f4f46476c9a072e9864b024748 psi-0.11_pre20070830.ebuild 2221 -SHA256 ea724571713669d82663c7e6d8de974cc9392233d2afc5491b9bd727e4d8dfc2 psi-0.11_pre20070830.ebuild 2221 -MD5 ba064680334ff2e41b51c0dfdd6a7c3d files/digest-psi-0.11_pre20070830 289 -RMD160 4e8b08ce8da2515cc3a3c02dba76110730f95fba files/digest-psi-0.11_pre20070830 289 -SHA256 ef48ec970d5fbe7129246af957bc38de5536c3170e9648fb5ae6e7cc66bc96af files/digest-psi-0.11_pre20070830 289 +DIST psi-dev-snapshot-2007-09-09.tar.bz2 2510301 RMD160 3fa63e96bae0193a801b973bd724e5980adc76e2 SHA1 79523741702fd56a1a7ca64f26d840e2024e96a1 SHA256 87579991e14faa0449aeb04271cb3a5b27d6eac0ddfa8569ff84ec31b1ba44a5 +EBUILD psi-0.11_pre20070909.ebuild 2049 RMD160 e8826e2d8df7c1533d0ac2cb856bf1c607a8d1ee SHA1 25fd73ff32b9a7691f123a5227812f19358671df SHA256 d446f199446569a410d97071634bac852d8fb4f7f1b6621a3424fa8d6f7d64a1 +MD5 a1ca376b14296d051005f0c75708bfba psi-0.11_pre20070909.ebuild 2049 +RMD160 e8826e2d8df7c1533d0ac2cb856bf1c607a8d1ee psi-0.11_pre20070909.ebuild 2049 +SHA256 d446f199446569a410d97071634bac852d8fb4f7f1b6621a3424fa8d6f7d64a1 psi-0.11_pre20070909.ebuild 2049 +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 bca3b715f50050696e5f37672a4f3f14 files/digest-psi-0.11_pre20070909 289 +RMD160 528fc203858b961c76eba3fd1114a5bf0d6399a5 files/digest-psi-0.11_pre20070909 289 +SHA256 9744218dad83eb8a5a063ce4d5ebdf8018c3e6e268942563359b857976953567 files/digest-psi-0.11_pre20070909 289 diff --git a/net-im/psi/files/digest-psi-0.11_pre20070830 b/net-im/psi/files/digest-psi-0.11_pre20070830 deleted file mode 100644 index 606533b..0000000 --- a/net-im/psi/files/digest-psi-0.11_pre20070830 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 11970e49ca685a7e6d298d18024db056 psi-dev-snapshot-2007-08-30.tar.bz2 2470526 -RMD160 9030c1f930ab6e5871e03763e1eab23fbcb1ad35 psi-dev-snapshot-2007-08-30.tar.bz2 2470526 -SHA256 e8ce17fb1a121d2f542f03d86fa3d02f8b434e3d9edff9112911d490220bf60e psi-dev-snapshot-2007-08-30.tar.bz2 2470526 diff --git a/net-im/psi/files/digest-psi-0.11_pre20070909 b/net-im/psi/files/digest-psi-0.11_pre20070909 new file mode 100644 index 0000000..e97f6f8 --- /dev/null +++ b/net-im/psi/files/digest-psi-0.11_pre20070909 @@ -0,0 +1,3 @@ +MD5 0a2d3899944a99147b1e87311af7fde4 psi-dev-snapshot-2007-09-09.tar.bz2 2510301 +RMD160 3fa63e96bae0193a801b973bd724e5980adc76e2 psi-dev-snapshot-2007-09-09.tar.bz2 2510301 +SHA256 87579991e14faa0449aeb04271cb3a5b27d6eac0ddfa8569ff84ec31b1ba44a5 psi-dev-snapshot-2007-09-09.tar.bz2 2510301 diff --git a/net-im/psi/files/psi-fix-update.patch b/net-im/psi/files/psi-fix-update.patch deleted file mode 100644 index e54e5bc..0000000 --- a/net-im/psi/files/psi-fix-update.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur psi-dev-snapshot-2007-08-30.old/iris/xmpp-core/simplesasl.cpp psi-dev-snapshot-2007-08-30/iris/xmpp-core/simplesasl.cpp ---- psi-dev-snapshot-2007-08-30.old/iris/xmpp-core/simplesasl.cpp 2007-08-31 00:07:00.000000000 +0200 -+++ psi-dev-snapshot-2007-08-30/iris/xmpp-core/simplesasl.cpp 2007-08-31 00:07:53.000000000 +0200 -@@ -435,7 +435,7 @@ - virtual void update(const QByteArray &from_net, const QByteArray &from_app) { - result_to_app_ = from_net; - result_to_net_ = from_app; -- encoded_ = 1; -+ encoded_ = from_app.size(); - result_ = Success; - QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection); - } diff --git a/net-im/psi/files/psi-qca-2.0_rc2.patch b/net-im/psi/files/psi-qca-2.0_rc2.patch deleted file mode 100644 index 54fd240..0000000 --- a/net-im/psi/files/psi-qca-2.0_rc2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur psi-dev-snapshot-2007-08-30.old/iris/xmpp-core/simplesasl.cpp psi-dev-snapshot-2007-08-30/iris/xmpp-core/simplesasl.cpp ---- psi-dev-snapshot-2007-08-30.old/iris/xmpp-core/simplesasl.cpp 2007-08-30 16:50:14.000000000 +0200 -+++ psi-dev-snapshot-2007-08-30/iris/xmpp-core/simplesasl.cpp 2007-08-30 16:51:02.000000000 +0200 -@@ -440,7 +440,7 @@ - QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection); - } - -- virtual void waitForResultsReady(int msecs) { -+ virtual bool waitForResultsReady(int msecs) { - - // TODO: for now, all operations block anyway - Q_UNUSED(msecs); diff --git a/net-im/psi/files/psi-simplesasl.patch b/net-im/psi/files/psi-simplesasl.patch deleted file mode 100644 index 8ab3c6f..0000000 --- a/net-im/psi/files/psi-simplesasl.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur psi-dev-snapshot-2007-08-30.old/iris/xmpp-core/simplesasl.cpp psi-dev-snapshot-2007-08-30/iris/xmpp-core/simplesasl.cpp ---- psi-dev-snapshot-2007-08-30.old/iris/xmpp-core/simplesasl.cpp 2007-08-30 22:39:57.000000000 +0200 -+++ psi-dev-snapshot-2007-08-30/iris/xmpp-core/simplesasl.cpp 2007-08-30 22:42:30.000000000 +0200 -@@ -419,11 +419,11 @@ - ++step; - result_ = Continue; - } -- else if (step == 2) { -+ /*else if (step == 2) { - out_buf.resize(0); - result_ = Continue; - ++step; -- } -+ }*/ - else { - out_buf.resize(0); - result_ = Success; diff --git a/net-im/psi/psi-0.11_pre20070830.ebuild b/net-im/psi/psi-0.11_pre20070909.ebuild similarity index 83% rename from net-im/psi/psi-0.11_pre20070830.ebuild rename to net-im/psi/psi-0.11_pre20070909.ebuild index 898e267..d253423 100644 --- a/net-im/psi/psi-0.11_pre20070830.ebuild +++ b/net-im/psi/psi-0.11_pre20070909.ebuild @@ -20,36 +20,29 @@ KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_P}" DEPEND="$(qt4_min_version 4.2.3) - >=app-crypt/qca-2.0.0_rc2 + >=app-crypt/qca-2.0.0_rc4 media-libs/libpng spell? ( app-text/aspell ) ssl? ( dev-libs/openssl ) xscreensaver? ( x11-libs/libXScrnSaver )" RDEPEND="${DEPEND} - crypt? ( >=app-crypt/qca-gnupg-0.1_p20070829 ) - ssl? ( >=app-crypt/qca-ossl-0.1_p20070829 )" + crypt? ( >=app-crypt/qca-gnupg-0.1_p20070904 ) + ssl? ( >=app-crypt/qca-ossl-0.1_p20070904 )" DEPEND="${DEPEND} doc? ( app-doc/doxygen )" pkg_setup() { if ! built_with_use x11-libs/qt qt3support ; then + eerror eerror "In order to compile Psi, you will need to recompile" eerror "qt4 with 'qt3support' USE flag enabled." - die "Recompile qt4 with 'qt3support' USE flag enabled" + eerror + die "Recompile qt4 with USE=\"qt3support\"" fi } -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-qca-2.0_rc2.patch - epatch "${FILESDIR}"/${PN}-simplesasl.patch - epatch "${FILESDIR}"/${PN}-fix-update.patch -} - src_compile() { # growl is mac osx extension only - maybe someday we will want this local myconf="--disable-growl --disable-bundled-qca" -- 2.11.4.GIT