Add REQUIRED_USE, bug #539940. Thanks to Nikoli.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

3 files changed, 86 insertions, 15 deletions

diff --git a/media-libs/libechonest/ChangeLog b/media-libs/libechonest/ChangeLog
index a7e5b6c20a3c..ecc6368c443e 100644
--- a/media-libs/libechonest/ChangeLog
+++ b/media-libs/libechonest/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libechonest
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/ChangeLog,v 1.31 2015/01/29 22:10:39 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/ChangeLog,v 1.32 2015/03/14 13:23:46 maksbotan Exp $
+
+*libechonest-2.3.1 (14 Mar 2015)
+
+  14 Mar 2015; Maxim Koltsov <maksbotan@gentoo.org> +libechonest-2.3.1.ebuild:
+  Add REQUIRED_USE, bug #539940. Thanks to Nikoli.
 
 *libechonest-2.3.0 (29 Jan 2015)
 
diff --git a/media-libs/libechonest/Manifest b/media-libs/libechonest/Manifest
index 62164caa027b..fe5529677bc1 100644
--- a/media-libs/libechonest/Manifest
+++ b/media-libs/libechonest/Manifest
@@ -6,25 +6,21 @@ AUX libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch 901 SHA256 c7832e7e5d47a4
 DIST libechonest-2.0.2.tar.bz2 82005 SHA256 e0d9b3fe7bf5fff0ce8d0f182c4cac8ea3b478c57be21549fc57da69c1a3088c SHA512 fb8baf396206cc567ae880c3f19191bd5a723820a8a8f7ea96f1065cea88c213b46ec9f7688838353331bdac105893c4e9ea118e5b17cdda313dce5ba810a1fb WHIRLPOOL d1bfd6059c5e648e190bf4ba9ddb5a3bdaeca8af346c34dc0f0177f3f05314b491f37bba2ad05944e6ff9b4ddd88e7042a089c9ecb370e75b61b6b405aa5e8d7
 DIST libechonest-2.2.0.tar.bz2 84242 SHA256 f2c043a3564bc9c5a4556a80737d1440519ced583feaa62f7afa362e35e81ee0 SHA512 482df30a7a139b14da28d752cff405267bae8af448014857aa5151c08312bcb1144039dc962c85d1613d013446eede8b97efca970801262a240a5f790e95d48e WHIRLPOOL d836f14163168f455311ed30ded1cd860311913693de41f24d6416419128487f6568fd4b8f9e52cb02ffe72b2418c46d2ffb55cab7f432b6a861dc295a99347c
 DIST libechonest-2.3.0.tar.bz2 87798 SHA256 79983ba72fbf9b112ebfb329b96b60eddf25d719ebe34eb70de01aa106ae2b44 SHA512 c6c01b463e9d3c5ab7178454d2341e61e4f4f184e0082cf4d0ea13a95752dbff2d3dee4bdc3aa2480265db6677611c9d9228c83da322242d23f5e67a7f0ee0f3 WHIRLPOOL 421257e75aea2a4a6b5d092fe5e579bc4759c8d51a59cc6e1587936c080bf6601fb30cad303f86f6a599ab4f3584abef6b2cea0fc1802f0f4f59bfae749ce6d8
+DIST libechonest-2.3.1.tar.bz2 87729 SHA256 56756545fd1cb3d9067479f52215b6157c1ced2bc82b895e72fdcd9bebb47889 SHA512 6d4c3571680657d01516e1fa5c55478a25931a825801b06b7bdd6d16715fe2a72385bd8e74be95e15b8fd2521f8b9f7bde5c2afe73a7bbc1faeba9fadd80d2f3 WHIRLPOOL 003b799295075f07310666d3352fb1dfd8704608d5595dd1962e31c3f1946af96c3fe28d4e7aa5e6ad75b77c9ed4eb803c5eeb00019007a18a30f37dc6ddb296
 EBUILD libechonest-2.0.2.ebuild 762 SHA256 9c3b7ce0c7974c0ca3295b3ea585162511fa0144b37d8867087602cda1976607 SHA512 f84ce7389d827fdcd2b37ac4d3c3918643c1a2b528e35d475c47ccfaa990135cef8dcd156d30dad40b8fe0e3e577c7a44e47a2a27d12277e871babb713d20a80 WHIRLPOOL bd419878f209d5225afcba6171c9088fce905504545da84c2eb15669980c232074d7e722f39683bc8753dfe0c43119b4da503aa9a55853159d1b4616bed1c8f0
 EBUILD libechonest-2.2.0-r1.ebuild 942 SHA256 4c105998d0f2e7d2641b72e3d3238009a54e4bd3139434ae6320dee56ebef8b2 SHA512 0b861517c85b44ea20c1511a7e1e9ef4b897afbe45f39c6c86c68f1122c95b0010a5773ae7c7ba05ec5dca60fa240c2c4c1963a3aaaf1b6ae0fcaf2dd242039e WHIRLPOOL f41766cfa88ba4995242433517253d3ff7dcf88cd63b9a9c7f22fa8ee28452a7af1b987fb718eb2cc9ef9d41c38a57fc9913e88c6a9f106873b98c80a780a2fa
 EBUILD libechonest-2.3.0.ebuild 1362 SHA256 0ae5745daf15d0c489205393558eba9eba2986a7fe1ca098ff65c3fff9408c2e SHA512 ebf884595d2d5d4d1a11110663a56c64ee509fce6af732f6f5e5f4a0e3c53d10273d0d8a6c1d2628aed15cb7d65cfba1657f91312bdbe8de85db19fa2788ef89 WHIRLPOOL 8f5b21aea792aee00f041d2b54aac0b0ea63d11e4262ce00eff03d4da04b44872b81be9b563b2222ac3a5d4b73f53e27ba4a6a4052c06fe5c6a8eceebdc49a1d
-MISC ChangeLog 4658 SHA256 6cb7585fea057561f591b336a945c167793de329b9d251b3dca678512987f421 SHA512 d6f88ab680a93976368859708b2d1fc65f72fcfe8ece0ae2d0c7aa59cafc59d09fcfe8822f0eb16a162e073f106f220da7778e8aa80cfafac260b83df77a6f48 WHIRLPOOL b81f6c1d8104dc49f327ceece3f6c03060e0c9cfa2edf66e0d69fea55153dff6ed0bc49e279307c7a57fc8171378cdbd878ac7e2721240f6be64ae73361d45f0
+EBUILD libechonest-2.3.1.ebuild 1398 SHA256 620a374ead46a877f884ce082eab9d22d173f2356aa6d3ab293bf6b413e6c53d SHA512 048b9cfb55b597ae62857934e2256fcdcee36f2d65d1426512e154df6ce54129c725f17e8c7d4261e611dfd1225d98cd3d73bcc133177e40c8a2a10a99e3b0fa WHIRLPOOL a2a12595610fd48dfa7281bccf83d2b263f53a7560163990fc6276ddcdc4c3f2c43ad58e0065cb05338671cb010c9120dda883837f3495612065394cb046d715
+MISC ChangeLog 4828 SHA256 59b5d52fa88718a761b27444b237803da4dadc24802ebedfe4a2fc896479ef3c SHA512 ee920e08fd7a6684554469d2756ab241d7db995c61993ca7ae05cb41f69c8446132d884667b46d8782986403a4e33df506a9c446a5abb2f80882cac26524b6cd WHIRLPOOL cf35381a03a825d082eef8c5badacd7a1d78e650573ba4aeb21e9c5bd4ea8a98fbda9d985062adef5e9f40222c68a488d2c09d4a053268f15b9d17236a093d1e
 MISC metadata.xml 386 SHA256 300b56df88b92756eec8b55d41a1ed72634b6b0f16bcce438f050347f8d54a33 SHA512 74292a80ede9dc9642e364c88625ac3bcfbf90d17dba787b82e43546e06628cc9ffe1db4624cf7779dcde12454d62b7dd0820969a07659235be8cce2102e88f4 WHIRLPOOL 6844c22d4a67f997a4f9bbe090ad3e4ac54a9bda47f2e4f407b7d33227619ba0372dfeab5348a1d11450899a8027bd0850c9a3dcc83628ca1382fa1e62fa7eb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUyq/jAAoJEGVpnaTzz9K9S6kP/1rEQWnaa2XZzS0R3doxPXSN
-z7B9hW/p5ZrFWfl+M0yCBBh82iWYHoHKFsNksQmUhnV/2y7Qd+hNCYPO2JgZI9oR
-IVcuMhlnv39ZkXVqTl8FL5CA+LxAIqZGWVrnVpbxH6+mJ+6bIB5WfU7lME7XBP9Y
-qf0N2UAl+ZM0X6vZvng3TIap1f7XNtUrJ2SPkPGm9kHQaiKoqUlnMZaiMmjYAaVG
-MaznZEFn4Rldkcb+MUn3bERpvS+3HYbY8T/bXxY1Izyf3a8CrBm6ItMvm9QoWTa4
-Y948Y716EON7s9zACwIvgGvUyQSyUAJnCh9Nub4iCXSGiaRMSPrvLmyFQgo/ICG6
-tMmXCdD5MmopQpY+6JnRTHYOD1i8KmtPG+fGp0GsCGAxmMWcPb5xwuBCmYXp6l0K
-KBg2sZ7WNgx4ZsM4hPavnCQsSDSTeBuLE4mFuJyU6f4BZsn+beoTDKmz9hs/enyK
-+Uoy/3WJves3VGCBKhCmuSuUhmTpfgURf1eJdc5BK2CWr4W0SrD6Z6B+vdH7GYMr
-k6NldOVxmpVzQeBlct+/nyiGxLy31LulgdM7EuKlbiDUh5S66/oZiSybWMg+t73m
-pkC6Jut0tRwdYQ9xQZFp8Q6khC98bEKU1jbRxc/W39FpUT1KwTPmdYgTaqHYmH+j
-AiOQ32BfRoz7fTPOZ3A7
-=hM4t
+iQEcBAEBCAAGBQJVBDYFAAoJEAmJmMX429re9NEIAIqvHTWGCCB4RyM003ubD1Ws
+LEEwRnkNv6hRFjje68dyeB5uBB0IfIS7pRLBfPiFK1yFOICKc3eTabW2/siVxbNA
+X1EXsntpwjuh8zTwFS68AX6A0PuGRVSkg5jEURvefXpTtA5pjARekveG04xLdbZq
+qGov22kQ3W2iSDmmrt+tVk5/uGfdEZYrj0zlwYJ6kBcCxRmwULdSWjyUPveS6zza
+ExESWTNvV3zkmCg/iwtWUpOrtiT888JNBVT+QCl9QESFhDkaCNE8swDwgK5p81gX
+3ENQhNUSfGIsJZh+ZB3enUHV5XcRAoM4fF6RX7ARabJmlU5wkyv7o4Q/fPm40vU=
+=jHjY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libechonest/libechonest-2.3.1.ebuild b/media-libs/libechonest/libechonest-2.3.1.ebuild
new file mode 100644
index 000000000000..0e95c4fae824
--- /dev/null
+++ b/media-libs/libechonest/libechonest-2.3.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/libechonest-2.3.1.ebuild,v 1.1 2015/03/14 13:23:46 maksbotan Exp $
+
+EAPI=5
+inherit cmake-utils multibuild
+
+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.3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+qt4 qt5"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RESTRICT="test" # Networking required
+
+RDEPEND="
+	qt4? (
+		dev-libs/qjson[qt4(+)]
+		dev-qt/qtcore:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README TODO )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DECHONEST_BUILD_TESTS=OFF
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			mycmakeargs+=(-DBUILD_WITH_QT4=ON)
+		fi
+
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=(-DBUILD_WITH_QT4=OFF)
+		fi
+
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}