Grab upstream patch for always using QJSON_LIBRARIES wrt #503656#c4 by "Uwe L. Korn"

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 66 insertions, 1 deletions

diff --git a/media-libs/libechonest/ChangeLog b/media-libs/libechonest/ChangeLog
index 2bafd5759bfb..277f33023d65 100644
--- a/media-libs/libechonest/ChangeLog
+++ b/media-libs/libechonest/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libechonest
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/ChangeLog,v 1.27 2014/04/06 19:00:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/ChangeLog,v 1.28 2014/04/06 19:05:59 ssuominen Exp $
+
+*libechonest-2.2.0-r1 (06 Apr 2014)
+
+  06 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch,
+  +libechonest-2.2.0-r1.ebuild:
+  Grab upstream patch for always using QJSON_LIBRARIES wrt #503656#c4 by "Uwe L.
+  Korn"
 
 *libechonest-2.2.0 (06 Apr 2014)
 
diff --git a/media-libs/libechonest/files/libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch b/media-libs/libechonest/files/libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch
new file mode 100644
index 000000000000..9edd035979c7
--- /dev/null
+++ b/media-libs/libechonest/files/libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/show_bug.cgi?id=503656#c4
+http://github.com/lfranchi/libechonest/pull/14
+
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -40,16 +40,8 @@
+ 
+ QT_WRAP_CPP( ${LIBECHONEST_H} )
+ 
+-SET( OS_SPECIFIC_LINK_LIBRARIES "" )
+-IF( APPLE OR MINGW )
+-  SET( OS_SPECIFIC_LINK_LIBRARIES ${QJSON_LIBRARIES} )
+-ELSE( APPLE OR MINGW )
+-  SET( OS_SPECIFIC_LINK_LIBRARIES ${QJSON_LDFLAGS} )
+-ENDIF( APPLE OR MINGW )
+-
+-
+ add_library( echonest SHARED ${LIBECHONEST_SRC} )
+-target_link_libraries( echonest ${OS_SPECIFIC_LINK_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY}  )
++target_link_libraries( echonest ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES} )
+ set_target_properties( echonest PROPERTIES VERSION ${ECHONEST_LIB_VERSION} SOVERSION ${ECHONEST_LIB_VERSION_SONAME} )
+ qt5_use_modules( echonest Core Network Xml )
+ install( TARGETS echonest   RUNTIME DESTINATION bin
diff --git a/media-libs/libechonest/libechonest-2.2.0-r1.ebuild b/media-libs/libechonest/libechonest-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..405b052c733f
--- /dev/null
+++ b/media-libs/libechonest/libechonest-2.2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# 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.2.0-r1.ebuild,v 1.1 2014/04/06 19:05:59 ssuominen Exp $
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0/2.2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test" # Networking required
+
+RDEPEND=">=dev-libs/qjson-0.5
+	dev-qt/qtcore:4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:4"
+
+DOCS=( AUTHORS README TODO )
+
+PATCHES=( "${FILESDIR}"/${P}-always_use_QJSON_LIBRARIES.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DECHONEST_BUILD_TESTS=OFF
+	)
+	cmake-utils_src_configure
+}