From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-commits+bounces-335302-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Q9MLh-0003tB-1D for garchives@archives.gentoo.org; Mon, 11 Apr 2011 19:00:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0ED35E01C9; Mon, 11 Apr 2011 19:00:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CF444E01C9 for <gentoo-commits@lists.gentoo.org>; Mon, 11 Apr 2011 19:00:24 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5120B1B4019 for <gentoo-commits@lists.gentoo.org>; Mon, 11 Apr 2011 19:00:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AC40C80065 for <gentoo-commits@lists.gentoo.org>; Mon, 11 Apr 2011 19:00:23 +0000 (UTC) From: "Andreas K. Huettel" <dilfridge@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Huettel" <dilfridge@gentoo.org> Message-ID: <451e31ee2428d90f8f22f8356d9e57b125a86307.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kde-l10n/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kde-l10n/kde-l10n-4.6.9999.ebuild kde-base/kde-l10n/kde-l10n-9999.ebuild X-VCS-Directories: kde-base/kde-l10n/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Huettel X-VCS-Revision: 451e31ee2428d90f8f22f8356d9e57b125a86307 Date: Mon, 11 Apr 2011 19:00:23 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4a98a0c6ba19436a97535afc1d287965 commit: 451e31ee2428d90f8f22f8356d9e57b125a86307 Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> AuthorDate: Mon Apr 11 19:02:57 2011 +0000 Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> CommitDate: Mon Apr 11 19:03:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D451e31ee [kde-base/kde-l10n] Block <kde-misc/konq-plugins-4.6 because of file coll= isions, bug 363091 (Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with = key B6C5F7DE) --- kde-base/kde-l10n/kde-l10n-4.6.9999.ebuild | 2 +- kde-base/kde-l10n/kde-l10n-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-base/kde-l10n/kde-l10n-4.6.9999.ebuild b/kde-base/kde-l1= 0n/kde-l10n-4.6.9999.ebuild index 16f9ad0..f3aa798 100644 --- a/kde-base/kde-l10n/kde-l10n-4.6.9999.ebuild +++ b/kde-base/kde-l10n/kde-l10n-4.6.9999.ebuild @@ -11,7 +11,7 @@ HOMEPAGE=3D"http://www.kde.org/" LICENSE=3D"GPL-2" =20 DEPEND=3D">=3Dsys-devel/gettext-0.17" -RDEPEND=3D"" +RDEPEND=3D"!<kde-misc/konq-plugins-4.6" =20 KEYWORDS=3D"" IUSE=3D"" diff --git a/kde-base/kde-l10n/kde-l10n-9999.ebuild b/kde-base/kde-l10n/k= de-l10n-9999.ebuild index 16f9ad0..f3aa798 100644 --- a/kde-base/kde-l10n/kde-l10n-9999.ebuild +++ b/kde-base/kde-l10n/kde-l10n-9999.ebuild @@ -11,7 +11,7 @@ HOMEPAGE=3D"http://www.kde.org/" LICENSE=3D"GPL-2" =20 DEPEND=3D">=3Dsys-devel/gettext-0.17" -RDEPEND=3D"" +RDEPEND=3D"!<kde-misc/konq-plugins-4.6" =20 KEYWORDS=3D"" IUSE=3D""