gentoo resync : 04.01.2018

3 files changed, 42 insertions, 4 deletions

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"