Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.

Package-Manager: portage-2.1.4.4

diff --git a/app-mobilephone/kmobiletools/ChangeLog b/app-mobilephone/kmobiletools/ChangeLog
index 30cf01670ef2ceb1a7c5d4dedc0152d6627566f7..dfb875003d2e019e31105dc6a4c0988f5416bc38 100644 (file)
--- a/app-mobilephone/kmobiletools/ChangeLog
+++ b/app-mobilephone/kmobiletools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/kmobiletools
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/ChangeLog,v 1.20 2007/10/25 20:48:26 mrness Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/ChangeLog,v 1.21 2008/02/19 01:17:22 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kmobiletools-0.5.0_beta3.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   25 Oct 2007; Alin Năstac <mrness@gentoo.org>
   -kmobiletools-0.5_beta1.ebuild, -kmobiletools-0.5.0_beta2.ebuild:

diff --git a/app-mobilephone/kmobiletools/Manifest b/app-mobilephone/kmobiletools/Manifest
index d32c09f24467e7aa038f1de369bd5a2f11522654..979debe5a0eb9337d1b5d64ad9332511ce4e2d8f 100644 (file)
--- a/app-mobilephone/kmobiletools/Manifest
+++ b/app-mobilephone/kmobiletools/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kmobiletools-0.5.0_beta3-no-automagic-deps.patch 4945 RMD160 ec2e5c14bdaea74c22db8f018c8b3c33e443c2d2 SHA1 a7b63c09801fc0b21bff24aabe8cb5e033af84da SHA256 acdd6a1bfe582ab95ba3b47bacf92c422ee0a16d52af2f0bd48f7b63c2a4c78e
 AUX kmobiletools-0.5.0_beta3-obexftp-file-collision-fix.patch 5045 RMD160 6810341ae99cbf1045c2edeefaf6da67c6c44aa6 SHA1 26d44bae18d926fddf8f6eb0da6ef692539b7cfe SHA256 b0d1330187a8347a98c8e8727d41f63c00b43b946fdfbded19dcbc934cdae5ea
 DIST kmobiletools-0.4.3.3.tar.bz2 800936 RMD160 4e0fd406a171e9bdb3cb91522439bab58cc6e7f5 SHA1 c0f79f6db5be34daf1729f65a1479522b6ea1656 SHA256 35e3e6249da39847155db240a325933476f4f9af6156be68b340f937c6799c7e
 DIST kmobiletools-0.5.0-beta3.tar.bz2 1282637 RMD160 767637c697ecfeb2800635a47a9c59ed299ffe63 SHA1 ce9b6d3a53ab0b771e8d4615d545625eccea54b6 SHA256 ef30d9d2ff8f0cb86c3b00137fa7a21d926a01f567e8375d4c7032dd41da346e
 EBUILD kmobiletools-0.4.3.3.ebuild 820 RMD160 23854760e7dc9a0bfb04a7d1eed6b7d0de037e9c SHA1 5ad655f64d63f8d4fe697fd73030377cc7149654 SHA256 d0afc1a6ecd6b70b74205c97619ee9c33e35ca62c94922c003d0adb92029ca3b
-EBUILD kmobiletools-0.5.0_beta3.ebuild 1881 RMD160 53171ec9a3b7e3f96e35bbf000fdc697402702b4 SHA1 013f4997f134bd947d2b5ba3a525e92ebfbf210f SHA256 cc0b84fda96ca6029bf8734b5d237bc453e6dbb7af8ae0f122e3aa06ea3f9622
-MISC ChangeLog 4893 RMD160 5206bf5267db985ae4cdcddef7b5359ad66916fd SHA1 a35ec21b719669ab491694cc9a589cb72c7a0681 SHA256 f77f7f11eea494773163be2a4500887f0f9168f13f63a809092b0667ed7d0508
+EBUILD kmobiletools-0.5.0_beta3.ebuild 1958 RMD160 bbd048b237c9acddd9641900ad83a7c1c23ae79e SHA1 82f09ccf365d87946fd22a517c6ba52fa2b4210a SHA256 a3d0ef35951ea51269c7bc68308bcbb67c30c40bd1da4a6ad46cbe8abf6df2c9
+MISC ChangeLog 5060 RMD160 f171e1298fdb0d5e0465eb2601193254008a5589 SHA1 268dcf19cb2e5ee83057de1c8177dc8148fea60e SHA256 c2628cfe54b9b2d2b6882983baf2c150c5d2bd8f8ad23097e00d386fa1901ee4
 MISC metadata.xml 451 RMD160 fac3a5f7d5a7a6e5e5f0f686a562dd0644ce9c65 SHA1 2ae641b00c3afa469cbca09d6e670135dc1fa2e9 SHA256 8dbf5c48aa6262f409345cc2a5da27bbf32d2ef2ff16c8a2d6f4405c7635637c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHui3uB18eXLOpYdkRAgrAAJ0WbUwk6AEIo9Fm3cyurRssYA5HcgCghYjs
+veZD5Fl6uCVo9ZHzvk1dO4c=
+=Gji/
+-----END PGP SIGNATURE-----

diff --git a/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild b/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild
index ffd1cfd744febe83907248ffff2ff6b936c7b167..b44a89832546fdc7276af950a70a63f67d9554be 100644 (file)
--- a/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild
+++ b/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild,v 1.4 2007/07/13 22:53:50 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild,v 1.5 2008/02/19 01:17:22 ingmar Exp $
 
 inherit kde eutils
 
@@ -13,26 +13,31 @@ LICENSE="GPL-2"
 IUSE="bluetooth gammu kde obex"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="kde? ( || ( ( kde-base/libkcal kde-base/kontact ) kde-base/kdepim ) )
-               bluetooth? ( >=net-wireless/kdebluetooth-1.0_beta2 )
-               gammu? ( ~app-mobilephone/gammu-1.11.0 net-wireless/bluez-libs )
-               obex? ( >=app-mobilephone/obexftp-0.21 net-wireless/bluez-libs )"
+DEPEND="
+       kde? (
+               || ( ( =kde-base/libkcal-3.5* =kde-base/kontact-3.5* )
+                       =kde-base/kdepim-3.5* )
+               )
+       bluetooth? ( >=net-wireless/kdebluetooth-1.0_beta2 )
+       gammu? ( ~app-mobilephone/gammu-1.11.0 net-wireless/bluez-libs )
+       obex? ( >=app-mobilephone/obexftp-0.21 net-wireless/bluez-libs )"
+RDEPEND=""
 
 need-kde 3.4
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
        kde_src_unpack
 
-       epatch ${FILESDIR}/${P}-no-automagic-deps.patch
+       epatch "${FILESDIR}"/${P}-no-automagic-deps.patch
 
        # Fixing file collision between kmobiletools and kdebluetooth when
        # USE="obex" is set, see bug 183245
-       epatch ${FILESDIR}/${P}-obexftp-file-collision-fix.patch
+       epatch "${FILESDIR}"/${P}-obexftp-file-collision-fix.patch
 
        # remove configure script to trigger it's rebuild during kde_src_compile
-       rm -f ${S}/configure
+       rm -f "${S}"/configure || die "Failed to remove ./configure"
 }
 
 src_compile() {