Added VCS version of psi, thank Nikoli for this job and Rion for review.
authorPeter Volkov <pva@gentoo.org>
Tue, 1 Jun 2010 10:42:11 +0000 (10:42 +0000)
committerPeter Volkov <pva@gentoo.org>
Tue, 1 Jun 2010 10:42:11 +0000 (10:42 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

net-im/psi/ChangeLog
net-im/psi/Manifest
net-im/psi/metadata.xml
net-im/psi/psi-0.13.ebuild [deleted file]
net-im/psi/psi-0.14-r1.ebuild
net-im/psi/psi-9999.ebuild [new file with mode: 0644]

index fc5a2a0ef7b21d20c690e97c37a2bdf6e995d8b5..175d64ef705193d1ece78ffddc57151f423998ca 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.189 2010/06/01 10:19:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.190 2010/06/01 10:42:11 pva Exp $
+
+*psi-9999 (01 Jun 2010)
+
+  01 Jun 2010; Peter Volkov <pva@gentoo.org> -psi-0.13.ebuild,
+  psi-0.14-r1.ebuild, +psi-9999.ebuild, metadata.xml:
+  Added VCS version of psi, thank Nikoli for this job and Rion for review.
 
   01 Jun 2010; Peter Volkov <pva@gentoo.org> psi-0.14-r1.ebuild:
   Added app-crypt/qca-ossl:2 dependency for hmac support missing for voice
index f08cfadce4da700a349b90b53f1c494d1110b67c..c9d5855dba891d8e41114f327513ea04bf602e34 100644 (file)
@@ -8,15 +8,13 @@ DIST psi-0.13.tar.bz2 2180062 RMD160 7557aea37d837eede5f28ec481eaa74dcc7958f5 SH
 DIST psi-0.14.tar.bz2 2168801 RMD160 0c4a07726c2f9819da0f8aa8f1982e939f1fc20f SHA1 f5f8e1a427339a4e9113b5fa513b01a42ae1be4b SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0
 DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 RMD160 4c3ea59043b91d607a3e30f3cec574e5787a0553 SHA1 6c9ce5717bd3a46a0d1f5eabb3b4756099590435 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2
 DIST psi-extra-iconsets-r1428.tar.bz2 3214991 RMD160 5aba49e65ca39209a4791c6e5eb400a54c4a9341 SHA1 969d55207eb89a5000442b57819e98b0a44f37c0 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c
-DIST psi-extra-iconsets-r807.tar.bz2 2846907 RMD160 fa8516ce37bf2936cdabe5f13b985fe368a0d906 SHA1 50f50ab951cc05a68da5a2b2547587d28ecf18ec SHA256 b10f398ffac34bc97476beedf7989fa77c45d259aacd9f0b761601d13b777b30
 DIST psi-extra-iconsets-r927.tar.bz2 3056366 RMD160 33f072e9db0c5430021963f0ad8fdbf9c4c8b0a4 SHA1 965efe6733bd61731238fcf24bbf4809ebef843d SHA256 292d64032c88b78169c455535c1496a306e8132265da1dfd65b9f7eaffbf4653
 DIST psi-extra-patches-r1428.tar.bz2 131700 RMD160 071eadf3a174f392cfb7202a85d2082b3256c76e SHA1 78cfe1f6b8a15852b9ed72c0dd569c9b4e6d9fac SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48
-DIST psi-extra-patches-r807.tar.bz2 98515 RMD160 636034b6f184d56cc441d8a17ee7f64f56256411 SHA1 41eb359d33dc3e84a953982564e82a442c8a8afd SHA256 ead3d5417ce2409fca2c265b57a94839a6943a57cadb409b53bbfc1a4a1fe802
 DIST psi-extra-patches-r927.tar.bz2 112414 RMD160 8ccf9325d1ea8ca89baebf3db6ac8a0697d49d2d SHA1 81ba49cbd687c86f096f3790446cb0a054ef4c36 SHA256 d1609118cec71009b24e96f9861cb55cf1de3218d285d6dc4a51eb60cc5ece3a
 DIST psi-langs-20090217.tar.bz2 641414 RMD160 03e95fc690aa0e1ea49b7ac277ef0ecea91285f8 SHA1 de5e149d6fc55a464af6e614121b8c228b6e1432 SHA256 59f17d6547e4c911e83199fcd3908fa1bf4db312ae25d2c14e27d4c536915f9c
 EBUILD psi-0.12.1.ebuild 2540 RMD160 f2172d73dfa757827ae488ca1e29c8a5ef9dd806 SHA1 3b9cfb761279c1edcc2964e5c3229b4206131c42 SHA256 02542f49f8e819b74b5589a11a74bd296c594b7f9d55a9633d97512ad55751ac
 EBUILD psi-0.13-r1.ebuild 3894 RMD160 68e199a2c2706b513e8616eafb0f072e596b8fab SHA1 adbd81c7fd3de58a4ab756e463f2c31f621f75e4 SHA256 c5ac2c01f93c73a0072c9580b88f89d95263768d59256dc92a1f9ab2aa67703a
-EBUILD psi-0.13.ebuild 3646 RMD160 3a59863ee3c2dacccd8f36b91c2ff709be1f3e47 SHA1 0bbfb1cffc7f50f0cc67dd0b18cae214699447a6 SHA256 c689aae3a02bf8a722550ec011a0164ef926dfa7d25f6c4a7a5cc57332d870b1
-EBUILD psi-0.14-r1.ebuild 4644 RMD160 c6d43eb7fdd41df168e777223e2b05d37ef6ffe4 SHA1 f756020e06b443b9dbdd3341c29ec405bde075b0 SHA256 ad37c848e05cf1f1dbefbf8814eac5edbad09bae8148758bb186b2dedf224648
-MISC ChangeLog 27876 RMD160 109ed06068bb50466106062a17a92acd6b909c82 SHA1 24c24c8e1fed3cbf29da234cdba6ce6ca45a14ea SHA256 a37df4b12d03f62c163b876e555c4729146dd91a73d8331237154c79f29b2710
-MISC metadata.xml 441 RMD160 cc697432cfc0f0615516f1d3434e2cc7f7dde7d3 SHA1 1e2aa9526abc1c328dbf063f12b940dd98d629a8 SHA256 7e042d514e4b647c17d4c0d42da84e795b102a0b3b53c7badc6f59b7e63439d6
+EBUILD psi-0.14-r1.ebuild 4643 RMD160 bf365bdf62b71bb3b333bb1627675aa9b82a5301 SHA1 244e0f4b88d81ab1266c02c30c7c6e6427968b97 SHA256 707fe1b1d1bbc92704b060b72a4aead2fa1e9052e57eabc5273a50215f0c855b
+EBUILD psi-9999.ebuild 5887 RMD160 343f1c851a8765520c15f3bf7c4c171a333904cd SHA1 1846af78a68e228a7b145826f08702645e476850 SHA256 639f14990def6fb767cec2f5afdaaf999751e8bb88c038f86f055a6aa8188294
+MISC ChangeLog 28094 RMD160 6971c3c4d1313047db3078dacf618d41dd202890 SHA1 48c4819cf82e9efdc49e0002c0b70c1b9615e4b8 SHA256 5e975b0b4033fe8e7e330caee2e6c3ce7e9f7e17f279477ca1d5a6254c8d905f
+MISC metadata.xml 828 RMD160 de45bfad6451302291b2e9d98dedf8f5b4ef5739 SHA1 a0af07fc8398913b1e07e1d995ccfdbaa95bc2ee SHA256 241d6e4d478091b7cfd4341152386d54e227eb6faf9a51c388f8be047a231268
index 75eb0d2425156449f5de478ec977c32417db0d73..13460790a9a01cfc4ac944da8fe21c4b7aab1f7a 100644 (file)
@@ -7,7 +7,12 @@
 </maintainer>
 <longdescription>Psi is a very good jabber client that uses QT</longdescription>
 <use>
+       <flag name='enchant'>Use enchant spell engine instead of aspell</flag>
        <flag name='extras'>Enables extra non official patches</flag>
+       <flag name='iconsets'>Install additional iconsets, some of them has not clear licensing</flag>
+       <flag name='plugins'>Enable plugins support</flag>
+       <flag name='powersave'>Disable some non critical timers for much less CPU usage</flag>
        <flag name='webkit'>Enable chatlog rendering using webkit</flag>
+       <flag name='whiteboarding'>Enable experimental interactive SVG drawing</flag>
 </use>
 </pkgmetadata>
diff --git a/net-im/psi/psi-0.13.ebuild b/net-im/psi/psi-0.13.ebuild
deleted file mode 100644 (file)
index 2e7ba4a..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.13.ebuild,v 1.5 2010/01/18 19:01:45 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils qt4 multilib
-
-MY_P="${P/_rc/-rc}"
-
-LANGPACK_VER="20090217"
-
-DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
-HOMEPAGE="http://psi-im.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-       mirror://gentoo/${PN}-langs-${LANGPACK_VER}.tar.bz2
-       extras? ( mirror://gentoo/${PN}-extra-patches-r807.tar.bz2
-               mirror://gentoo/${PN}-extra-iconsets-r807.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver"
-RESTRICT="test"
-
-LANGS="cs de eo es_ES fr it mk pl pt_BR ru uk ur_PK vi zh zh_TW"
-for LNG in ${LANGS}; do
-       IUSE="${IUSE} linguas_${LNG}"
-       #SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm"
-done
-
-RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
-       >=app-crypt/qca-2.0.2:2
-       spell? ( app-text/aspell )
-       xscreensaver? ( x11-libs/libXScrnSaver )"
-
-DEPEND="${RDEPEND}
-       doc? ( app-doc/doxygen )"
-
-PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
-       jingle? ( net-im/psimedia )
-       ssl? ( app-crypt/qca-ossl:2 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-       if use extras; then
-               # some patches from psi+ project http://code.google.com/p/psi-dev
-               ewarn "You're about to build heavily patched version of Psi called Psi+."
-               ewarn "It has really nice features but still is under heavy development."
-               ewarn "Take a look at homepage for more info: http://code.google.com/p/psi-dev"
-               ewarn "If you wish to disable some patches just put"
-               ewarn "MY_EPATCH_EXCLUDE=\"list of patches\""
-               ewarn "into /etc/portage/env/${CATEGORY}/${PN} file."
-               ewarn
-               ewarn "Note: some patches depend on other. So if you disabled some patch"
-               ewarn "and other started to fail to apply, you'll have to disable patches"
-               ewarn "that fail too."
-               ebeep
-
-               EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} 270-psi-application-info.diff" \
-               EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
-               sed -e 's/\(^#define PROG_CAPS_NODE     \).*/\1"http:\/\/psi-dev.googlecode.com\/caps";/' \
-                       -e 's:\(^#define PROG_NAME "Psi\):\1+:' \
-                               -i src/applicationinfo.cpp || die
-       fi
-
-       rm -rf third-party/qca # We use system libraries.
-}
-
-src_configure() {
-       # unable to use econf because of non-standard configure script
-       # disable growl as it is a MacOS X extension only
-       local confcmd="./configure
-                       --prefix=/usr
-                       --qtdir=/usr
-                       --disable-bundled-qca
-                       --disable-growl
-                       $(use dbus || echo '--disable-qdbus')
-                       $(use debug && echo '--enable-debug')
-                       $(use spell || echo '--disable-aspell')
-                       $(use xscreensaver || echo '--disable-xss')"
-
-       echo ${confcmd}
-       ${confcmd} || die "configure failed"
-}
-
-src_compile() {
-       eqmake4
-
-       emake || die "emake failed"
-
-       if use doc; then
-               cd doc
-               mkdir -p api # 259632
-               make api_public || die "make api_public failed"
-       fi
-}
-
-src_install() {
-       emake INSTALL_ROOT="${D}" install || die "emake install failed"
-
-       # this way the docs will be installed in the standard gentoo dir
-       newdoc iconsets/roster/README README.roster || die
-       newdoc iconsets/system/README README.system || die
-       newdoc certs/README README.certs || die
-       dodoc README || die
-
-       if use doc; then
-               cd doc
-               dohtml -r api || die "dohtml failed"
-       fi
-
-       # install translations
-       cd "${WORKDIR}/${PN}-langs"
-       insinto /usr/share/${PN}/
-       for LNG in ${LANGS}; do
-               if use linguas_${LNG}; then
-                       doins ${PN}_${LNG/ur_PK/ur_pk}.qm || die
-               fi
-       done
-
-       if use extras; then
-               cp -a "${WORKDIR}"/iconsets/* "${D}"/usr/share/${PN}/iconsets/ || die
-       fi
-}
index 84de3ae8f3b4730f9834b60005d6432501063821..715aa66f2f5203f0ddbd2da9d951e7f984e8f964 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r1.ebuild,v 1.7 2010/06/01 10:19:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r1.ebuild,v 1.8 2010/06/01 10:42:11 pva Exp $
 
 EAPI="2"
 
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )"
 
 PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
-       jingle? ( net-im/psimedia 
+       jingle? ( net-im/psimedia
                app-crypt/qca-ossl:2 )
        ssl? ( app-crypt/qca-ossl:2 )"
 
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
new file mode 100644 (file)
index 0000000..b5f620e
--- /dev/null
@@ -0,0 +1,218 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.1 2010/06/01 10:42:11 pva Exp $
+
+EAPI="2"
+
+LANGS="ar be bg br ca cs da de ee el eo es et fi fr hr hu it ja mk nl pl pt pt_BR ru se sk sl sr sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+
+EGIT_REPO_URI="git://git.psi-im.org/psi.git"
+EGIT_HAS_SUBMODULES="true"
+LANGS_URI="git://pv.et-inf.fho-emden.de/git/psi-l10n"
+
+ESVN_DISABLE_DEPENDENCIES="true"
+BASE_URI="http://psi-dev.googlecode.com/svn/trunk"
+ESVN_PROJECT="psiplus"
+
+inherit eutils qt4-r2 multilib git subversion
+
+DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
+HOMEPAGE="http://psi-im.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="crypt dbus debug doc enchant extras jingle iconsets spell ssl xscreensaver powersave
+plugins -whiteboarding webkit"
+
+RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
+       >=app-crypt/qca-2.0.2:2
+       whiteboarding? ( x11-libs/qt-svg:4 )
+       spell? (
+               enchant? ( >=app-text/enchant-1.3.0 )
+               !enchant? ( app-text/aspell )
+       )
+       xscreensaver? ( x11-libs/libXScrnSaver )
+       extras? ( webkit? ( x11-libs/qt-webkit ) )
+       app-arch/unzip"
+
+DEPEND="${RDEPEND}
+       extras? (
+               ${SUBVERSION_DEPEND}
+               sys-devel/qconf
+       )
+       doc? ( app-doc/doxygen )"
+
+PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
+       jingle? (
+               net-im/psimedia
+               app-crypt/qca-ossl:2
+               )
+       ssl? ( app-crypt/qca-ossl:2 )"
+
+RESTRICT="test"
+
+pkg_setup() {
+       for x in iconsets plugins powersave webkit whiteboarding;do
+               use ${x} && use !extras && \
+                       ewarn "USE=${x} is only available in Psi+ and requires USE=extras, ${x} will be disabled."
+       done
+
+       if use extras; then
+               ewarn
+               ewarn "You're about to build heavily patched version of Psi called Psi+."
+               ewarn "It has really nice features but still is under heavy development."
+               ewarn "Take a look at homepage for more info: http://code.google.com/p/psi-dev"
+               ewarn "If you wish to disable some patches just put"
+               ewarn "MY_EPATCH_EXCLUDE=\"list of patches\""
+               ewarn "into /etc/portage/env/${CATEGORY}/${PN} file."
+               ewarn
+               ewarn "Note: some patches depend on other. So if you disabled some patch"
+               ewarn "and other started to fail to apply, you'll have to disable patches"
+               ewarn "that fail too."
+               ebeep
+
+               if use iconsets; then
+                       ewarn
+                       ewarn "Some artwork is from open source projects, but some is provided 'as-is'"
+                       ewarn "and has not clear licensing."
+                       ewarn "Possibly this build is not redistributable in some countries."
+               fi
+       fi
+}
+
+src_unpack() {
+       git_src_unpack
+
+       # fetch translations
+       mkdir "${WORKDIR}/psi-l10n"
+       for x in ${LANGS}; do
+               if use linguas_${x}; then
+                       EGIT_REPO_URI="${LANGS_URI}-${x}"
+                       EGIT_PROJECT="psi-l10n/${x}"
+                       S="${WORKDIR}/psi-l10n/${x}"
+                       git_fetch
+               fi
+       done
+
+       if use extras; then
+               S="${WORKDIR}/patches"
+               ESVN_REPO_URI="${BASE_URI}/patches"
+               subversion_fetch
+               if use iconsets; then
+                       S="${WORKDIR}/${P}/iconsets"
+                       ESVN_REPO_URI="${BASE_URI}/iconsets"
+                       subversion_fetch
+               else
+                       for x in clients moods activities system; do
+                               S="${WORKDIR}/${P}/iconsets/${x}/default"
+                               ESVN_REPO_URI="${BASE_URI}/iconsets/${x}/default"
+                               ESVN_PROJECT="psiplus/${x}"
+                               subversion_fetch
+                       done
+               fi
+       fi
+
+       S="${WORKDIR}/${P}"
+}
+
+src_prepare() {
+       rm -rf third-party/qca # We use system libraries.
+
+       if use extras; then
+               EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE}
+                       *-win32-*
+                       *dirty-check*" \
+               EPATCH_SOURCE="${WORKDIR}/patches/" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
+
+               use powersave && epatch "${WORKDIR}/patches/dev/psi-reduce-power-consumption.patch"
+
+               if use whiteboarding; then
+                       sed -e 's/#CONFIG += whiteboarding/CONFIG += whiteboarding/' \
+                               -i src/src.pro || die "sed failed"
+                       epatch "${WORKDIR}/patches/dev/psi-wb.patch"
+
+                       ewarn "Whiteboarding is very unstable."
+               fi
+
+               subversion_wc_info
+               sed -e "s/.xxx/.${ESVN_WC_REVISION}/" \
+                       -i src/applicationinfo.cpp || die "sed failed"
+
+               qconf || die "Failed to create ./configure."
+       fi
+}
+
+src_configure() {
+       # unable to use econf because of non-standard configure script
+       # disable growl as it is a MacOS X extension only
+       local confcmd="./configure
+                       --prefix=/usr
+                       --qtdir=/usr
+                       --disable-bundled-qca
+                       --disable-growl
+                       $(use dbus || echo '--disable-qdbus')
+                       $(use debug && echo '--debug')
+                       $(use spell && {
+                               use enchant && echo '--disable-aspell' || echo '--disable-enchant'
+                               } || echo '--disable-aspell --disable-enchant')
+                       $(use xscreensaver || echo '--disable-xss')
+                       $(use extras && {
+                               use plugins && echo '--enable-plugins'
+                               use webkit && echo '--enable-webkit'
+                               } )"
+
+       echo "${confcmd}"
+       ${confcmd} || die "configure failed"
+}
+
+src_compile() {
+       eqmake4
+
+       emake || die "emake failed"
+
+       if use doc; then
+               cd doc
+               mkdir -p api # 259632
+               make api_public || die "make api_public failed"
+       fi
+}
+
+src_install() {
+       emake INSTALL_ROOT="${D}" install || die "emake install failed"
+       rm "${D}"/usr/share/psi/{COPYING,README}
+
+       # this way the docs will be installed in the standard gentoo dir
+       newdoc iconsets/roster/README README.roster || die
+       newdoc iconsets/system/README README.system || die
+       newdoc certs/README README.certs || die
+       dodoc README || die
+
+       if use doc; then
+               cd doc
+               dohtml -r api || die "dohtml failed"
+       fi
+
+       # install translations
+       cd "${WORKDIR}/psi-l10n"
+       insinto /usr/share/${PN}
+       for x in ${LANGS}; do
+               if use linguas_${x}; then
+                       lrelease "${x}/${PN}_${x}.ts" || die "lrelease ${x} failed"
+                       doins "${x}/${PN}_${x}.qm" || die
+                       newins "${x}/INFO" "INFO.${x}" || die
+               fi
+       done
+
+       if use extras; then
+               if use plugins; then
+                       cd "${S}"
+                       insinto /usr/share/psi/plugins
+                       doins src/plugins/plugins.pri || die
+                       doins src/plugins/psiplugin.pri || die
+                       doins -r src/plugins/include || die
+                       dosed "s:target.path.*:target.path = /usr/$(get_libdir)/psi/plugins:" \
+                               /usr/share/psi/plugins/psiplugin.pri \
+                               || die "sed failed"
+               fi
+       fi
+}