media-libs/libechonest: synchronise release and live ebuilds

Closes: gentoo#1395
johu · May 11, 2016 · 7335f1f · 7335f1f
1 parent 098611c
commit 7335f1f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git 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
@@ -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 )"