kensington 14/11/30 14:05:08 Modified: libattica-0.4.2.ebuild ChangeLog Log: Force Qt4 build wrt bug #531184. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Revision Changes Path 1.6 dev-libs/libattica/libattica-0.4.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild?r1=1.5&r2=1.6 Index: libattica-0.4.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libattica-0.4.2.ebuild 2 Aug 2013 14:33:10 -0000 1.5 +++ libattica-0.4.2.ebuild 30 Nov 2014 14:05:08 -0000 1.6 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild,v 1.5 2013/08/02 14:33:10 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/libattica-0.4.2.ebuild,v 1.6 2014/11/30 14:05:08 kensington Exp $ EAPI=5 @@ -23,31 +23,15 @@ LICENSE="GPL-2 LGPL-2" SLOT="0" -IUSE="debug +qt4 qt5 test" - -REQUIRED_USE="^^ ( qt4 qt5 )" +IUSE="debug test" RDEPEND=" - qt4? ( dev-qt/qtcore:4 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) + dev-qt/qtcore:4 " DEPEND="${RDEPEND} - qt5? ( - dev-libs/extra-cmake-modules - dev-qt/qtconcurrent:5 - ) test? ( - qt4? ( - dev-qt/qtgui:4 - dev-qt/qttest:4 - ) - qt5? ( - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - ) + dev-qt/qtgui:4 + dev-qt/qttest:4 ) " @@ -57,7 +41,7 @@ src_configure() { local mycmakeargs=( - $(cmake-utils_use_find_package qt5 Qt5Core) + -DQT4_BUILD=true $(cmake-utils_use test ATTICA_ENABLE_TESTS) ) cmake-utils_src_configure 1.50 dev-libs/libattica/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/ChangeLog?rev=1.50&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/ChangeLog?rev=1.50&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libattica/ChangeLog?r1=1.49&r2=1.50 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libattica/ChangeLog,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ChangeLog 2 Aug 2013 17:30:09 -0000 1.49 +++ ChangeLog 30 Nov 2014 14:05:08 -0000 1.50 @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libattica -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/ChangeLog,v 1.49 2013/08/02 17:30:09 johu Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/ChangeLog,v 1.50 2014/11/30 14:05:08 kensington Exp $ + + 30 Nov 2014; Michael Palimaka <kensing...@gentoo.org> libattica-0.4.2.ebuild: + Force Qt4 build wrt bug #531184. 02 Aug 2013; Johannes Huber <j...@gentoo.org> -files/libattica-0.4.1-automagic.patch, -files/libattica-0.4.1-qt5.patch,