Created attachment 371900 [details] libechonest-2.2.0 ebuild New version of libechonest was released incl. Qt5 support. Package has preference for Qt4 as Qt5 is not yet in the tree
Comment on attachment 371900 [details] libechonest-2.2.0 ebuild --- libechonest-2.1.0.ebuild 2013-11-02 18:43:03.452210470 +0100 +++ - 2014-03-07 15:53:46.343470414 +0100 @@ -1,26 +1,46 @@ -# 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/media-libs/libechonest/libechonest-2.1.0.ebuild,v 1.2 2013/10/29 20:03:16 maksbotan Exp $ +# $Header: $ EAPI=5 inherit cmake-utils DESCRIPTION="A library for communicating with The Echo Nest" HOMEPAGE="http://projects.kde.org/projects/playground/libs/libechonest" -SRC_URI="http://files.lfranchi.com/${P}.tar.bz2 - http://pwsp.cleinias.com/${P}.tar.bz2" +SRC_URI="http://files.lfranchi.com/${P}.tar.bz2" LICENSE="GPL-2" -SLOT="0/2.1" +SLOT="0/2.2" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="+qt4 qt5" +REQUIRED_USE="^^ ( qt4 qt5 )" RESTRICT="test" # Networking required -RDEPEND=">=dev-libs/qjson-0.5 - dev-qt/qtcore:4" +RDEPEND=" + qt4? ( + >=dev-libs/qjson-0.5[qt4(+)] + dev-qt/qtcore:4 + ) + qt5? ( + =dev-libs/qjson-9999[qt5] + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtxml:5 + ) +" DEPEND="${RDEPEND} virtual/pkgconfig - dev-qt/qttest:4" + qt4? ( dev-qt/qttest:4 ) + qt5? ( dev-qt/qttest:5 ) +" DOCS=( AUTHORS README TODO ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use qt4 BUILD_WITH_QT4) + ) + + cmake-utils_src_configure +}
Created attachment 372422 [details, diff] patch for ebuild
'=dev-libs/qjson-9999[qt5]' this is definitely wrong: non live ebuilds should not have live ebuilds in deps, so i did not add USE qt5. Also 2.2.0 does not link to qjson anymore, but still has 'find_package(QJSON REQUIRED)', asked upstream via mail.
QJson is definitely needed in source and there is a statement in src/CMakeLists.txt that should link to it but is broken. Upstream fix submitted at https://github.com/lfranchi/libechonest/pull/14 As there is no upstream QJson release with Qt5 support, I would suggest for the moment to omit Qt5 support for the release version of libechonest and use Nikoli's latest proposed patch/ebuild.
(In reply to Uwe L. Korn from comment #4) > QJson is definitely needed in source and there is a statement in > src/CMakeLists.txt that should link to it but is broken. Upstream fix > submitted at https://github.com/lfranchi/libechonest/pull/14 > > As there is no upstream QJson release with Qt5 support, I would suggest for > the moment to omit Qt5 support for the release version of libechonest and > use Nikoli's latest proposed patch/ebuild. I agree. It's done, in Portage, as 2.2.0-r1
