media-libs/libechonest: synchronise release and live ebuilds

Closes: https://github.com/gentoo/gentoo/pull/1395

diff --git a/media-libs/libechonest/libechonest-2.3.1-r1.ebuild b/media-libs/libechonest/libechonest-2.3.1-r1.ebuild
index c609bf30329cf8d138c7e53e2e65035e493e5fcf..7c1a828871a5c468f2d2a9d1280d3ad986448caf 100644 (file)
--- a/media-libs/libechonest/libechonest-2.3.1-r1.ebuild
+++ b/media-libs/libechonest/libechonest-2.3.1-r1.ebuild
@@ -5,13 +5,19 @@
 EAPI=6
 inherit cmake-utils multibuild
 
+if [[ ${PV} == *9999* ]]; then
+       EGIT_REPO_URI="git://github.com/lfranchi/libechonest.git"
+       inherit git-r3
+else
+       SRC_URI="http://files.lfranchi.com/${P}.tar.bz2"
+       KEYWORDS="~amd64 ~x86"
+fi
+
 DESCRIPTION="A library for communicating with The Echo Nest"
 HOMEPAGE="https://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 )"
@@ -20,16 +26,18 @@ RESTRICT="test" # Networking required
 
 RDEPEND="
        qt4? (
-               dev-libs/qjson[qt4(+)]
+               >=dev-libs/qjson-0.5[qt4(+)]
                dev-qt/qtcore:4
        )
        qt5? (
                dev-qt/qtcore:5
                dev-qt/qtnetwork:5
+               dev-qt/qtxml:5
        )
 "
 DEPEND="${RDEPEND}
-       virtual/pkgconfig"
+       virtual/pkgconfig
+"
 
 DOCS=( AUTHORS README TODO )
 

diff --git a/media-libs/libechonest/libechonest-9999.ebuild b/media-libs/libechonest/libechonest-9999.ebuild
index 7988f9c68dac52b22d501d615a2d162611360f4d..6531dfde0721b6a9d1ddec468f93dc2391e6f0b4 100644 (file)
--- a/media-libs/libechonest/libechonest-9999.ebuild
+++ b/media-libs/libechonest/libechonest-9999.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="A library for communicating with The Echo Nest"
 HOMEPAGE="https://projects.kde.org/projects/playground/libs/libechonest"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/2.3"
 IUSE="+qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"