gentoo resync : 06.05.2018

7 files changed, 3 insertions, 109 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 77c1a329120f..b186825cda69 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 8261e8ddd3ab..1c815867ae12 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,3 +1,3 @@
 DIST cairomm-1.12.0.tar.xz 789588 BLAKE2B 4c864705ce4b232a3dcaf7251cf22f7f9ac2f964253552cdac5a115bc7e085f38a58375e33f99ea03105b59d056a53e91ea9234c4c6b49d8701c01c8a1e12dc2 SHA512 750e05f079c2ee9786d1a1ddb66ff90405549a82aeb542d585f904f7147994a451950a77ecb563f290cf2358f7010360ab03d9aa3a319651615c48bd25aeb7e8
-EBUILD cairomm-1.12.0-r1.ebuild 1246 BLAKE2B e169c076242c4001cf1c3596c57a8c9095f95520d82121965a37c353080a8dbeefb5b6724baa7b6a49adf0d2d5da974ca838a7805d9051031775fc1b76ac4561 SHA512 3355f9a40f6b3a3549008c648c5e94af2124925baada409984c918aa4acffe1b6c6dfec333d7376c735c18fb8ea2bdff0c004d35a176f7a9f792c1f245042edc
+EBUILD cairomm-1.12.0-r1.ebuild 1248 BLAKE2B fd76aa075911840f816a0105f86b289f10e3fa0479cc86b1beb79a308ae5211f169c63dc02f211e26dfe2b8ca80a5d3cd9ad903954af193eb77b0d512fac60e1 SHA512 e86684c05b8c963227e46b882218f840fcda445f3669f8bcac5a94c2d7544d029f53b1d4cef4664fdf52c78319006a42666e83679b452a2ee84dca525e514eb8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
index f5493ca50bac..cd7789e4703f 100644
--- a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 inherit gnome2 multilib-minimal
 
 DESCRIPTION="C++ bindings for the Cairo vector graphics library"
-HOMEPAGE="http://cairographics.org/cairomm"
+HOMEPAGE="https://cairographics.org/cairomm/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
diff --git a/dev-cpp/gmock/Manifest b/dev-cpp/gmock/Manifest
deleted file mode 100644
index afe0ece52737..000000000000
--- a/dev-cpp/gmock/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gmock-1.7.0-gcc6.patch 981 BLAKE2B 068462693a68144441d5572678609b6bfc58b9415f620df4c1d88b3b629dbdb16787ef5eda714b40a0db3577f84b4493b18fadaf63ff54474de1fab74479b5a7 SHA512 8deb186aaeed74c2e4b2f030f2d9a1f224ba698931862d48775db07a88b798e20e28494b6840dad53fd9f9370dbd506d87425ca52b7fb28f5361b4c9392fd6b2
-DIST gmock-1.7.0.zip 2167746 BLAKE2B fc8939615d076512181c62e87028f55ac962a462a625faa4dbf4e8368dc59949f38413293e941c02e21c459190a8678f6618f252364d288b1d2323bcd19bd525 SHA512 0ab7bb2614f8c00e4842a6819dbc6d9323c42241335078c23eaee53ed420d42f1845d44334eccbf7c114cc88f6ac7a493e20d9b46c58cdba645bbd400eb6db55
-EBUILD gmock-1.7.0-r1.ebuild 1289 BLAKE2B da7c07b45f14cff9451342e898bbe9339979782d933720fd44effadf492b31d644237e40afad503f288191a6a662aecf74c10328af87a4103474ad56ece6520e SHA512 9f74c87f0858ac7c9c7ba06758473e637baa858d6a4f7541f84559257d1dcf70d7aaf01077724e6ad2893bf23c68ee788df23ff2bccca8b63940fb9b8f0140dd
-MISC metadata.xml 304 BLAKE2B 4b8caac4a67750f2d058c06572784636ea7374bea3d7da8dc98ce5848365ffce343d58958e166d954ef590708c43de70db0febf01d075b5bd52e50f806027a3f SHA512 573fc08baeff103567932299b2a802742cec7c389cd4d06fb4538d5a07bcacae12a2d4455f44e736e83bc417faa60f153db8fc318aba1d9f21a432bcae2c70f9
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 58a78462d60d..000000000000
--- 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 42e424f63b84..000000000000
--- 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 09ce02b4056b..000000000000
--- 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>