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-380793-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1R1PYv-0006BG-HD
	for garchives@archives.gentoo.org; Wed, 07 Sep 2011 21:21:37 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 855E821C2E2;
	Wed,  7 Sep 2011 21:21:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 481AF21C2E2
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Sep 2011 21:21:15 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id BF60D1B4021
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Sep 2011 21:21:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 067D680043
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Sep 2011 21:21:14 +0000 (UTC)
From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" <alexxy@gentoo.org>
Message-ID: <3a7d483b1bbf1c50449ff90bdd157eca22dd85ff.alexxy@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-9999.ebuild
X-VCS-Directories: kde-base/kdelibs/
X-VCS-Committer: alexxy
X-VCS-Committer-Name: Alexey Shvetsov
X-VCS-Revision: 3a7d483b1bbf1c50449ff90bdd157eca22dd85ff
Date: Wed,  7 Sep 2011 21:21:14 +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: c3b74c259794592c667edc14ee6d102d

commit:     3a7d483b1bbf1c50449ff90bdd157eca22dd85ff
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  7 21:20:10 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 21:20:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc=
ommit;h=3D3a7d483b

[kde-base/kdelibs] Drop old blockers

(Portage version: 2.2.0_alpha54/git/Linux x86_64, signed Manifest commit =
with key F82F92E6)

---
 kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild |   18 ------------------
 kde-base/kdelibs/kdelibs-9999.ebuild        |   18 ------------------
 2 files changed, 0 insertions(+), 36 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 96b3aea..691119f 100644
--- a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
@@ -93,11 +93,7 @@ DEPEND=3D"${COMMONDEPEND}
 	nls? ( virtual/libintl )
 "
 RDEPEND=3D"${COMMONDEPEND}
-	!dev-libs/conversion
-	!dev-libs/kunitconversion
 	!x11-libs/qt-phonon
-	!<=3Dkde-misc/kdnssd-avahi-0.1.2:0
-	!<=3Dkde-misc/knetworkmanager-4.4.0_p20100820
 	>=3Dapp-crypt/gnupg-2.0.11
 	app-misc/ca-certificates
 	$(add_kdebase_dep kde-env)
@@ -119,20 +115,6 @@ PDEPEND=3D"
 	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
 "
=20
-# Blockers added due to packages from old versions, removed in the meanw=
hile
-# as well as for file collisions
-add_blocker libknotificationitem
-add_blocker libkworkspace '<4.3.66'
-add_blocker kcontrol '<4.5.80'
-# @since 4.4 - kpilot is gone (blocker added to help upgrades)
-add_blocker kpilot
-# Block some old versions of KDE-3.5 packages that don't work well with =
KDE-4
-add_blocker kdebase 0 3.5.9-r4:3.5
-add_blocker kdebase-startkde 0 3.5.10:3.5
-add_blocker kdelibs 0 '<3.5.10:3.5'
-# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 =
-> 4.3.75
-add_blocker plasma-workspace '<4.3.75'
-
 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 96b3aea..691119f 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -93,11 +93,7 @@ DEPEND=3D"${COMMONDEPEND}
 	nls? ( virtual/libintl )
 "
 RDEPEND=3D"${COMMONDEPEND}
-	!dev-libs/conversion
-	!dev-libs/kunitconversion
 	!x11-libs/qt-phonon
-	!<=3Dkde-misc/kdnssd-avahi-0.1.2:0
-	!<=3Dkde-misc/knetworkmanager-4.4.0_p20100820
 	>=3Dapp-crypt/gnupg-2.0.11
 	app-misc/ca-certificates
 	$(add_kdebase_dep kde-env)
@@ -119,20 +115,6 @@ PDEPEND=3D"
 	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
 "
=20
-# Blockers added due to packages from old versions, removed in the meanw=
hile
-# as well as for file collisions
-add_blocker libknotificationitem
-add_blocker libkworkspace '<4.3.66'
-add_blocker kcontrol '<4.5.80'
-# @since 4.4 - kpilot is gone (blocker added to help upgrades)
-add_blocker kpilot
-# Block some old versions of KDE-3.5 packages that don't work well with =
KDE-4
-add_blocker kdebase 0 3.5.9-r4:3.5
-add_blocker kdebase-startkde 0 3.5.10:3.5
-add_blocker kdelibs 0 '<3.5.10:3.5'
-# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 =
-> 4.3.75
-add_blocker plasma-workspace '<4.3.75'
-
 PATCHES=3D(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"