diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-12-23 00:37:38 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-12-23 00:37:38 +0000 |
| commit | b4892d1cfbbb01338ec4774400c54e2c488c287a (patch) | |
| tree | 66bf81b459f8f7e2ad0fdba4534bd4098650a479 /kde-base/kopete | |
| parent | Fix prefix support (diff) | |
| download | gentoo-2-b4892d1cfbbb01338ec4774400c54e2c488c287a.tar.gz gentoo-2-b4892d1cfbbb01338ec4774400c54e2c488c287a.tar.bz2 gentoo-2-b4892d1cfbbb01338ec4774400c54e2c488c287a.zip | |
Pull in changes from overlay and prefix support
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base/kopete')
| -rw-r--r-- | kde-base/kopete/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kopete/kopete-4.3.4.ebuild | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog index 0e7825839f73..243601e11136 100644 --- a/kde-base/kopete/ChangeLog +++ b/kde-base/kopete/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kopete # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.232 2009/12/10 22:03:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.233 2009/12/23 00:37:38 abcd Exp $ + + 23 Dec 2009; Jonathan Callen <abcd@gentoo.org> kopete-4.3.4.ebuild: + Pull in changes from overlay and prefix support 10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -kopete-4.3.1.ebuild: Drop KDE SC-4.3.1. diff --git a/kde-base/kopete/kopete-4.3.4.ebuild b/kde-base/kopete/kopete-4.3.4.ebuild index 58158a44c353..d3ba0c5204e2 100644 --- a/kde-base/kopete/kopete-4.3.4.ebuild +++ b/kde-base/kopete/kopete-4.3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.3.4.ebuild,v 1.1 2009/12/01 10:56:31 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.3.4.ebuild,v 1.2 2009/12/23 00:37:38 abcd Exp $ EAPI="2" @@ -66,8 +66,8 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" COMMONDEPEND=" dev-libs/libpcre $(add_kdebase_dep kdepimlibs) - x11-libs/libXScrnSaver >=x11-libs/qt-gui-4.4.0:4[mng] + !aqua? ( x11-libs/libXScrnSaver ) gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2 ) jabber? ( @@ -90,7 +90,7 @@ RDEPEND="${COMMONDEPEND} " # telepathy? ( net-libs/decibel )" DEPEND="${COMMONDEPEND} - x11-proto/scrnsaverproto + !aqua? ( x11-proto/scrnsaverproto ) " PDEPEND=" facebook? ( net-im/kopete-facebook ) @@ -99,15 +99,15 @@ PDEPEND=" src_configure() { local x x2 # Disable old msn support. - mycmakeargs="${mycmakeargs} -DWITH_msn=OFF" + mycmakeargs=(-DWITH_msn=OFF) # enable protocols for x in ${PROTOCOLS}; do [[ ${x/+/} = msn ]] && x2=wlm || x2="" - mycmakeargs="${mycmakeargs} $(cmake-utils_use_with ${x/+/} ${x2})" + mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2})) done # enable plugins for x in ${PLUGINS}; do - mycmakeargs="${mycmakeargs} $(cmake-utils_use_with ${x/+/})" + mycmakeargs+=($(cmake-utils_use_with ${x/+/})) done kde4-meta_src_configure @@ -119,7 +119,7 @@ pkg_postinst() { #if use telepathy; then # elog "To use kopete telepathy plugins, you need to start gabble first:" # elog "GABBLE_PERSIST=1 telepathy-gabble &" - # elog "export TELEPATHY_DATA_PATH=/usr/share/telepathy/managers/" + # elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'" #fi if ! use ssl; then |