[gentoo-commits] gentoo-x86 commit in net-im/psi: ChangeLog psi-0.13_rc1-r1.ebuild psi-0.13_rc1.ebuild

[Peter Volkov (pva)]

pva         09/06/02 17:04:40

  Modified:             ChangeLog
  Added:                psi-0.13_rc1-r1.ebuild
  Removed:              psi-0.13_rc1.ebuild
  Log:
  Fixed bug when call dialog might not display, bug #271091, thank Petr Moravek for report.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.160                net-im/psi/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/psi/ChangeLog?rev=1.160&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/psi/ChangeLog?rev=1.160&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/psi/ChangeLog?r1=1.159&r2=1.160

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- ChangeLog	1 Jun 2009 11:31:37 -0000	1.159
+++ ChangeLog	2 Jun 2009 17:04:40 -0000	1.160
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.159 2009/06/01 11:31:37 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.160 2009/06/02 17:04:40 pva Exp $
+
+*psi-0.13_rc1-r1 (02 Jun 2009)
+
+  02 Jun 2009; Peter Volkov <pva@g.o> -psi-0.13_rc1.ebuild,
+  +psi-0.13_rc1-r1.ebuild, +files/psi-0.13_rc1-dialog-show.patch:
+  Fixed bug when call dialog might not display, bug #271091, thank Petr
+  Moravek for report.
 
   01 Jun 2009; Peter Volkov <pva@g.o> psi-0.13_rc1.ebuild:
   Updated qca version dependency as some psi bugs were fixed in 2.0.2 only,



1.1                  net-im/psi/psi-0.13_rc1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/psi/psi-0.13_rc1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/psi/psi-0.13_rc1-r1.ebuild?rev=1.1&content-type=text/plain

Index: psi-0.13_rc1-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 2009/06/02 17:04:40 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-r515.tar.bz2
		mirror://gentoo/${PN}-extra-iconsets-r515.tar.bz2 )"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
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.0.2: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

	rm -rf third-party/qca # We use system libraries.

	epatch "${FILESDIR}/${P}-dialog-show.patch"
}

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() {
	elog "If you wish to try voice (and video) chat in psi, don't forget to"
	elog " # emerge psimedia"
}