From 7d04a96df3e61cb913e248585d14c938f5e3452f Mon Sep 17 00:00:00 2001 From: Przemyslaw Maciag Date: Sun, 31 Dec 2006 12:13:26 +0000 Subject: [PATCH] Version bump to newest snap. And some more ebuild changes / cleanups (see changelog) Package-Manager: portage-2.1.2_rc4-r2 --- net-im/psi/ChangeLog | 24 +++- net-im/psi/files/digest-psi-0.11_pre20061231 | 3 + net-im/psi/psi-0.11_pre20061231.ebuild | 129 +++++++++++++++++++ 3 files changed, 151 insertions(+), 5 deletions(-) create mode 100644 net-im/psi/files/digest-psi-0.11_pre20061231 create mode 100644 net-im/psi/psi-0.11_pre20061231.ebuild diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog index 26ab6246cf30..0861c6decedf 100644 --- a/net-im/psi/ChangeLog +++ b/net-im/psi/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for net-im/psi # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.106 2006/12/05 17:14:48 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.107 2006/12/31 12:13:26 troll Exp $ + +*psi-0.11_pre20061231 (31 Dec 2006) + + 31 Dec 2006; Przemysław Maciąg + -psi-0.11_beta4.ebuild, +psi-0.11_pre20061231.ebuild: + Removed beta4 - newest snapshot used instead (I preffer this, as it has fixed + few problems. + Version bump to 2006-12-31 snapshot. + Added jingle and plugins USE flags. + Added doc use flag to install some developer documentation. + Added check for qt3support in qt4, when building with libjingle (thx to Rudi + Mayerhofer, see #158285). + Added some qmake execution over pro files. + Rechecked DEPEND - should be more accurate now. 05 Dec 2006; Stefan Schweizer ChangeLog: remove 0.11_pre20061020 - older than beta4 and does not build for me @@ -10,12 +24,12 @@ 04 Dec 2006; Hanno Boeck +psi-0.11_beta4.ebuild: Add beta version of 0.11. - 13 Nov 2006; Diego Pettenò psi-0.10.ebuild: + 13 Nov 2006; Diego Pettenò psi-0.10.ebuild: Remove xmms useflag. *psi-0.10-r2 (12 Nov 2006) - 12 Nov 2006; Przemysław Maciąg + 12 Nov 2006; Przemysław Maciąg -files/psi-taskbar_flashing.patch, -psi-0.10-r1.ebuild, +psi-0.10-r2.ebuild: Removing broken psi-0.10-r1, so everyone will see it changed. Removing xmms @@ -44,13 +58,13 @@ *psi-0.10-r1 (29 Sep 2006) - 29 Sep 2006; Przemysław Maciąg + 29 Sep 2006; Przemysław Maciąg +files/psi-taskbar_flashing.patch, +psi-0.10-r1.ebuild: Fixed icon missing in gnome menu (#106665). Thx to Martin Schwier. Taskbar flashing patch, as requested (#139159). Updated langpacks. - 25 Sep 2006; Przemysław Maciąg -psi-0.9.3-r1.ebuild, + 25 Sep 2006; Przemysław Maciąg -psi-0.9.3-r1.ebuild, -psi-0.9.3-r2.ebuild, -psi-0.9.3-r3.ebuild, -psi-0.9.3-r4.ebuild, -files/digest-psi-0.9.3-r1, -files/digest-psi-0.9.3-r2, -files/digest-psi-0.9.3-r3, -files/digest-psi-0.9.3-r4, diff --git a/net-im/psi/files/digest-psi-0.11_pre20061231 b/net-im/psi/files/digest-psi-0.11_pre20061231 new file mode 100644 index 000000000000..31cb2878cd7c --- /dev/null +++ b/net-im/psi/files/digest-psi-0.11_pre20061231 @@ -0,0 +1,3 @@ +MD5 b4f86b62fe75b58a7357deb18b33f1e9 psi-dev-snapshot-2006-12-31.tar.bz2 2366142 +RMD160 10e3d652aa008a8459b8e02f3ee97313f7dd0547 psi-dev-snapshot-2006-12-31.tar.bz2 2366142 +SHA256 114e36a0167d056e16749ec0d64b0c8fbe400a68e11de6563594ce7306af975a psi-dev-snapshot-2006-12-31.tar.bz2 2366142 diff --git a/net-im/psi/psi-0.11_pre20061231.ebuild b/net-im/psi/psi-0.11_pre20061231.ebuild new file mode 100644 index 000000000000..842d2ba1b755 --- /dev/null +++ b/net-im/psi/psi-0.11_pre20061231.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.11_pre20061231.ebuild,v 1.1 2006/12/31 12:13:26 troll Exp $ + +inherit confutils eutils qt4 + +MY_PV="${PV:8:4}-${PV:12:2}-${PV:14:2}" +MY_P="${PN}-dev-snapshot-${MY_PV}" + +IUSE="doc jingle plugins sasl spell ssl xscreensaver" + +DESCRIPTION="QT 4.x Jabber Client, with Licq-like interface" +HOMEPAGE="http://psi-im.org/" +SRC_URI="http://psi-im.org/files/snapshot/${MY_P}.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86" + +S="${WORKDIR}/${MY_P}" + +DEPEND="$(qt4_min_version 4.2) + media-libs/libpng + sys-libs/zlib + dev-libs/glib + doc? ( app-doc/doxygen ) + jingle? ( ~net-libs/ortp-0.7.1 + media-libs/speex + media-libs/alsa-lib ) + sasl? ( dev-libs/cyrus-sasl ) + spell? ( app-text/aspell ) + ssl? ( dev-libs/openssl ) + xscreensaver? ( x11-misc/xscreensaver )" + +RDEPEND="${DEPEND}" + +pkg_setup() { + if use jingle && !(built_with_use x11-libs/qt qt3support); then + eerror "In order to compile psi with jingle support (google/talk" + eerror "xmpp extension) you will need to recompile qt4 with" + eerror "qt3support use flag enabled." + die "Recompile qt4 with qt3support use flag enabled or disable jingle support in psi" + fi; +} + +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/psi-jingle-gcc4.patch +} + +src_compile() { + # growl is mac osx extension only - maybe someday we will want this + local myconf="--disable-growl" + + # jingle is still alpha code... + if use jingle; then + mv configure-jingle configure + chmod +x configure + + myconf="${myconf} --enable-jingle" + else + # xmms must die! + myconf="${myconf} --disable-xmms" + fi; + + QTDIR=/usr/lib ./configure \ + --prefix=/usr \ + $(enable_extension_disable xss xscreensaver) \ + $(enable_extension_disable cyrussasl sasl) \ + $(enable_extension_disable aspell spell) \ + $(enable_extension_disable openssl ssl) \ + $(use_enable plugins) \ + ${myconf} || die "configure failed" + + # for custom CXXFLAGS - should use eqmake in near future + cd ${S}/src + qmake src.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" + + cd ${S} + qmake psi.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" + + # for now, we need bundled qca :/ + cd ${S}/third-party/qca + qmake qca.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" + + cd ${S} + emake || die "make failed" + + if use doc; then + cd ${S}/doc + make api_public + fi; +} + +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 emoticons; do + newdoc ${S}/iconsets/${i}/README README.${i} + done; + newdoc certs/README README.certs + dodoc ChangeLog README TODO + + use doc && cp -ar ${S}/doc/api ${D}/usr/share/psi +} -- 2.26.2