From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-893466-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id B155C13832F
	for <garchives@archives.gentoo.org>; Mon, 25 Jul 2016 15:30:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id D2817E09A9;
	Mon, 25 Jul 2016 15:30:33 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 093F8E09A9
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jul 2016 15:30:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A4262340BDA
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jul 2016 15:30:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2806E7E3
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jul 2016 15:30:29 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
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" <kensington@gentoo.org>
Message-ID: <1469460614.912d150938c9730009816bf4008ea9455cf07772.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
X-VCS-Repository: proj/kde
X-VCS-Files: eclass/kde5.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: 912d150938c9730009816bf4008ea9455cf07772
X-VCS-Branch: master
Date: Mon, 25 Jul 2016 15:30:29 +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
X-Archives-Salt: fd76c9f6-4fd3-4db8-bd4d-a1992581b4f9
X-Archives-Hash: 8edfbb74166b675ec0c00d5b936d01db

commit:     912d150938c9730009816bf4008ea9455cf07772
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jul 23 13:02:36 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 15:30:14 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=912d1509

kde5.eclass: More cleanup after 16.04 removal

 eclass/kde5.eclass | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 14d4e87..a4e3768 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -109,12 +109,6 @@ if [[ ${KDEBASE} = kdel10n ]]; then
 	fi
 fi
 
-# @ECLASS-VARIABLE: KDE_PIM_KEEP_SUBDIR
-# @DESCRIPTION:
-# If building a split package from KMNAME="kdepim", provide a list of
-# subdirectories that need to be present for a successful build.
-: ${KDE_PIM_KEEP_SUBDIR:=}
-
 # @ECLASS-VARIABLE: KDE_PUNT_BOGUS_DEPS
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -254,16 +248,7 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KMNAME} = kdepim ]]; then
-	local subproj
-	if [[ ${PV} != 16.04* ]]; then
-		subproj="/${PN}"
-	fi
-	if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-		S="${WORKDIR}/${P}${subproj}"
-	else
-		S="${WORKDIR}/${KMNAME}-${PV}${subproj}"
-	fi
-	unset subproj
+	S="${S}/${PN}"
 fi
 
 _kde_is_unreleased() {