Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorPrzemyslaw Maciag <troll@gentoo.org>2007-02-12 02:05:26 +0000
committerPrzemyslaw Maciag <troll@gentoo.org>2007-02-12 02:05:26 +0000
commit2c7b24b29164f5d75fdd5669f5cbe4978de6a104 (patch)
treeb7fdda826a0d2ef57af38e40b38264c0c3f5dea6 /net-im
parentMore fixes for 165482 (diff)
downloadgentoo-2-2c7b24b29164f5d75fdd5669f5cbe4978de6a104.tar.gz
gentoo-2-2c7b24b29164f5d75fdd5669f5cbe4978de6a104.tar.bz2
gentoo-2-2c7b24b29164f5d75fdd5669f5cbe4978de6a104.zip
Snapshot version bump. First plugin build. Possibly fixed #165125 as-needed problem
(Portage version: 2.1.2-r9)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/psi/ChangeLog10
-rw-r--r--net-im/psi/files/digest-psi-0.11_pre200702013
-rw-r--r--net-im/psi/files/digest-psi-0.11_pre200702113
-rw-r--r--net-im/psi/files/psi-echoplugin.patch12
-rw-r--r--net-im/psi/psi-0.10-r2.ebuild4
-rw-r--r--net-im/psi/psi-0.11_pre20070211.ebuild (renamed from net-im/psi/psi-0.11_pre20070201.ebuild)48
6 files changed, 69 insertions, 11 deletions
diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index d5033fb4f740..4a6a59251ef2 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-im/psi
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.110 2007/02/01 23:20:56 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.111 2007/02/12 02:05:26 troll Exp $
+
+*psi-0.11_pre20070211 (12 Feb 2007)
+
+ 12 Feb 2007; Przemysław Maciąg <troll@gentoo.org>
+ +files/psi-echoplugin.patch, -psi-0.11_pre20070201.ebuild,
+ +psi-0.11_pre20070211.ebuild:
+ Snapshot version bump - first build with plugins. Possibly fixed --as-needed
+ in included libjingle (#165125).
*psi-0.11_pre20070201 (01 Feb 2007)
diff --git a/net-im/psi/files/digest-psi-0.11_pre20070201 b/net-im/psi/files/digest-psi-0.11_pre20070201
deleted file mode 100644
index 0fbc6e1f2222..000000000000
--- a/net-im/psi/files/digest-psi-0.11_pre20070201
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 77351e831d56cd5de8eb8b9091d7b02b psi-dev-snapshot-2007-02-01.tar.bz2 2367209
-RMD160 28ccef3760eba2ec75565672fba0135d05c60416 psi-dev-snapshot-2007-02-01.tar.bz2 2367209
-SHA256 c2dee74474b8744230d9596cf80365ad22aefeb4b9d317a2ab7281224d94f91f psi-dev-snapshot-2007-02-01.tar.bz2 2367209
diff --git a/net-im/psi/files/digest-psi-0.11_pre20070211 b/net-im/psi/files/digest-psi-0.11_pre20070211
new file mode 100644
index 000000000000..360f30f2d3f3
--- /dev/null
+++ b/net-im/psi/files/digest-psi-0.11_pre20070211
@@ -0,0 +1,3 @@
+MD5 ecbf0b2c19b37ec6875c9a86e6e2d5b2 psi-dev-snapshot-2007-02-11.tar.bz2 2381625
+RMD160 2efbc89d5f6b8e097c2fd9236c50159c6f05fcbd psi-dev-snapshot-2007-02-11.tar.bz2 2381625
+SHA256 4c3b405340dc423d36249db4e2c3207890031a76a77a30cf8edc0637d723a1b0 psi-dev-snapshot-2007-02-11.tar.bz2 2381625
diff --git a/net-im/psi/files/psi-echoplugin.patch b/net-im/psi/files/psi-echoplugin.patch
new file mode 100644
index 000000000000..47f0e5220d79
--- /dev/null
+++ b/net-im/psi/files/psi-echoplugin.patch
@@ -0,0 +1,12 @@
+diff -ru psi-dev-snapshot-2007-02-04-orig/src/plugins/generic/echo/echoplugin.cpp psi-dev-snapshot-2007-02-04/src/plugins/generic/echo/echoplugin.cpp
+--- psi-dev-snapshot-2007-02-04-orig/src/plugins/generic/echo/echoplugin.cpp 2007-02-04 06:30:25.000000000 +0100
++++ psi-dev-snapshot-2007-02-04/src/plugins/generic/echo/echoplugin.cpp 2007-02-05 02:29:04.000000000 +0100
+@@ -60,7 +60,7 @@
+ {
+ qWarning(qPrintable(QString("Received message '%1', echoing back to %2").arg(message).arg(fromDisplay)));
+ QVariant option;
+- emit getGlobalOption(message, &option);
++ emit getGlobalOption(message, option);
+ QString reply;
+ if (option.isValid())
+ reply=QString("<message to=\"%1\" type=\"chat\"><body>Option %2 = %3 </body></message>").arg(fromJid).arg(message).arg(option.toString());
diff --git a/net-im/psi/psi-0.10-r2.ebuild b/net-im/psi/psi-0.10-r2.ebuild
index 8b0ad7be9353..e4f13faa7d42 100644
--- a/net-im/psi/psi-0.10-r2.ebuild
+++ b/net-im/psi/psi-0.10-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.10-r2.ebuild,v 1.1 2006/11/12 23:09:16 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.10-r2.ebuild,v 1.2 2007/02/12 02:05:26 troll Exp $
inherit eutils qt3
diff --git a/net-im/psi/psi-0.11_pre20070201.ebuild b/net-im/psi/psi-0.11_pre20070211.ebuild
index 0eb365dc8cc1..dd5fa5261a7e 100644
--- a/net-im/psi/psi-0.11_pre20070201.ebuild
+++ b/net-im/psi/psi-0.11_pre20070211.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.11_pre20070201.ebuild,v 1.1 2007/02/01 23:20:56 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.11_pre20070211.ebuild,v 1.1 2007/02/12 02:05:26 troll Exp $
inherit confutils eutils qt4
@@ -19,6 +19,8 @@ KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_P}"
+PLUGINS="chess echo noughtsandcrosses"
+
DEPEND="$(qt4_min_version 4.2)
media-libs/libpng
sys-libs/zlib
@@ -47,7 +49,11 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/psi-jingle-gcc4.patch
- epatch ${FILESDIR}/psi-ptr_64bit_fix.patch
+
+ if use plugins; then
+ epatch ${FILESDIR}/psi-ptr_64bit_fix.patch
+ epatch ${FILESDIR}/psi-echoplugin.patch
+ fi;
}
src_compile() {
@@ -106,9 +112,35 @@ src_compile() {
"CONFIG+=no_fixpath release" \
|| die "qmake failed"
+ if use jingle; then
+ cd ${S}/third-party/libjingle
+ qmake libjingle.pro \
+ QTDIR=/usr/lib \
+ QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
+ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+ QMAKE=/usr/bin/qmake \
+ QMAKE_RPATH= \
+ "CONFIG+=no_fixpath release" \
+ || die "qmake failed"
+
+ fi;
+
cd ${S}
emake || die "make failed"
+ use plugins && for pl in ${PLUGINS}; do
+ cd ${S}/src/plugins/generic/${pl}
+ qmake ${pl}plugin.pro \
+ QTDIR=/usr/lib \
+ QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
+ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+ QMAKE=/usr/bin/qmake \
+ QMAKE_RPATH= \
+ "CONFIG+=no_fixpath release" \
+ || die "qmake failed"
+ make || die "make plugin ${pl} failed"
+ done
+
if use doc; then
cd ${S}/doc
make api_public
@@ -119,11 +151,17 @@ 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; do
- newdoc ${S}/iconsets/${i}/README README.${i}
- done;
+ newdoc ${S}/iconsets/roster/README README.roster
+ newdoc ${S}/iconsets/system/README README.system
newdoc certs/README README.certs
dodoc ChangeLog README TODO
+ if use plugins; then
+ dodir /usr/share/psi/plugins
+ for pl in ${PLUGINS}; do
+ cp ${S}/src/plugins/generic/${pl}/lib${pl}plugin.so ${D}/usr/share/psi/plugins
+ done;
+ fi;
+
use doc && cp -ar ${S}/doc/api ${D}/usr/share/psi
}