From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 91B591381F3 for ; Thu, 11 Jul 2013 11:46:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42053E09B0; Thu, 11 Jul 2013 11:46:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C67BAE0968 for ; Thu, 11 Jul 2013 11:46:08 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81CDC33E90E for ; Thu, 11 Jul 2013 11:46:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B86CCE468F for ; Thu, 11 Jul 2013 11:46:05 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1373543005.e647143ac2d7c40e7a180127ad5b5289c9c4dfa8.kensington@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.10.90.ebuild kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild kde-base/kdelibs/kdelibs-9999.ebuild X-VCS-Directories: kde-base/kdelibs/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: e647143ac2d7c40e7a180127ad5b5289c9c4dfa8 X-VCS-Branch: master Date: Thu, 11 Jul 2013 11:46:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7ddfeaf7-bf73-449c-9013-c12726b5764f X-Archives-Hash: 7e10871a2febbc3ba141363259d40063 commit: e647143ac2d7c40e7a180127ad5b5289c9c4dfa8 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jul 11 11:43:25 2013 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Jul 11 11:43:25 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e647143a [kde-base/kdelibs] Avoid add_blocker. Package-Manager: portage-2.1.12.13 --- kde-base/kdelibs/kdelibs-4.10.90.ebuild | 8 ++------ kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild | 8 ++------ kde-base/kdelibs/kdelibs-9999.ebuild | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/kde-base/kdelibs/kdelibs-4.10.90.ebuild b/kde-base/kdelibs/kdelibs-4.10.90.ebuild index 5264b22..a454ac2 100644 --- a/kde-base/kdelibs/kdelibs-4.10.90.ebuild +++ b/kde-base/kdelibs/kdelibs-4.10.90.ebuild @@ -90,6 +90,8 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND} !dev-qt/qtphonon + !<=kde-base/plasma-workspace-4.7.1:4 + !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates $(add_kdebase_dep kde-env) @@ -117,12 +119,6 @@ PDEPEND=" ) " -# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities -add_blocker plasma-workspace 4.7.1 - -# file collision, bug 394991 -add_blocker kcontrol 4.4.50 - PATCHES=( "${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.11.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild index 9fe89d1..bd00fd2 100644 --- a/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild @@ -90,6 +90,8 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND} !dev-qt/qtphonon + !<=kde-base/plasma-workspace-4.7.1:4 + !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates $(add_kdebase_dep kde-env) @@ -117,12 +119,6 @@ PDEPEND=" ) " -# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities -add_blocker plasma-workspace 4.7.1 - -# file collision, bug 394991 -add_blocker kcontrol 4.4.50 - PATCHES=( "${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/kdelibs-9999.ebuild index ec796e1..12a1d63 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -90,6 +90,8 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND} !dev-qt/qtphonon + !<=kde-base/plasma-workspace-4.7.1:4 + !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates $(add_kdebase_dep kde-env) @@ -117,12 +119,6 @@ PDEPEND=" ) " -# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities -add_blocker plasma-workspace 4.7.1 - -# file collision, bug 394991 -add_blocker kcontrol 4.4.50 - PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"