diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-10 17:26:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-10 17:26:49 +0100 |
| commit | 6957f5c65b02bba533954eabc0b62f5de36be206 (patch) | |
| tree | 21d8ab8f61dffd9cccc82d0badb68982516a6855 /dev-embedded | |
| parent | e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 (diff) | |
gentoo resync : 10.04.2018
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/Manifest.gz | bin | 12241 -> 12232 bytes | |||
| -rw-r--r-- | dev-embedded/cpik/Manifest | 5 | ||||
| -rw-r--r-- | dev-embedded/cpik/cpik-0.7.4_p4.ebuild (renamed from dev-embedded/cpik/cpik-0.7.2_p4.ebuild) | 27 | ||||
| -rw-r--r-- | dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch | 12 |
4 files changed, 32 insertions, 12 deletions
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz Binary files differindex 68a3e0ad9a6e..79612c0b1ad4 100644 --- a/dev-embedded/Manifest.gz +++ b/dev-embedded/Manifest.gz diff --git a/dev-embedded/cpik/Manifest b/dev-embedded/cpik/Manifest index 61e6f22c35c3..691bf6a74747 100644 --- a/dev-embedded/cpik/Manifest +++ b/dev-embedded/cpik/Manifest @@ -1,3 +1,4 @@ -DIST cpik-0.7.2-4.tar.gz 5960822 BLAKE2B 744c3a35bb5c2421b14497e2f34c1a5bb37ba7a69d918ff72353970b1d973b4ac8443ab0fff61676100c9489a7bfef6c907932b77d67a1681bf4ed532c0b4cf9 SHA512 e1ea5ebdd8eb2481dbfebb14c6e194d277755fbbd58388c089d0127006485a3a8b66b79e58135903ea41d4f7b1ccc49263519b741e680f29c0aa486240b12df3 -EBUILD cpik-0.7.2_p4.ebuild 714 BLAKE2B d7ed5a501f4f936a7b899ffe30b0704391bfea0bff63d8039a30cccdc1ea44468c8fee1087a1422298a949b3b051fbde744786ace9d7d0bd386e9c0f0e4c546a SHA512 e61425269d0f7f9bbd84fd02a1b6ee00f69b128794b019c85181d7c42591fdcc8a1ecd3f4d5d56f7380f39507dd257d7036948cd8185edd06d2da03edca1d652 +AUX cpik-0.7.4_p4-gcc6.patch 441 BLAKE2B d4d9b9688f343d167059080f669bc0b28fde8047df2138394a819165ec4cb2d81142bf6de9ef01a9e194504017f28925d2968b0baa8fdce58ca4b56ab21fdd49 SHA512 77413a7934676781d85475f44a65078fbe63c3736562f23ef190ac905c1231aba63b84d3a5d3786f02afb48f1e544517d6f5a0b6fa6a2fdae3649c221b3a57d5 +DIST cpik-0.7.4-4.tar.gz 8322003 BLAKE2B e88f04a92f44800139089b3115da42c5bbe88128300db28660b9300ae4260cba08432de0865d0426ce179743388483c9a3310c417bfaa3c7e4ef93217c38574b SHA512 d376af949bd2fbc80bd3c13e02d44c5a9ef82c409ac20e4c750fa77b654b89e77289b5a022988e05261cdbfe15563f837ec0e6382bb8bf27be673d0e55bbfa2c +EBUILD cpik-0.7.4_p4.ebuild 849 BLAKE2B 0364da4bfc672403ef1f90dcd3dcca289b527092cc2f8827305065d14bb0d6d64dc9e113eca7b4f4dcc84c36a49ce954fca4842e85da66576ffebe97cc6c9b61 SHA512 75c8ed591db7b4b09b655cbb128446dce9a53a54040dcae95f8380abcb85d44bb271dd9601c4982dae1af3dff67a153f2276303dabc9807bad2f210055b4081a MISC metadata.xml 628 BLAKE2B 5c70cb2f1b0aa48950e961c9a6d26ce9b945da8631a237cadf8ae7702ab1c4f3d14c3ef72add54d42b412a330735d9994c6fdc73f0445c1813650f76f634fa2a SHA512 3fd531f77a31c0258a5d5ca2da9e6cd44fb84e05b2a8ffb91dfe86cb9274b9df20212b8a021ae873b32b92db410f6bd94684477080a3dcfd11a9e03f5b99bf71 diff --git a/dev-embedded/cpik/cpik-0.7.2_p4.ebuild b/dev-embedded/cpik/cpik-0.7.4_p4.ebuild index bcfc5f6e24bc..376bf94a41fb 100644 --- a/dev-embedded/cpik/cpik-0.7.2_p4.ebuild +++ b/dev-embedded/cpik/cpik-0.7.4_p4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit qt4-r2 +inherit qmake-utils MY_PV="${PV/_p/-}" MY_P="${PN}-${MY_PV}" @@ -17,23 +17,30 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="dev-qt/qtcore:4" +DEPEND="dev-qt/qtcore:5" RDEPEND="" S="${WORKDIR}/${MY_P}" -DOCS="${MY_PV/-*/}/doc/*.pdf" -HTML_DOCS="${MY_PV/-*/}/doc/html/." +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 -i -e '/INSTALLS += docs/d' "${PN}"*.pro || die 'sed failed.' + sed -e '/INSTALLS += docs/d' \ + -i "${PN}"*.pro || die 'sed failed.' +} - qt4-r2_src_prepare +src_configure() { + eqmake5 } src_install() { - qt4-r2_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 */ |