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 ) id 1RbgGV-0005gh-SR for garchives@archives.gentoo.org; Fri, 16 Dec 2011 22:28:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB99521C06B; Fri, 16 Dec 2011 22:28:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AF4F421C06B for ; Fri, 16 Dec 2011 22:28:24 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 324581B404A for ; Fri, 16 Dec 2011 22:28:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A0D9D8004A for ; Fri, 16 Dec 2011 22:28:23 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <891b8f0dce40fc940a4fb25f9a53354c1f30dbc6.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild kde-base/kdelibs/kdelibs-4.7.90.ebuild kde-base/kdelibs/kdelibs-9999.ebuild X-VCS-Directories: kde-base/kdelibs/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 891b8f0dce40fc940a4fb25f9a53354c1f30dbc6 Date: Fri, 16 Dec 2011 22:28:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e67c9c49-9833-462b-8291-6eae4448ade6 X-Archives-Hash: bb57b92cbc4959a7a8393641be58fe62 commit: 891b8f0dce40fc940a4fb25f9a53354c1f30dbc6 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Fri Dec 16 22:28:14 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Fri Dec 16 22:28:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D891b8f0d [kde-base/kdelibs] Add a blocker for kcontrol-4.4 because of file collisi= ons, bug 394991 (Portage version: 2.1.10.40/git/Linux x86_64, unsigned Manifest commit) --- kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild | 3 +++ kde-base/kdelibs/kdelibs-4.7.90.ebuild | 3 +++ kde-base/kdelibs/kdelibs-9999.ebuild | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild b/kde-base/kdeli= bs/kdelibs-4.7.49.9999.ebuild index e947c97..d8cdf3a 100644 --- a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild @@ -119,6 +119,9 @@ PDEPEND=3D" # Force the upgrade of plasma-workspace to a version that explicitly dep= ends on kactivities add_blocker plasma-workspace 4.7.1 =20 +# file collision, bug 394991 +add_blocker kcontrol 4.4.50 + PATCHES=3D( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" diff --git a/kde-base/kdelibs/kdelibs-4.7.90.ebuild b/kde-base/kdelibs/kd= elibs-4.7.90.ebuild index 8437b83..5e8a65d 100644 --- a/kde-base/kdelibs/kdelibs-4.7.90.ebuild +++ b/kde-base/kdelibs/kdelibs-4.7.90.ebuild @@ -123,6 +123,9 @@ PDEPEND=3D" # Force the upgrade of plasma-workspace to a version that explicitly dep= ends on kactivities add_blocker plasma-workspace 4.7.1 =20 +# file collision, bug 394991 +add_blocker kcontrol 4.4.50 + PATCHES=3D( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdel= ibs-9999.ebuild index 24b8d79..e93c6fe 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -123,6 +123,9 @@ PDEPEND=3D" # Force the upgrade of plasma-workspace to a version that explicitly dep= ends on kactivities add_blocker plasma-workspace 4.7.1 =20 +# file collision, bug 394991 +add_blocker kcontrol 4.4.50 + PATCHES=3D( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"