From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 3DA0A13940E for ; Thu, 27 Oct 2016 19:42:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A62BFE0B2B; Thu, 27 Oct 2016 19:42:03 +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 8C4BAE0B2B for ; Thu, 27 Oct 2016 19:42:03 +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 E830F3411FB for ; Thu, 27 Oct 2016 19:42:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22D32249D for ; Thu, 27 Oct 2016 19:42:00 +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: <1477597311.dee51a1b9f5e7511897a22a122a2fba4edb7ed82.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch media-gfx/krita/krita-9999.ebuild X-VCS-Directories: media-gfx/krita/files/ media-gfx/krita/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: dee51a1b9f5e7511897a22a122a2fba4edb7ed82 X-VCS-Branch: master Date: Thu, 27 Oct 2016 19:42:00 +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: 81764ead-3253-4cf5-9434-673c3e3118c0 X-Archives-Hash: fdd1bf3c2f0bf86e9d09ecfa84c95d24 commit: dee51a1b9f5e7511897a22a122a2fba4edb7ed82 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 27 19:41:40 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 27 19:41:51 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dee51a1b media-gfx/krita: drop breeze collision patch Upstream-commit: f50c5949365e333e9762b635722251a8406b3f81 Package-Manager: portage-2.3.2 .../krita/files/krita-3.0.1-breeze-collisions.patch | 16 ---------------- media-gfx/krita/krita-9999.ebuild | 1 - 2 files changed, 17 deletions(-) diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch deleted file mode 100644 index 890f825..0000000 --- a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch +++ /dev/null @@ -1,16 +0,0 @@ -Avoid installing files that collide with kde-plasma/breeze. - -Gentoo-bug: 594594 -KDE-bug: 368093 - ---- a/krita/data/themes/CMakeLists.txt -+++ b/krita/data/themes/CMakeLists.txt -@@ -1,8 +1,6 @@ - ########### install files ############### - - install(FILES --BreezeDark.colors --BreezeHighContrast.colors - BreezeLight.colors - KritaNeutral.colors - KritaBlender.colors diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild index 33d11a2..8ee6353 100644 --- a/media-gfx/krita/krita-9999.ebuild +++ b/media-gfx/krita/krita-9999.ebuild @@ -72,7 +72,6 @@ RDEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch" "${FILESDIR}/${PN}-3.0.1-vc-cxxflags.patch" )