diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-08 22:46:55 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-08 22:49:58 +0200 |
| commit | 1257a57be6a6d27551914d9d37490a1ef9755fd0 (patch) | |
| tree | e5984dd19b75c307b7d88b93f150cf71e80789db | |
| parent | www-servers/tomcat: clean duplicate patches (diff) | |
| download | gentoo-1257a57be6a6d27551914d9d37490a1ef9755fd0.tar.gz gentoo-1257a57be6a6d27551914d9d37490a1ef9755fd0.tar.bz2 gentoo-1257a57be6a6d27551914d9d37490a1ef9755fd0.zip | |
dev-embedded/cpik: 0.7.4_p4 version bump, use qtcore:5, fix GCC-6
Thanks-to: Thomas Posch <bugs.gentoo.org@online.posch.name>
Bug: https://bugs.gentoo.org/644402
Closes: https://bugs.gentoo.org/639554
Package-Manager: Portage-2.3.28, Repoman-2.3.9
| -rw-r--r-- | dev-embedded/cpik/Manifest | 1 | ||||
| -rw-r--r-- | dev-embedded/cpik/cpik-0.7.4_p4.ebuild | 46 | ||||
| -rw-r--r-- | dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch | 12 |
3 files changed, 59 insertions, 0 deletions
diff --git a/dev-embedded/cpik/Manifest b/dev-embedded/cpik/Manifest index 1cd53147e09f..5499eb560430 100644 --- a/dev-embedded/cpik/Manifest +++ b/dev-embedded/cpik/Manifest @@ -1 +1,2 @@ DIST cpik-0.7.2-4.tar.gz 5960822 BLAKE2B 744c3a35bb5c2421b14497e2f34c1a5bb37ba7a69d918ff72353970b1d973b4ac8443ab0fff61676100c9489a7bfef6c907932b77d67a1681bf4ed532c0b4cf9 SHA512 e1ea5ebdd8eb2481dbfebb14c6e194d277755fbbd58388c089d0127006485a3a8b66b79e58135903ea41d4f7b1ccc49263519b741e680f29c0aa486240b12df3 +DIST cpik-0.7.4-4.tar.gz 8322003 BLAKE2B e88f04a92f44800139089b3115da42c5bbe88128300db28660b9300ae4260cba08432de0865d0426ce179743388483c9a3310c417bfaa3c7e4ef93217c38574b SHA512 d376af949bd2fbc80bd3c13e02d44c5a9ef82c409ac20e4c750fa77b654b89e77289b5a022988e05261cdbfe15563f837ec0e6382bb8bf27be673d0e55bbfa2c diff --git a/dev-embedded/cpik/cpik-0.7.4_p4.ebuild b/dev-embedded/cpik/cpik-0.7.4_p4.ebuild new file mode 100644 index 000000000000..376bf94a41fb --- /dev/null +++ b/dev-embedded/cpik/cpik-0.7.4_p4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit qmake-utils + +MY_PV="${PV/_p/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="C compiler for PIC18 devices" +HOMEPAGE="http://pikdev.free.fr/" +SRC_URI="http://pikdev.free.fr/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-qt/qtcore:5" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +DOCS=( ${MY_PV/-*/}/doc/cpik-{0.5.2-tutorial,0.7.4-4-doc}.pdf ) +HTML_DOCS=( ${MY_PV/-*/}/doc/html/. ) + +PATCHES=( "${FILESDIR}/${P}-gcc6.patch" ) + +src_prepare() { + default + + # does not install docs in wrong path + sed -e '/INSTALLS += docs/d' \ + -i "${PN}"*.pro || die 'sed failed.' +} + +src_configure() { + eqmake5 +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs + dosym "${PN}-${MY_PV/-*/}" "/usr/bin/${PN}" +} 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 new file mode 100644 index 000000000000..c1f41cd7e6e0 --- /dev/null +++ b/dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch @@ -0,0 +1,12 @@ +diff -Naur cpik-0.7.2-4-orig/utility.h cpik-0.7.2-4/utility.h +--- cpik-0.7.2-4-orig/utility.h 2017-12-03 03:47:35.302504007 +0100 ++++ cpik-0.7.2-4/utility.h 2017-12-03 03:47:59.537116442 +0100 +@@ -75,7 +75,7 @@ + static bool stringTo ( const string& s, T& result ) + { + istringstream is ( s ) ; +- return is >> result ; ++ return static_cast<bool>(is >> result); + } + + /** generic conversion from T to string */ |