From c0ab18887b1988662d1f87d01f53c36ce1f5457c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 14 Apr 2015 07:42:27 +0000 Subject: [PATCH] Add USE=internal-jsoncpp to solve circular dependency, bug #546130 Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- dev-util/cmake/ChangeLog | 6 ++++- dev-util/cmake/Manifest | 37 ++++++++++++++++--------------- dev-util/cmake/cmake-3.2.1.ebuild | 7 +++--- dev-util/cmake/metadata.xml | 3 +++ 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 81b7d0c72d3e..e34b4602febc 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,10 @@ # 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.302 2015/04/09 17:45:50 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.303 2015/04/14 07:42:24 mgorny Exp $ + + 14 Apr 2015; Michał Górny cmake-3.2.1.ebuild, + metadata.xml: + Add USE=internal-jsoncpp to solve circular dependency, bug #546130 *cmake-3.2.1 (09 Apr 2015) diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index d1f29d728ab5..360eda994f31 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -38,24 +38,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 5183 SHA256 8b174416f8e82cb9f49cf11e7127d008e0ba1e189b114134e3ebf3e97df6cda8 SHA512 b842a14193c94e4d453bfec2f06ecad41bd87e0d66ee3509a1ad44c26c5fe20e2a4f72524d5f20f062aa7001f110448cd1e3d6dbe11e46764ec265948f952620 WHIRLPOOL fdc583d8011282d2dad783b8e4fb6e1c6bac247f4c222744785b5eec7b3f54d16068b6105ea41724e9bce5af4aa8de95516b8ba232e6e225eda3206a0ce6ce42 -MISC ChangeLog 49076 SHA256 38722218660fe03f1808b3cb8d3f5f04526a80c9e572a95464d1ef724ce11f34 SHA512 e12bac997818705b77c4433f405e139fdb416799f79f522351bc78ea44a8928a031ab87f58c32d945e17a6fd03ae4341382b6c863212295d64a0644d0907929d WHIRLPOOL 4eb99d3e5c8c8e20c46678dfcdad5031afb35073b33f771c1f1d3981576b33c7452a62db998b7d0d85120f4fb95f1bc8489bd12ee9a958c3bd8a94026a09f344 -MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3 +EBUILD cmake-3.2.1.ebuild 5274 SHA256 c2081f0e35213607c799c2502df15063d2ad1a85572322dcca8c441a3ce62a71 SHA512 1c019b10cc1209bbede25f3a6f2eb7c71acf8596b0b887f45a0c0f4af9566a33a8188bea71d7be95d617fabf4d9e1ef53d1b66f32a02cbd3f929856dbc07824f WHIRLPOOL 3835e20dfcbdeeb1a35b8423e3326230b4f782f8d2ed0ffaa3d0e626dfa26568aeb33fd22a81d2542730935e98b78d2095ac5bf97220aaee686011b3550e54c7 +MISC ChangeLog 49228 SHA256 d69257d7100bc12d867af090b96c5ebff182baba8798019e64c01866fc4f6b4e SHA512 6c837175ed1945a9cc329d6685ef37b379d9581d3fd669b7698365d96c93cacb81b5c5c7538c103766349c8a7fd105a1f88ee54797ad0934e7c2a91e92120d9f WHIRLPOOL 02aaae1967db2c76bb9a2ee8a233ea495a3868b8aa8fbd02c17881c6cf4e4fb931285b354292de862d0947258e60063132cf8e8b1b5506b6e64fca82d02cfd63 +MISC metadata.xml 358 SHA256 77e9931c9dcc148b60da6f5b9fa3424d3ddf1d393c2d5cb519e7ed488cf75e57 SHA512 ad506c358d613fc3b78c9776a7e811281c710df8d84c041b966660845385e826b75d677a370ef77f550362ab5a8012af4076183e725539529ce2da5b4d8316f3 WHIRLPOOL ba4f93d32f3b4ceadf4b3588c082c213425fd342ee712ff690080fab42484e2619e51382f508c88599424be96a91f3c736aa7e0b63f49cf60fdce9e1f4c3c1ca -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJiBAEBCABMBQJVJrreRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 -MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh -7B4REACWVECdOAhjzRR2gKHxVjQvZwcyXTnZS+YUANsrMm7JE8tSWSrXKi+mXr9C -7AB7Yqt14kM8QQR6HMw+OGRHgq0KjHvAA0O1javZKADpaIrfWB9ZxYGbAT/vF3U2 -QiKU6TXCB/sgkKmYztGiITZnhO1Vo/afS0lHmGrHbOPtyW1uVq1fOoArMg2pPSxR -Jw85sN01paJ+korm1x/mm6VhT4B2qzAuIMPeA9ZkZ3glbTbCKOt2hwsBhKoL3ydW -z0qbJVdMPEdDNTlmlnea4NJa4lSGfx4n53IzF1xZaVrgs8SN1NDXb3JVih+PzgjP -QmdIQmUGEL1sLXU4loBqHz+zF9BBnOzdxOSmxjlJWUjojSAfaT1KSFfOJPVxDRO+ -8qd8ZrjGsBh2n2UGFntxZ1jW8ZYQQPH0yCxiEoi2nlmJ6wZFFLc3gZ8R5t2ABJuc -yF28oN6r53ROawZQSqjH+IOCh5DKkamolFjS9NG5soL+nPlQ/m2PWr9EzeN9vWEa -JfV2mPs2dkjJ6jllamxiRBIlzFN+gMlwSqxCZlg4TaydxSKP5oZhhmuNt5ePYzUf -2HsItem58y4wuPcH9dI5rcA4zTP4RBkASY7tDR7AsYtYv36GoT5ddB4eVm6DdqUX -xjVm5DNTH1oNV0rJeLGSWvKhMS/opy+AWC5mXGDmJnmxEFzn8w== -=/zk4 +iQJ8BAEBCABmBQJVLMTiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5TMQALWT0m8CnqOZDRHJd957Tuwq +m+1GvSghfrdfG2cx79MZyIgJMn38mJVA6dN2cWJzLX1F6r7bHAdY2l5yodaLAGAR +LMmUsWiLJmEZbH6rEGWE4/0gEVZWBbJ3VLkllBQcI14TdgqEKAh2aenHdti2kIyi +m2xsf9JecXy9aXskU+fPIPtsA+/1ioMZ/1abgWoWLShzl/XYCnZWgM46t2tyflqL +ICNXqmZCFy7tzovIZwjy7ONVBQ9x0rINKH2v45qkQHeo5DKoqk5JHWBv42Ka2PLz +x09eJMzG9Oww9huRlOxWNNxT3uMHri3WWxK5GqV9V5X9/yG38u4CfbcqFsJ78UHf +Ek5y9G8INX5PhMl9/NsduWSvKGermTqLY70nU127OLnK+dJ/R/fvZfwkw1X2x+fe +aPQsFXmO0qD/vTTTZ2UXgkS7vt4DcyYw6n6BFUFhzMM5tj5H7AgJU95PR6f14miM +dzXco0Y+E6ATlpHW8Q8ATS23RhIRSuAiZ65Lcc47/1IWDMzdFdrmsjminBBl25RI +nkP1VqrmvRXK8312k1ZmSlEQ5Bb+mu4CXkCKjESPHQp6ntdAwhcQROT48xq28+cx +dszxQXApcE16lUP5XgG1mOZ4qaVdmDfVJFSulG35GNt7BbTu4HCYiwniS9rTdNBZ +oX+w3MMFcv6P+FHnit/J +=ze4r -----END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-3.2.1.ebuild b/dev-util/cmake/cmake-3.2.1.ebuild index f5d5a54265f1..d2a042a6c5a9 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.1 2015/04/09 17:45:50 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild,v 1.2 2015/04/14 07:42:24 mgorny Exp $ EAPI=5 @@ -14,14 +14,13 @@ 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 ncurses qt4 qt5" +IUSE="doc emacs internal-jsoncpp ncurses qt4 qt5" REQUIRED_USE="?? ( qt4 qt5 )" RDEPEND=" >=app-arch/libarchive-2.8.0:= >=dev-libs/expat-2.0.1 - >=dev-libs/jsoncpp-0.6.0_rc2 >=net-misc/curl-7.20.0-r1[ssl] sys-libs/zlib virtual/pkgconfig @@ -36,6 +35,7 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) + !internal-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2 ) " DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) @@ -133,6 +133,7 @@ src_prepare() { src_configure() { local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMAKE_USE_SYSTEM_JSONCPP=$(usex !internal-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 a23f444b67d6..736037d4b28a 100644 --- a/dev-util/cmake/metadata.xml +++ b/dev-util/cmake/metadata.xml @@ -2,4 +2,7 @@ kde + + Use bundled copy of dev-libs/jsoncpp. Enable this in order solve the circular dependency between cmake and jsoncpp, disable afterwards. + -- 2.26.2