Version bump to development version, bug #271091, thank Dennis Schridde for report and Vadim Efimov for ebuild. The return of USE=extras, now from http://code.google.com/p/psi-dev.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 138 insertions, 3 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index d4a885d934f4..e29bfb8734c0 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/psi
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.157 2009/03/23 10:11:10 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.158 2009/05/29 07:57:50 pva Exp $
+
+*psi-0.13_rc1 (29 May 2009)
+
+  29 May 2009; Peter Volkov <pva@gentoo.org> +psi-0.13_rc1.ebuild:
+  Version bump to development version, bug #271091, thank Dennis Schridde
+  for report and Vadim Efimov for ebuild. The return of USE=extras, now from
+  http://code.google.com/p/psi-dev.
 
   23 Mar 2009; Peter Volkov <pva@gentoo.org>
   +files/psi-0.12.1-build-error.patch, -psi-0.12.ebuild, psi-0.12.1.ebuild:
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index c60fe11bb4c4..dd08fd9c5d7a 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -12,6 +12,9 @@ DIST gentoo-psi-0.10-r2.tar.bz2 36370 RMD160 157b2f6fd4d1be8886572f10752a94b732c
 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.12.1.tar.bz2 2112404 RMD160 a5fc850796b0078bc1a03f4ff93a03611ee11e80 SHA1 6fdcea3a072b40333faecc37acdb925f9bf8c5c3 SHA256 a8022faadbbe15bc4691338b1d83400adf069f773b7fa3b462552515990b277e
+DIST psi-0.13-rc1.tar.bz2 3011018 RMD160 12dc6edd39216c04f7bea1c56bf9c35523a6072a SHA1 f77f014a7ff6155aa213c5c00cc39b62c96d2d2b SHA256 ca882b14cc5666f6ea09e4bcf3b99a0286e64fc31e76a87ee63397c044f31743
+DIST psi-extra-iconsets-r504.tar.bz2 2758164 RMD160 fa6c6f6efb5928113b2477e7c84e04e82da517af SHA1 15069375cb50562be6a9d52cb129f96c37c6d9a0 SHA256 2797adbcdf46ef845dff2609bb25bcf0de9bc5451e8bca4cc39d4783ac0f759e
+DIST psi-extra-patches-r504.tar.bz2 66012 RMD160 748232b4320c8e1027967f6f890c444d57797ae3 SHA1 0164ae39dfb87d227036eaedb1258efdd65a9897 SHA256 2fdcc04c35f110bdbc150971185f95ff3e6860c22dbc858ece9f9552c60f34f1
 DIST psi-extras-insecure.tar.bz2 15914 RMD160 a61d51cbc9280677f62d3121eada4981573842fa SHA1 22c8da902f00ae401df756b0d4195dc70083a9ff SHA256 44ac11a3f1a3280a2dc613dc3719a4750f30aadd4516bee61942409d648c4740
 DIST psi-langs-20090217.tar.bz2 641414 RMD160 03e95fc690aa0e1ea49b7ac277ef0ecea91285f8 SHA1 de5e149d6fc55a464af6e614121b8c228b6e1432 SHA256 59f17d6547e4c911e83199fcd3908fa1bf4db312ae25d2c14e27d4c536915f9c
 DIST psi_ar-0.9.3.tar.bz2 31466 RMD160 c592e630fda60f097dc8df0079b0fb72380fd996 SHA1 8aedb3f8cfdda29ccf5a59c9b0f84462fcd3b649 SHA256 5108803f55a6c71b15b90d76ca20040970349ee89edc2613d96379d6c61f04a9
@@ -45,5 +48,6 @@ DIST psi_zh-0.10-a-1.tar.bz2 32898 RMD160 c0440dcb7763908354fc9c8f1d1b1873a00f7f
 EBUILD psi-0.10-r3.ebuild 11114 RMD160 976ca5966451c160c5b9d1a3b807e448e3806cba SHA1 82482330f1eee7e663616a4372760bad6b3b07eb SHA256 95f5a8ec32f1f24468960fef8f617fb69b743978b19432ed61d208e3dd6c1cc8
 EBUILD psi-0.10-r4.ebuild 11397 RMD160 c20c4f836a46adad23327029605818104441d98e SHA1 256af111995319422ffa88a61f600acce60ffb97 SHA256 0ecdf57a7ead4808dcddd572a88d8c103e127af35eb0a75973330629f41dc5e8
 EBUILD psi-0.12.1.ebuild 2522 RMD160 45ce61c682c2c67b0494f2540d96c4e00d4387ca SHA1 bea59266a7c381fea331200aa1e1681ec2b64eea SHA256 87eba6ba85ae6065239a3d13a73c54661d417ded2c5d3957837db1907cd0e337
-MISC ChangeLog 22287 RMD160 f2ce4af29cf317be1e6f45eaa34f1c9b9986c9c4 SHA1 3ddada77b67d03a5dfed593c13141dda0b382925 SHA256 72844d4dc5debdd60e5d3b161976b672b8455b55cf5c1d441205f3643694fefd
+EBUILD psi-0.13_rc1.ebuild 3701 RMD160 da524779d08dcd69f9350957c77b7f5d5fc0dbb6 SHA1 97eb283cb95d3e88e76bc1efe026fee3f341a2f1 SHA256 ef0d5a7398e09e84eb8e7fdd1bef8ef00a3182e630630a9f8f91c31a8e8578c8
+MISC ChangeLog 22571 RMD160 31a9c4eaa08629e79aa7fd6e83b7fc76a0c8537b SHA1 cb95e588ff0f324869a4d37b49e61226cd58aa5c SHA256 b5e55f97e3e29434b69e0a0aeb4ed74e30b30239c1b6e041caf68915abfbb64b
 MISC metadata.xml 657 RMD160 023b0019db1f817210d34984e84707b61f6bbcc8 SHA1 211eafaca6d54acdddac70381bd630a67896d11b SHA256 758f7d2a69a9f3f3a49a7bec2c866f19fc416a45fd1fd0bebfe8a4fd1a2dfa2e
diff --git a/net-im/psi/psi-0.13_rc1.ebuild b/net-im/psi/psi-0.13_rc1.ebuild
new file mode 100644
index 000000000000..408c0524b2ae
--- /dev/null
+++ b/net-im/psi/psi-0.13_rc1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.13_rc1.ebuild,v 1.1 2009/05/29 07:57:50 pva 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-r504.tar.bz2
+		mirror://gentoo/${PN}-extra-iconsets-r504.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt dbus debug doc spell ssl xscreensaver extras"
+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
+
+COMMON_DEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
+	app-crypt/qca:2
+	spell? ( app-text/aspell )
+	xscreensaver? ( x11-libs/libXScrnSaver )"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )"
+
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( >=app-crypt/qca-gnupg-2.0.0_beta2 )
+	ssl? ( >=app-crypt/qca-ossl-2.0.0_beta2 )"
+
+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 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."
+		ebeep
+
+		EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} 280-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
+}
+
+src_configure() {
+	# disable growl as it is a MacOS X extension only
+	local myconf="--prefix=/usr --qtdir=/usr"
+	myconf="${myconf} --disable-growl --disable-bundled-qca"
+	use debug && myconf="${myconf} --enable-debug"
+	use dbus || myconf="${myconf} --disable-qdbus"
+	use spell || myconf="${myconf} --disable-aspell"
+	use xscreensaver || myconf="${myconf} --disable-xss"
+
+	# cannot use econf because of non-standard configure script
+	./configure ${myconf} || die "configure failed"
+}
+
+src_compile() {
+	eqmake4 ${PN}.pro
+
+	SUBLIBS="-L/usr/${get_libdir}/qca2" 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
+}
+
+pkg_postinst() {
+	if use extras; then
+		ewarn "You've built Psi+ version of Psi (USE=extras)."
+		ewarn "Do not report any bugs upstream, until you manage"
+		ewarn "to reproduce them with USE=-extras. Thank you."
+	fi
+}