summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-07-27 07:49:59 +0000
committerJohannes Huber <johu@gentoo.org>2012-07-27 07:49:59 +0000
commit9906fe95c793304a9567423c7880689e31bb7bbf (patch)
tree816f9682f0ac062639833c960f8389ceed90bf8d /net-im
parentmarked x86 per bug 428086 (diff)
downloadgentoo-2-9906fe95c793304a9567423c7880689e31bb7bbf.tar.gz
gentoo-2-9906fe95c793304a9567423c7880689e31bb7bbf.tar.bz2
gentoo-2-9906fe95c793304a9567423c7880689e31bb7bbf.zip
Block old net-im/ktp-contact-list to prevent file collisions, bug #428242.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/ktp-common-internals/ChangeLog7
-rw-r--r--net-im/ktp-common-internals/ktp-common-internals-0.4.1.ebuild3
2 files changed, 7 insertions, 3 deletions
diff --git a/net-im/ktp-common-internals/ChangeLog b/net-im/ktp-common-internals/ChangeLog
index 9364d56e9d34..fe2bde8b7f8e 100644
--- a/net-im/ktp-common-internals/ChangeLog
+++ b/net-im/ktp-common-internals/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/ktp-common-internals
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-common-internals/ChangeLog,v 1.6 2012/07/26 12:28:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-common-internals/ChangeLog,v 1.7 2012/07/27 07:49:59 johu Exp $
+
+ 27 Jul 2012; Johannes Huber <johu@gentoo.org>
+ ktp-common-internals-0.4.1.ebuild:
+ Block old net-im/ktp-contact-list to prevent file collisions, bug #428242.
*ktp-common-internals-0.4.1 (26 Jul 2012)
@@ -33,4 +37,3 @@
25 Jan 2012; Johannes Huber <johu@gentoo.org>
+ktp-common-internals-0.3.0.ebuild, +metadata.xml:
Initial import from kde overlay. Add KDE Telepathy 0.3.0.
-
diff --git a/net-im/ktp-common-internals/ktp-common-internals-0.4.1.ebuild b/net-im/ktp-common-internals/ktp-common-internals-0.4.1.ebuild
index eeeb892afb55..3f81f56e79a6 100644
--- a/net-im/ktp-common-internals/ktp-common-internals-0.4.1.ebuild
+++ b/net-im/ktp-common-internals/ktp-common-internals-0.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-common-internals/ktp-common-internals-0.4.1.ebuild,v 1.1 2012/07/26 12:28:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-common-internals/ktp-common-internals-0.4.1.ebuild,v 1.2 2012/07/27 07:49:59 johu Exp $
EAPI=4
@@ -24,5 +24,6 @@ IUSE="debug"
DEPEND="
>=net-libs/telepathy-qt-0.9.1
+ !!<net-im/ktp-contact-list-0.4.0
"
RDEPEND="${DEPEND}"