From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-cpp/gmock/Manifest | 6 +++ dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch | 32 ++++++++++++++++ dev-cpp/gmock/gmock-1.7.0-r1.ebuild | 61 ++++++++++++++++++++++++++++++ dev-cpp/gmock/metadata.xml | 11 ++++++ 4 files changed, 110 insertions(+) create mode 100644 dev-cpp/gmock/Manifest create mode 100644 dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch create mode 100644 dev-cpp/gmock/gmock-1.7.0-r1.ebuild create mode 100644 dev-cpp/gmock/metadata.xml (limited to 'dev-cpp/gmock') diff --git a/dev-cpp/gmock/Manifest b/dev-cpp/gmock/Manifest new file mode 100644 index 000000000000..57ae9d75b38f --- /dev/null +++ b/dev-cpp/gmock/Manifest @@ -0,0 +1,6 @@ +AUX gmock-1.7.0-gcc6.patch 981 SHA256 47322352bb367d9aa212c8589770222f64f1839c5ee5f5fe43a93c17b80e282f SHA512 8deb186aaeed74c2e4b2f030f2d9a1f224ba698931862d48775db07a88b798e20e28494b6840dad53fd9f9370dbd506d87425ca52b7fb28f5361b4c9392fd6b2 WHIRLPOOL 6f77dd7e376e1065eae916e11974fdad5a4150aff4b6fe50229a943fcc33b0da3116c1110ef89952f29b1c79d6c3f1a723ab38abf727f1ff00b01dde4e498d4f +DIST gmock-1.7.0.zip 2167746 SHA256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b SHA512 0ab7bb2614f8c00e4842a6819dbc6d9323c42241335078c23eaee53ed420d42f1845d44334eccbf7c114cc88f6ac7a493e20d9b46c58cdba645bbd400eb6db55 WHIRLPOOL 722ea3f8bd4130662386810ae0270baafcecb6b7066e8a361388d530e7a2bad4e10787c921c6bb5cefb15a640f4302d288d07deea58acf8c5f5ca84d82722c8e +EBUILD gmock-1.7.0-r1.ebuild 1289 SHA256 1c5d5b46a4e22839581e1cdb5bb886e7f5e64f1e31856d748f6dc3fc6d176aea SHA512 9f74c87f0858ac7c9c7ba06758473e637baa858d6a4f7541f84559257d1dcf70d7aaf01077724e6ad2893bf23c68ee788df23ff2bccca8b63940fb9b8f0140dd WHIRLPOOL 162fa6c91b0073bac485ab1078ad43c36d9d5f8c354e9dd9b7b9d7c1cb6a4e1c19e38c2143a0a0b32476456198fe6cacac162acda6d7d0f7bf5ccddfda6bd38a +MISC ChangeLog 3802 SHA256 68ce3e9e843ea1909fc4849e7060a618d4ae0cfe310e0745c031a8a1198627c5 SHA512 9fa596d8a09564f155795d0c838d8098598b5e145350cef7d0b041fd4a70c51018bc0db6a6b008c5e65c9592abbf3bc08a352bd6498927f845cbf53d33173f9a WHIRLPOOL 249623ac138e406213f7ab0a5c1b3574bd13296e6834d4a7e33e45da7f2a0f4a318a10834c25005fe42f7c463ebbe47dc7431c6adabbb51ead20f17fd4c4e72f +MISC ChangeLog-2015 4228 SHA256 df7c6913b69a0753e56dc0e56d8f0c91ef1bc812715cc35de5e2ef514c1b972a SHA512 d78535d15a9b53ff974ad3b779f5452fa71c839e1a92092a1f5026a7f1694927283150f96744ff19500a8be27a6160f69b6a5d778c18fc098e00e2d722705a79 WHIRLPOOL ac416ad8f7f7aac26ca2c4dc3624583e867714d147e6d5b4d7dae6607657921e1e36efb2e909aee8867ef93a4e2b4118409fdb6f7e5ae118945e791b3bf8b58c +MISC metadata.xml 354 SHA256 dd5b363c503f555907c6415e5dbd86c7230860984229cbb8738270999a41ffff SHA512 61df749507137960049707611f4d4fae7183714c1f701c30cf53aecb095341fedabca711c3a8f2d3aca5d9df117e7e219f5a2951729fcc679249d20210239af7 WHIRLPOOL bbd1beee1584af3229638db78a74cc91c54e4d254afb50b1d0d7b72a0f29488bb9707f7569431dcd168b114cc62b8ab536f59be4099121b2aa1a73e5db201342 diff --git a/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch b/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch new file mode 100644 index 000000000000..58a78462d60d --- /dev/null +++ b/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch @@ -0,0 +1,32 @@ +Bug: https://bugs.gentoo.org/602158 +Patch: https://github.com/google/googletest/issues/705#issuecomment-235067917 + +--- a/include/gmock/gmock-spec-builders.h ++++ b/include/gmock/gmock-spec-builders.h +@@ -1370,6 +1370,8 @@ + template <> + class ActionResultHolder : public UntypedActionResultHolderBase { + public: ++ explicit ActionResultHolder() {} ++ + void GetValueAndDelete() const { delete this; } + + virtual void PrintAsActionResult(::std::ostream* /* os */) const {} +@@ -1381,7 +1383,7 @@ + const typename Function::ArgumentTuple& args, + const string& call_description) { + func_mocker->PerformDefaultAction(args, call_description); +- return NULL; ++ return new ActionResultHolder(); + } + + // Performs the given action and returns NULL. +@@ -1390,7 +1392,7 @@ + const Action& action, + const typename Function::ArgumentTuple& args) { + action.Perform(args); +- return NULL; ++ return new ActionResultHolder(); + } + }; + diff --git a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild new file mode 100644 index 000000000000..42e424f63b84 --- /dev/null +++ b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" + +PYTHON_COMPAT=( python2_7 ) + +inherit epatch libtool multilib-minimal python-any-r1 + +DESCRIPTION="Google's C++ mocking framework" +HOMEPAGE="https://github.com/google/googlemock" +SRC_URI="https://googlemock.googlecode.com/files/${P}.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +IUSE="static-libs test" + +RDEPEND="=dev-cpp/gtest-${PV}*[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + test? ( ${PYTHON_DEPS} ) + app-arch/unzip" + +pkg_setup() { + # Stub to disable python_setup running when USE=-test. + # We'll handle it down in src_test ourselves. + : +} + +src_unpack() { + default + # make sure we always use the system one + rm -r "${S}"/gtest/{Makefile,configure}* || die +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc6.patch + + sed -i -r \ + -e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \ + Makefile.in + elibtoolize +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf $(use_enable static-libs static) +} + +multilib_src_test() { + python_setup + emake check +} + +multilib_src_install() { + default + dobin scripts/gmock-config +} + +multilib_src_install_all() { + use static-libs || find "${ED}" -name '*.la' -delete +} diff --git a/dev-cpp/gmock/metadata.xml b/dev-cpp/gmock/metadata.xml new file mode 100644 index 000000000000..750cc7eff167 --- /dev/null +++ b/dev-cpp/gmock/metadata.xml @@ -0,0 +1,11 @@ + + + + + vapier@gentoo.org + + + googlemock + google/googlemock + + -- cgit v1.2.3