Revision bump uses subslot on dev-libs/boost. Remove old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)

4 files changed, 11 insertions, 106 deletions

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index 03c1206e2e21..f9f3a1fc4e7b 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/tomahawk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.47 2015/05/28 19:15:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.48 2015/05/30 21:07:18 johu Exp $
+
+*tomahawk-0.8.4-r1 (30 May 2015)
+
+  30 May 2015; Johannes Huber <johu@gentoo.org> +tomahawk-0.8.4-r1.ebuild,
+  -tomahawk-0.8.2.ebuild, -tomahawk-0.8.4.ebuild, tomahawk-9999.ebuild:
+  Revision bump uses subslot on dev-libs/boost. Remove old.
 
 *tomahawk-0.8.4 (28 May 2015)
 
diff --git a/media-sound/tomahawk/tomahawk-0.8.2.ebuild b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
index 2da17f88406e..44ee820ae226 100644
--- a/media-sound/tomahawk/tomahawk-0.8.2.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.4 2015/05/11 20:57:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild,v 1.1 2015/05/30 21:07:18 johu Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ REQUIRED_USE="telepathy? ( kde )"
 DEPEND="
 	dev-cpp/lucene++
 	dev-cpp/sparsehash
-	dev-libs/boost
+	dev-libs/boost:=
 	dev-libs/quazip
 	>=media-libs/libechonest-2.2.0:=
 	media-libs/liblastfm
diff --git a/media-sound/tomahawk/tomahawk-0.8.4.ebuild b/media-sound/tomahawk/tomahawk-0.8.4.ebuild
deleted file mode 100644
index 2e2b5e4b909d..000000000000
--- a/media-sound/tomahawk/tomahawk-0.8.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.4.ebuild,v 1.1 2015/05/28 19:15:38 johu Exp $
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-inherit kde4-base ${GIT_ECLASS}
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="http://tomahawk-player.org/"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="debug +hatchet kde qt5 telepathy xmpp"
-
-REQUIRED_USE="telepathy? ( kde )"
-
-# TODO
-# qt5 use flag needs some work:
-# - deps with missing qt4/qt5 use flags
-# - does not build with in-tree only deps
-DEPEND="
-	dev-cpp/lucene++
-	dev-cpp/sparsehash
-	dev-libs/boost
-	dev-libs/quazip
-	>=media-libs/libechonest-2.2.0:=
-	media-libs/liblastfm
-	>=media-libs/taglib-1.8.0
-	>=net-libs/gnutls-3.2
-	x11-libs/libX11
-	hatchet? ( dev-cpp/websocketpp )
-	xmpp? ( net-libs/jreen )
-	!qt5? (
-		app-crypt/qca:2[qt4(+)]
-		>=dev-libs/libattica-0.4.0
-		dev-libs/qjson
-		dev-libs/qtkeychain[qt4]
-		dev-qt/designer:4
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsql:4[sqlite]
-		dev-qt/qtsvg:4
-		dev-qt/qtwebkit:4
-		media-libs/phonon[qt4]
-		telepathy? ( net-libs/telepathy-qt[qt4] )
-	)
-	qt5? (
-		app-crypt/qca:2[qt5(+)]
-		dev-libs/qtkeychain[qt5]
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/attica:5
-		media-libs/phonon[qt5]
-		telepathy? ( net-libs/telepathy-qt[qt5] )
-	)
-"
-RDEPEND="${DEPEND}
-	app-crypt/qca:2[openssl]
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CRASHREPORTER=OFF
-		$(cmake-utils_use_build hatchet)
-		$(cmake-utils_use_with xmpp Jreen)
-		$(cmake-utils_use_with kde KDE4)
-		$(cmake-utils_use_build !qt5 WITH_QT4)
-		$(cmake-utils_use_with telepathy TelepathyQt)
-	)
-
-	if [[ ${PV} != *9999* ]]; then
-		mycmakeargs+=( -DBUILD_RELEASE=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 32e29d7f628f..93bb7e0d6aa4 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.32 2015/05/11 20:57:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.33 2015/05/30 21:07:18 johu Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ REQUIRED_USE="telepathy? ( kde )"
 DEPEND="
 	dev-cpp/lucene++
 	dev-cpp/sparsehash
-	dev-libs/boost
+	dev-libs/boost:=
 	dev-libs/quazip
 	>=media-libs/taglib-1.8.0
 	>=net-libs/gnutls-3.2