Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-sound/amarok
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/amarok')
-rw-r--r--media-sound/amarok/ChangeLog8
-rw-r--r--media-sound/amarok/Manifest26
-rw-r--r--media-sound/amarok/amarok-2.5.0-r4.ebuild137
-rw-r--r--media-sound/amarok/amarok-2.6.0.ebuild128
-rw-r--r--media-sound/amarok/amarok-2.7.0.ebuild127
-rw-r--r--media-sound/amarok/amarok-2.7.1.ebuild129
-rw-r--r--media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch28
-rw-r--r--media-sound/amarok/files/amarok-2.5.0-kde48.patch62
-rw-r--r--media-sound/amarok/files/amarok-2.5.0-qtdebug.patch55
9 files changed, 22 insertions, 678 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 1721dc4af1b4..667a838e96ad 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-sound/amarok
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.460 2013/08/19 14:29:44 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.461 2013/08/21 15:31:00 kensington Exp $
+
+ 21 Aug 2013; Michael Palimaka <kensington@gentoo.org> -amarok-2.5.0-r4.ebuild,
+ -amarok-2.6.0.ebuild, -amarok-2.7.0.ebuild, -amarok-2.7.1.ebuild,
+ -files/amarok-2.5.0-fix-context-view-on-startup.patch,
+ -files/amarok-2.5.0-kde48.patch, -files/amarok-2.5.0-qtdebug.patch:
+ Remove old.
*amarok-2.7.1-r1 (19 Aug 2013)
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index fa005e9aaf96..c25d8e94cc86 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,16 +1,20 @@
-AUX amarok-2.5.0-fix-context-view-on-startup.patch 1217 SHA256 8e9c224ff81a2d39898820a4a219a589fc9dd12c2cdea7d159db5329179fb49c SHA512 5a73ca88ed7503f69d999ca76f952d7681b172de1e12edff872e164db66d24bc92d89f696e69dbaa85ab55c82b776bf1e4876ffb4db4e67d5e80782efe436238 WHIRLPOOL 13e244cc9f645736469cb4fa991af74ee7d389914494fa6886c685dd41b8b7fbf8de5c417a43de8ad1d27e7c8465f59e627e4e27db469da4c847fe99101d479e
-AUX amarok-2.5.0-kde48.patch 2111 SHA256 4ee6b27d79d42e7fbb5469f46c3ebaf69eef73ff83cb0882e44f4d993ba0ce51 SHA512 27dfba494cf2a12db9b2300de3c2b217c1b84945daa32881152f9e9eddea637ace74ff37cf7d3855a405c6618bfeb45929600e0fedbffc255e91c7dbc5663e8e WHIRLPOOL 3f8968ecd3209dd284de1cae6138613a5c3ab2240f8bd3357884032424f3450b93d0c27f8ede70b6bd5f9136a249cd33508ac0c3df325184edc28c5eab389ada
-AUX amarok-2.5.0-qtdebug.patch 2787 SHA256 a2b4ff34c38741979a76b96e0a741e5da7cadecc1a592035e10773b233d38f29 SHA512 5ea1523e16d9889a027866ee5e3f8bf8bb9efe743f55f7b5871aa6ef1a8f5341744b6858547251a9f472f840911cc516f247021659280a28f35eed41e27f5f85 WHIRLPOOL e2b8a58ad15e3d76e0a66befa044dd5b32e3838ddd0a94f767d723288c40854d257e1fe110f5b13c57b1d5842a47a4489c60711f9c8240c67dfc67524a2a24a6
-DIST amarok-2.5.0.tar.bz2 46607238 SHA256 1ed191db290fdede7c910c322cff2aba8ecfc1c4af891508d9ee410db3768849 SHA512 ac195f627ed0b1daba4b3a2896048d445caa85310b3373b373cabc76c36f424a60f2a3a439012363f3022c0ddb85a6770f2debd5b1a6e009e067bc5329d284c6 WHIRLPOOL e2256ae5dc941016afc9c3798b8f4ee4275dd23085b520067d6f24fa682ce465254d251c3494208a679441058771226668d5b500cb84851ccdd5b48584bb73bc
-DIST amarok-2.6.0.tar.bz2 42331208 SHA256 a91280e588181cf9363d7146f339ef527220fe0c8057f26f010f592b01fdd2c0 SHA512 da67876dfc41dcc3e1f3087698d36dabb43a339cef1669ca0518de191e2d9dd2e3e72122ffe76ecfd763e83547e46c55bba8606c095d35c85058df77bf35fb4a WHIRLPOOL 70fadaff2565fc2e9d8cb628942ec8107c6f4fcea0bd3e898f4ba6a72231ebaca8cb1d924f1413ced7c82940790438c9dcbe2fba7760e356b100eb832d8a2edc
-DIST amarok-2.7.0.tar.bz2 15499004 SHA256 b3138400d946511f6fddd8f1fea383a1e744ca76094f1f9e407fb40d3db6d2f3 SHA512 0c2ed7e2c9e84bd19994f2adbea8e628ae50fcf8347406544a10f88e513312f6cee12708182f79e0d7e1fc531a32ec35f12725fac5e9a3755dd8403f3ac32a3e WHIRLPOOL b710a3eb8840c779f61e4a1dbcff54833cd71cde69ef4abc1e31fa3d890f7cda499582aa73a3bafd6ce902cd410e6de7ece3bc2b4707ec50cfd15dabff63c2c2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST amarok-2.7.1.tar.bz2 42872919 SHA256 9e0dc6653096179ee6bd1538da95964efd6e69ef247d6de29a3e5a69bac5bb89 SHA512 7e398a52a2aee67fa36f8e550ef9929af0b36ad118cd22e75bf1420a2db67f657478fecddaacd42f6ce6be4221fbe93c4ba5e0b979359253f06065836f1860b8 WHIRLPOOL 7ad8bae556739dc48973749f3c99ed640136d918084100492f8acae93de6025a1807753b3ea0c7504d0179e4847399b2b520dfcc27c609b033e8f0394d7e3464
DIST amarok-2.8.0.tar.bz2 39950028 SHA256 f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6 SHA512 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d WHIRLPOOL 108cfd95d65e74f28f85a846f605bc349e5b2962b7f9a357415225f3e48ff87148d7f50a642665cc3c809bb2cb4c22f339ad049cdeb4659bb7c0a48e798833ad
-EBUILD amarok-2.5.0-r4.ebuild 3800 SHA256 8306a195a1e008954ca58c45ea318c0c0bad085890af0e9d79c74e96ed115291 SHA512 7c9a2a12a9168dcaf63471d94ee1e02888581471b4f2c97b1a30bd8970f7f967282f6869500069d415c72f3137a0917c8452b4777b3496e97c609d43b532e7d3 WHIRLPOOL 33345fbd385f07cda260cbf6c0c54aa3576e8c1610ee64057d1652b3c3cf353faf07fd25264266c75c4046f6ba36d08f834ff88cf36cd29c80d097ad82a45729
-EBUILD amarok-2.6.0.ebuild 3443 SHA256 3996282ca71c6e2c91859a24c1dda157cb0dcd5f0a9cadaf0cc2928178243055 SHA512 e77b7f519ef078d6bd0c63fad4cc0fb85dc072dc545e3e92a473f4da74e758250fb3af0f241a60ec4a3c0cdc311cc8c2bc1a14d4a2e9f993bff54df969b6794a WHIRLPOOL 9361c7c028d461f734b861678b562cc7136b40e3ef1472f54e31705f61f8d52be4773c88886584ca2a4c82a0e50adf35e8613c3d2ed91f283c0ab1d8ec10c7b7
-EBUILD amarok-2.7.0.ebuild 3513 SHA256 a9fb2e214f542d16eef3c0a80693f3e23be03f747e77011e4253b7225eac6f18 SHA512 fee39667d5a9eec14019907aae908f73aa104ed9c993e11e3628fbe6e40b385216d03e8d4262635d55b75327d404ba3ae0b097507bd254855ef2630735f7723d WHIRLPOOL f4577e0d60110e1f205a2472c0b6426d5ea99c3546e682b3c205214a933e937f4982994bfea27e3d5808dea01778c8fd24b303f2f9edfc8215d43547173f6c1c
EBUILD amarok-2.7.1-r1.ebuild 3516 SHA256 8d6f3b76622d9f35bb36064e4c295e63e01d74ad7a339ced73d74a20fa812375 SHA512 e41443e1085336fd1d9912579cd52dd5a25ba06b88cf51e897d2a603a28d1b5d8d6e2e7eadd14966fb1651fc7faa7eea97b97f5fe5200ec3576bc8cf5bf7a68e WHIRLPOOL a06ce02acb9f71ab7f12a49b16c8305c95201d886c16822edc17df180d9ff40c43bd088123e2012b5a9c2db4db1e0ec91e717607165e4a3ecc59f427c5ee6640
-EBUILD amarok-2.7.1.ebuild 3485 SHA256 31df6b6440c61c723a48a6304fe378ed71154da2a433d8a6297cb0dbce0a46cb SHA512 43961e9255f6b4b43d59882511e7a6cee41fe05e9170dff2d23670f7c1bc7cf3a6595dbed20a1a1c656c0c9a223f78c93a486ec176eeb07e78903d87599a57c4 WHIRLPOOL b8c892edc9ac6fbee47e6b406853a1c582e8dfaa124601065a8ac82fb7b9cca4a39b14d9a4f436ea4dd722d30d924f64d4da65241c561f755602ffd0a677a2c0
EBUILD amarok-2.8.0.ebuild 3437 SHA256 0b2d29b5f7ddd38d8df7b90df6cce14f58c3bbd515b5937a570a09c0c1fd5157 SHA512 4b11f463b4c0a64ca2f1153bcc008b50c9c4b038119bfe26b0668460b30b346858c4bfdcd66868fe30782fce0e6cc6f3e0fa378c2cbcfe0f7403244407e98019 WHIRLPOOL 5961520403e6101031d0063065ec58204fc2941b8e4f3a24c10ed5d86b1e788f721357adc30b22986fe35d16ad5ae4ae9ead630bc5f8fd777f4b4c0d56b2da2d
-MISC ChangeLog 78417 SHA256 0836b9ce47af9f6d866b5bff44861fab98e877dca2b208c7ffd2cb451f8a961a SHA512 d69d290d19110d6d3c0b4e2a0eaeb732c434b622438070253326b49d11417c742c5b690a758d6ccb90fd99f079d8841c5d168e23fa42be1286b38c24df999701 WHIRLPOOL 97ca7db577dae5647e311dabef958838912e76236954b46d6d0dadd016adcb9992b1852a656d2e4028d62659d65b3c43f821216720998e0795005a6382869ac9
+MISC ChangeLog 78713 SHA256 7dbc743d3ef177f2b27750ef331de0c85dca03ad14ebd80d3fb077bece4c7067 SHA512 4680c5ca1ed104fde6d2ea871058088a2273ecfa96955c6d6afd2720975e8116fa38c0a9ec8be34201efeacc110d28829774cb4334238af66bd5279d447fbc04 WHIRLPOOL 512bef22fc7087cc9dcde85c8dfb90e89eb02871e08b862b1a6ebdf636d0c3d5fc29c7d234346d1b188a21f26ac9c1225e2fd9810b49b959b847eea23c7d522b
MISC metadata.xml 1265 SHA256 9684c4d743e651bacb1c5c0775e738bce5d99d5fdee933c0d2f4a62b470417ee SHA512 87e754fa6ad0f2309104ce9d316d30080e7bdfa1b5881b5cf84bd181e03c77e29c128ad9433eb1acaf8eb7c008afd97670e81716e0251b44e1f053d902bf03f8 WHIRLPOOL ad0baa1456718b3820912d94cd8c421177af9103d393a55309776fbff42dfc98d7c2af50d4874cf6b554cbccb4a62f241d3abe190596d5b30d14c9333b02ce33
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.21 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSFNysAAoJEMbwO6tnXQ0sJ88IALXDFwo+IB4tnR9y+lhbYgKF
+mNR6gnKBxwnVzhcLjRtRg9KN1cD7UG1cpRRTE383mEFgIiAiSEYUyDfwAkVfWyHf
+S/rVc7FuykPtNg2fX624GGYgAPu+BVu0o3YAk5U+VCA2VG89XJdEozZr3S3WJM71
+w1YkYu2u18CVFlWWTX9ccoJTOy9e+j5IPLlmYZCnOfiFz+jSLLzfx6V9HalIRqru
+YTKstjdYwfI7QffmVk4SIVk2E0cvQw3/yMNPzYW7PDEysXuT6Ty6aieDsjNDwVqF
+FZvdGzuGOk7dNh2APOo8cQcQiPyZxkvb+KfWqnrqX5NWIYdyTomlt6wYuk2AJOM=
+=SiyD
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.5.0-r4.ebuild b/media-sound/amarok/amarok-2.5.0-r4.ebuild
deleted file mode 100644
index e2933c8de617..000000000000
--- a/media-sound/amarok/amarok-2.5.0-r4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r4.ebuild,v 1.8 2013/05/30 12:09:02 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="af ar ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et
-eu fa fi fr ga gl he hr hu is it ja km ko ku lt lv mai ml ms nb nds ne nl nn
-oc pa pl pt pt_BR ro ru se si sk sl sq sr sr@ijekavian sr@ijekavianlatin
-sr@Latn sv tg th tr ug uk wa zh_CN zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
- KEYWORDS="amd64 ppc x86"
-else
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
- app-crypt/qca:2
- >=app-misc/strigi-0.5.7
- $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)?')
- $(add_kdebase_dep kdebase-kioslaves)
- >=media-libs/taglib-1.6.1[asf,mp4]
- >=media-libs/taglib-extras-1.0.1
- sys-libs/zlib
- >=virtual/mysql-5.1[embedded?]
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtscript:4
- >=x11-libs/qtscriptgenerator-0.1.0
- cdda? (
- $(add_kdebase_dep libkcddb)
- $(add_kdebase_dep libkcompactdisc)
- || (
- $(add_kdebase_dep audiocd-kio)
- $(add_kdebase_dep kdemultimedia-kioslaves)
- )
- )
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( =media-libs/liblastfm-0.3* )
- mp3tunes? (
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/openssl
- net-libs/loudmouth
- net-misc/curl
- dev-qt/qtcore:4[glib]
- )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- ofa? ( >=media-libs/libofa-0.9.0 )
- opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
- dev-util/automoc
- virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
- !media-sound/amarok-utils
- $(add_kdebase_dep phonon-kde)
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.5.0-kde48.patch"
- "${FILESDIR}/${PN}-2.5.0-qtdebug.patch"
- "${FILESDIR}/${PN}-2.5.0-fix-context-view-on-startup.patch"
-)
-
-src_configure() {
- # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
- use ppc64 && append-flags -mminimal-toc
- local mycmakeargs
-
- # Mygpo-qt not yet in portage, add IUSE when available
- mycmakeargs=(
- -DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_Mygpo-qt=OFF
- $(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
- $(cmake-utils_use_with ipod)
- $(cmake-utils_use_with ipod Gdk)
- $(cmake-utils_use_with lastfm LibLastFm)
- $(cmake-utils_use_with mtp)
- $(cmake-utils_use_with mp3tunes MP3Tunes)
- $(cmake-utils_use_with ofa LibOFA)
- )
-
- mycmakeargs+=(
- $(cmake-utils_use_with utils UTILITIES)
- )
-
- # $(cmake-utils_use_with semantic-desktop Nepomuk)
- # $(cmake-utils_use_with semantic-desktop Soprano)
-
- kde4-base_src_configure
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- if use daap; then
- echo
- elog "You have installed amarok with daap support."
- elog "You may be interested in installing www-servers/mongrel as well."
- echo
- fi
-
- if ! use embedded; then
- echo
- elog "You've disabled the amarok support for embedded mysql DBs."
- elog "You'll have to configure amarok to use an external db server."
- echo
- elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
- elog "to configure the external db and migrate your data from the embedded database."
- echo
-
- if has_version "virtual/mysql[minimal]"; then
- elog "You built mysql with the minimal use flag, so it doesn't include the server."
- elog "You won't be able to use the local mysql installation to store your amarok collection."
- echo
- fi
- fi
-}
diff --git a/media-sound/amarok/amarok-2.6.0.ebuild b/media-sound/amarok/amarok-2.6.0.ebuild
deleted file mode 100644
index cc7771df9952..000000000000
--- a/media-sound/amarok/amarok-2.6.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.6.0.ebuild,v 1.8 2013/05/30 12:09:02 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bs ca cs da de el en_GB es et eu fi ga gl hu it ja lt lv nb nl pa
-pl pt pt_BR ru sl sr sr@latin sv uk zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
- KEYWORDS="amd64 ppc x86"
-else
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
- app-crypt/qca:2
- >=app-misc/strigi-0.5.7
- $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)?')
- $(add_kdebase_dep kdebase-kioslaves)
- >=media-libs/taglib-1.7[asf,mp4]
- >=media-libs/taglib-extras-1.0.1
- sys-libs/zlib
- >=virtual/mysql-5.1[embedded?]
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtscript:4
- >=x11-libs/qtscriptgenerator-0.1.0
- cdda? (
- $(add_kdebase_dep libkcddb)
- $(add_kdebase_dep libkcompactdisc)
- || (
- $(add_kdebase_dep audiocd-kio)
- $(add_kdebase_dep kdemultimedia-kioslaves)
- )
- )
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( =media-libs/liblastfm-0.3* )
- mp3tunes? (
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/openssl
- net-libs/loudmouth
- net-misc/curl
- dev-qt/qtcore:4[glib]
- )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- ofa? ( >=media-libs/libofa-0.9.0 )
- opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
- dev-util/automoc
- virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
- !media-sound/amarok-utils
- $(add_kdebase_dep phonon-kde)
-"
-
-src_configure() {
- # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
- use ppc64 && append-flags -mminimal-toc
- local mycmakeargs
-
- mycmakeargs=(
- -DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_SPECTRUM_ANALYZER=ON
- $(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
- $(cmake-utils_use_with ipod)
- $(cmake-utils_use_with ipod Gdk)
- $(cmake-utils_use_with lastfm LibLastFm)
- $(cmake-utils_use_with mtp)
- $(cmake-utils_use_with mp3tunes MP3Tunes)
- $(cmake-utils_use_with ofa LibOFA)
- )
-
- mycmakeargs+=(
- $(cmake-utils_use_with utils UTILITIES)
- )
-
- # $(cmake-utils_use_with semantic-desktop Nepomuk)
- # $(cmake-utils_use_with semantic-desktop Soprano)
-
- kde4-base_src_configure
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- if use daap; then
- echo
- elog "You have installed amarok with daap support."
- elog "You may be interested in installing www-servers/mongrel as well."
- echo
- fi
-
- if ! use embedded; then
- echo
- elog "You've disabled the amarok support for embedded mysql DBs."
- elog "You'll have to configure amarok to use an external db server."
- echo
- elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
- elog "to configure the external db and migrate your data from the embedded database."
- echo
-
- if has_version "virtual/mysql[minimal]"; then
- elog "You built mysql with the minimal use flag, so it doesn't include the server."
- elog "You won't be able to use the local mysql installation to store your amarok collection."
- echo
- fi
- fi
-}
diff --git a/media-sound/amarok/amarok-2.7.0.ebuild b/media-sound/amarok/amarok-2.7.0.ebuild
deleted file mode 100644
index cd3fbd95e007..000000000000
--- a/media-sound/amarok/amarok-2.7.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.7.0.ebuild,v 1.8 2013/05/30 12:09:02 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
-ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-VIRTUALX_REQUIRED=test
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
- KEYWORDS="amd64 ppc x86"
-else
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop test +utils"
-
-if [[ ${PV} == *9999* ]]; then
- RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
- app-crypt/qca:2
- >=app-misc/strigi-0.5.7
- $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)?' 4.8.4)
- $(add_kdebase_dep kdebase-kioslaves)
- >=media-libs/taglib-1.7[asf,mp4]
- >=media-libs/taglib-extras-1.0.1
- sys-libs/zlib
- >=virtual/mysql-5.1[embedded?]
- >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtdbus-4.8:4
- >=dev-qt/qtscript-4.8:4
- >=x11-libs/qtscriptgenerator-0.1.0
- cdda? (
- $(add_kdebase_dep libkcddb)
- $(add_kdebase_dep libkcompactdisc)
- $(add_kdebase_dep audiocd-kio)
- )
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( >=media-libs/liblastfm-1.0.3 )
- mp3tunes? (
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/openssl
- net-libs/loudmouth
- net-misc/curl
- >=dev-qt/qtcore-4.8.4:4[glib]
- )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- ofa? ( >=media-libs/libofa-0.9.0 )
- opengl? ( virtual/opengl )
- semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
-"
-DEPEND="${COMMONDEPEND}
- dev-util/automoc
- virtual/pkgconfig
- test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
- !media-sound/amarok-utils
- $(add_kdebase_dep phonon-kde)
-"
-
-src_configure() {
- # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
- use ppc64 && append-flags -mminimal-toc
- local mycmakeargs
-
- mycmakeargs=(
- -DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_SPECTRUM_ANALYZER=OFF
- $(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
- $(cmake-utils_use_with ipod)
- $(cmake-utils_use_with ipod Gdk)
- $(cmake-utils_use_with lastfm LibLastFm)
- $(cmake-utils_use_with mtp)
- $(cmake-utils_use_with mp3tunes MP3Tunes)
- $(cmake-utils_use_with ofa LibOFA)
- $(cmake-utils_use_with semantic-desktop Nepomuk)
- $(cmake-utils_use_with semantic-desktop Soprano)
- )
-
- mycmakeargs+=(
- $(cmake-utils_use_with utils UTILITIES)
- )
-
- kde4-base_src_configure
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- if use daap; then
- echo
- elog "You have installed amarok with daap support."
- elog "You may be interested in installing www-servers/mongrel as well."
- echo
- fi
-
- if ! use embedded; then
- echo
- elog "You've disabled the amarok support for embedded mysql DBs."
- elog "You'll have to configure amarok to use an external db server."
- echo
- elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
- elog "to configure the external db and migrate your data from the embedded database."
- echo
-
- if has_version "virtual/mysql[minimal]"; then
- elog "You built mysql with the minimal use flag, so it doesn't include the server."
- elog "You won't be able to use the local mysql installation to store your amarok collection."
- echo
- fi
- fi
-}
diff --git a/media-sound/amarok/amarok-2.7.1.ebuild b/media-sound/amarok/amarok-2.7.1.ebuild
deleted file mode 100644
index 5df93342c0f0..000000000000
--- a/media-sound/amarok/amarok-2.7.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.7.1.ebuild,v 1.5 2013/07/01 09:06:50 ago Exp $
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
-ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-VIRTUALX_REQUIRED=test
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
- if [[ $PV == *[6-9][0-9]* ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
- else
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
- fi
- KEYWORDS="amd64 ppc x86"
-else
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
-
-if [[ ${PV} == *9999* ]]; then
- RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
- app-crypt/qca:2
- >=app-misc/strigi-0.5.7
- $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)' 4.8.4)
- $(add_kdebase_dep kdebase-kioslaves)
- >=media-libs/taglib-1.7[asf,mp4]
- >=media-libs/taglib-extras-1.0.1
- $(add_kdebase_dep nepomuk-core '' 4.9.0)
- sys-libs/zlib
- >=virtual/mysql-5.1[embedded?]
- >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtdbus-4.8:4
- >=dev-qt/qtscript-4.8:4
- >=x11-libs/qtscriptgenerator-0.1.0
- cdda? (
- $(add_kdebase_dep libkcddb)
- $(add_kdebase_dep libkcompactdisc)
- $(add_kdebase_dep audiocd-kio)
- )
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( >=media-libs/liblastfm-1.0.3 )
- mp3tunes? (
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/openssl
- net-libs/loudmouth
- net-misc/curl
- >=dev-qt/qtcore-4.8.4:4[glib]
- )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- ofa? ( >=media-libs/libofa-0.9.0 )
- opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
- dev-util/automoc
- virtual/pkgconfig
- test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
- !media-sound/amarok-utils
- $(add_kdebase_dep phonon-kde)
-"
-
-src_configure() {
- # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
- use ppc64 && append-flags -mminimal-toc
- local mycmakeargs
-
- mycmakeargs=(
- -DWITH_PLAYER=ON
- -DWITH_Libgcrypt=OFF
- -DWITH_SPECTRUM_ANALYZER=OFF
- $(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
- $(cmake-utils_use_with ipod)
- $(cmake-utils_use_with ipod Gdk)
- $(cmake-utils_use_with lastfm LibLastFm)
- $(cmake-utils_use_with mtp)
- $(cmake-utils_use_with mp3tunes MP3Tunes)
- $(cmake-utils_use_with ofa LibOFA)
- )
-
- mycmakeargs+=(
- $(cmake-utils_use_with utils UTILITIES)
- )
-
- kde4-base_src_configure
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- if use daap; then
- echo
- elog "You have installed amarok with daap support."
- elog "You may be interested in installing www-servers/mongrel as well."
- echo
- fi
-
- if ! use embedded; then
- echo
- elog "You've disabled the amarok support for embedded mysql DBs."
- elog "You'll have to configure amarok to use an external db server."
- echo
- elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
- elog "to configure the external db and migrate your data from the embedded database."
- echo
-
- if has_version "virtual/mysql[minimal]"; then
- elog "You built mysql with the minimal use flag, so it doesn't include the server."
- elog "You won't be able to use the local mysql installation to store your amarok collection."
- echo
- fi
- fi
-}
diff --git a/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch b/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch
deleted file mode 100644
index f39113b11fdf..000000000000
--- a/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit a0f4288e0b952830d38151264c0a8b042e32d8a4
-Author: Matěj Laitl <matej@laitl.cz>
-Date: Tue Jun 26 00:42:50 2012 +0200
-
- Fix Context view not being fully formed on startup
-
- Something from inside Plasma tries to resize context view's sceneRect()
- to 200x200 px. I don't know why this happens, but let's hope we'll have
- QML context view soon, so don't investigate and use a work-around.
-
- BUG: 292895
- FIXED-IN: 2.6
- DIGEST: popular bug fixed in Amarok
-
-diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-index a23305f..8fa6f9b 100644
---- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-+++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry()
- if(!view())
- return;
-
-- QRectF rect = view()->sceneRect();
-+ // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895
-+ QRectF rect( view()->pos(), view()->maximumViewportSize() );
- setGeometry( rect );
- m_applets->setGeometry( rect );
- m_applets->refresh();
diff --git a/media-sound/amarok/files/amarok-2.5.0-kde48.patch b/media-sound/amarok/files/amarok-2.5.0-kde48.patch
deleted file mode 100644
index b110eeb1018f..000000000000
--- a/media-sound/amarok/files/amarok-2.5.0-kde48.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/src/context/ToolbarView.cpp b/src/context/ToolbarView.cpp
-index f3b4916..840b99b 100644
---- a/src/context/ToolbarView.cpp
-+++ b/src/context/ToolbarView.cpp
-@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasma::Containment* containment, QGraphicsSc
- setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-
- // now we create the toolbar
-- m_toolbar = new AppletToolbar( containment );
-+ m_toolbar = new AppletToolbar(0);
-+ scene->addItem(m_toolbar.data());
-+ m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
- m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
- m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
-
-@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasma::Containment* containment, QGraphicsSc
-
- Context::ToolbarView::~ToolbarView()
- {
--
-+ delete m_toolbar.data();
- }
-
- void
-diff --git a/src/context/toolbar/AppletToolbar.cpp b/src/context/toolbar/AppletToolbar.cpp
-index 0e0deb5..c51762c 100644
---- a/src/context/toolbar/AppletToolbar.cpp
-+++ b/src/context/toolbar/AppletToolbar.cpp
-@@ -67,6 +67,19 @@ Context::AppletToolbar::~AppletToolbar()
- }
-
- void
-+
-+Context::AppletToolbar::setContainment( Containment * containment )
-+{
-+ m_cont = containment;
-+}
-+
-+Context::Containment *
-+Context::AppletToolbar::containment() const
-+{
-+ return m_cont;
-+}
-+
-+void
- Context::AppletToolbar::resizeEvent( QGraphicsSceneResizeEvent * event )
- {
- debug() << "setting layout to" << QRectF( QPointF( 0, 0 ), event->newSize() );
-diff --git a/src/context/toolbar/AppletToolbar.h b/src/context/toolbar/AppletToolbar.h
-index ee8a208..058baae 100644
---- a/src/context/toolbar/AppletToolbar.h
-+++ b/src/context/toolbar/AppletToolbar.h
-@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWidget
-
- void appletRemoved( Plasma::Applet* applet );
-
-+ void setContainment( Containment * containment );
-+ Containment* containment() const;
-+
- signals:
- void showApplet( Plasma::Applet* );
- void appletAddedToToolbar( Plasma::Applet* applet, int loc );
diff --git a/media-sound/amarok/files/amarok-2.5.0-qtdebug.patch b/media-sound/amarok/files/amarok-2.5.0-qtdebug.patch
deleted file mode 100644
index 8c6e0223b0dd..000000000000
--- a/media-sound/amarok/files/amarok-2.5.0-qtdebug.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Patch originally from KDE commit d1a1c80370e4132c26fa636308822fdb3aa1b2e6, modified to work with current Amarok.
-diff -ruN /root/amarok-2.5.0/ChangeLog amarok-2.5.0/ChangeLog
---- a/amarok-2.5.0/ChangeLog 2011-12-15 02:36:48.000000000 -0500
-+++ b/amarok-2.5.0/ChangeLog 2012-06-21 21:05:29.871236927 -0400
-@@ -8,6 +8,7 @@
- Playlist's layout items.
-
- BUGFIXES:
-+ * Fix crash on start when Qt is build with debugging assertions. (BR 285720)
- * Do not crash when iPod doesn't have a master playlist. (BR 288936)
- * Fix Last.fm not finding KDE Wallet. (BR 286741)
- * Put a border around bottom toolbars, visually separating them from
-diff -ruN /root/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp
---- a/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp 2011-12-15 02:36:48.000000000 -0500
-+++ b/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp 2012-06-21 21:05:09.810237474 -0400
-@@ -223,23 +223,15 @@
- {
- int &rowValue = groupList[insertedProxyRow-1];
- if( idx.row() <= rowValue )
-- {
- //increment the rows that come after the new row since they moved one place up.
- rowValue++;
-- }
- else
-- {
- break;
-- }
- }
-
- if( updatedGroups.contains( i.key() ) )
-- {
-- //the row needs to be added to this group
-- beginInsertRows( index( i.key() ), insertedProxyRow, insertedProxyRow );
-- groupList.insert( insertedProxyRow, idx.row() );
-- endInsertRows();
-- }
-+ // we're inside beginInsertRows() or beginInsertRows(), don't re-enter it.
-+ groupList.insert( insertedProxyRow, idx.row() );
- }
-
- return updatedGroups;
-diff -ruN /root/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h
---- a/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h 2011-12-15 02:36:48.000000000 -0500
-+++ b/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h 2012-06-21 21:04:42.778238198 -0400
-@@ -38,8 +38,8 @@
- void setGroupedColumn( int groupedColumn );
-
- /* QAbstractProxyModel methods */
-- virtual QModelIndex index( int, int c = 0,
-- const QModelIndex& parent = QModelIndex() ) const;
-+ virtual QModelIndex index( int row, int column = 0,
-+ const QModelIndex& parent = QModelIndex() ) const;
- virtual Qt::ItemFlags flags( const QModelIndex &idx ) const;
- virtual QModelIndex parent( const QModelIndex &idx ) const;
- virtual int rowCount( const QModelIndex &idx = QModelIndex() ) const;