commit: aa89b1449bc88fc12783fea969cf5fe761d3498c Author: Aaron Bauman <bman <AT> gentoo <DOT> org> AuthorDate: Sat May 5 19:40:47 2018 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Sat May 5 19:44:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa89b144
dev-cpp/gmock: treeclean dev-cpp/gmock/Manifest | 1 - 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 | 9 ----- profiles/package.mask | 5 --- 5 files changed, 108 deletions(-) diff --git a/dev-cpp/gmock/Manifest b/dev-cpp/gmock/Manifest deleted file mode 100644 index b455c0c8817..00000000000 --- a/dev-cpp/gmock/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gmock-1.7.0.zip 2167746 BLAKE2B fc8939615d076512181c62e87028f55ac962a462a625faa4dbf4e8368dc59949f38413293e941c02e21c459190a8678f6618f252364d288b1d2323bcd19bd525 SHA512 0ab7bb2614f8c00e4842a6819dbc6d9323c42241335078c23eaee53ed420d42f1845d44334eccbf7c114cc88f6ac7a493e20d9b46c58cdba645bbd400eb6db55 diff --git a/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch b/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch deleted file mode 100644 index 58a78462d60..00000000000 --- a/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch +++ /dev/null @@ -1,32 +0,0 @@ -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<void> : public UntypedActionResultHolderBase { - public: -+ explicit ActionResultHolder() {} -+ - void GetValueAndDelete() const { delete this; } - - virtual void PrintAsActionResult(::std::ostream* /* os */) const {} -@@ -1381,7 +1383,7 @@ - const typename Function<F>::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<F>& action, - const typename Function<F>::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 deleted file mode 100644 index 42e424f63b8..00000000000 --- a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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 deleted file mode 100644 index 09ce02b4056..00000000000 --- a/dev-cpp/gmock/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="google-code">googlemock</remote-id> - <remote-id type="github">google/googlemock</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 2909041bac4..2f4449978cd 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -83,11 +83,6 @@ dev-python/kiwi # instead of its own. Removal in 30 days. Bug #526552. dev-python/tdaemon -# Arfrever Frehtes Taifersar Arahesis <arfrever....@gmail.com> (26 Apr 2018) -# Merged into >=dev-cpp/gtest-1.8.0. -# Masked for removal in 30 days. -dev-cpp/gmock - # Andreas Sturmlechner <ast...@gentoo.org> (26 Apr 2018) # Depends on dead Qt4, no more revdeps. Masked for removal in 30 days. dev-libs/qjson
