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 F0D7A139082 for ; Sat, 17 Dec 2016 19:51:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 475B4E0C6B; Sat, 17 Dec 2016 19:51:54 +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 1F95DE0C6B for ; Sat, 17 Dec 2016 19:51:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 10B1033D3C7 for ; Sat, 17 Dec 2016 19:51:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A556A24AB for ; Sat, 17 Dec 2016 19:51:51 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1482004285.579645e62f7de13dea285220dba38a5b789acce2.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kmail/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kmail/kmail-16.12.49.9999.ebuild kde-apps/kmail/kmail-9999.ebuild X-VCS-Directories: kde-apps/kmail/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 579645e62f7de13dea285220dba38a5b789acce2 X-VCS-Branch: master Date: Sat, 17 Dec 2016 19:51:51 +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: 6ce531e3-260f-483e-9464-a197521680ef X-Archives-Hash: 4317ab55c20e472ff8efb5d89aa346e0 commit: 579645e62f7de13dea285220dba38a5b789acce2 Author: Johannes Huber gentoo org> AuthorDate: Sat Dec 17 19:51:25 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Dec 17 19:51:25 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=579645e6 kde-apps/kmail: Fix file collision Collides with kde-apps/ktnef:4 as well. Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/kmail/kmail-16.12.49.9999.ebuild | 2 +- kde-apps/kmail/kmail-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/kmail/kmail-16.12.49.9999.ebuild b/kde-apps/kmail/kmail-16.12.49.9999.ebuild index ac2d938..f139949 100644 --- a/kde-apps/kmail/kmail-16.12.49.9999.ebuild +++ b/kde-apps/kmail/kmail-16.12.49.9999.ebuild @@ -78,7 +78,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !kde-apps/kdepim:5 !kde-apps/kdepim-common-libs:4 - !kde-apps/ktnef:5 + !kde-apps/ktnef " src_prepare() { diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild index d61e458..28da36a 100644 --- a/kde-apps/kmail/kmail-9999.ebuild +++ b/kde-apps/kmail/kmail-9999.ebuild @@ -77,7 +77,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepim-common-libs:4 - !kde-apps/ktnef:5 + !kde-apps/ktnef " src_prepare() {