commit:     9e0b54b49a0aa3f667ea5827be41b8e88c03e062
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 21:39:23 2017 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> 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

Reply via email to