diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-07 19:15:28 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-07 19:15:28 +0000 |
| commit | bb716b3c683dd1ccf8591fdb90c15037689586aa (patch) | |
| tree | e22f2ee8bc95f9e6a718b39d877fed1fc3deffd8 /kde-base/kopete | |
| parent | Changed the dirty hack to disable GTK to a proper patch to xvattr so that it ... (diff) | |
| download | gentoo-2-bb716b3c683dd1ccf8591fdb90c15037689586aa.tar.gz gentoo-2-bb716b3c683dd1ccf8591fdb90c15037689586aa.tar.bz2 gentoo-2-bb716b3c683dd1ccf8591fdb90c15037689586aa.zip | |
Update dependencies based on the recent work on net-im/kopete. Fix modular X dependencies.
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'kde-base/kopete')
| -rw-r--r-- | kde-base/kopete/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kopete/kopete-3.5.1-r1.ebuild | 35 |
2 files changed, 33 insertions, 8 deletions
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog index 35d7d0f14149..2c273bf47eaf 100644 --- a/kde-base/kopete/ChangeLog +++ b/kde-base/kopete/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kopete # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.50 2006/03/05 22:02:00 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.51 2006/03/07 19:15:28 flameeyes Exp $ + + 07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-3.5.1-r1.ebuild: + Update dependencies based on the recent work on net-im/kopete. Fix modular X + dependencies. *kopete-3.5.1-r1 (05 Mar 2006) diff --git a/kde-base/kopete/kopete-3.5.1-r1.ebuild b/kde-base/kopete/kopete-3.5.1-r1.ebuild index 869d86c565ea..5649bb946a43 100644 --- a/kde-base/kopete/kopete-3.5.1-r1.ebuild +++ b/kde-base/kopete/kopete-3.5.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.1-r1.ebuild,v 1.1 2006/03/05 22:02:00 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.1-r1.ebuild,v 1.2 2006/03/07 19:15:28 flameeyes Exp $ KMNAME=kdenetwork MAXKDEVER=$PV @@ -13,14 +13,35 @@ HOMEPAGE="http://kopete.kde.org/" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="sametime ssl xmms" -DEPEND="dev-libs/libxslt +# The kernel_linux? ( ) conditional dependencies are for webcams, not supported +# on other kernels AFAIK +BOTH_DEPEND="dev-libs/libxslt dev-libs/libxml2 + net-dns/libidn >=dev-libs/glib-2 + app-crypt/qca sametime? ( =net-libs/meanwhile-0.4* ) - xmms? ( media-sound/xmms )" -RDEPEND="$DEPEND - ssl? ( app-crypt/qca-tls ) - !net-im/kopete" + xmms? ( media-sound/xmms ) + || ( ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + x11-libs/libXScrnSaver + ) virtual/x11 ) + kernel_linux? ( virtual/opengl )" + +RDEPEND="${BOTH_DEPEND} + ssl? ( app-crypt/qca-tls )" + +DEPEND="${BOTH_DEPEND} + kernel_linux? ( virtual/os-headers ) + || ( ( + x11-proto/videoproto + x11-proto/xextproto + x11-proto/xproto + kernel_linux? ( x11-libs/libXv ) + x11-proto/scrnsaverproto + ) virtual/x11 )" PATCHES="${FILESDIR}/${PN}-3.5.x-msn-filetransfer.patch" @@ -29,7 +50,7 @@ src_compile() { # Maybe we can enable it in the future. # The nowlistening plugin has xmms support. local myconf="$(use_enable sametime sametime-plugin) - $(use_with xmms) --without-external-libgadu" + $(use_with xmms) --without-external-libgadu" kde-meta_src_compile } |