1 |
commit: 1257a57be6a6d27551914d9d37490a1ef9755fd0 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 8 20:46:55 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 8 20:49:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1257a57b |
7 |
|
8 |
dev-embedded/cpik: 0.7.4_p4 version bump, use qtcore:5, fix GCC-6 |
9 |
|
10 |
Thanks-to: Thomas Posch <bugs.gentoo.org <AT> online.posch.name> |
11 |
Bug: https://bugs.gentoo.org/644402 |
12 |
Closes: https://bugs.gentoo.org/639554 |
13 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
14 |
|
15 |
dev-embedded/cpik/Manifest | 1 + |
16 |
dev-embedded/cpik/cpik-0.7.4_p4.ebuild | 46 ++++++++++++++++++++++++ |
17 |
dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch | 12 +++++++ |
18 |
3 files changed, 59 insertions(+) |
19 |
|
20 |
diff --git a/dev-embedded/cpik/Manifest b/dev-embedded/cpik/Manifest |
21 |
index 1cd53147e09..5499eb56043 100644 |
22 |
--- a/dev-embedded/cpik/Manifest |
23 |
+++ b/dev-embedded/cpik/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST cpik-0.7.2-4.tar.gz 5960822 BLAKE2B 744c3a35bb5c2421b14497e2f34c1a5bb37ba7a69d918ff72353970b1d973b4ac8443ab0fff61676100c9489a7bfef6c907932b77d67a1681bf4ed532c0b4cf9 SHA512 e1ea5ebdd8eb2481dbfebb14c6e194d277755fbbd58388c089d0127006485a3a8b66b79e58135903ea41d4f7b1ccc49263519b741e680f29c0aa486240b12df3 |
26 |
+DIST cpik-0.7.4-4.tar.gz 8322003 BLAKE2B e88f04a92f44800139089b3115da42c5bbe88128300db28660b9300ae4260cba08432de0865d0426ce179743388483c9a3310c417bfaa3c7e4ef93217c38574b SHA512 d376af949bd2fbc80bd3c13e02d44c5a9ef82c409ac20e4c750fa77b654b89e77289b5a022988e05261cdbfe15563f837ec0e6382bb8bf27be673d0e55bbfa2c |
27 |
|
28 |
diff --git a/dev-embedded/cpik/cpik-0.7.4_p4.ebuild b/dev-embedded/cpik/cpik-0.7.4_p4.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..376bf94a41f |
31 |
--- /dev/null |
32 |
+++ b/dev-embedded/cpik/cpik-0.7.4_p4.ebuild |
33 |
@@ -0,0 +1,46 @@ |
34 |
+# Copyright 1999-2018 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+ |
39 |
+inherit qmake-utils |
40 |
+ |
41 |
+MY_PV="${PV/_p/-}" |
42 |
+MY_P="${PN}-${MY_PV}" |
43 |
+ |
44 |
+DESCRIPTION="C compiler for PIC18 devices" |
45 |
+HOMEPAGE="http://pikdev.free.fr/" |
46 |
+SRC_URI="http://pikdev.free.fr/${MY_P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="GPL-2" |
49 |
+SLOT="0" |
50 |
+KEYWORDS="~amd64 ~x86" |
51 |
+IUSE="" |
52 |
+ |
53 |
+DEPEND="dev-qt/qtcore:5" |
54 |
+RDEPEND="" |
55 |
+ |
56 |
+S="${WORKDIR}/${MY_P}" |
57 |
+ |
58 |
+DOCS=( ${MY_PV/-*/}/doc/cpik-{0.5.2-tutorial,0.7.4-4-doc}.pdf ) |
59 |
+HTML_DOCS=( ${MY_PV/-*/}/doc/html/. ) |
60 |
+ |
61 |
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" ) |
62 |
+ |
63 |
+src_prepare() { |
64 |
+ default |
65 |
+ |
66 |
+ # does not install docs in wrong path |
67 |
+ sed -e '/INSTALLS += docs/d' \ |
68 |
+ -i "${PN}"*.pro || die 'sed failed.' |
69 |
+} |
70 |
+ |
71 |
+src_configure() { |
72 |
+ eqmake5 |
73 |
+} |
74 |
+ |
75 |
+src_install() { |
76 |
+ emake INSTALL_ROOT="${D}" install |
77 |
+ einstalldocs |
78 |
+ dosym "${PN}-${MY_PV/-*/}" "/usr/bin/${PN}" |
79 |
+} |
80 |
|
81 |
diff --git a/dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch b/dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch |
82 |
new file mode 100644 |
83 |
index 00000000000..c1f41cd7e6e |
84 |
--- /dev/null |
85 |
+++ b/dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch |
86 |
@@ -0,0 +1,12 @@ |
87 |
+diff -Naur cpik-0.7.2-4-orig/utility.h cpik-0.7.2-4/utility.h |
88 |
+--- cpik-0.7.2-4-orig/utility.h 2017-12-03 03:47:35.302504007 +0100 |
89 |
++++ cpik-0.7.2-4/utility.h 2017-12-03 03:47:59.537116442 +0100 |
90 |
+@@ -75,7 +75,7 @@ |
91 |
+ static bool stringTo ( const string& s, T& result ) |
92 |
+ { |
93 |
+ istringstream is ( s ) ; |
94 |
+- return is >> result ; |
95 |
++ return static_cast<bool>(is >> result); |
96 |
+ } |
97 |
+ |
98 |
+ /** generic conversion from T to string */ |