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 0D83713888F for ; Thu, 15 Oct 2015 08:15:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4631B21C00F; Thu, 15 Oct 2015 08:15:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A941921C00F for ; Thu, 15 Oct 2015 08:15:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F73F33E01A for ; Thu, 15 Oct 2015 08:15:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BD12922 for ; Thu, 15 Oct 2015 08:15:18 +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: <1444896911.dee669499b78692e054ce2ba07d40234b4c4f93f.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-runtime-meta/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild kde-apps/kdebase-runtime-meta/metadata.xml X-VCS-Directories: kde-apps/kdebase-runtime-meta/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: dee669499b78692e054ce2ba07d40234b4c4f93f X-VCS-Branch: master Date: Thu, 15 Oct 2015 08:15:18 +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: 37ac243b-88a0-4ba2-a2bb-6928b4d92991 X-Archives-Hash: 218a570c1234feb16ffc268fb2cc5c0c commit: dee669499b78692e054ce2ba07d40234b4c4f93f Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Oct 14 17:54:41 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 15 08:15:11 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dee66949 kde-apps/kdebase-runtime-meta: Make more RDEPENDs optional kglobalaccel, kuiserver: Do it like upstream and don't RDEPEND if USE=minimal See upstream commit be3ee5b9a36e1b7f3c6eab466e33762ae101b3c6 kwalletd: Make it optional with USE=oldwallet Package-Manager: portage-2.2.23 .../kdebase-runtime-meta-15.08.49.9999.ebuild | 13 ++++++++----- .../kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild | 13 ++++++++----- kde-apps/kdebase-runtime-meta/metadata.xml | 1 + 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild index ec98095..769af9a 100644 --- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild +++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.08.49.9999.ebuild @@ -8,7 +8,7 @@ inherit kde5-meta-pkg DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages" KEYWORDS="" -IUSE="crash-reporter minimal" +IUSE="crash-reporter minimal +oldwallet" RDEPEND=" $(add_kdeapps_dep kcmshell) @@ -21,7 +21,6 @@ RDEPEND=" $(add_kdeapps_dep kdontchangethehostname) $(add_kdeapps_dep keditfiletype) $(add_kdeapps_dep kfile) - $(add_kdeapps_dep kglobalaccel) $(add_kdeapps_dep kiconfinder) $(add_kdeapps_dep kimgio) $(add_kdeapps_dep kioclient) @@ -34,20 +33,24 @@ RDEPEND=" $(add_kdeapps_dep kstart) $(add_kdeapps_dep ktimezoned) $(add_kdeapps_dep ktraderclient) - $(add_kdeapps_dep kuiserver) $(add_kdeapps_dep kurifilter-plugins) - $(add_kdeapps_dep kwalletd) $(add_kdeapps_dep phonon-kde) $(add_kdeapps_dep plasma-runtime) $(add_kdeapps_dep renamedlg-plugins) $(add_kdeapps_dep solid-runtime) crash-reporter? ( $(add_kdeapps_dep drkonqi ) ) - minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') ) + minimal? ( + $(add_kdeapps_dep solid-runtime '-bluetooth') + oldwallet? ( $(add_kdeapps_dep kwalletd) ) + ) !minimal? ( $(add_kdeapps_dep attica) $(add_kdeapps_dep kcontrol) $(add_kdeapps_dep kdebase-kioslaves) + $(add_kdeapps_dep kglobalaccel) $(add_kdeapps_dep knetattach) + $(add_kdeapps_dep kuiserver) + $(add_kdeapps_dep kwalletd) ) " REQUIRED_USE="minimal? ( !crash-reporter )" diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild index ec98095..769af9a 100644 --- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild +++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild @@ -8,7 +8,7 @@ inherit kde5-meta-pkg DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages" KEYWORDS="" -IUSE="crash-reporter minimal" +IUSE="crash-reporter minimal +oldwallet" RDEPEND=" $(add_kdeapps_dep kcmshell) @@ -21,7 +21,6 @@ RDEPEND=" $(add_kdeapps_dep kdontchangethehostname) $(add_kdeapps_dep keditfiletype) $(add_kdeapps_dep kfile) - $(add_kdeapps_dep kglobalaccel) $(add_kdeapps_dep kiconfinder) $(add_kdeapps_dep kimgio) $(add_kdeapps_dep kioclient) @@ -34,20 +33,24 @@ RDEPEND=" $(add_kdeapps_dep kstart) $(add_kdeapps_dep ktimezoned) $(add_kdeapps_dep ktraderclient) - $(add_kdeapps_dep kuiserver) $(add_kdeapps_dep kurifilter-plugins) - $(add_kdeapps_dep kwalletd) $(add_kdeapps_dep phonon-kde) $(add_kdeapps_dep plasma-runtime) $(add_kdeapps_dep renamedlg-plugins) $(add_kdeapps_dep solid-runtime) crash-reporter? ( $(add_kdeapps_dep drkonqi ) ) - minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') ) + minimal? ( + $(add_kdeapps_dep solid-runtime '-bluetooth') + oldwallet? ( $(add_kdeapps_dep kwalletd) ) + ) !minimal? ( $(add_kdeapps_dep attica) $(add_kdeapps_dep kcontrol) $(add_kdeapps_dep kdebase-kioslaves) + $(add_kdeapps_dep kglobalaccel) $(add_kdeapps_dep knetattach) + $(add_kdeapps_dep kuiserver) + $(add_kdeapps_dep kwalletd) ) " REQUIRED_USE="minimal? ( !crash-reporter )" diff --git a/kde-apps/kdebase-runtime-meta/metadata.xml b/kde-apps/kdebase-runtime-meta/metadata.xml index 42a8f90..39dab8e 100644 --- a/kde-apps/kdebase-runtime-meta/metadata.xml +++ b/kde-apps/kdebase-runtime-meta/metadata.xml @@ -5,5 +5,6 @@ Builds a gui tool to submit crash information to the upstream backtracker Install a Plasma 5 compatible subset of the package + Install kde-apps/kwalletd on a minimal setup for migration purposes