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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

5 files changed, 27 insertions, 124 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/Manifest b/media-sound/tomahawk/Manifest
index bcf81dfade88..ad0c1c3230a8 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST tomahawk-0.8.2.tar.bz2 8563213 SHA256 522d2ef873f8548990ac1fc736c11dd08c347687c77d63b520f55207f19db3ae SHA512 30a95a583796a0a8082aaaf3e3555719b91eb18a8744eb72865c8105d16128b2b477d82838ae6914d38c6b0f09e700761e84083dab79d1375acb1ad88d919a26 WHIRLPOOL f81f3ffd41e9439355a6a9d7808c92a1c8d1295f18eea90be3a4f788e4dcfa80a956b85f8b3745f4c241ca306f51b43762d3d6a38635bc92d0fa59e35af1cc31
 DIST tomahawk-0.8.4.tar.bz2 8611412 SHA256 0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449 SHA512 5b312f593eac39d06de05e24d4ce429122d0777a9d52d6db8c65309ac283d7ae560c2fc189b186f0f8b1a7bbe1135ed0d59e1d850de6a93655e53efe4f5317c7 WHIRLPOOL 3577f47f13b191f0bea42d7c30c00ad8e6346afc7527eb5f5ecb81185183a8e99dcc0559414afbba485db5d80d2e5f9830fe341d4563d3d7427a98f54382e013
-EBUILD tomahawk-0.8.2.ebuild 2204 SHA256 f166e8952017cdf388cad34dc33a0dde0f63572f062a68e1c731b254e32d014c SHA512 2da7e9a66ccbeca5905f33ce46f977f8641566557903b8ab0f756d42eca11a9fe6dc9b47b0c0995f8ebab3018621a7236bb693594dc018951cac57400f0a7037 WHIRLPOOL cbf3459f693d21def6ece70fb987694fbb163f4c23c50a1d8bbf9b647410c218f28a8df1942071b0feaeed1ce8f1f0c8d901e86fef45d63b8a1e18dde2baf71a
-EBUILD tomahawk-0.8.4.ebuild 2203 SHA256 1ce0c3a00e9031f8d711d2516d5a355530075e98a265e8dc5329a6ad327bf343 SHA512 fd2bda57c8b3b713970a9d7da9505d00e8b6f445e2774148f06f2dadfcb6d76909f28d2b503c53e75ffed37dfd600b8eb5dc7ae23c27c1acc67d9dc2177ae716 WHIRLPOOL e3457bb77be990b1442ee7768cb7b93b57b09b467ccfe4e62da8d36310291e4ad58cacf61a405fc160ca4465b0ffa43ddea4a4a46d3efc532bc55c6a3a994acb
-EBUILD tomahawk-9999.ebuild 2157 SHA256 0cd6a22969c263f34ecf58dd30124cf5ab775ae7d8136ca0294f6c223ce4630c SHA512 68452847aea25f058941c82a11e036ad984f5749794088473776e9f149c9c25be99c42e39a8706df034eebc26bccc5563d22928426efaeed463b45b0285e5b03 WHIRLPOOL f5dab3d79d1425122f9ab7b754ffd97f65af2a2dfc7c2c37f556a08eede0ad26f3358776d06c492734e4e0c8d215f9d8b0db76528e85bb0a53fcb4cb9ad5be68
-MISC ChangeLog 7635 SHA256 52f6c25efd8a69463b7576b105a4f27e9bc344b7fa8885c88c34569cd4fbcfc3 SHA512 e21489dc761ef0869367b5e2ebe14217b643e384b694d96dd880690a077386ba21643a3c4190936c534e2beb3740a0274a02b397fd3f94826704fbcf98ed2122 WHIRLPOOL 834fa1e78a5f9f45a9d32df69985ba25a4fc9771682b042c0770713ac38a3cab2ef7315dbd3a2edff80ab7090e3aa0efef28879e921b71dfc64d2fefaf3a9b93
+EBUILD tomahawk-0.8.4-r1.ebuild 2208 SHA256 db7af1a1794436786a94cdf5ad676077f63bff921112cd9217aa177a867139a7 SHA512 a01535df8174584c31b91f0398dc20e786f062a20384cfaf2902997f19cb57197d5fa531a251a5ae3bb168ac2b8bb87b44deba4e9ff452bff816ed48875d9871 WHIRLPOOL ad53b9fb0ec5f63ebcf5fd7efbe7ebf067ce572558af6c13ef7c077c7ad06f8c06c68af268327631b2759e49beb528a08f5a303e504737d3d4cdb2ca3a384136
+EBUILD tomahawk-9999.ebuild 2158 SHA256 064b8e542eb3e3286eafeba044833762e0569f050cafd5788974cac07f3b39c5 SHA512 707a1b45c4518ac1b59f1b0efd132fd539695e7631266d99d051697e46001215bba9a71b192e85273e87d5b735b7359c9e707236eb7beeea79dc22c80fc013d3 WHIRLPOOL c24a46b1c9514085f6cf5da2fab290b1b74e9b7e454f4f218539976d61a0b54381d42245fcd663949a0c139f81f1fbe82607d73f1de31362733c322ff9e115dc
+MISC ChangeLog 7877 SHA256 d70a2c8407e9c4854e6f68c4c80a83c8d2f56a1da8e23ef598487bc1d40b51de SHA512 bc5e3ed0910b4f4c64f8b190b93809184900cbe7d3fad5b946eec63606cd4dc9c51c231d0abd39208066c31724f24bfec5223d977d96238012e22369294562fc WHIRLPOOL 99b28478add0723cbababd068b7869b6f7cd7b1685d07ed1ac9f5922bb31358aaafe320694e206e2a99b89e05a9bff6888569a017d5f648c1cc0567c33afe889
 MISC metadata.xml 449 SHA256 49d0ed467fa509bfdabea945cda8147db6980b565d5cf57ef0f7122d918973f6 SHA512 618943cbf72f232ab56ab529e08e9fb1f600b9c7885dc1a3d7e84f0bbf19bfd13befc253bbfc5b6f22863e9d890040f749fcbf50fe7c3c10825464f30f654343 WHIRLPOOL d13c16baef4735c911d00c682bea15832f0f0dc75b45e151171f498db29820ad8a8ffcc5d98fedafdc66857f681cd3f1455dfa71b71065d82a25bb56f8c5e7a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVZ2mAAAoJEGVpnaTzz9K9NacP/RlPmrmwwHvskr3odXIxAz3V
-G59C6yF4rvbOZQIQEbrVea31N0kJYQeTOrN2E3BDydlm5WgQCtgBtJgv6bfLVPzx
-k43zc4WgjcGqZ0BroV/Mpg1Woxbibmgg5WKYnrp1+O7I319y0ZO4+pAMRMh0+z69
-SUATnXx0JfPZ6/pC5rrsu34lS+9Hd25RmSzQx6Li7xJzhFQoOZSc+8NXXXUOhJ6d
-UnXJn0YqPe31WjM04QBerj28WIZ2m0sljqrbbgb/axcuJqIvD2wQZpzQ47oXtIYp
-RBSi4NYUwrFK23cigrLlPp4DfHukpdJt8tdJVOKvgMZw6eUGX9BruZSA9NsG6pIO
-JgDeH8vm7yP/5phib1tScH3EYYt/O8gpgDS0HIbh7I+wcvGlmE2+JLPpW0t1SRzF
-OfZRx0KWvjXeiydQMYgii5jqZ3sve/Zgyua+sMXul6ayZdT1u1KE71VhQ+zDWUx2
-8iQ5JnCmO92F+DhcjFgAP7GZx2gTBREjbqzGAWl94t00nsI2CPLMBPhfyC8a7jTI
-Nuy0mYiDYTZT92kpv+GREOPPsGXEeRcEPaR7rKj/LbTeCvKydff7KRQ55+Ucq+md
-HrFNHHQSRX4CeFZaIbherq4nFLhiPUlpLU0LpMdwDxDAFTRY050dZ4xzpaqtn4TO
-aJ/IZ24XKip3c+jqKaaW
-=E2SG
+iQIcBAEBCAAGBQJVaiaKAAoJEGVpnaTzz9K9wREP/1oOd12rd0uIMALvnHUMvRro
+0LKuz1dFwOJt6ITgvvCCJOUgmQeZnbsPMbJhP5XGaWw7FFctLQlOPhuwjhMOFIY0
+oJbL/IKF5ZOU/a9S7aCPHfhvwbJ4EQ7L5aQfcTbj0JGzPn7fWeKU30aNTGmhiumI
+Sge5zVeKv6T9Q5vrR8Xec4xd4jlqLvhn3q+QMw859m2yAPZFpLeg1dBh7Ym54ygb
+kWuNGdQsm/Z+7jfp/ITzjEIcMEfDgeXSutjVfjaTMRhR2hPrLKIcGiKyoRWXqW1k
+K+GphFtCNlSm6v1R34fy3EOLxStsHFR+9vQG/WFWZwVxK0uFSaxiYJ5eUdO72oWA
+IqBkqunadIyOcdOze28oqKo2yfYlhsZvj/556I3JFIigG6VuScQmWUGVzrYDCS0w
+4ic2ty2ZST1piCmJ55UTlM9auCbFx/vGGCdRCZ/mgSu7j9rQzkOQcZfKAZSmg2sf
+28HGZBkb66naPFxmrMusHyjMbEDwxIqG8qFSAxsls127a+zNECbWBGz8QKxujpZ8
+LL1iq96MvJDjtD+gBd2jGWC8gxXuee5avZ8gL+TmFmdNnw/tf4IQLBL1wD+/hqcF
+JTFEwtFnoVgLfQe/NFfe0Ty5OJhsuZkrq4lhVHI4Nu8yGniO3zZd6Ta9qtX4HDBj
+ImNIQtxFf18N4rmymKsB
+=DfVz
 -----END PGP SIGNATURE-----
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