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 D4C49139085 for ; Sat, 4 Feb 2017 21:40:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18B7321C1C5; Sat, 4 Feb 2017 21:40:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 EAAD521C1C5 for ; Sat, 4 Feb 2017 21:40:45 +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 AF39A341655 for ; Sat, 4 Feb 2017 21:40:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D22763DCE for ; Sat, 4 Feb 2017 21:40:36 +0000 (UTC) From: "Alon Bar-Lev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alon Bar-Lev" Message-ID: <1486244424.9e0b54b49a0aa3f667ea5827be41b8e88c03e062.alonbl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/, app-crypt/xca/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/xca/files/xca-1.0.0-desktop.patch app-crypt/xca/xca-1.3.2-r2.ebuild X-VCS-Directories: app-crypt/xca/files/ app-crypt/xca/ X-VCS-Committer: alonbl X-VCS-Committer-Name: Alon Bar-Lev X-VCS-Revision: 9e0b54b49a0aa3f667ea5827be41b8e88c03e062 X-VCS-Branch: master Date: Sat, 4 Feb 2017 21:40:36 +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: 467e4c24-b0b7-4373-9576-80d0f4bee092 X-Archives-Hash: 69325273df1097152066a00d74c8ee76 commit: 9e0b54b49a0aa3f667ea5827be41b8e88c03e062 Author: Alon Bar-Lev gentoo org> AuthorDate: Sat Feb 4 21:39:23 2017 +0000 Commit: Alon Bar-Lev gentoo org> CommitDate: Sat Feb 4 21:40:24 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0b54b4 app-crypt/xca: eapi bump Package-Manager: portage-2.3.3 app-crypt/xca/files/xca-1.0.0-desktop.patch | 4 ++-- app-crypt/xca/xca-1.3.2-r2.ebuild | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app-crypt/xca/files/xca-1.0.0-desktop.patch b/app-crypt/xca/files/xca-1.0.0-desktop.patch index 0d35160..e2da3a1 100644 --- a/app-crypt/xca/files/xca-1.0.0-desktop.patch +++ b/app-crypt/xca/files/xca-1.0.0-desktop.patch @@ -1,5 +1,5 @@ ---- misc/xca.desktop 2012-05-12 05:37:14.000000000 -0400 -+++ xca.desktop.new 2013-01-03 19:43:35.877856711 -0500 +--- a/misc/xca.desktop 2012-05-12 05:37:14.000000000 -0400 ++++ b/misc/xca.desktop 2013-01-03 19:43:35.877856711 -0500 @@ -7,5 +7,5 @@ Icon=xca-32x32 Terminal=false diff --git a/app-crypt/xca/xca-1.3.2-r2.ebuild b/app-crypt/xca/xca-1.3.2-r2.ebuild index 117d698..37b4f1b 100644 --- a/app-crypt/xca/xca-1.3.2-r2.ebuild +++ b/app-crypt/xca/xca-1.3.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils flag-o-matic toolchain-funcs autotools @@ -25,9 +25,13 @@ RDEPEND=" qt4? ( dev-qt/qtgui:4 )" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-desktop.patch" + "${FILESDIR}/${P}-build.patch" +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch - epatch "${FILESDIR}"/${P}-build.patch + default AT_M4DIR="m4" eautoreconf } @@ -35,7 +39,6 @@ src_configure() { # bug #595440 use qt5 && append-cxxflags -std=c++11 econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --with-qt-version=$(use qt5 && echo 5 || echo 4) \ $(use_enable doc) \ STRIP=true @@ -49,6 +52,7 @@ src_compile() { src_install() { # non standard destdir emake install destdir="${ED}" + einstalldocs insinto /etc/xca doins misc/*.txt