gentoo resync : 04.01.2018

8 files changed, 105 insertions, 11 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 9abc19038571..8d8ea5af9a33 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index bd2f38742591..4d3481aba8e9 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -2,8 +2,10 @@ AUX gflags-2.1.1-libs.patch 1975 BLAKE2B de24ed552b9e7877be1afceae3245b3377712f9
 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 1030 BLAKE2B 8a1a36854637073bb9e3b1f4df99510fb0f40389e13efa957c7927d5dbdba31a21328c30f741559aeef6d9c38453223438a1fc5af3635d898be5aa8a0e5b4f44 SHA512 dd515a74db59c1afc8eae3adfa62670c3b616f3956078f172b9865a5532b4fcac78304b24a039d93902da5acf59b68b099407f07ea562c41e281f22d37707f8c
-EBUILD gflags-9999.ebuild 1032 BLAKE2B e7d3ea22e4b70bcb9bc5ad5ce5448735fa22a757268b803d6ac466ee4ffbfa9dc561b2db98594e1f3497ddff522e5594bd46e1d877f2000decfa25831d0c4519 SHA512 951dbcbe0738d3261e8a250cb1af5d79f708269964ca4a93cc3824006c560593088fc8baa295296d0f752b5ec8ed4cd5ff6525b6030adacd8fdfaaafba75d7af
+EBUILD gflags-2.2.1.ebuild 1030 BLAKE2B 03b755376e1339389264e50fe248801f8b5e280cc8069b45beda8bb8a9135373b047e3dee8e32bc2d9745b5639b6b95d065a0e747e1e06266c0945b6e5ae2e05 SHA512 e295339b15b1c234fa5f2c3b996eff23ab4aea666f06f970a8e66afcc0697ef8328e3334f672785488da462889003a71db87aa59be8f1b49a397d49fc1c99d3a
+EBUILD gflags-9999.ebuild 1030 BLAKE2B 03b755376e1339389264e50fe248801f8b5e280cc8069b45beda8bb8a9135373b047e3dee8e32bc2d9745b5639b6b95d065a0e747e1e06266c0945b6e5ae2e05 SHA512 e295339b15b1c234fa5f2c3b996eff23ab4aea666f06f970a8e66afcc0697ef8328e3334f672785488da462889003a71db87aa59be8f1b49a397d49fc1c99d3a
 MISC metadata.xml 303 BLAKE2B ffe806891bf2b398e66676c5a17dbbcf2b53a1738a92d994828aecd33bf52dae92d9f2631d262f2c5c375b7f4c6918c9011f03ed94a0bc6a50f2475ee4620537 SHA512 80f049b850a5f55f33964fd8776aa4b510d9937022caac6d3817d583ae3089dd5cc73bd44b8ef48e867a706fd9223861001759281903ee1a1a467149ca7bf37e
diff --git a/dev-cpp/gflags/gflags-2.2.1.ebuild b/dev-cpp/gflags/gflags-2.2.1.ebuild
new file mode 100644
index 000000000000..91f405e1e9bf
--- /dev/null
+++ b/dev-cpp/gflags/gflags-2.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gflags/gflags"
+else
+	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Google's C++ argument parsing library"
+HOMEPAGE="http://gflags.github.io/gflags/"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+IUSE="static-libs test"
+
+# AUTHORS.txt only links the google group
+DOCS=( ChangeLog.txt README.md )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TESTING=$(usex test)
+		# avoid installing .cmake/packages, e.g.:
+		# >>> /tmp/portage/dev-cpp/gflags-9999/homedir/.cmake/packages/gflags/a7fca4708532331c2d656af0fdc8b8b9
+		-DREGISTER_INSTALL_PREFIX=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 79f70a7aee48..91f405e1e9bf 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -1,13 +1,13 @@
-# 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 cmake-multilib
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gflags/gflags.git"
+	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 60100744568d..f25dc399b3f3 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -3,7 +3,9 @@ AUX glog-0.3.4-fix-build-system.patch 4861 BLAKE2B d1c10a8c4b264003e0718da28e1df
 AUX glog-0.3.4-fix-gcc5-demangling.patch 1992 BLAKE2B 086661e687a98e34777fd0baf97dec3730acad2ff8fd2184bb0a25d3c516125ca97d92bd799f33fabce4aabfeb1fba6dd865c89aef1659095988c34166285f69 SHA512 6f0b6f74dd039672f80dce55526ae784ff56add01ffc0dc0f5adf4c0ebbf9af15cfd054b370a0631fb7044abb20edf6dc79cb0dd2ac49fda7131ec152f54f054
 DIST glog-0.3.3.tar.gz 509676 BLAKE2B 21d8893ff535c0e8c1de27214f535aaea99727128d80f421da096969c19504da6a296054db2931232b4fd372446f96189464e4000f44c5720152085aa9976978 SHA512 95418ff0857415a0fbc15caeb22a13f3b6736618adcc3c30e054626f1397bc58399c45f68784c70b1f5dc594ebc6ea66e386896beab5c20be72dd53b25f5a4ac
 DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993bb74960e5aedb214ec52ef9e9fc39efb1a34f38f217b92df7db064ff01d58df36c3e4ad789becc97335ec2 SHA512 139525b546a9eccacc9bebf7cc3053ba52229e9488485ad45344c3d3134ca819d3b571250c0e3a6d84097009c8be89b0f4fa16ef5ec838ffcc237ae11c3a034c
+DIST glog-0.3.5.tar.gz 532275 BLAKE2B a455f3ff8fc7cf2861a4351a0305db9455bb79977e57c49b6269b3fa2c147cd9627bfaf4c7aaa04fe4a49158d79abeb5b985813fe8c473d6005e915335c0d693 SHA512 a54a3b8b4b7660d7558ba5168c659bc3c8323c30908a4f6a4bbc6f9cd899350f3243aabc720daebfdeb799b276b51ba1eaa1a0f83149c4e1a038d552ada1ed72
 EBUILD glog-0.3.3-r1.ebuild 1834 BLAKE2B d916387f3779f4de88582b4ffac1225b87696d3708fce86436c800aeab6f523ee6b9357c4694836f1831e08fbb803a15ad56869fb4e6752bb67f0506c52ebfee SHA512 6a399224979c430102861f0bcd80344c1227d270e1eb175e0df4172f6294c5800112fd0c9a94c84a3e6baf8b77880c6447b1c13d75ddf941a44e1ffaca482606
 EBUILD glog-0.3.4-r1.ebuild 1245 BLAKE2B 4ceae0391b3b19821492310b8dfd314eb401fbce7f5b01a515a99d71b7eccb200c94644abf1fe5320e8d81e6f2991130c059aa81106fa0588e8b00e5ca4d8c80 SHA512 a2a03fa729dcf6cd3c46f432c609eb98d7a63bbafd8590ef21019b0c89659ce64ea72f706aedb54895bdd8387cc77adb5be8ab961175f1f304b0fceb8188ad00
 EBUILD glog-0.3.4.ebuild 1855 BLAKE2B 32eaaedc1ce19d93d999f30e6acf8a5a70643ee0f364eb7dd04762e4535dd35d0261491eddab4bd5f5e7ebbc0ffdfa5417a87f5b90c3b8dc35c817cf09dfe333 SHA512 f9feb687feb6d5141580ade93318bdaa505c98697f86a1c51e7f4e3e61819df41bb131f317db721723865a5a49856147cd8284fcaeaae8b0250044473478d613
+EBUILD glog-0.3.5.ebuild 1198 BLAKE2B d30874550c821e6bc4e1127660c43fbf23e3ce1f4fe74d05246fe97d1f0912f9452b6ed43c78cf93e70e460fcb14268f18ea64439c82e3ce196f236e81f08acb SHA512 f60474a111c82217991ef31825cc9d3f19914815d011351216f814041902e77e6dd44aaf8cb3a90fd0601654add6d82111532143227fbba41ed8c5db5afaa1ea
 MISC metadata.xml 609 BLAKE2B 44e06e9039e048b3be88b61ad11a3b698a99e78fcd8df49e66c5a63bea43422e3c8f197f847e5c22057828d23ddc37efb09cb9015f5a6b252e20c8d038ecf5b3 SHA512 9dc4390cd212eb4a9d05ea2eeae26d7556c7ddc01444a917a9d5958d4604a4808b73ab7a7f9f4c6809ae396a53c1e9c73c5ce6b96595c7dd7d86dd6ec7a739fb
diff --git a/dev-cpp/glog/glog-0.3.5.ebuild b/dev-cpp/glog/glog-0.3.5.ebuild
new file mode 100644
index 000000000000..1f4064c66394
--- /dev/null
+++ b/dev-cpp/glog/glog-0.3.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Google's C++ logging library"
+HOMEPAGE="https://github.com/google/glog"
+SRC_URI="https://github.com/google/${PN}/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="gflags static-libs test unwind"
+
+RDEPEND="
+	gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
+	"${FILESDIR}"/${PN}-0.3.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-0.3.4-fix-gcc5-demangling.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable gflags) \
+		$(use_enable static-libs static) \
+		$(use_enable test gtest-config) \
+		$(use_enable unwind)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index c5552715c6e5..c1e389735a44 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -6,5 +6,5 @@ DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 3d10c1e502c2fac1500d07301031a9328b29027a
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gtest-1.7.0-r1.ebuild 1249 BLAKE2B 67bd0dc17b6525938dbcf19158b7fbea0d5c0ec97f89f212d521a9bb8905e25a3a15a53c8fa95cf833f3cd265223af9aaeee2f5ad90a8091f5ba3e5cc46000fb SHA512 67a53dfcbc8c85f6e4e6aedc348a413b7fcc328130f5c83bb3963e607e96d735d9213d5b013ca40beb910accca5c69f36bfc9e9c5012c3be2663cb4cf93b6fb2
 EBUILD gtest-1.8.0.ebuild 1451 BLAKE2B 0419ee0c8af52245f762d84e46f4eaec593d6e3c687acc6d7f1d1c801e31199ff2e436091f7f23efd3a5878985dad711469931aca68c052a4b144563f546e804 SHA512 c883641e274747e567d0f1aa5d5c7a593b6f0d3f54dcc540e0900cf03c7129f480c96eb2b920a7b8cdd8c07243fd12420428c9c461faf1600a09727917061eaa
-EBUILD gtest-9999.ebuild 1291 BLAKE2B 388c8271f0d03494c4247b141f0827a30e3091794367c5c6eff0e5c6f379dc0cae67a4e53f4068596e8fae323256c36e0bfe2eba5728cd0df0380057228dc630 SHA512 1ab32d603822dde81e81e5cb16815f749c3e054b3e25fdce40ea1ee487b7721c812a2f0ff47e70e978af4e81647c9ff49ce549e3f1b690f8586cc182c60dec32
+EBUILD gtest-9999.ebuild 1592 BLAKE2B 2dd521e94c698d42d3930eb2319261703724cc2e2a44f0da27ea295a5c6d20bf10af019aa64c6324a152476794e4559c7b4bc979d664e58609f0f3d9643cc15f SHA512 58ec8bd8f6f8dc5efe0d23a4a68fb22ab5d798d7248a2fab002d927220193a79405e211a5c9ba90f7c6c33cbcf439ded042aae8744b5b4450e3f3a37a15b7a16
 MISC metadata.xml 569 BLAKE2B e59ed2ce4fbd2ba88d3b5f3b6cac059d20007f4b9c1b71066f3ea79db48c1f160f6e15f58557f255c35af6eb37d902ec467d85ce879ce5be986e2ec968870490 SHA512 8e884231265f404e28bd9d1b3e05ab06d96e3e3c9fc036aacee2026d81161e60f3019260d9d3f55a5b057b68c37303e22b88bf51125336aa977e43b1c687a624
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 47a3ca79f6ee..a4ab55ca6f1e 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -1,16 +1,24 @@
-# 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"
 
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
-inherit git-r3 python-any-r1 cmake-multilib
+inherit python-any-r1 cmake-multilib
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/googletest"
+else
+	SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	S="${WORKDIR}"/googletest-release-${PV}
+fi
 
 DESCRIPTION="Google C++ Testing Framework"
 HOMEPAGE="https://github.com/google/googletest"
-EGIT_REPO_URI="https://github.com/google/googletest.git"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,8 +28,7 @@ DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-py-tests.patch
-	"${FILESDIR}"/${P}-fix-gcc6-undefined-behavior.patch
+	"${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
 )
 
 pkg_setup() {