diff options
| -rw-r--r-- | media-sound/amarok/ChangeLog | 9 | ||||
| -rw-r--r-- | media-sound/amarok/Manifest | 38 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-2.4.0.ebuild | 4 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-2.4.3.ebuild | 4 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-2.5.0.ebuild | 149 |
5 files changed, 181 insertions, 23 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index 695b953264d1..e1d0cf15eb71 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/amarok # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.413 2011/11/08 20:16:45 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.414 2011/12/20 09:22:09 jmbsvicetto Exp $ + +*amarok-2.5.0 (20 Dec 2011) + + 20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + amarok-2.4.0.ebuild, amarok-2.4.3.ebuild, +amarok-2.5.0.ebuild: + [media-sound/amarok] Bump to the 2.5.0 release. + Dropped ~ppc64 keywords as all KDE versions are masked on the ppc64 arch. 08 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> amarok-2.4.3.ebuild: No use-deps on strigi, bug 386259 diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index db960e01ca88..65b5da70c59c 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX amarok-2.3.2-fix-qt-regression.patch 2958 RMD160 810ddadf7fa226302b75aaaf6945a19fe57472d2 SHA1 4f5c730f989c1f5aab57af72a9540223698bd7e1 SHA256 2f2a77552a06e6ec30106d8cb1f012f3f4213ac3354e64c7fe7f6933deb6d6ab AUX amarok-2.3.2-flac-fix.patch 1233 RMD160 ee3f98e2ccbd14798c2b75ed6def2d1709ead21e SHA1 3a4cb3edd6dc1a14410d3f13b6c9a7c0019c1a17 SHA256 f68f3c9b4fb8be02a37ac21d535d417b8fa6167d123e6e13e98c26fb758e40f1 @@ -7,24 +7,26 @@ AUX amarok-2.4.0.90-fix-plugin-detection.patch 623 RMD160 897a669e6a26e2559e7130 AUX amarok-fix-upnp-dep.patch 1896 RMD160 e0542160a01bde718555ac06bf7759fdc4078cf6 SHA1 d7a4e359bb13dde781605786d1f20017c5687a7b SHA256 e88481548d77d334adb51250ee2e70186249ee51164f060382a7b1ee2c6839d6 DIST amarok-2.4.0.tar.bz2 15219572 RMD160 f32a664521b9827ef8e7d49100e39b69fa87dd29 SHA1 d37ecda0fecdba88bb239f11c6d4ff885d7ac23f SHA256 52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c DIST amarok-2.4.3.tar.bz2 17468203 RMD160 02026c400025e944c69f31b29013c8054a2575d2 SHA1 8a46fca6a550a4ca403a9be7f595728c819641c4 SHA256 6ce448ecd30cc3d45211617636904e3662c2082441b79ca1e36685c8b0be8208 -EBUILD amarok-2.4.0.ebuild 4027 RMD160 dd54636bb8651bed3a5fa5a5e844c09c422470ad SHA1 dfc0ad88e444e0bf54e075fde81c8204437d6793 SHA256 3a0defb4e17e6fcca4487e5d77277e0c327090020c1cfe54ae8c40701d70420c -EBUILD amarok-2.4.3.ebuild 3966 RMD160 eb54bcde9e18ff9446a2cdcbe8890741101fcdcd SHA1 50555d0a77034988b523220fedb6dfb7ca78af0b SHA256 dbdb3765817a8140279949bb3d289d85cc5f0eb337bb3669dc811ed3a7b2ca51 -MISC ChangeLog 70787 RMD160 b38d320dd0ad090de54e0d47adf0a3cc8c1db442 SHA1 91ba37edc7eb5d44c1dc89239a2d03224927bd65 SHA256 dce15277b1ad99fb9795e71370b026a95428f52dfe27d80cb8b18719135e65f9 +DIST amarok-2.5.0.tar.bz2 46607238 RMD160 4506d4b4b1b11378d25ad488f3bdba54cd9b7567 SHA1 9849900d20225e703c43d242650a8fa211cf15f2 SHA256 1ed191db290fdede7c910c322cff2aba8ecfc1c4af891508d9ee410db3768849 +EBUILD amarok-2.4.0.ebuild 4023 RMD160 a083182d5ef0a4a6bf3fb06f3a2ce94ab12b655c SHA1 c8c363ac52361fb9345450304a63f14a98f9e991 SHA256 d36c21adcf3aa887d63d1b560b3ffa959cc9935f7e630189f6eee9288a96c836 +EBUILD amarok-2.4.3.ebuild 3961 RMD160 11e52e8f6a63848dfa992c56098a7f4dca7ad880 SHA1 9cea33664da7ba5e06f01854b4f1932cb9af4dec SHA256 d1c04f5e1011c7e56804542109077e4a5dc531c1411c8b204c1b18cdbf1a1690 +EBUILD amarok-2.5.0.ebuild 3961 RMD160 9ca6c640799a9697ea3e86b0a561e7787b14688e SHA1 9a7cef7b24d85eef617b2a67e1bfb69c527d8f4e SHA256 8799d70ae5340af5b974493363fd71863794b2d0107d1a2a8d900b6bb84d3a1e +MISC ChangeLog 71078 RMD160 329921867608c1046852310deaae6e9ad0cecd96 SHA1 8290d433234463dd789fb840a061f74e5b5eb367 SHA256 f45ea5987546dc288da5633da3010519ef2726346960185a30da9db20c121bde MISC metadata.xml 1566 RMD160 1ba975766c2e4e1cb5b162bf97e534c78a638e6b SHA1 6e0705052a0f430b39e693a4a7d722299a4d46c7 SHA256 c034e203d562fb1ac92d0d48436f64d3a36d04a3dadd15c5f7eec73d9298bd71 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOuY6KAAoJEEb+UGWnxTyHF48P/AvRWgE7I8ENcNWYKs5y8Ovm -f1IXKVNQtKS9IamwicKClT+jhExbzixBK5vtqglXv096NK18BagCvm/xwiru3Mtk -/ncEa+UkFIuwppVP9EOkLZtrGW65zlB8IT4wV+466L3bZxq+2m8Zli+K/xultzPA -Gya1xGHJ90IQUitHg2+7C+qPpjgB6Y/FB2pTFa7JHhZ+MjmbPCxS94PQG+qmHer9 -RR1JQ5fBHTljuK51V3qyIo4ydKI86OGAZ4IF5ebO4Pca9Q+8jnA2SbyPxxDRTV/x -KhC6nxnzwq8zfKTc9RtV5GgEZQpBwVT1VZtiZ++2oSMGXi1pexq5zABsFve5vesF -OyFdDom0x7nhnL38ICRrl8yAcRmGouAa19cs568ZnRIJt0fRTlPth4sJdFDxEf6z -zgWxNZUaC+qPFBCcIrvX2KNO+6BsOtboozslXCApa6EXszH9Hz0zSfgP4Z9DOklW -QIybU8J9Tg3CRppdFHWF3JPjVteBcTk74UX7tB5s2nPb3NarrZFaM8LAVvB/xobZ -8Oti1lQH6yIMxTSl2tlpRCgFXYcrP4p3KJSUkadp6+itnsJrH8B1oruBX85AkQw5 -oc7EO40W9FITdrHr2MMzed2ZfZGhyhjeBAeGwa5x1iHcjJcOgpt+Umise5C/iwi4 -yznKamG6KnePcMFkwKvQ -=PR1h +iQIcBAEBAgAGBQJO8FNjAAoJEC8ZTXQF1qEPgHYQAIqVjgdaIsAeU9aOsqGghQ6o +96i3kwrWXZfyRMzsHlVBzd6gC6ofL2brBV9oM3W8DbNb1DGEsftohzajMUOWtI5O +DtDQnOCargCSs6+WkIC/8J97xDIpuC2K8UZZr9GVtjcSSBjmLF0v8UC395YMVVRf +8FK4O7hO7DCdzerBRsOEyrcQA+KFjfPfz1pJVRFNLXo9uTGmo+LufiLKTQBO5kMo +47wQWgTNDhYqGsU0lBNNAjXEhe0gsgylpgQxc28ZYHeuU/JJ5PMzk14276IycDtE +hxutx8lp4roeeZ6LlJGwDOgkYVgF8ZHXpeMbbKHxUIT+wY+ZJQk3bYAP7ZiZlTy2 +LrydpvwT5g2CK+kij8nxuFFK0KRcMizwkmdXxk6mqTMo1c2mGXucxM4nq5GTA+gz +pMJhDon+T8lU2v9pK4TLlooueyUuh0TxkmXVr+mr7IFCK6XyXX462LWWW4USfUq/ +MAaLnNkYdi0yZJ3A51VAdLk1OI8NDP9NlSNKJAHJCVSKvuKXQcOcVepTHnlmDxri +I573yNhaFD+89rR0teIRggCmfn1ME6UrHdYwuS/sVjq+Cgqcyduu26XzooP/heTq +75oxSibQfmWgRtv1XUgAglHZGp7omIupuRCEMh/MX7cyfVAq7iyY/yw+OX4uIRt2 +gPc1i+WSvcgA4ZJ10YhW +=AcoI -----END PGP SIGNATURE----- diff --git a/media-sound/amarok/amarok-2.4.0.ebuild b/media-sound/amarok/amarok-2.4.0.ebuild index 4b2f3cf204ee..ca38a051c7b9 100644 --- a/media-sound/amarok/amarok-2.4.0.ebuild +++ b/media-sound/amarok/amarok-2.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v 1.9 2011/08/23 21:55:04 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v 1.10 2011/12/20 09:22:09 jmbsvicetto Exp $ EAPI="3" @@ -9,7 +9,7 @@ if [[ ${PV} != *9999* ]]; then KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW" SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2" - KEYWORDS="amd64 ppc ~ppc64 x86" + KEYWORDS="amd64 ppc x86" else KDE_SCM="git" KEYWORDS="" diff --git a/media-sound/amarok/amarok-2.4.3.ebuild b/media-sound/amarok/amarok-2.4.3.ebuild index 4127dd143642..f99fae9ee7c0 100644 --- a/media-sound/amarok/amarok-2.4.3.ebuild +++ b/media-sound/amarok/amarok-2.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3.ebuild,v 1.4 2011/11/08 20:16:45 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3.ebuild,v 1.5 2011/12/20 09:22:10 jmbsvicetto Exp $ EAPI=4 @@ -14,7 +14,7 @@ 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 ~ppc64 ~x86" + KEYWORDS="~amd64 ~ppc ~x86" else KEYWORDS="" fi diff --git a/media-sound/amarok/amarok-2.5.0.ebuild b/media-sound/amarok/amarok-2.5.0.ebuild new file mode 100644 index 000000000000..eeed0ea69aca --- /dev/null +++ b/media-sound/amarok/amarok-2.5.0.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2011 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.ebuild,v 1.1 2011/12/20 09:22:10 jmbsvicetto Exp $ + +EAPI=4 + +KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa +pl pt pt_BR ru sl sr sr@latin sv th tr uk wa 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 opengl +player 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=" + >=media-libs/taglib-1.6.1[asf,mp4] + >=media-libs/taglib-extras-1.0.1 + player? ( + app-crypt/qca:2 + >=app-misc/strigi-0.5.7 + $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?') + $(add_kdebase_dep kdebase-kioslaves) + sys-libs/zlib + >=virtual/mysql-5.1[embedded?] + x11-libs/qt-script + >=x11-libs/qtscriptgenerator-0.1.0 + cdda? ( + $(add_kdebase_dep libkcddb) + $(add_kdebase_dep libkcompactdisc) + $(add_kdebase_dep kdemultimedia-kioslaves) + ) + ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) + lastfm? ( >=media-libs/liblastfm-0.3.0 ) + mp3tunes? ( + dev-libs/glib:2 + dev-libs/libxml2 + dev-libs/openssl + net-libs/loudmouth + net-misc/curl + x11-libs/qt-core[glib] + ) + mtp? ( >=media-libs/libmtp-1.0.0 ) + opengl? ( virtual/opengl ) + ) + utils? ( + x11-libs/qt-core + x11-libs/qt-dbus + ) + !player? ( !utils? ( media-sound/amarok[player] ) ) +" +DEPEND="${COMMONDEPEND} + dev-util/automoc + dev-util/pkgconfig +" +RDEPEND="${COMMONDEPEND} + !media-sound/amarok-utils + player? ( $(add_kdebase_dep phonon-kde) ) +" + +src_prepare() { + if ! use player; then + # Disable po processing + sed -e "s:include(MacroOptionalAddSubdirectory)::" \ + -i "${S}/CMakeLists.txt" \ + || die "Removing include of MacroOptionalAddSubdirectory failed." + sed -e "s:macro_optional_add_subdirectory( po )::" \ + -i "${S}/CMakeLists.txt" \ + || die "Removing include of MacroOptionalAddSubdirectory failed." + fi + + kde4-base_src_prepare +} + +src_configure() { + # Append minimal-toc cflag for ppc64, see bug 280552 and 292707 + use ppc64 && append-flags -mminimal-toc + local mycmakeargs + + if use player; then + mycmakeargs=( + -DWITH_PLAYER=ON + -DWITH_Libgcrypt=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) + ) + else + mycmakeargs=( + -DWITH_PLAYER=OFF + ) + fi + + 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 player; then + + 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 + fi +} |