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 25B53138330 for ; Wed, 31 Aug 2016 14:34:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0447721C168; Wed, 31 Aug 2016 14:33:47 +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 A05FA21C13A for ; Wed, 31 Aug 2016 14:33:45 +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 6CEFC340861 for ; Wed, 31 Aug 2016 14:33:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E890E247F for ; Wed, 31 Aug 2016 14:33:41 +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: <1472654009.596eb1de8840ea0a6aac9d5ec21b56db22bedb20.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ktnef/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/ktnef/ktnef-16.08.0.ebuild kde-apps/ktnef/ktnef-16.08.49.9999.ebuild kde-apps/ktnef/ktnef-9999.ebuild X-VCS-Directories: kde-apps/ktnef/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 596eb1de8840ea0a6aac9d5ec21b56db22bedb20 X-VCS-Branch: master Date: Wed, 31 Aug 2016 14:33:41 +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: ab3a0a2d-6a0b-4dbf-b66d-aac451980e19 X-Archives-Hash: f517a0b5664be047517aa50a0d48696e commit: 596eb1de8840ea0a6aac9d5ec21b56db22bedb20 Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Aug 30 14:14:14 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Aug 31 14:33:29 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=596eb1de kde-apps/ktnef: Upstream repository changed (kdepim -> kmail) Therefore, source dir needs extra care. Fix DESCRIPTION. Package-Manager: portage-2.2.28 kde-apps/ktnef/ktnef-16.08.0.ebuild | 2 +- kde-apps/ktnef/ktnef-16.08.49.9999.ebuild | 2 +- kde-apps/ktnef/ktnef-9999.ebuild | 18 +++--------------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/kde-apps/ktnef/ktnef-16.08.0.ebuild b/kde-apps/ktnef/ktnef-16.08.0.ebuild index c638861..2be31dd 100644 --- a/kde-apps/ktnef/ktnef-16.08.0.ebuild +++ b/kde-apps/ktnef/ktnef-16.08.0.ebuild @@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional" KMNAME="kdepim" inherit kde5 -DESCRIPTION="A viewer for TNEF attachments" +DESCRIPTION="Viewer for TNEF attachments (proprietary MS Outlook/Exchange Server format)" HOMEPAGE="https://www.kde.org/" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="~amd64 ~x86" diff --git a/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild b/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild index 17cbc58..d6f7e6f 100644 --- a/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild +++ b/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild @@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional" KMNAME="kdepim" inherit kde5 -DESCRIPTION="A viewer for TNEF attachments" +DESCRIPTION="Viewer for TNEF attachments (proprietary MS Outlook/Exchange Server format)" HOMEPAGE="https://www.kde.org/" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" diff --git a/kde-apps/ktnef/ktnef-9999.ebuild b/kde-apps/ktnef/ktnef-9999.ebuild index 17cbc58..b1bb0e1 100644 --- a/kde-apps/ktnef/ktnef-9999.ebuild +++ b/kde-apps/ktnef/ktnef-9999.ebuild @@ -5,10 +5,10 @@ EAPI=6 KDE_HANDBOOK="forceoptional" -KMNAME="kdepim" +KMNAME="kmail" inherit kde5 -DESCRIPTION="A viewer for TNEF attachments" +DESCRIPTION="Viewer for TNEF attachments (proprietary MS Outlook/Exchange Server format)" HOMEPAGE="https://www.kde.org/" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" @@ -31,16 +31,4 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - # ktnef subproject does not contain doc nor searches for DocTools - # at least until properly split upstream - echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir" - - mkdir doc || die "Failed to create doc dir" - mv ../doc/${PN} doc || die "Failed to move handbook" - cat <<-EOF > doc/CMakeLists.txt -find_package(KF5DocTools) -add_subdirectory(${PN}) -EOF - kde5_src_prepare -} +S="${S}/${PN}"