1 |
commit: 9e0b54b49a0aa3f667ea5827be41b8e88c03e062 |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 4 21:39:23 2017 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 4 21:40:24 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0b54b4 |
7 |
|
8 |
app-crypt/xca: eapi bump |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
|
12 |
app-crypt/xca/files/xca-1.0.0-desktop.patch | 4 ++-- |
13 |
app-crypt/xca/xca-1.3.2-r2.ebuild | 14 +++++++++----- |
14 |
2 files changed, 11 insertions(+), 7 deletions(-) |
15 |
|
16 |
diff --git a/app-crypt/xca/files/xca-1.0.0-desktop.patch b/app-crypt/xca/files/xca-1.0.0-desktop.patch |
17 |
index 0d35160..e2da3a1 100644 |
18 |
--- a/app-crypt/xca/files/xca-1.0.0-desktop.patch |
19 |
+++ b/app-crypt/xca/files/xca-1.0.0-desktop.patch |
20 |
@@ -1,5 +1,5 @@ |
21 |
---- misc/xca.desktop 2012-05-12 05:37:14.000000000 -0400 |
22 |
-+++ xca.desktop.new 2013-01-03 19:43:35.877856711 -0500 |
23 |
+--- a/misc/xca.desktop 2012-05-12 05:37:14.000000000 -0400 |
24 |
++++ b/misc/xca.desktop 2013-01-03 19:43:35.877856711 -0500 |
25 |
@@ -7,5 +7,5 @@ |
26 |
Icon=xca-32x32 |
27 |
Terminal=false |
28 |
|
29 |
diff --git a/app-crypt/xca/xca-1.3.2-r2.ebuild b/app-crypt/xca/xca-1.3.2-r2.ebuild |
30 |
index 117d698..37b4f1b 100644 |
31 |
--- a/app-crypt/xca/xca-1.3.2-r2.ebuild |
32 |
+++ b/app-crypt/xca/xca-1.3.2-r2.ebuild |
33 |
@@ -1,8 +1,8 @@ |
34 |
-# Copyright 1999-2016 Gentoo Foundation |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
# $Id$ |
38 |
|
39 |
-EAPI="5" |
40 |
+EAPI="6" |
41 |
|
42 |
inherit eutils flag-o-matic toolchain-funcs autotools |
43 |
|
44 |
@@ -25,9 +25,13 @@ RDEPEND=" |
45 |
qt4? ( dev-qt/qtgui:4 )" |
46 |
DEPEND="${RDEPEND}" |
47 |
|
48 |
+PATCHES=( |
49 |
+ "${FILESDIR}/${PN}-1.0.0-desktop.patch" |
50 |
+ "${FILESDIR}/${P}-build.patch" |
51 |
+) |
52 |
+ |
53 |
src_prepare() { |
54 |
- epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch |
55 |
- epatch "${FILESDIR}"/${P}-build.patch |
56 |
+ default |
57 |
AT_M4DIR="m4" eautoreconf |
58 |
} |
59 |
|
60 |
@@ -35,7 +39,6 @@ src_configure() { |
61 |
# bug #595440 |
62 |
use qt5 && append-cxxflags -std=c++11 |
63 |
econf \ |
64 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
65 |
--with-qt-version=$(use qt5 && echo 5 || echo 4) \ |
66 |
$(use_enable doc) \ |
67 |
STRIP=true |
68 |
@@ -49,6 +52,7 @@ src_compile() { |
69 |
src_install() { |
70 |
# non standard destdir |
71 |
emake install destdir="${ED}" |
72 |
+ einstalldocs |
73 |
|
74 |
insinto /etc/xca |
75 |
doins misc/*.txt |