mgorny 15/04/14 07:42:24 Modified: metadata.xml cmake-3.2.1.ebuild ChangeLog Log: Add USE=internal-jsoncpp to solve circular dependency, bug #546130 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.5 dev-util/cmake/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/metadata.xml?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/metadata.xml?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/metadata.xml?r1=1.4&r2=1.5 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/metadata.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- metadata.xml 1 Oct 2009 18:10:14 -0000 1.4 +++ metadata.xml 14 Apr 2015 07:42:24 -0000 1.5 @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <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> + </use> </pkgmetadata> 1.2 dev-util/cmake/cmake-3.2.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild?r1=1.1&r2=1.2 Index: cmake-3.2.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cmake-3.2.1.ebuild 9 Apr 2015 17:45:50 -0000 1.1 +++ cmake-3.2.1.ebuild 14 Apr 2015 07:42:24 -0000 1.2 @@ -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 @@ 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 @@ 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_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 1.303 dev-util/cmake/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.303&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.303&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?r1=1.302&r2=1.303 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- ChangeLog 9 Apr 2015 17:45:50 -0000 1.302 +++ ChangeLog 14 Apr 2015 07:42:24 -0000 1.303 @@ -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 <mgo...@gentoo.org> cmake-3.2.1.ebuild, + metadata.xml: + Add USE=internal-jsoncpp to solve circular dependency, bug #546130 *cmake-3.2.1 (09 Apr 2015)
