Replace internal-jsoncpp USE flag with system-jsoncpp to ensure that an initial install will succeed without user interaction.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

5 files changed, 34 insertions, 18 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 3a850ab90f02..3fd3a03c421e 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.306 2015/05/15 00:50:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.307 2015/05/28 19:08:02 kensington Exp $
+
+  28 May 2015; Michael Palimaka <kensington@gentoo.org> cmake-3.2.1.ebuild,
+  cmake-3.2.2.ebuild, metadata.xml:
+  Replace internal-jsoncpp USE flag with system-jsoncpp to ensure that an
+  initial install will succeed without user interaction.
 
   15 May 2015; Mike Gilbert <floppym@gentoo.org> cmake-3.2.1.ebuild,
   cmake-3.2.2.ebuild:
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 50df0dccf288..6adaaea9e34c 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -39,14 +39,25 @@ EBUILD cmake-2.8.12.2-r2.ebuild 5702 SHA256 e92cff9b67120db42d8b2b408aa42fe3a593
 EBUILD cmake-2.8.12.2.ebuild 5551 SHA256 589273d08366fd0a979406f3f9f46a8b84764472f2b5e8dad64aa1bd2d574776 SHA512 10a02c2ace51ed3c80a6a65cd2032547c8feee32fd7b45c30d0548926cebf605b61232fbfed2420bee0bf86a8fbd48237e2c15758ac83c18c28c6504944d2e73 WHIRLPOOL 359dae6d17a23382a514b5891cb6df1c867f51fb5952482fb0d5bf504e19ae9342be667ad9c17f89f0478bc2bd9f1ec630da0f831769bfd524c3fba3673d2d52
 EBUILD cmake-3.0.2.ebuild 5156 SHA256 6c841ac46ae5769e22ac16b6af6b1cf234266d3d640507cf0379619ed2582649 SHA512 05f7cee174b3373ca62bafbaee1461e84418a4065895c69c5462f667a0236bbd2d90f4f5a4eb624dc24335c1481f689f223b6d8f84be633939840781ef0058fc WHIRLPOOL 1504c0f74e9d463a590338c4eeac5430c011a6f390f0121a88efc8b2cf88033133f86c7c6836faf66a943974898e01aedb34561c98f750341265f57cf7e1ca93
 EBUILD cmake-3.1.0.ebuild 5099 SHA256 b8af207aee127c21224279e8bdbf9a5cf62760f74d3e192c50719bfad0e5a63b SHA512 5ae290035da81569ac4019e327881fbe42aeca31f25bb62740f3afef8ef1b5308e66fabb5a9f5c4159d5065112131efc606d85e1e456bddfcaa60344c2543956 WHIRLPOOL 0fb06a7127411a0ced9eb316dc602714c21b80dd560c3234ec43e4e8bfd21da77c7fd972737ab07f5713f99efa60862a68ae1dce48bed7dc949dbb22bad6e88b
-EBUILD cmake-3.2.1.ebuild 5296 SHA256 017a0938bfac85a0455ca3e5ad2422e7ef21c0c385ec2328e7f1b6789ccd088b SHA512 3ee53c47d05f575bda225766727d329f7bc852dde61c52fed987852674135272b00235cb6795fe30fddf8f2b4811709a4f5d87c5cbbee328576d2c4354c5d456 WHIRLPOOL 4d59ac56b484dc453876791a37a5454ae21afcfba819cce9f266b019c1c7316b4ced77fa673a168ae523a3746838cfd27761163559cf82b9e46004fe65921b6f
-EBUILD cmake-3.2.2.ebuild 5296 SHA256 7f609a17cf0cfb4d8290897e3a1af4fed100bc163a2f0f0ac0a9e62db689e4d0 SHA512 c4540310a3255def7779f53e3d4f24c1133ed40900e37875d4a31d7904cb577779f38e46f8e029795c6fd446dd70fdc915d8b5fab364234e67296282f1b54afa WHIRLPOOL bef7a15fc493944570dbfe05b2c57f53e074fd954a10354f4f1912b86f2cf17c4b9331c78bc18190e127aa194f4c3ed3fb368f6b4b4fd98b668b21554649c6fc
-MISC ChangeLog 49623 SHA256 544a03b04c722f31e5a9af0c1cb858fc9b527fcc6761ee8e8c3258b2873ff31c SHA512 9f17812a694e83a9e80522e61f74c1aab20fef82c6c62156359c3c615d742079963330556a07881b13587e6f461b3b414e7c51da93c18fa1b265aa72b4eba420 WHIRLPOOL 128733dfab56f6d1076fc2ac9931a495a2a3f4a0c2f043b7e6918e08656828e0618a1e28f053f5110a3a176386e9cbb110c7f37d1a639594986573503e8f4fd7
-MISC metadata.xml 358 SHA256 77e9931c9dcc148b60da6f5b9fa3424d3ddf1d393c2d5cb519e7ed488cf75e57 SHA512 ad506c358d613fc3b78c9776a7e811281c710df8d84c041b966660845385e826b75d677a370ef77f550362ab5a8012af4076183e725539529ce2da5b4d8316f3 WHIRLPOOL ba4f93d32f3b4ceadf4b3588c082c213425fd342ee712ff690080fab42484e2619e51382f508c88599424be96a91f3c736aa7e0b63f49cf60fdce9e1f4c3c1ca
+EBUILD cmake-3.2.1.ebuild 5281 SHA256 40bbc0fc3493abfdc8891841abc97337e7d99d6970763201d4fd9cf05b7d1b27 SHA512 822b1702ed2acd1ecae745eee81538b955e66d9cf0f8ea5c20c33b3abd020b887276b79d8908f8b4ad36c96428a3b0140a20c2b700f94500da593e8368a60275 WHIRLPOOL 9c2fe1965ad07080715964f71f31387c8bc98cbd8cce1fa8ab07952afa6754f28e83f1d9000f8a0a4aef7e13fc35cc5e255940567137dff1ccfcc3c98543d37f
+EBUILD cmake-3.2.2.ebuild 5281 SHA256 b89686728a3769c46dc98d2ef292bb0d454042e4fe86d6018675a6464d6873f4 SHA512 9c0db2224a460aa48b40b9faeba757881340f49e709294a621fa70cfadd20db4f376aaa52bf7387691fce932299e3c40a0422970658d82404607a8c5e9d23882 WHIRLPOOL 57e7bfe1766d3d2eb6f64fc5aacd84471702f8b54e23ede43e3bbffc4087d7aa31346a7057f4c05d5827d8a103d1a23dfd7a746f10b23b16f9eb30f4d6c163f5
+MISC ChangeLog 49870 SHA256 864e89ea6f167e5255104a8d196cb485a3ea4f28e995c54508f2ecac8717f93c SHA512 41caf787711dc9d7618c79aeeb86b2faae8030b9260908be9fd6213b0520d68f08a520b84c45d234f864c4e761ee9e0d1fba41c7a2026af56c3e037738579e09 WHIRLPOOL c354af24156d18473b49a0714717be783e1e360f0c4fd05b0e42cfa7ff52419e0ebb9dd436a8b98cba655f4ca2095a73e18b6b671eeb658a68793491d82c17ae
+MISC metadata.xml 280 SHA256 9c11fcc54fc2212abdf8d07008cdb7cd8c1352fb59aeabebf58ee6aa89fdd8c5 SHA512 7b3012e7dcac7f1a9d0bf66616fd5c43884d236d1d617993a6ad8b142af0a0609c7c87fd6f1f60e0187c4138246e63733bdce51ddc0ccf31523427e96b9c737c WHIRLPOOL 122044a3ae23a55d2a218478e9c309e9c373e0f00f22a1d97d4c9178cbfa63f4a250a1eff9e2ba6f7e3c80c457fc232e5219ce685347103324bb2b15c59cf4a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlVVQsAACgkQC77qH+pIQ6SbMAEApawGQQXcQC/Yl5L483iDS18X
-1EOzAHKtpfWAU2zM2LQA/0TthHrHg48VpVJbPGIO0/yaRyWiLF1mCCTDkoLCTSgc
-=xC/7
+iQJiBAEBCABMBQJVZ2eTRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7MEyEACmtAuuGNhLtlEWNtiZUC0H2X2GY8/qbEcv7jujrmL98/8/Y1nKfBdNgkxj
+7Up3k9oLO/7andI/Me3jPxl76rKClFPKmp8PvCAOfM+8MSbks01NxKN8RLeiC+WF
+yz1aUbqpI8ogfSt+SHnwCKw0XMqURDbxP1fPVncALk8iaWJ6Fgnn4WOgN+NVzu3r
+QzHwVd6M/wpQOW63X2C/TAckyX6sPjbD/lfDKiF8PnE5XTijiFK10WArKqo9SAL6
+2d10YW3lGnTTEyN0QAlG7m1okzpCcDJl0LSPk/U30sUHq2GPtX6KsguEu2mMwdbi
+DZCk7uQtEcpqpQbEJtWO+Gpe4u4hNhMkjmVhp9Vgl8nxvgOUG++oiV0v51Vbxilr
+GxG7ZDlKkeSdGUVRmhOqK/iJwJspMdqac6ctaAG5khbn3j37GKYKYJCjzyRAwmN5
+jRWlhtyo9RindEm6jQgaRekQmIIolGDyvrNkMx0GJMwfTSgZrJ7LFW80EFz1dHG4
+pvVDyGM4pqsHOD2v2oOrJ50SnbMP2ieTv1mTrhEAlCWohLh0gTNcG26gbZVWVyX8
+3xIW9DUWR1Y0mbie87faFE2GOQEUfdPef8WKsA9v0uREhIyIOHOAGFahCCnaUD53
+NoIm6HAgnUKnjiVIIosZ/3qqitXpcCVvl0swYBF13YlmPo6A6A==
+=pabJ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-3.2.1.ebuild b/dev-util/cmake/cmake-3.2.1.ebuild
index 21d8cd522d15..f7bd2e970221 100644
--- a/dev-util/cmake/cmake-3.2.1.ebuild
+++ b/dev-util/cmake/cmake-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild,v 1.4 2015/05/15 00:50:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild,v 1.5 2015/05/28 19:08:02 kensington Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar
 LICENSE="CMake"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs internal-jsoncpp ncurses qt4 qt5"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
 
 REQUIRED_USE="?? ( qt4 qt5 )"
 
@@ -35,7 +35,7 @@ RDEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
-	!internal-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 "
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )
@@ -133,7 +133,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		$(cmake-utils_useno internal-jsoncpp CMAKE_USE_SYSTEM_LIBRARY_JSONCPP)
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
 		-DCMAKE_DOC_DIR=/share/doc/${PF}
 		-DCMAKE_MAN_DIR=/share/man
diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild
index 255f59851e8d..fa47be1c71a8 100644
--- a/dev-util/cmake/cmake-3.2.2.ebuild
+++ b/dev-util/cmake/cmake-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild,v 1.2 2015/05/15 00:50:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild,v 1.3 2015/05/28 19:08:02 kensington Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar
 LICENSE="CMake"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs internal-jsoncpp ncurses qt4 qt5"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
 
 REQUIRED_USE="?? ( qt4 qt5 )"
 
@@ -35,7 +35,7 @@ RDEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
-	!internal-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 "
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )
@@ -133,7 +133,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		$(cmake-utils_useno internal-jsoncpp CMAKE_USE_SYSTEM_LIBRARY_JSONCPP)
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
 		-DCMAKE_DOC_DIR=/share/doc/${PF}
 		-DCMAKE_MAN_DIR=/share/man
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
index 736037d4b28a..7e3fec5ae431 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>kde</herd>
 	<use>
-		<flag name='internal-jsoncpp'>Use bundled copy of <pkg>dev-libs/jsoncpp</pkg>. Enable this in order solve the circular dependency between cmake and jsoncpp, disable afterwards.</flag>
+		<flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
 	</use>
 </pkgmetadata>