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 1QTemK-0003mL-0R for garchives@archives.gentoo.org; Mon, 06 Jun 2011 18:43:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 123E01C05F; Mon, 6 Jun 2011 18:43:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D220A1C05F for ; Mon, 6 Jun 2011 18:43:48 +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 6C02C1B4013 for ; Mon, 6 Jun 2011 18:43:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 197FC8003C for ; Mon, 6 Jun 2011 18:43:47 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: <3d00a1a3468d60f7ebe178cc9ffe49054897197b.abcd@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-base.eclass X-VCS-Directories: eclass/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: 3d00a1a3468d60f7ebe178cc9ffe49054897197b Date: Mon, 6 Jun 2011 18:43:47 +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: X-Archives-Hash: 5aa22fe0b2abd8eef7bd09ac219c63fd commit: 3d00a1a3468d60f7ebe178cc9ffe49054897197b Author: Jonathan Callen gentoo org> AuthorDate: Mon Jun 6 18:43:37 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Mon Jun 6 18:43:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D3d00a1a3 [eclass] Goodbye kdeprefix (part 1 -- die on +kdeprefix) --- eclass/kde4-base.eclass | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 808e7bf..6779d41 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.94 2011/0= 6/06 17:51:26 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.95 2011/0= 6/06 18:42:55 abcd Exp $ =20 # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -620,6 +620,20 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_UR= I is ${SRC_URI}" kde4-base_pkg_setup() { debug-print-function ${FUNCNAME} "$@" =20 + if has kdeprefix ${IUSE//+} && use kdeprefix; then + eerror "Sorry, kdeprefix support has been removed." + eerror "Please remove kdeprefix from your USE variable." + die "kdeprefix support has been removed" + fi + + if [[ ${CATEGORY}/${PN} !=3D kde-base/kdelibs && ${CATEGORY}/${PN} !=3D= kde-base/kde-env ]] && \ + { [[ ${KDE_REQUIRED} =3D=3D always ]] || { [[ ${KDE_REQUIRED} =3D=3D = optional ]] && use kde; }; } && \ + has_version kde-base/kdelibs[kdeprefix]; then + eerror "Sorry, kdeprefix support has been removed." + eerror "Please rebuild kdelibs without kdeprefix support." + die "kdeprefix support has been removed" + fi + # QA ebuilds [[ -z ${KDE_MINIMAL_VALID} ]] && ewarn "QA Notice: ignoring invalid KDE= _MINIMAL (defaulting to ${KDE_MINIMAL})." =20