Snapshot version bump. First plugin build. Possibly fixed #165125 as-needed problem

Package-Manager: portage-2.1.2-r9

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index d5033fb4f7408612785f14ba8f24b381086c77f8..4a6a59251ef2876d42355fc3e985243944feb85f 100644 (file)
--- 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/Manifest b/net-im/psi/Manifest
index cb2f070a55606c39ff72f9315fd48c063739a095..388c3acb439dbe548ce77b7addf1d63cae8eed14 100644 (file)
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -5,6 +5,10 @@ AUX psi-desktop2.patch 508 RMD160 50037b740407ec36e5d01386f145f5f055e4eae0 SHA1
 MD5 73fdd72109e3a7469c80d96ed5f5d410 files/psi-desktop2.patch 508
 RMD160 50037b740407ec36e5d01386f145f5f055e4eae0 files/psi-desktop2.patch 508
 SHA256 b4045dafc0bc00b0167449693fc3e9b2f53041a070a93954f8939ee0866efa8e files/psi-desktop2.patch 508
+AUX psi-echoplugin.patch 785 RMD160 eba6e881b251062d5f102d0a9450239eb778cf75 SHA1 1ba5d83ce9cf517e13eb6510ea16b62641c276f1 SHA256 9476e8de292427a7c3e209a72cd2ee5663bfe76e88b89618414adde84991c8ff
+MD5 8f1e5b2f1e6487a2d670dad45b75e1b4 files/psi-echoplugin.patch 785
+RMD160 eba6e881b251062d5f102d0a9450239eb778cf75 files/psi-echoplugin.patch 785
+SHA256 9476e8de292427a7c3e209a72cd2ee5663bfe76e88b89618414adde84991c8ff files/psi-echoplugin.patch 785
 AUX psi-indicator.png 300 RMD160 507ab090f82276492bbf6af23eab78e2f8c8ccf2 SHA1 2adcd9b63b2f0ba98415c8bb526d1a57c24d88f4 SHA256 a0e9adcd0409d23c9033170ceb8f22980ba6d5e14f19234630f9986bfb94bce2
 MD5 0d5cafd17325fc912c4855252d73378f files/psi-indicator.png 300
 RMD160 507ab090f82276492bbf6af23eab78e2f8c8ccf2 files/psi-indicator.png 300
@@ -28,7 +32,7 @@ SHA256 2a690a7cda661884ce3424530ac6569a7fcb1e6c97342c120767a0d5058c403c files/ps
 DIST gentoo-psi-0.10-r2.tar.bz2 36370 RMD160 157b2f6fd4d1be8886572f10752a94b732cead8f SHA1 67004e3e70ab30129d174567b0332f0577a19dd9 SHA256 e450004e358e949113db1c298990a0d0514012f605ad1d7710b204eb82209a75
 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-dev-snapshot-2007-02-01.tar.bz2 2367209 RMD160 28ccef3760eba2ec75565672fba0135d05c60416 SHA1 1e26f61a090fbf490d36bed0447c515c8105d0f2 SHA256 c2dee74474b8744230d9596cf80365ad22aefeb4b9d317a2ab7281224d94f91f
+DIST psi-dev-snapshot-2007-02-11.tar.bz2 2381625 RMD160 2efbc89d5f6b8e097c2fd9236c50159c6f05fcbd SHA1 a0bd34c8c4255c16b073166088b97cf4725fc307 SHA256 4c3b405340dc423d36249db4e2c3207890031a76a77a30cf8edc0637d723a1b0
 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-1.tar.bz2 34477 RMD160 0a9b61207a8bf9d0b97ac9bed94aa5b47a1915a5 SHA1 f114dbb802b0f640e52dae1a2dcc0796fd7ea58f SHA256 3418401beefdf694fa24178563558340e69e7a6f8ebde925d0aee5bd09316cf6
@@ -71,22 +75,22 @@ DIST psi_vi-0.10-a.tar.bz2 34178 RMD160 3b39e29ffe0c31f2fea1bd6a59773b131999904f
 DIST psi_vi-0.10-b-1.tar.bz2 34255 RMD160 e1d168e189a454d392473996e77dbcd8778fbe05 SHA1 f2c894a60f8a385f8eb94cceeace1a120535d02a SHA256 94ae3fe1f421132ce285e6246db9c0facbf1a6f472c870e28ee42993dbc98039
 DIST psi_zh-0.10-a-1.tar.bz2 32898 RMD160 c0440dcb7763908354fc9c8f1d1b1873a00f7f75 SHA1 fa859645d2fb7da6a94c028c9413da18abd12b3c SHA256 747993fe4d9c9517d72360a8618c7c33600e2b870223fe69e107d64166d5a43a
 DIST psi_zh-0.9.3-a.tar.bz2 31925 RMD160 3e9ff4622de47c0029bc6c2e497e530498729bc0 SHA1 5213118ba5660f7f2101ee8688548d08bce549e1 SHA256 ef85eb3a85119f0e038ae021a5c84d1e3294635bfcda854fd759283267eb5aea
-EBUILD psi-0.10-r2.ebuild 11017 RMD160 31306454e7e401fad9c0eeafd2e2d23ebff6c88a SHA1 491b63b3165f2f7b97bf1a00e0fb5bb19439248c SHA256 35ce098c54f50c8b4273295da5a24718c4fa2efdfaf4894e114bfe334ebe354e
-MD5 f79ef65dec0259a8eb721f18a115227b psi-0.10-r2.ebuild 11017
-RMD160 31306454e7e401fad9c0eeafd2e2d23ebff6c88a psi-0.10-r2.ebuild 11017
-SHA256 35ce098c54f50c8b4273295da5a24718c4fa2efdfaf4894e114bfe334ebe354e psi-0.10-r2.ebuild 11017
+EBUILD psi-0.10-r2.ebuild 11017 RMD160 d1a09db8fe9fad854ee25d4413a88afc2b569f28 SHA1 dfa3587e0ae2442e076e19d86561570c9d6dde73 SHA256 88fc9aff2ddf8941c84e6b75066dcb7a052351028e21dfaedc62f4cfe18fa812
+MD5 98077b14244c536afb539f17e474f60e psi-0.10-r2.ebuild 11017
+RMD160 d1a09db8fe9fad854ee25d4413a88afc2b569f28 psi-0.10-r2.ebuild 11017
+SHA256 88fc9aff2ddf8941c84e6b75066dcb7a052351028e21dfaedc62f4cfe18fa812 psi-0.10-r2.ebuild 11017
 EBUILD psi-0.10.ebuild 10906 RMD160 5a452dd092a015412e34f5b0771fae4e9d9b3a3a SHA1 b5b0a4eff06cdd33242d3e074b44c1cb086b8e7b SHA256 253e978bd2c47d6de7f983c2c468b5081e56afe712eb7e21b77486b2280963fb
 MD5 283f39cfa965adea24408861427e5139 psi-0.10.ebuild 10906
 RMD160 5a452dd092a015412e34f5b0771fae4e9d9b3a3a psi-0.10.ebuild 10906
 SHA256 253e978bd2c47d6de7f983c2c468b5081e56afe712eb7e21b77486b2280963fb psi-0.10.ebuild 10906
-EBUILD psi-0.11_pre20070201.ebuild 3200 RMD160 b5f798b1b284e7175e77e4ae831896b0f2ddb854 SHA1 b8645719f51df6831158e98ab04984696161663d SHA256 4c644c803fa6a6c76fc9ce38fa0cb0e0004819d484bd7a6bb9f4157f8bfcd5ee
-MD5 70a28c63366b5ba7383d2f031359e2d2 psi-0.11_pre20070201.ebuild 3200
-RMD160 b5f798b1b284e7175e77e4ae831896b0f2ddb854 psi-0.11_pre20070201.ebuild 3200
-SHA256 4c644c803fa6a6c76fc9ce38fa0cb0e0004819d484bd7a6bb9f4157f8bfcd5ee psi-0.11_pre20070201.ebuild 3200
-MISC ChangeLog 15731 RMD160 5fe15b8c5a5aeb8d6336b2a9afa1718f891893a6 SHA1 6cb8f8985df4e9b9ebc9ed426ab7a442218b0ffc SHA256 d5a9be2c0fecc4b0a582a95e6997b89ca6aff1c7e31f58139911ea7d84bef268
-MD5 1d89214a18aa7e7bc3cb39480a6111f9 ChangeLog 15731
-RMD160 5fe15b8c5a5aeb8d6336b2a9afa1718f891893a6 ChangeLog 15731
-SHA256 d5a9be2c0fecc4b0a582a95e6997b89ca6aff1c7e31f58139911ea7d84bef268 ChangeLog 15731
+EBUILD psi-0.11_pre20070211.ebuild 4146 RMD160 5a39a1f45c770aaa834b3bb8d09995b47a11e20c SHA1 38147e4b4299f96f64ccaaccb0bf70e1e7011efd SHA256 7870c64f4148ff4215f7542ab8b374d2f66d0744986859e031a98a7069305c72
+MD5 692e355c3ab1bac50435e30ec531dce1 psi-0.11_pre20070211.ebuild 4146
+RMD160 5a39a1f45c770aaa834b3bb8d09995b47a11e20c psi-0.11_pre20070211.ebuild 4146
+SHA256 7870c64f4148ff4215f7542ab8b374d2f66d0744986859e031a98a7069305c72 psi-0.11_pre20070211.ebuild 4146
+MISC ChangeLog 16030 RMD160 9e9db1e1db6581a7a43d1f8eb90b1883c575b7e1 SHA1 6b9ffb4dacf33df444515873f3953e1f09519b78 SHA256 c29fb1c4b95d7af245b00c0381f705589061360f7097d51d07ff4429085bc970
+MD5 d38ab6b23c7b7e0b7c153cd0c8032edd ChangeLog 16030
+RMD160 9e9db1e1db6581a7a43d1f8eb90b1883c575b7e1 ChangeLog 16030
+SHA256 c29fb1c4b95d7af245b00c0381f705589061360f7097d51d07ff4429085bc970 ChangeLog 16030
 MISC metadata.xml 303 RMD160 deecd227e21d24af6eae6f787e0efd65765741e6 SHA1 a379c487e73d24f68f1036f913c745775a6e9846 SHA256 ea6a7b120f076cc2fa66725d5361639a74895eeb3adc404a887da3be921dfb92
 MD5 5436d288bb839d51d856765357e80098 metadata.xml 303
 RMD160 deecd227e21d24af6eae6f787e0efd65765741e6 metadata.xml 303
@@ -97,13 +101,13 @@ SHA256 83e7a43300883f75bb7c3d264d1729fe9c04f754a7b04583730b0a2b3f5d95db files/di
 MD5 9d6624c3f74285a62f7d8e922a9264e6 files/digest-psi-0.10-r2 7579
 RMD160 b8f3564fe6f258125f36a8a81b54deb761082441 files/digest-psi-0.10-r2 7579
 SHA256 21127ed7d5379fa4c8fc3beb3f5a2886d4601c89f93cd6ea7c5f9ea69b2baa18 files/digest-psi-0.10-r2 7579
-MD5 b4d5e610569a96cb09d5fd2fd848497c files/digest-psi-0.11_pre20070201 289
-RMD160 9b0c3790c4279deaae930b1e9945f742a702604f files/digest-psi-0.11_pre20070201 289
-SHA256 be1e939ca4a78df73c1e3c890628453a3d0d50c52991bbc7745b1051ec23c25a files/digest-psi-0.11_pre20070201 289
+MD5 b4eec56e864b45b2498130fc8d29eba8 files/digest-psi-0.11_pre20070211 289
+RMD160 cf5af84f4973d0d8c3207d2527df19b7fc953ee2 files/digest-psi-0.11_pre20070211 289
+SHA256 f7c4d92281a423907a4777ac92d6257e9eeb3d6ad7dcbe6732dae0100a7240fd files/digest-psi-0.11_pre20070211 289
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFwnceexDpKttj3ykRAgwIAJ9UW/rV38KTBeGmF2LXjbaqDCCQ0gCghUpF
-3iOnepQCZyTFji462u7rVI4=
-=HVOo
+iD8DBQFFz809exDpKttj3ykRAgBZAJ40KrFBJQXYOw0jG81fD3K6w7SDxwCfTd0Y
+6rZIWCwCj7703ulHnRtGM3g=
+=ACxf
 -----END PGP SIGNATURE-----

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 (file)
index 0fbc6e1..0000000
--- 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 (file)
index 0000000..360f30f
--- /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 (file)
index 0000000..47f0e52
--- /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 8b0ad7be9353671c37e264814ee55434879ccbe4..e4f13faa7d42108d53f09b6c354ae947b360d455 100644 (file)
--- 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
similarity index 72%
rename from net-im/psi/psi-0.11_pre20070201.ebuild
rename to net-im/psi/psi-0.11_pre20070211.ebuild
index 0eb365dc8cc1e2ed4e07f3bfb6b0fa1f3a071ff0..dd5fa5261a7eb4fd7103897e9105b3b3d46bcc59 100644 (file)
--- 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
 }