From 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Mar 2018 15:59:12 +0000 Subject: gentoo resync : 02.03.2018 --- dev-util/Manifest.gz | Bin 63732 -> 63744 bytes dev-util/buildbot-prometheus/Manifest | 3 +- .../buildbot-prometheus-17.7.2-r1.ebuild | 26 +++ .../buildbot-prometheus-17.7.2.ebuild | 6 +- dev-util/cmake/Manifest | 5 +- dev-util/cmake/cmake-3.11.0_rc1.ebuild | 214 --------------------- dev-util/cmake/cmake-3.11.0_rc2.ebuild | 212 ++++++++++++++++++++ .../cmake-3.11.0_rc1-add_missing_pthread.patch | 21 -- dev-util/cmdtest/Manifest | 2 +- dev-util/cmdtest/cmdtest-0.30.ebuild | 2 +- dev-util/conan/Manifest | 6 +- dev-util/conan/conan-0.30.2.ebuild | 55 ------ dev-util/conan/conan-1.0.4.ebuild | 55 ++++++ dev-util/conan/metadata.xml | 9 +- dev-util/debhelper/Manifest | 4 +- dev-util/debhelper/debhelper-11.1.3.ebuild | 73 ------- dev-util/debhelper/debhelper-11.1.5.ebuild | 73 +++++++ dev-util/devhelp/Manifest | 2 +- dev-util/devhelp/devhelp-3.24.0.ebuild | 1 + dev-util/drone-cli/Manifest | 4 +- dev-util/drone-cli/drone-cli-0.8.2.ebuild | 35 ---- dev-util/drone-cli/drone-cli-0.8.4.ebuild | 35 ++++ dev-util/jenkins-bin/Manifest | 4 - dev-util/jenkins-bin/jenkins-bin-2.89.3.ebuild | 46 ----- dev-util/jenkins-bin/jenkins-bin-2.97.ebuild | 46 ----- dev-util/lcov/Manifest | 2 +- dev-util/lcov/lcov-1.13-r1.ebuild | 4 +- dev-util/lldb/Manifest | 6 +- dev-util/lldb/lldb-6.0.0_rc2.ebuild | 119 ------------ dev-util/lldb/lldb-6.0.0_rc3.ebuild | 119 ++++++++++++ dev-util/lockrun/Manifest | 2 +- dev-util/lockrun/lockrun-20120508-r1.ebuild | 2 +- dev-util/meson/Manifest | 2 +- dev-util/meson/meson-0.44.1.ebuild | 2 +- dev-util/valgrind/Manifest | 4 +- .../files/valgrind-3.13.0-xml-socket.patch | 27 +++ dev-util/valgrind/valgrind-3.13.0-r2.ebuild | 115 +++++++++++ dev-util/valgrind/valgrind-9999.ebuild | 20 +- dev-util/vint/Manifest | 4 +- dev-util/vint/vint-0.3.13-r1.ebuild | 46 ----- dev-util/vint/vint-0.3.18.ebuild | 2 +- 41 files changed, 715 insertions(+), 700 deletions(-) create mode 100644 dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild delete mode 100644 dev-util/cmake/cmake-3.11.0_rc1.ebuild create mode 100644 dev-util/cmake/cmake-3.11.0_rc2.ebuild delete mode 100644 dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch delete mode 100644 dev-util/conan/conan-0.30.2.ebuild create mode 100644 dev-util/conan/conan-1.0.4.ebuild delete mode 100644 dev-util/debhelper/debhelper-11.1.3.ebuild create mode 100644 dev-util/debhelper/debhelper-11.1.5.ebuild delete mode 100644 dev-util/drone-cli/drone-cli-0.8.2.ebuild create mode 100644 dev-util/drone-cli/drone-cli-0.8.4.ebuild delete mode 100644 dev-util/jenkins-bin/jenkins-bin-2.89.3.ebuild delete mode 100644 dev-util/jenkins-bin/jenkins-bin-2.97.ebuild delete mode 100644 dev-util/lldb/lldb-6.0.0_rc2.ebuild create mode 100644 dev-util/lldb/lldb-6.0.0_rc3.ebuild create mode 100644 dev-util/valgrind/files/valgrind-3.13.0-xml-socket.patch create mode 100644 dev-util/valgrind/valgrind-3.13.0-r2.ebuild delete mode 100644 dev-util/vint/vint-0.3.13-r1.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index e99e750bbb21..0d69d37d0398 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/buildbot-prometheus/Manifest b/dev-util/buildbot-prometheus/Manifest index 4934e752dcae..0019b631b011 100644 --- a/dev-util/buildbot-prometheus/Manifest +++ b/dev-util/buildbot-prometheus/Manifest @@ -1,3 +1,4 @@ DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b -EBUILD buildbot-prometheus-17.7.2.ebuild 624 BLAKE2B 53e5d5a111eba5433a1d234c91929c192165b7ba0bfddd99cb529c5ab94e61f43baa95fa9b22837918f93ef2d622226620b18b69bfe8cb3ec9545c0bfd839933 SHA512 eefdb7f1939150323e767707c21a59a8c2431a6e006e57af1d7fed92c71c66b7ccca55da95b7af66838b4f252140efc6b74992567c921f0ecd6a638949ed3f01 +EBUILD buildbot-prometheus-17.7.2-r1.ebuild 786 BLAKE2B eb065d7e22a00eca5d57658a0e26e6600dd3ba40dcb6b0dd27cd41230903103f7f5f472977e6152b7e9842c01389645d342153afeecc5c2619d84e2e3e928da8 SHA512 bcfed633ffe3aaef5e30f638fafbae2a6c716b269efc0ac7e52b3f1ffa9c61b69531c576b10f5d1226a8018792010a7bae759f2c6144f407fdfd0bc8f9740fa4 +EBUILD buildbot-prometheus-17.7.2.ebuild 786 BLAKE2B eb065d7e22a00eca5d57658a0e26e6600dd3ba40dcb6b0dd27cd41230903103f7f5f472977e6152b7e9842c01389645d342153afeecc5c2619d84e2e3e928da8 SHA512 bcfed633ffe3aaef5e30f638fafbae2a6c716b269efc0ac7e52b3f1ffa9c61b69531c576b10f5d1226a8018792010a7bae759f2c6144f407fdfd0bc8f9740fa4 MISC metadata.xml 392 BLAKE2B 2a2acde2274ca75c4477314c27d5bdc2f02ffd3f207a000ae928cf30b258e15d345cb27dd22254181ffc488e01354225f297ad56ce9d2b3575ef4a68199b7e0e SHA512 3d0a5ff260e9606e29ec0eabd8b87fc7f338f35b86dba44024dedf2029fd8d4e04e4f895812f75821dd21703ecf6c57ae25e27ca92dfbb8e817c49c1d404bbb0 diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild new file mode 100644 index 000000000000..a930624175f3 --- /dev/null +++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{5,6} ) +inherit distutils-r1 + +DESCRIPTION="A Prometheus metrics exporter for Buildbot" +HOMEPAGE="https://github.com/claws/buildbot-prometheus" +SRC_URI="https://github.com/claws/buildbot-prometheus/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}] + dev-util/buildbot[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + ${RDEPEND}" + +python_prepare_all() { + sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = .*/requires = ['buildbot', 'prometheus_client']/" setup.py || die + distutils-r1_python_prepare_all +} diff --git a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild index e84caf199146..a930624175f3 100644 --- a/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild +++ b/dev-util/buildbot-prometheus/buildbot-prometheus-17.7.2.ebuild @@ -18,5 +18,9 @@ IUSE="" RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}] dev-util/buildbot[${PYTHON_USEDEP}]" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] ${RDEPEND}" + +python_prepare_all() { + sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = .*/requires = ['buildbot', 'prometheus_client']/" setup.py || die + distutils-r1_python_prepare_all +} diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 39aabbf24977..e455f9f9ae03 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -6,7 +6,6 @@ AUX cmake-3.0.0-prefix-dirs.patch 4279 BLAKE2B 86f5b3a0f79c4126aa105eb27887b7bc4 AUX cmake-3.0.2-FindLAPACK.patch 1369 BLAKE2B dea4b1299253ae61a24794de0168e869b7ae2f97392229905f47974deab148ba77eac04a6f77574be8a161eb673fd88b28187597bb9d47efd772a3b3177eafad SHA512 4f20c4475841201c28ad49539fe896345add626dad5615357ff01817e10f7315ffe39e3a8d4bd0270179d7c58e5679a5bd9ae2accc1019ecee91db380ba48577 AUX cmake-3.1.0-FindPythonInterp.patch 1045 BLAKE2B 5421ea6600f6b47a654d7dbd5571d284eb2b2c505cb57c0d5862c859f9e6d61fa39ccd19467dffdf8f7200b469ec9e058e0e5bd8d608ff98dc02cedc18f5f85e SHA512 ec89a5589b70427c5d8d7a7b23ee87e3b437973081595f6387b5e7d902014b089f85b3634a906c5aa688726ff0f7588c7fb06161009e044813553c03409cabc0 AUX cmake-3.1.0-darwin-isysroot.patch 1926 BLAKE2B 4e8dfc78db33e62a6234a91210f0136312dcd0fec065ba76fa0b6a9f1f3e4ae0139af700494951d999bdf2eee57a5c22db5516b8b8276f4d8be4395f2c4cb675 SHA512 0cbb55f8f5458e72b1e465577809287dcc270636aef192f039eb1e48ef78b933a7290f81c6fefb0dd1f5eb8f9d209766687ffcb4f37c702b8317f8d2e36236ad -AUX cmake-3.11.0_rc1-add_missing_pthread.patch 777 BLAKE2B 5df8d28912320849cfb82d0fea841ed3bec4b7d89c7c036c9ac2a5f942ccf2231754c51fee352418945f57a716bc0354685274dd94b7dbb8c9feb8d94d35d3e9 SHA512 1825eb9f673ad6ca151515258f6948c2d0c12ba0bfd3703afb5c3ff510bd29020c70db58327ab4305b5789bca54bbf4094995e70796bf8abc7191478477b800a AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479 AUX cmake-3.8.0_rc2-FindBoost-python.patch 6575 BLAKE2B 4a169862e81b053ea8077ed61001434ba2619230ab4a4d75a11e2ea2c18ad704792d6d37a3cfa78cb54a6bf6cd71bc9b0d6a7a1bba004a92212746001874f385 SHA512 bb156cc2b47f9928f2e6bae909e90866f4442e42d7357744aa2b00903a02a27cf8af4a788a74858bc51874c442c40788717c86e77690b91def80abaa38b90163 @@ -15,11 +14,11 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b529d79d84c71663054d45d32c42003c0914003ea55edaece22ac6ca29561b6740be477b0accb71f673969c910eec2d58c5a6 SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49 SHA512 f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b -DIST cmake-3.11.0-rc1.tar.gz 7945667 BLAKE2B d2f36d20105eda2eddadcc0cc93d3de081fa7e41dfe3c9ecbc1d15ef658cd713894abdb300e34f5055ea37848339c0f1bce5952654fdd2525ed7a0405d7fb825 SHA512 0baa40a04184c33a04735e70ff782c76d0453baa00087480640c6e28c1461032b96bd3a3fa07bedc2855eea83349ef50ee2652ec810ad3314b86e80df8df62fb +DIST cmake-3.11.0-rc2.tar.gz 7946761 BLAKE2B 7ef3df8bd1e356a43f71e806f4b63bf3d2ed9363782a1224846ad8c710ff01695ae2391db400d0f2d29ec12e20ee36da2e8019300bcb6e14d051b2e21c83d663 SHA512 4b91455f787c04e4b792129d6168d9c45d74b50582eaf3f738a9a0ddd690c0e359bbd3ad218470c2acbdfd09f4465dd9084433b0a20c033c3177abfb8af381ef DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1 SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c EBUILD cmake-3.10.2.ebuild 5914 BLAKE2B 7320e10ee6fb27623f18227a688e87f17b909fdc75e43e30c5ce49f13378c27f5241a030c6caca6b773150f41a1340fe1053337447a98da6610f303e0596d08b SHA512 38914325ded6bb2885220e61f77b1e79a26b5fc8ceec6a972109c8d2a1db907cfdb62f48c5fdcfbeea045720c9ef85124bff794b6c61604b35f5c8260f5a4582 -EBUILD cmake-3.11.0_rc1.ebuild 5920 BLAKE2B 61c25bb8dd93610036a2cfcf07b83db57a333f1eabffed37566e72c554c9bc723d01edd782e90d4bd504b290cfd1120f31f2084849d59f6edd7db4d8c7c4894a SHA512 bd289c1aa58f08849b2d357d2610acc2260fc8e901c3db53a6242fba1142c7f0a1aad61a97c1ae8385bfa6631fb7f3850dbc9c7be7014e724654b44ff0333ff1 +EBUILD cmake-3.11.0_rc2.ebuild 5861 BLAKE2B 0297315d9311bd2ff14fbf8c50e3b58dcce74888c527ea6c34aae168645af8babc138a1334660a12e88b5a9a93041d744969ea6778930aa880928510b1b3edb3 SHA512 bc28af9895d7bd7e7625a46f2320bf51eafa0576c3b099b3144c79b32e6ad8293d21dbd1f51fe9ba79d79fcf6a830b601ffbf4ec663c45071cb407edd2e526fd EBUILD cmake-3.8.2.ebuild 5702 BLAKE2B 41a2b56a1666d4f2375b7e0d2ba473b889c215340b57ef5ca4297eb10f71870bc83db16d803a85eea0204f2d931901af2484fbd19269ccd52d2b07b436a04981 SHA512 ffe83e85988895e7bacdad4db796f112a1f8888a7f9df580c1c0fce6c8b959dd568079b73dbe8f9ff605388f64de9c4a9a1e61950876f7d5b7ea3444bc6ce62f EBUILD cmake-3.9.6.ebuild 5955 BLAKE2B 239073bc7c7aaea4422893f51bbd0c8151acd128ae1857100d74564dda786a3d8aa0e68234cc52d0ddd93352d7d8077ace1400aa452bcecea3f158413046e37f SHA512 9afd703b46784f6c225f355c7c3402abddfa0548eb031f23974d39de0130e04011bda6d15f49e998348084ced2649c8f192c472fcb741c6995443162c1828fcc MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015 diff --git a/dev-util/cmake/cmake-3.11.0_rc1.ebuild b/dev-util/cmake/cmake-3.11.0_rc1.ebuild deleted file mode 100644 index a1fdde41672d..000000000000 --- a/dev-util/cmake/cmake-3.11.0_rc1.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="https://cmake.org/" -SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -SLOT="0" -[[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs server system-jsoncpp ncurses qt5" - -RDEPEND=" - app-crypt/rhash - >=app-arch/libarchive-3.0.0:= - >=dev-libs/expat-2.0.1 - >=dev-libs/libuv-1.0.0:= - >=net-misc/curl-7.21.5[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch - - "${FILESDIR}"/${PN}-3.11.0_rc1-add_missing_pthread.patch - - # upstream fixes (can usually be removed with a version bump) -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # Qt4Deploy, which tries to break sandbox and ignores prefix - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because - # debugedit binary is not in the expected location - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake-utils_src_prepare - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} - -src_configure() { - # Fix linking on Solaris - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - -DBUILD_CursesDialog="$(usex ncurses)" - -DCMake_ENABLE_SERVER_MODE="$(usex server)" - ) - - if use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake-utils_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/vim/syntax/cmake.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/vim/indent/cmake.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} - - rm -r "${ED}"/usr/share/cmake/{completions,editors} || die -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use qt5; then - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - if use qt5; then - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} diff --git a/dev-util/cmake/cmake-3.11.0_rc2.ebuild b/dev-util/cmake/cmake-3.11.0_rc2.ebuild new file mode 100644 index 000000000000..ebda7cc29ddc --- /dev/null +++ b/dev-util/cmake/cmake-3.11.0_rc2.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_REMOVE_MODULES="no" +inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils + +MY_P="${P/_/-}" + +DESCRIPTION="Cross platform Make" +HOMEPAGE="https://cmake.org/" +SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" + +LICENSE="CMake" +SLOT="0" +[[ "${PV}" = *_rc* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc emacs server system-jsoncpp ncurses qt5" + +RDEPEND=" + app-crypt/rhash + >=app-arch/libarchive-3.0.0:= + >=dev-libs/expat-2.0.1 + >=dev-libs/libuv-1.0.0:= + >=net-misc/curl-7.21.5[ssl] + sys-libs/zlib + virtual/pkgconfig + emacs? ( virtual/emacs ) + ncurses? ( sys-libs/ncurses:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) +" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx ) +" + +S="${WORKDIR}/${MY_P}" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + # prefix + "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch + "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch + + # handle gentoo packaging in find modules + "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch + "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch + "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch + + # respect python eclasses + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch + + # upstream fixes (can usually be removed with a version bump) +) + +cmake_src_bootstrap() { + # Cleanup args to extract only JOBS. + # Because bootstrap does not know anything else. + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null + if [ $? -eq 0 ]; then + par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') + par_arg="--parallel=${par_arg}" + else + par_arg="--parallel=1" + fi + + # disable running of cmake in boostrap command + sed -i \ + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ + bootstrap || die "sed failed" + + # execinfo.h on Solaris isn't quite what it is on Darwin + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die + fi + + tc-export CC CXX LD + + # bootstrap script isn't exactly /bin/sh compatible + ${CONFIG_SHELL:-sh} ./bootstrap \ + --prefix="${T}/cmakestrap/" \ + ${par_arg} \ + || die "Bootstrap failed" +} + +cmake_src_test() { + # fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:#IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + pushd "${BUILD_DIR}" > /dev/null + + local ctestargs + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # BundleUtilities: bundle creation broken + # CTest.updatecvs: which fails to commit as root + # Fortran: requires fortran + # Qt4Deploy, which tries to break sandbox and ignores prefix + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because + # debugedit binary is not in the expected location + # TestUpload, which requires network access + "${BUILD_DIR}"/bin/ctest ${ctestargs} \ + -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \ + || die "Tests failed" + + popd > /dev/null +} + +src_prepare() { + cmake-utils_src_prepare + + # Add gcc libs to the default link paths + sed -i \ + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + -DSPHINX_MAN=$(usex doc) + -DSPHINX_HTML=$(usex doc) + -DBUILD_CursesDialog="$(usex ncurses)" + -DCMake_ENABLE_SERVER_MODE="$(usex server)" + ) + + if use qt5 ; then + mycmakeargs+=( + -DBUILD_QtDialog=ON + $(cmake-utils_use_find_package qt5 Qt5Widgets) + ) + fi + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use emacs && elisp-compile Auxiliary/cmake-mode.el +} + +src_test() { + virtx cmake_src_test +} + +src_install() { + cmake-utils_src_install + + if use emacs; then + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + insinto /usr/share/vim/vimfiles/syntax + doins Auxiliary/vim/syntax/cmake.vim + + insinto /usr/share/vim/vimfiles/indent + doins Auxiliary/vim/indent/cmake.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${PN}.vim" + + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} + + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die +} + +pkg_postinst() { + use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} diff --git a/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch b/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch deleted file mode 100644 index 3a4c4352c6ff..000000000000 --- a/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- cmake-3.11.0-rc1/Source/CMakeLists.txt -+++ cmake-3.11.0-rc1/Source/CMakeLists.txt -@@ -765,6 +765,7 @@ - ${CMAKE_LIBUV_LIBRARIES} - ${CMAKE_LIBRHASH_LIBRARIES} - ${CMake_KWIML_LIBRARIES} -+ pthread - ) - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc") ---- cmake-3.11.0-rc1/Tests/CMakeLib/CMakeLists.txt -+++ cmake-3.11.0-rc1/Tests/CMakeLib/CMakeLists.txt -@@ -30,7 +30,7 @@ - - create_test_sourcelist(CMakeLib_TEST_SRCS CMakeLibTests.cxx ${CMakeLib_TESTS}) - add_executable(CMakeLibTests ${CMakeLib_TEST_SRCS}) --target_link_libraries(CMakeLibTests CMakeLib) -+target_link_libraries(CMakeLibTests CMakeLib pthread) - - set_property(TARGET CMakeLibTests PROPERTY C_CLANG_TIDY "") - set_property(TARGET CMakeLibTests PROPERTY CXX_CLANG_TIDY "") diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest index 10ab9353adf8..8484fa51dec7 100644 --- a/dev-util/cmdtest/Manifest +++ b/dev-util/cmdtest/Manifest @@ -5,5 +5,5 @@ DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2da EBUILD cmdtest-0.16.ebuild 565 BLAKE2B 995a4abe2db0272e6f806937b4990fb89843ed2fcf825140e6ce963bf4beb14223aee7b50cbbd9f68a7e80249ef11f2f5253f34b889e821f8c7804e3261809d3 SHA512 35a3ab987715ec0af7dc3665c766a9c1b4d35005d7799eadb7478c0125add44761a61b17f8e2d8b80cf79421c0b0a3b7ca6f886153934728a5e2809f291fabe3 EBUILD cmdtest-0.18.ebuild 601 BLAKE2B 77c1b49917bf33964f7f2075ccd9e2b2f068a5d50d7d3744b388db2d69870605813486e6ac6858a19fce0c2bfedcda576af3a09b2b1386afb95e8e5dad4207e3 SHA512 432135a76f50e12791623ceab1e1866dfdce2b038f0a82bc6c884f85f2aa50ba6371c6ba0bd1a9e1ac5d155dd6467e012b566ec22c1512a5e19553a6bc39970b EBUILD cmdtest-0.27.ebuild 641 BLAKE2B 0719f9ee8398d9651210172815b72314c5ce0a4f4aca2b676c54144a182e12de4a1b33670584401e3080cea867f02a74f14989aa9578394f0cad5759cf3d7094 SHA512 47d71f682e2f37c913593a768097bc1c04ccbcb393057428e89de3ea7ce214160fc25b785b7689327d73ed8fedd4c0e6b3269b51cd2ec33463cea4aeb26091d3 -EBUILD cmdtest-0.30.ebuild 738 BLAKE2B 0d9e4fe6c000d628f94ed66ccd6ced066837d229b074fabd3c856e3280d342648df80a8c02e56e1466de73ae8befe167294a151022e4f8cdec93c774e03b8260 SHA512 6d7ead350c046e23aa652d5632951e69b16796b7477906737139893b612d293a318128a0fc6afd0bc92c77f0760bcc6cd0e81e904447cfa0acb8a6b2485fbcf5 +EBUILD cmdtest-0.30.ebuild 735 BLAKE2B f108753a80162f278f42f3035d81c7675d5f9521b01beece418aa3744f70fa757d4f785f29b2a9f16e7b478d9516d30b9423f61e0c26771ac3106fc28e45d027 SHA512 c2ce7c2520a784c9ff72e809c18b6de89fad3826481f91dc0a447e2ec1f319f557ac1ebdfb4114533cccdd006277ace3fbf70b30a6c4d9dfd1409820b85485d2 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild index 54ac784f7575..371e8ce29c2c 100644 --- a/dev-util/cmdtest/cmdtest-0.30.ebuild +++ b/dev-util/cmdtest/cmdtest-0.30.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd" RDEPEND=" dev-python/cliapp[${PYTHON_USEDEP}] diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest index 8dee8db07367..ee3952a26d10 100644 --- a/dev-util/conan/Manifest +++ b/dev-util/conan/Manifest @@ -1,3 +1,3 @@ -DIST conan-0.30.2.tar.gz 573660 BLAKE2B 3f4a591c5ff949e67b84946238d802de3041eeda9116ee445db9187de8ef422896f26b45d9dd616dbd631ff317d98879771655b0c9cfa14bf052f35776f253f6 SHA512 ec9309d876a33dda322e3a19ced2d8e39d1e0593b8c8b6f7a8e4a09336d2b76a94c13fb3a091963af519ef93950a51e680238cb13c0156260b538af8e12e097f -EBUILD conan-0.30.2.ebuild 1614 BLAKE2B c3540882f406a5873a94843b5fd9e62c266597ce38093f8a7bb0a11605bdff5d81c6d524ab521bdec8ffd77b1c7fb699db9a3695b1152eacb62c44f369cde36b SHA512 451c31d88a0941575e6f815bf626a20a852ac803e8a908c4ea3a9532f051bafcb4168d22c77f8ba507b091ecb1bc288c083e7e0b870bd3f3ad03fa74dd19bb25 -MISC metadata.xml 523 BLAKE2B 4cbd1a7259659c7a5a7eb3e75e45686e1168a04025d7492c073e31bd83c55fcd543b2320f2c6e1587a38834b0954c3af1318e1eb7265dd307b305c3c81dfb3a3 SHA512 8927c754ff8f428e972bcc869b21c9f0d25002d2399f1a418e84ff146a71b81f7f356dd7ab5b323f514d9c476b0fac4c797163860aeafa6e9e8d92d5e92a883b +DIST conan-1.0.4.tar.gz 580404 BLAKE2B a3099e7f5bdb882591bab031da267f3df5582975d93a840cd7bf42d7b5b57850d42a28ea33440f6570149b7db8c2ae6a395460f375fee084a9336435d42e7df6 SHA512 47fe9632b0007cdc0456004e6c9122df387869c33b58694b4a2dca9956daf977532f79c204207b21d3a4e7d90337a25dba49cf84cba98c1f9bde3170f1a185a9 +EBUILD conan-1.0.4.ebuild 1614 BLAKE2B 61927121cb774070d2886f2a93c4e7e7e334cb8eb482fc5c0e44fd71be75a9af5a860696b9dafe72fdab6344791c0a9f9074fbd45644fae5fbb3cb95620b4ddc SHA512 51c96947fc4653b955269143e9d72aabe7837cdfb03c064c61e2ff45605603b1b8b4c409d1d78e956a77e36d1cd656bfeda317cf83cf96626ea69e2a21799790 +MISC metadata.xml 735 BLAKE2B 12342e8032df1d0377576fd154e9db9713f915af597a6840f6cd003aff2976288fa29a75875bddcdb0972ee47f2a79543df80453a821358a7e15b6f202e31c9e SHA512 ff1ecd407675bc4b417af1f8e56fd1cb4b1c6c5f5de08836ffa8f944cacd8b60d6068553b9a8739a3a2d94b85311f6e9c0da5ab0dac0b80f3dae660eeec1068f diff --git a/dev-util/conan/conan-0.30.2.ebuild b/dev-util/conan/conan-0.30.2.ebuild deleted file mode 100644 index 2a97f62c081b..000000000000 --- a/dev-util/conan/conan-0.30.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -DESCRIPTION="Distributed C/C++ package manager" -HOMEPAGE="http://conan.io/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -# overly strict requirements? -# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt -RDEPEND=" - >=dev-python/bottle-0.12.8[${PYTHON_USEDEP}] - >=dev-python/colorama-0.3.3[${PYTHON_USEDEP}] - >=dev-python/distro-1.0.2[${PYTHON_USEDEP}] - >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}] - ~dev-python/future-0.16.0[${PYTHON_USEDEP}] - ~dev-python/node-semver-0.1.1[${PYTHON_USEDEP}] - >=dev-python/passlib-1.6.5[${PYTHON_USEDEP}] - ~dev-python/patch-1.16[${PYTHON_USEDEP}] - >=dev-python/pluginbase-0.5[${PYTHON_USEDEP}] - >=dev-python/pyjwt-1.4[${PYTHON_USEDEP}] - >=dev-python/pygments-2.0[${PYTHON_USEDEP}] - ~dev-python/pylint-1.6.5[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}] - >=dev-python/requests-2.7[${PYTHON_USEDEP}] - >=dev-python/six-1.10[${PYTHON_USEDEP}] -" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-lang/go - >=dev-python/mock-1.3.0[${PYTHON_USEDEP}] - >=dev-python/nose-1.3.7[${PYTHON_USEDEP}] - >=dev-python/nose-parameterized-0.5.0[${PYTHON_USEDEP}] - >=dev-python/webtest-2.0.18[${PYTHON_USEDEP}] - dev-util/cmake - ) -" - -python_test() { - cd "${BUILD_DIR}"/lib || die - PYTHONPATH=. nosetests -v . || die -} diff --git a/dev-util/conan/conan-1.0.4.ebuild b/dev-util/conan/conan-1.0.4.ebuild new file mode 100644 index 000000000000..990edbd43c60 --- /dev/null +++ b/dev-util/conan/conan-1.0.4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_REQ_USE="sqlite" + +inherit distutils-r1 + +DESCRIPTION="Distributed C/C++ package manager" +HOMEPAGE="http://conan.io/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +# overly strict requirements? +# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt +RDEPEND=" + >=dev-python/pyjwt-1.4[${PYTHON_USEDEP}] + >=dev-python/requests-2.7[${PYTHON_USEDEP}] + >=dev-python/colorama-0.3.3[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}] + ~dev-python/patch-1.16[${PYTHON_USEDEP}] + >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}] + >=dev-python/six-1.10[${PYTHON_USEDEP}] + >=dev-python/node-semver-0.2.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.0.2[${PYTHON_USEDEP}] + >=dev-python/pylint-1.8.1[${PYTHON_USEDEP}] + ~dev-python/future-0.16.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.0[${PYTHON_USEDEP}] + >=dev-python/astroid-1.6[${PYTHON_USEDEP}] + >=dev-python/pluginbase-0.5[${PYTHON_USEDEP}] + >=dev-python/bottle-0.12.8[${PYTHON_USEDEP}] +" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + dev-lang/go + >=dev-python/mock-1.3.0[${PYTHON_USEDEP}] + >=dev-python/nose-1.3.7[${PYTHON_USEDEP}] + >=dev-python/nose-parameterized-0.5.0[${PYTHON_USEDEP}] + >=dev-python/webtest-2.0.18[${PYTHON_USEDEP}] + dev-util/cmake + ) +" + +python_test() { + cd "${BUILD_DIR}"/lib || die + PYTHONPATH=. nosetests -v . || die +} diff --git a/dev-util/conan/metadata.xml b/dev-util/conan/metadata.xml index 32c4a333fca0..bbd391fd5b61 100644 --- a/dev-util/conan/metadata.xml +++ b/dev-util/conan/metadata.xml @@ -1,7 +1,14 @@ - + + beschindler@gmail.com + Benjamin Schindler + + + proxy-maint@gentoo.org + Proxy Maintainers + conan conan-io/conan diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest index fbdbe8aeb57a..bfefda57e278 100644 --- a/dev-util/debhelper/Manifest +++ b/dev-util/debhelper/Manifest @@ -1,7 +1,7 @@ -DIST debhelper_11.1.3.tar.xz 449268 BLAKE2B 9cbd8a2c71897a5ba28b987b24e939e830a9322332c48f94c42ea417330b94ddee60f5619426b37db96cf4e560b74cd2d1dc221fed27433943b7ff6db7adbeff SHA512 e7a36b2226eb0dcbf91068fa312d42125add7864fd16eefa3346d196162fa739c436df41c053e6d25d82f5d784c95df37dd1a43927dd007c358382dd042c4e92 DIST debhelper_11.1.4.tar.xz 449928 BLAKE2B 6cf3b3aa79802ab8fcc8a1ce84f10e53071c85b249311c41ce84c33a5acbf8d88a5bed28c62154c26e96bc1b925f2ff7bcbad1c84afde303532963589bb74d15 SHA512 4389914409b9160b7f8903ea814bad58666d5dcada5641a897a1805579024fc49e6a631d40ca70c4caa914d790867d70dcaca04a633b42767d4d6f48245b039e +DIST debhelper_11.1.5.tar.xz 451468 BLAKE2B 504cf7453e23e6bdc4759c3e4f0cdcc42b450d14992c5400b8fccd3b1bc3926a0f1ba7cffffff81846bdcffc847d58aab0c6e19f99bf5802e6f0a9792c72cfe7 SHA512 a6cc982bfbb2a172866e6deea936d9396dad5c4c89381cd04aba9efce8ba9ed8acfad2e6f80818cec6d91318cd912b75640ff9ee8cb25d212b63fb3b90a05041 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62 -EBUILD debhelper-11.1.3.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4 EBUILD debhelper-11.1.4.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4 +EBUILD debhelper-11.1.5.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735 diff --git a/dev-util/debhelper/debhelper-11.1.3.ebuild b/dev-util/debhelper/debhelper-11.1.3.ebuild deleted file mode 100644 index eb7e5fa626c2..000000000000 --- a/dev-util/debhelper/debhelper-11.1.3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs - -DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules" -HOMEPAGE="https://tracker.debian.org/pkg/debhelper" -SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux" -IUSE="test" -DH_LANGS=( de es fr ) -IUSE+=" ${DH_LANGS[@]/#/l10n_}" - -NLS_DEPEND=$( - printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]} -) - -RDEPEND=" - >=dev-lang/perl-5.10:= - >=app-arch/dpkg-1.17 - dev-perl/TimeDate - virtual/perl-Getopt-Long -" -DEPEND=" - ${RDEPEND} - ${NLS_DEPEND} - test? ( - dev-perl/Test-Pod - sys-apps/fakeroot - ) -" - -S=${WORKDIR}/${PN} - -src_compile() { - tc-export CC - - local LANGS="" USE_NLS=no lang - for lang in ${DH_LANGS[@]}; do - if use l10n_${lang}; then - LANGS+=" ${lang}" - USE_NLS=yes - fi - done - - emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - dodoc doc/* debian/changelog - docinto examples - dodoc examples/* - local lang - for manfile in *.1 *.7 ; do - for lang in ${DH_LANGS[@]}; do - case ${manfile} in - *.${lang}.?) - use l10n_${lang} \ - && cp ${manfile} "${T}"/${manfile/.${lang}/} \ - && doman -i18n=${lang} "${T}"/${manfile/.${lang}/} - ;; - *) - doman ${manfile} - ;; - esac - done - done -} diff --git a/dev-util/debhelper/debhelper-11.1.5.ebuild b/dev-util/debhelper/debhelper-11.1.5.ebuild new file mode 100644 index 000000000000..eb7e5fa626c2 --- /dev/null +++ b/dev-util/debhelper/debhelper-11.1.5.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils toolchain-funcs + +DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules" +HOMEPAGE="https://tracker.debian.org/pkg/debhelper" +SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux" +IUSE="test" +DH_LANGS=( de es fr ) +IUSE+=" ${DH_LANGS[@]/#/l10n_}" + +NLS_DEPEND=$( + printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]} +) + +RDEPEND=" + >=dev-lang/perl-5.10:= + >=app-arch/dpkg-1.17 + dev-perl/TimeDate + virtual/perl-Getopt-Long +" +DEPEND=" + ${RDEPEND} + ${NLS_DEPEND} + test? ( + dev-perl/Test-Pod + sys-apps/fakeroot + ) +" + +S=${WORKDIR}/${PN} + +src_compile() { + tc-export CC + + local LANGS="" USE_NLS=no lang + for lang in ${DH_LANGS[@]}; do + if use l10n_${lang}; then + LANGS+=" ${lang}" + USE_NLS=yes + fi + done + + emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc doc/* debian/changelog + docinto examples + dodoc examples/* + local lang + for manfile in *.1 *.7 ; do + for lang in ${DH_LANGS[@]}; do + case ${manfile} in + *.${lang}.?) + use l10n_${lang} \ + && cp ${manfile} "${T}"/${manfile/.${lang}/} \ + && doman -i18n=${lang} "${T}"/${manfile/.${lang}/} + ;; + *) + doman ${manfile} + ;; + esac + done + done +} diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest index 98224f0f9f86..c6fdbec89fed 100644 --- a/dev-util/devhelp/Manifest +++ b/dev-util/devhelp/Manifest @@ -1,3 +1,3 @@ DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062 -EBUILD devhelp-3.24.0.ebuild 1620 BLAKE2B 3109dbca3591f2b8f5a3ff5bfeb8389bc91a0e07519892f900d68810f2a4780ffacd473f48e8fd79a6b21780da592a815504aa73cf0981f89a64c426770a2974 SHA512 886e1203fd56a94d812e5c870841b2e0078738299860fe70b861a6b9e0a7d4b9787242967c8fab66ac745f1a7b32d8bcce8add9f6e44cddcc636c8df7b525663 +EBUILD devhelp-3.24.0.ebuild 1648 BLAKE2B 617aea54f102dc7e804f68afc80b1bccc24fadf7b3cc3be7c426b2b395d11bc728ad432d414f03b97640b5f48385c13b4032219c6d7688eb80b26dd5c2e61837 SHA512 aa01a059b3500401113d9d92b950f759ef01ff1e5b32050bafa10dfa682b9e1da84c63971307f25df38a0f480f069dd4a176aba18fc8e7d1e5175888765da3a1 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753 diff --git a/dev-util/devhelp/devhelp-3.24.0.ebuild b/dev-util/devhelp/devhelp-3.24.0.ebuild index ea0598606290..34bd10cfdd15 100644 --- a/dev-util/devhelp/devhelp-3.24.0.ebuild +++ b/dev-util/devhelp/devhelp-3.24.0.ebuild @@ -34,6 +34,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} >=dev-util/gtk-doc-am-1.25 + >=sys-devel/gettext-0.19.7 virtual/pkgconfig " # eautoreconf requires: diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest index c66bde3ab599..68685d0b7993 100644 --- a/dev-util/drone-cli/Manifest +++ b/dev-util/drone-cli/Manifest @@ -1,7 +1,7 @@ DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168 -DIST drone-cli-0.8.2.tar.gz 1383569 BLAKE2B 570a8af9da23be7aac83299e3feaec17e09af4a506c715b636417b35f5f1e4253e3c049a44ceeb3ee056f9134463bdb5d8bbda8228b757178fa3022461d13909 SHA512 cbf32882bf7ce1a29ff37bd600f60b3fd3517d56803fca7575fc4595c2e398ce2b4cc760ca03f16eca414386e6328ee782726c9720f9678457bf97c56f24f232 DIST drone-cli-0.8.3.tar.gz 1378969 BLAKE2B 5dd0d399067b454422aa0ed07e665efaf40d4882de941176f8032441c0cd32a74be2f374ac57ec56ae7cd625e2ba1307821bf713732a30e3403cbc8f28f368f9 SHA512 2dfb4739536e7af9c220f6c21e1e3861ef8599e30ad8406efb5cdb035ee5721957a8b5a340f991335b51de34477b5acfcb5372ca10a9e6b1e28a8f0d1a284438 +DIST drone-cli-0.8.4.tar.gz 1380019 BLAKE2B 1fa7d6efa795de7b0015afff77365d21a7f019a4bd1c47a6c77b590e2fccf50d0c8bae3b78c8a4dfef45421cce00017ee3a72e4e3d87b86a5fd41b08c04aca94 SHA512 14bd7e5172311117a7a012d6a1d9a0d271384355ff99894250b4a352f86678597f545ec9f4e40e9f8718e1058e0dd2c940e5afbd4bee73ada0bd6ce165f1299b EBUILD drone-cli-0.7.0_p20170717.ebuild 784 BLAKE2B 22d5fbe09cbf07437a2b095caddf942fd5c0ee484e7d30404b5a109856ced11f99930601234fdab2bfe21d8ae32134909594491d435eef7fc74f4e8682ada7d4 SHA512 e0b0fe272d3fa48d84b346a6114e98b477f7d6785e9d214d70202e15c84a92bf80ea3af1ad98ff08e90121d18d3a39c4b7f97665db8d03736d8100a53eb49558 -EBUILD drone-cli-0.8.2.ebuild 776 BLAKE2B b34171f2374a53942f1ea7cd45d6df56cbbe048be116fc0264a651c3b4526109b471b4fdb8f3981bd6c6b267041bc63007f0234b987582b118d054fb645699bd SHA512 6dd61f938441c87273dd58150b49fbe5d9e61a962a018d7fec68a5e18011cb3f65fb15fdebb55b2b7c9d743bfd3bfdd3d21f98a5974d36e2c3f2f1e22a303354 EBUILD drone-cli-0.8.3.ebuild 776 BLAKE2B fc60842f9e273d7a43951040984b11e9e04ff4c5fdba486a9781ff055b891099f64b96517e6acd39fb83ec63d42280866c6f3d4dcb5ee4d7b88cb028a957d446 SHA512 c018118f50a62416ffcc6b0e7214a9fb9de850e594c44a2270ed4cbab4cff5a8d0c81f5c2b938906f704315006fc3c4e75bd4e8db6982acee94101cc06a9bcda +EBUILD drone-cli-0.8.4.ebuild 776 BLAKE2B fc60842f9e273d7a43951040984b11e9e04ff4c5fdba486a9781ff055b891099f64b96517e6acd39fb83ec63d42280866c6f3d4dcb5ee4d7b88cb028a957d446 SHA512 c018118f50a62416ffcc6b0e7214a9fb9de850e594c44a2270ed4cbab4cff5a8d0c81f5c2b938906f704315006fc3c4e75bd4e8db6982acee94101cc06a9bcda MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc diff --git a/dev-util/drone-cli/drone-cli-0.8.2.ebuild b/dev-util/drone-cli/drone-cli-0.8.2.ebuild deleted file mode 100644 index 227f4987dfe1..000000000000 --- a/dev-util/drone-cli/drone-cli-0.8.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN="github.com/drone/drone-cli" -EGIT_COMMIT="91d29707ae30f7ffb628c0397dfaca1c986be5ce" - -inherit golang-build golang-vcs-snapshot - -ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" - -DESCRIPTION="Command-line interface for Drone" -HOMEPAGE="https://github.com/drone/drone-cli" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -RESTRICT="test" - -RDEPEND="!! +Date: Thu, 3 Aug 2017 05:22:01 +0000 (+0000) +Subject: Fix handling command line option --xml-socket. +X-Git-Url: https://sourceware.org/git/?p=valgrind.git;a=commitdiff_plain;h=34dd8493de39314033509bb7ad62673f33dcf3db + +Fix handling command line option --xml-socket. +Fixes BZ#382998 +Patch by: Orgad Shaneh + + + +git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16467 +--- + +diff --git a/coregrind/m_libcprint.c b/coregrind/m_libcprint.c +index d66c67d..f6ba202 100644 +--- a/coregrind/m_libcprint.c ++++ b/coregrind/m_libcprint.c +@@ -526,7 +526,7 @@ void VG_(init_log_xml_sinks)(VgLogTo log_to, VgLogTo xml_to, + break; + + case VgLogTo_Socket: +- log_fd = prepare_sink_socket(VG_(clo_xml_fname_unexpanded), ++ xml_fd = prepare_sink_socket(VG_(clo_xml_fname_unexpanded), + &VG_(xml_output_sink), True); + break; + } diff --git a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild new file mode 100644 index 000000000000..f509e509703b --- /dev/null +++ b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools flag-o-matic toolchain-funcs multilib pax-utils + +DESCRIPTION="An open-source memory debugger for GNU/Linux" +HOMEPAGE="http://www.valgrind.org" +LICENSE="GPL-2" +SLOT="0" +IUSE="mpi" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/" + inherit git-r3 +else + SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +fi + +DEPEND="mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" + +src_prepare() { + # Correct hard coded doc location + sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die + + # Don't force multiarch stuff on OSX, bug #306467 + sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die + + # Respect CFLAGS, LDFLAGS + eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch + + # Fix test failures on glibc-2.26 + eapply "${FILESDIR}"/${P}-test-fixes.patch + + # Fix --xml-socket command line option (qt-creator), bug #641790 + eapply "${FILESDIR}"/${P}-xml-socket.patch + + # Allow users to test their own patches + eapply_user + + # Regenerate autotools files + eautoreconf +} + +src_configure() { + local myconf=() + + # Respect ar, bug #468114 + tc-export AR + + # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression" + # while compiling insn_sse.c in none/tests/x86 + # -fstack-protector more undefined references to __guard and __stack_smash_handler + # because valgrind doesn't link to glibc (bug #114347) + # -fstack-protector-all Fails same way as -fstack-protector/-fstack-protector-strong. + # Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it + # -fstack-protector-strong See -fstack-protector (bug #620402) + # -m64 -mx32 for multilib-portage, bug #398825 + # -ggdb3 segmentation fault on startup + filter-flags -fomit-frame-pointer + filter-flags -fstack-protector + filter-flags -fstack-protector-all + filter-flags -fstack-protector-strong + filter-flags -m64 -mx32 + replace-flags -ggdb3 -ggdb2 + + if use amd64 || use ppc64; then + ! has_multilib_profile && myconf+=("--enable-only64bit") + fi + + # Force bitness on darwin, bug #306467 + use x86-macos && myconf+=("--enable-only32bit") + use x64-macos && myconf+=("--enable-only64bit") + + # Don't use mpicc unless the user asked for it (bug #258832) + if ! use mpi; then + myconf+=("--without-mpicc") + fi + + econf "${myconf[@]}" +} + +src_install() { + default + + if [[ ${PV} == "9999" ]]; then + # Otherwise FAQ.txt won't exist: + emake -C docs FAQ.txt + mv docs/FAQ.txt . || die "Couldn't move FAQ.txt" + fi + + dodoc FAQ.txt + + pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_names on shared libraries, can't turn them into bundles, + # as dyld won't load them any more then, bug #306467 + local l + for l in "${ED}"/usr/lib/valgrind/*.so ; do + install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}" + done + fi +} + +pkg_postinst() { + elog "Valgrind will not work if glibc does not have debug symbols." + elog "To fix this you can add splitdebug to FEATURES in make.conf" + elog "and remerge glibc. See:" + elog "https://bugs.gentoo.org/show_bug.cgi?id=214065" + elog "https://bugs.gentoo.org/show_bug.cgi?id=274771" + elog "https://bugs.gentoo.org/show_bug.cgi?id=388703" +} diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild index 855bd8a16c29..2b96d5f5150c 100644 --- a/dev-util/valgrind/valgrind-9999.ebuild +++ b/dev-util/valgrind/valgrind-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils DESCRIPTION="An open-source memory debugger for GNU/Linux" @@ -39,7 +39,7 @@ src_prepare() { } src_configure() { - local myconf + local myconf=() # Respect ar, bug #468114 tc-export AR @@ -61,23 +61,23 @@ src_configure() { replace-flags -ggdb3 -ggdb2 if use amd64 || use ppc64; then - ! has_multilib_profile && myconf="${myconf} --enable-only64bit" + ! has_multilib_profile && myconf+=("--enable-only64bit") fi # Force bitness on darwin, bug #306467 - use x86-macos && myconf="${myconf} --enable-only32bit" - use x64-macos && myconf="${myconf} --enable-only64bit" + use x86-macos && myconf+=("--enable-only32bit") + use x64-macos && myconf+=("--enable-only64bit") # Don't use mpicc unless the user asked for it (bug #258832) if ! use mpi; then - myconf="${myconf} --without-mpicc" + myconf+=("--without-mpicc") fi - econf ${myconf} + econf "${myconf[@]}" } src_install() { - emake DESTDIR="${D}" install + default if [[ ${PV} == "9999" ]]; then # Otherwise FAQ.txt won't exist: @@ -85,7 +85,7 @@ src_install() { mv docs/FAQ.txt . || die "Couldn't move FAQ.txt" fi - dodoc AUTHORS FAQ.txt NEWS README* + dodoc FAQ.txt pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest index 8a3fc93ce3cc..cf8ea99ffb9e 100644 --- a/dev-util/vint/Manifest +++ b/dev-util/vint/Manifest @@ -1,5 +1,3 @@ -DIST vint-0.3.13.tar.gz 91599 BLAKE2B 7cc9a6aca8cbd259d3ff79659c38e3d51b5f0ba75a7485872fd922543d75867fcc1689b0f7f8915e3195905b47bb0a467d9646bcb29082e9c04a1557e19b3717 SHA512 ef0b811df0250899e23e30ee4b240cf8b54e510231353ca86202661fd5f0826b9faeacc9268849e51bd6a1c71c1514498dec04a7a4ed79f00a5098811525e3d4 DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53 SHA512 1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd -EBUILD vint-0.3.13-r1.ebuild 1286 BLAKE2B a7c10f97ad9a9e03860ff03e78d38e9dc3b8b44fca91b7a4f05c1a80b96917cff3607040f3e45479bbbfbd08d8d61967e8d831bbca6aa464bf4ddd1718050517 SHA512 97029069852754b6a87fe81f3fe79166ede0a34481f1110a4a1dcd7c69e4f319759f41f7e4d1e8312d81ffe5decf90a0a715f1dd36698419c05bba3c107a2cd0 -EBUILD vint-0.3.18.ebuild 1327 BLAKE2B 07db1c17ce7d947d6877f4cff87c810cf8149a9c8a4320695b547abd60bb3993d62e9c11f74bea6fec38633dc01c491a83ad99365ed1cdff9ca25dc0dd5c432f SHA512 712bc373397763c714c50bf06553fb57139007af6aab4aa33eb80afa249cbf06042e8961c18ea2b7fffd81d4afa7fb29a68a7b292818d9ff70a649c0aa111952 +EBUILD vint-0.3.18.ebuild 1326 BLAKE2B 9f32b59eaa10316ba075fc819b70ebf1df19b67093eb66c52bd0256cb869f07199546ef67e093c2aade82d34682fe09945b5441519f79579464cdce2fc5b1182 SHA512 59bde463196e832ead4862e065ee691d245de4abad2d355b882bfdfe3689f1086e607b6f31a20a5f9589a298fa3980fd215bec615f9631f1224e67181629ce15 MISC metadata.xml 555 BLAKE2B e81c06d278624abc6cd0f3d1410a79176ccba036344df6a1d414f8efce803e9395116f5fcf9dfdf791971a6160c0514f2a1d613f21b55805e6288fa1d11b4562 SHA512 ed3b8b8054f549adb826668dc08d364b02e86e0ec83d5455c8a9adc21702a143b488d028a8d12135a28f66bb673c3281d0f79fe20773ec1f78b632a86c859129 diff --git a/dev-util/vint/vint-0.3.13-r1.ebuild b/dev-util/vint/vint-0.3.13-r1.ebuild deleted file mode 100644 index bcc5e5b2c5fd..000000000000 --- a/dev-util/vint/vint-0.3.13-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit distutils-r1 - -DESCRIPTION="Lint tool for Vim script language" -HOMEPAGE="https://github.com/Kuniwak/vint https://pypi.python.org/pypi/vim-vint/" -SRC_URI="https://github.com/Kuniwak/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="test" - -RDEPEND=" - >=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}] - >=dev-python/chardet-2.3.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}] - virtual/python-enum34[${PYTHON_USEDEP}] - virtual/python-pathlib[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - >=dev-python/coverage-3.7.1[${PYTHON_USEDEP}] - >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}] - >=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7) - ) -" - -python_prepare_all() { - distutils-r1_python_prepare_all - - # Don't try to use an installed vint executable. - # See https://github.com/Kuniwak/vint/issues/22 - sed -i -e "s|'vint'|'bin/vint'|" test/acceptance/test_cli{,_vital}.py || die -} - -python_test() { - py.test -v || die "Test suite failed with ${EPYTHON}" -} diff --git a/dev-util/vint/vint-0.3.18.ebuild b/dev-util/vint/vint-0.3.18.ebuild index 00895d88442f..9020a6461e71 100644 --- a/dev-util/vint/vint-0.3.18.ebuild +++ b/dev-util/vint/vint-0.3.18.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/Kuniwak/vint/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="test" RDEPEND=" -- cgit v1.2.3