gentoo resync : 16.06.2018

9 files changed, 2 insertions, 129 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 783a2fcdc70a..ce181bbd05ad 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index 943212b7b781..c7baeca51097 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1,10 +1,5 @@
-AUX gflags-2.1.1-libs.patch 1975 BLAKE2B de24ed552b9e7877be1afceae3245b3377712f969887a9be116279e5552253f68dd9129b0242c5eb0338200c8f5d05d89807a3f10f586eb231f7f400759f53ec SHA512 8e75d43de9de8053de42573bd0f243b8060bb1f43f995fe555c0cb984bacddddbc670c9f17115f054e5a54bc52a7d3df20b39b03c3229bae397ad3dfbcf9a66c
-DIST gflags-2.1.1.tar.gz 102015 BLAKE2B 93a6595730e338f171ba4d3f980aa84bafa7c5890e588027cad8f29f6397c4579186f675f1ba995c9e4be243beecde60ec3449d72baeec016948814aa65a1f86 SHA512 18d1a0a1271f12f0e87447e3a9d6810f531f5b190d84274465add5a928c189caac911ec2592422895961ab3c0c7566ff50c0c22f71d185ac3413c54bdbfb00ef
-DIST gflags-2.1.2.tar.gz 95716 BLAKE2B 1f7aa19176cf4560e5be9d85217cdd3256d5a71db26d504bb9c845f27f303e46ee2debc5d9d791936dc05cff8ae0ace8cc38af8e782c86d0ca4e55fe94e29c3a SHA512 f636023c1150e4d536d2d472e40d643ff0b02d3c96d8cb7f31544df23e6255fa6c4fd927ef94a3660c250d3faeae7d8d78519fc5e856749a577347a78d9d9ab5
 DIST gflags-2.2.0.tar.gz 96408 BLAKE2B 571f07dd0972cec201eae8ce66d5e0592abb6ddb81bcf3c539f38861f0cd379de2db20ba99eab885ba030235938816d7a61e589b74a61743de7cdb2710646854 SHA512 e2106ca70ff539024f888bca12487b3bf7f4f51928acf5ae3e1022f6bbd5e3b7882196ec50b609fd52f739e1f7b13eec7d4b3535d8216ec019a3577de6b4228d
 DIST gflags-2.2.1.tar.gz 96985 BLAKE2B 065dac9cf5d878e4179cb6d56ddf240052a552b72036fd06cb83197d9772a9b97fa544f809c6e1efd6f9ad8cd0222872fc6292c44bc013c5f70e235bcc5b290c SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9
-EBUILD gflags-2.1.1-r1.ebuild 807 BLAKE2B d53e8caa6d1ea9fdf6f62cb3264d3ce05b7b43d79c9503479df4b29721744b62b0fc3f390f28233935e6018d02b53ca3bf4d3ce83876cc7478de913f96eb0e6c SHA512 92521158fe6613c7f845202dfd8f82782ea059c485ec43425ea1202d09b9b5cf90252bb6b7969ee45d6841b7fe65f7342798d297122fdde8bbcea9ac6cc6b8ba
-EBUILD gflags-2.1.2.ebuild 754 BLAKE2B b0a14fe4ea94e66fb64e10dffe489da098e33d4736da77e94923fa3d8602caf0e74a5f62049e48c8e1fda5b6c737c0e852ceb328e6a0a0250808988b62beab61 SHA512 6b427bb3093826ad366cb3ca49bb6dcd7814eb86cd3fc669a0c0afcbbba9e3986d90980984560d44237bfc7ba1b26665d4ea33f050b4261474e3829aabbdafb5
 EBUILD gflags-2.2.0.ebuild 1027 BLAKE2B db9af87c53e7a4f28ea172a48b2e4590113918038c7273d2a2305dcd0514d067c33efaa053f78542c25fdbf4a44007a4efeac4a01bd84e92c089e04d6bb7f560 SHA512 8f494ba4001554d9d6cbbf33a8f35dec437b4aab4b543f09b49da8258255659525dfabb81a59eeff07f16f3f2d1985b2446d34e8b5340306c9d312e43cb15394
 EBUILD gflags-2.2.1.ebuild 1030 BLAKE2B 03b755376e1339389264e50fe248801f8b5e280cc8069b45beda8bb8a9135373b047e3dee8e32bc2d9745b5639b6b95d065a0e747e1e06266c0945b6e5ae2e05 SHA512 e295339b15b1c234fa5f2c3b996eff23ab4aea666f06f970a8e66afcc0697ef8328e3334f672785488da462889003a71db87aa59be8f1b49a397d49fc1c99d3a
 EBUILD gflags-9999.ebuild 1030 BLAKE2B 03b755376e1339389264e50fe248801f8b5e280cc8069b45beda8bb8a9135373b047e3dee8e32bc2d9745b5639b6b95d065a0e747e1e06266c0945b6e5ae2e05 SHA512 e295339b15b1c234fa5f2c3b996eff23ab4aea666f06f970a8e66afcc0697ef8328e3334f672785488da462889003a71db87aa59be8f1b49a397d49fc1c99d3a
diff --git a/dev-cpp/gflags/files/gflags-2.1.1-libs.patch b/dev-cpp/gflags/files/gflags-2.1.1-libs.patch
deleted file mode 100644
index 0e59cb937e14..000000000000
--- a/dev-cpp/gflags/files/gflags-2.1.1-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17d38b4..ca2c1df 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,6 +22,8 @@ version_numbers (
-     PACKAGE_VERSION_PATCH
- )
- 
-+set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}")
-+
- # ----------------------------------------------------------------------------
- # options
- set (GFLAGS_NAMESPACE   "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.")
-@@ -256,7 +258,9 @@ foreach (TYPE IN ITEMS STATIC SHARED)
-         endif ()
-         set_target_properties (
-           gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}"
--                                           OUTPUT_NAME "gflags${opts}"
-+                                           OUTPUT_NAME         "gflags${opts}"
-+                                           VERSION             "${PACKAGE_VERSION}"
-+                                           SOVERSION           "${PACKAGE_SOVERSION}"
-         )
-         if (HAVE_SHLWAPI_H)
-           target_link_libraries (gflags${opts}-${type} shlwapi.lib)
-@@ -280,9 +284,18 @@ if (OS_WINDOWS)
-   set (CONFIG_INSTALL_DIR  CMake)
- else ()
-   set (RUNTIME_INSTALL_DIR bin)
--  set (LIBRARY_INSTALL_DIR lib)
-+  # The LIB_INSTALL_DIR and LIB_SUFFIX variables are used by the Fedora
-+  # package maintainers. Also package maintainers of other distribution
-+  # packages need to be able to specify the name of the library directory.
-+  if (NOT LIB_INSTALL_DIR)
-+    set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
-+  endif ()
-+  set (LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}"
-+    CACHE PATH "Directory of installed libraries, e.g., \"lib64\""
-+  )
-+  mark_as_advanced (LIBRARY_INSTALL_DIR)
-   set (INCLUDE_INSTALL_DIR include)
--  set (CONFIG_INSTALL_DIR  lib/cmake/${PACKAGE_NAME})
-+  set (CONFIG_INSTALL_DIR  ${LIBRARY_INSTALL_DIR}/cmake/${PACKAGE_NAME})
- endif ()
- 
- file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}")
diff --git a/dev-cpp/gflags/gflags-2.1.1-r1.ebuild b/dev-cpp/gflags/gflags-2.1.1-r1.ebuild
deleted file mode 100644
index 837721b2123e..000000000000
--- a/dev-cpp/gflags/gflags-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-multilib
-
-DESCRIPTION="Google's C++ argument parsing library"
-HOMEPAGE="http://gflags.github.io/gflags/"
-SRC_URI="https://github.com/schuhschuh/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-PATCHES=( "${FILESDIR}/gflags-2.1.1-libs.patch" )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		$(cmake-utils_use_build static-libs STATIC_LIBS)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	rm -rf "${ED}"/usr/share/doc
-	dodoc {AUTHORS,ChangeLog,NEWS,README}.txt
-	dohtml doc/*
-}
diff --git a/dev-cpp/gflags/gflags-2.1.2.ebuild b/dev-cpp/gflags/gflags-2.1.2.ebuild
deleted file mode 100644
index f240f164803e..000000000000
--- a/dev-cpp/gflags/gflags-2.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-multilib
-
-DESCRIPTION="Google's C++ argument parsing library"
-HOMEPAGE="http://gflags.github.io/gflags/"
-SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		$(cmake-utils_use_build static-libs STATIC_LIBS)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	rm -rf "${ED}"/usr/share/doc
-	dodoc {AUTHORS,ChangeLog}.txt README.md
-	dohtml doc/*
-}
diff --git a/dev-cpp/tree/Manifest b/dev-cpp/tree/Manifest
index dd0601348eab..f62b8c1be1ae 100644
--- a/dev-cpp/tree/Manifest
+++ b/dev-cpp/tree/Manifest
@@ -1,5 +1,4 @@
 AUX tree-2.62-test.patch 289 BLAKE2B 9074ea69e8c141b813e1854c5956eb016846196c9722ed3740a942caae7a0b086f37a4ab54e2faa81c73d310e1a2effdf8302f5703aa23a3052cc88e67638037 SHA512 7b63e0e60db5c636a13fe4cf8f8043fa4029a04b21eeb4cac08fcce4f433e0e6096927fffb7f345c319b46ea6043a9388a7419e8fa6c783f58b449f9ab1061db
-AUX tree-2.65-gcc46.patch 337 BLAKE2B 2fe38b8730e4fb84c3c0171c45b8b5d45a1abe54b8e429b295f3e188b6fdfeccd1105affac8c2e0f08308432abe9767ada0c23279cb44f7dc395fea994d22673 SHA512 e649bca26c7926c627b02852cd70e9ed4b84fa187e3d4c16ac8acdb96f72e62cec1bed9831b73f81bfd165a9c8ec8af031c7027877ae2ebef11f30e5ad05d7ff
 DIST tree-2.81.tar.gz 1167128 BLAKE2B ea92724b16fc7ea8a5f0036f5a7a57d000d66b332b4ba46139463f707f95922f38b1d4d56a6d2fca0a3c4ece8f11e28bbf4aa6bec5c5a7bc59ccaa36a01413d6 SHA512 85e910fdb19ffd03ae79302a95ebffdb44725fd9f291a61d6912f743b54fe9b3d1c863e00c7e75d238f428946809e42c7ae6379b1051688fb06ee6c6d761d294
 EBUILD tree-2.81.ebuild 930 BLAKE2B e936c307f73b44080c3174f5fd659e7c23a488807cf6e1b88cc2e67264e5478939a03f798e736ed453343303225c287734da844c6039450876385d29f55595a9 SHA512 5c04375499ecbf2fbf635536949163824cae501a53618fd07855bb5cd257b32d3728a36c72516f0259d407a8d88966750025a8b59633fbc79a7fe318f99b520f
 MISC metadata.xml 619 BLAKE2B ac5307e69727d5da71a21955619b8e322df63ebd877617c70b494ad541c470ef6df41a90ddf92b132452c293e2fbcbb85f2b72ee372f95491124ab50f7299ce2 SHA512 b2486910e891482643fc8464b11269ca6f83e87a8403edb78b2163e7fa37586b503597f0ea61332439322d257ad239d0c0a210707788043d555a96f3b712cc84
diff --git a/dev-cpp/tree/files/tree-2.65-gcc46.patch b/dev-cpp/tree/files/tree-2.65-gcc46.patch
deleted file mode 100644
index d75b516112ba..000000000000
--- a/dev-cpp/tree/files/tree-2.65-gcc46.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- tree.hh |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/tree.hh b/tree.hh
-index 1429da3..d780be3 100644
---- a/tree.hh
-+++ b/tree.hh
-@@ -71,6 +71,7 @@
- #include <set>
- #include <queue>
- #include <algorithm>
-+#include <cstddef>
- 
- // HP-style construct/destroy have gone from the standard,
- // so here is a copy.
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index f9012a82b15d..4cc6ba20aa08 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -1,3 +1,3 @@
 DIST websocketpp-0.7.0.tar.gz 682271 BLAKE2B 4da1fb076c2f533cdbdaa2cc0b0b45509216fcbc3b465f137905a34477aff0e93005f36d0257f314fd91b7de59e587e1b1df9af664a717b8dbf477b168025f26 SHA512 91a86d4f5120db3f474169bb146f865f82167b1e9eedabec8793b31005e4ce3d22083283bc1b9f9e37fa0da835addcb2b68260a27c753852c06b3b1bb2f3c12e
-EBUILD websocketpp-0.7.0.ebuild 735 BLAKE2B e2eb66fc5a9743e989058a3aca67aed381d962462e1919d20f4310e748635d622bfce075365d153f04f12247e5d8178dc8968565230603ac93415ae8f55b484f SHA512 ffa1057dfd543311f4d90bd3f38afa0a9f64b334b416b2b03b8bbec18dc09a605b923754397a0d1bf7ed9aa9a945226f08832d51ca696cb3428686002de09ccd
+EBUILD websocketpp-0.7.0-r1.ebuild 785 BLAKE2B a881cd969ee9426baa095431a63d67cafcd0cc37174e45e279d3f9a9e57c322f13e37a6008d922a47f252cf81dc83248c6eb4659ac87bd9994365c2227c15a87 SHA512 6d15ee7021ce643d7f1706f2198bd640b23ad0a9204cf0245ae551c7d810450d91e8c706d03822de98abfd00dd6be181ecba4292b35b7d09e6b550e3751d8377
 MISC metadata.xml 419 BLAKE2B 11f113ce200752e1982b6f246f267e8029901c9dd6fa4dcdb131a28f62c3041792dc25b0ff449b20f755d9e9e9f1f4cfa23077f7648d8bfd17619b1887f44316 SHA512 92d8c85006a8857390b3bb83a9fcaa6e8a74a68eadc63018f6e70e2d4259332caaf549611a69baf44689557f05f1f7f7824d24bb9a5b582913b6580cc21608c0
diff --git a/dev-cpp/websocketpp/websocketpp-0.7.0.ebuild b/dev-cpp/websocketpp/websocketpp-0.7.0-r1.ebuild
index 0f0ca9b6ecd5..5102455cf018 100644
--- a/dev-cpp/websocketpp/websocketpp-0.7.0.ebuild
+++ b/dev-cpp/websocketpp/websocketpp-0.7.0-r1.ebuild
@@ -24,6 +24,7 @@ RESTRICT="test"
 
 src_configure() {
 	local mycmakeargs=(
+		-DINSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
 		-DENABLE_CPP11="$(usex !boost)"
 		-DBUILD_TESTS="$(usex test)"
 	)