diff options
| -rw-r--r-- | media-sound/amarok/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/amarok/Manifest | 6 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-2.0.2.ebuild | 48 | ||||
| -rw-r--r-- | media-sound/amarok/files/amarok-ipod.patch (renamed from media-sound/amarok/files/2.0.2-ipod.patch) | 0 |
4 files changed, 22 insertions, 37 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index 417093b070e..6bb99fd388d 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + -media-sound/amarok/files/2.0.2-ipod.patch, + +media-sound/amarok/files/amarok-ipod.patch: + Updating amarok-2.0.2 to get it to build with qt4.5. + 25 Mar 2009; Theo Chatzimichos <tampakrap@gentoo.org> files/2.0.2-ipod.patch, +files/disable_bindings_test.patch, amarok-9999.ebuild: diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index 0681103c026..f4d74c89080 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -1,7 +1,7 @@ -AUX 2.0.2-ipod.patch 5230 RMD160 d147223985dc8c45d0aaaad5008a4b2024159051 SHA1 d94aa98a17229b2ddbae4128021bdb727fb38202 SHA256 b119ba280bba29276ece49b3d80d8770aee831e9afcb1d8795811130b734994a +AUX amarok-ipod.patch 5230 RMD160 d147223985dc8c45d0aaaad5008a4b2024159051 SHA1 d94aa98a17229b2ddbae4128021bdb727fb38202 SHA256 b119ba280bba29276ece49b3d80d8770aee831e9afcb1d8795811130b734994a AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdcbd1 SHA1 09dadd86dc57c39ce768230bf8e0630af40db297 SHA256 b3a4cd44dbd8ce610cb6d5a9214df0abb1458290c6382458dfeb95de00f92ba6 DIST amarok-2.0.2.tar.bz2 4979989 RMD160 d9e7aa2e97c9a80450993aceebbbe1a6f0c301f3 SHA1 13bb7c71b27e88cad728f63c624af90111daeb5c SHA256 d13c0b6b058a8dfd86194c81f89365f69adc14f0e4e6ac82359135629caaf651 -EBUILD amarok-2.0.2.ebuild 2927 RMD160 88f7f894ca790a645429723c3779928c660e85f8 SHA1 a49cdf66656d244b7f12513db861fe9979289a55 SHA256 36527638df074bfe9e937b7b407bd7b4f19ae079bbf1ce3a183112458478cd37 +EBUILD amarok-2.0.2.ebuild 2350 RMD160 0cadc4f02c9682acc0c2e364ef51c55eecf8db11 SHA1 9be506f9f348fb1a33f80d1739d91edf13b9b141 SHA256 de735ac36ff47f1d168faa3cd5952886e094bdee5391fefa65b91f58cf6df1d9 EBUILD amarok-9999.ebuild 2674 RMD160 b0fcb3ab3cd15b6c3c95f9d615c50634b1fb375d SHA1 c096960aaa36492144a0ce0e1a21e9da760a0947 SHA256 56ca189eb9cc87e225f36c5b13496084dd7fdd10d4a198e379fb1e9742dcbeda -MISC ChangeLog 4720 RMD160 b7bece786d095ded8f33c8afa661ab6d3996551e SHA1 a4ac0f2f7d58f8367a131c825cea803d92f5092e SHA256 5fa1d79cbb9f03718fe07df9938ce2f3c4881f8ba2d416d6fd974be6af76746e +MISC ChangeLog 4936 RMD160 bc918264aacfe7f065c21592453ecfe5b095c5e4 SHA1 5c87af6a2274cd7ac4daea25fd8e928477b0127e SHA256 a033ee0a3ada6aacfcf1750293bad9e8ae0f4a7cdd7ccdf840f8ad3177a97cbc MISC metadata.xml 2111 RMD160 27d5395947be1230fe299e1bfd2c39a2c391944a SHA1 dfa479d20096c1d930e3606ea213bde600b0c86f SHA256 c70d4b86309dd709e1d075f6d315cc5f783487ca91a25447a715eb46a2a2d4ce diff --git a/media-sound/amarok/amarok-2.0.2.ebuild b/media-sound/amarok/amarok-2.0.2.ebuild index 6188c7fa81b..b26c2dc141c 100644 --- a/media-sound/amarok/amarok-2.0.2.ebuild +++ b/media-sound/amarok/amarok-2.0.2.ebuild @@ -1,31 +1,31 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.0.1.1.ebuild,v 1.12 2009/03/16 10:24:20 scarabeus Exp $ EAPI="2" +OPENGL_REQUIRED="optional" KDE_LINGUAS="ar be bg ca cs csb da de el eo es et eu fi fr ga gl he is it ja km - ko ku lt lv nb nds ne nl nn oc pa pl pt pt_BR ro ru se sl si sk sv th tr uk zh_CN zh_TW" - + ko ku lt lv nb nds ne nl nn oc pa pl pt pt_BR ro ru se si sk sl sv th tr uk zh_CN zh_TW" OPENGL_REQUIRED="optional" + inherit kde4-base DESCRIPTION="Advanced audio player based on KDE framework." HOMEPAGE="http://amarok.kde.org/" -SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~x86" SLOT="2" IUSE="cdaudio daap debug ifp ipod mp3tunes mp4 mtp njb +semantic-desktop" +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2" DEPEND=" >=app-misc/strigi-0.5.7 || ( - >=dev-db/mysql-5.0[embedded] - >=dev-db/mysql-community-5.0[embedded] + >=dev-db/mysql-5.0[embedded,-minimal] + >=dev-db/mysql-community-5.0[embedded,-minimal] ) - dev-db/sqlite:3 >=media-libs/taglib-1.5 || ( media-sound/phonon @@ -39,7 +39,7 @@ DEPEND=" >=kde-base/libkcddb-${KDE_MINIMAL}[kdeprefix=] ) ifp? ( media-libs/libifp ) - ipod? ( >=media-libs/libgpod-0.4.2 ) + ipod? ( >=media-libs/libgpod-0.7.0 ) mp3tunes? ( dev-libs/libxml2 dev-libs/openssl @@ -50,37 +50,18 @@ DEPEND=" mtp? ( >=media-libs/libmtp-0.3.0 ) njb? ( >=media-libs/libnjb-2.2.4 ) " + RDEPEND="${DEPEND} app-arch/unzip - daap? ( www-servers/mongrel ) - semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL}[kdeprefix=] ) -" - -PATCHES=( "${FILESDIR}/${PV}-ipod.patch" ) + daap? ( www-servers/mongrel )" -pkg_setup() { - if use amd64 ; then - echo - ewarn "Compilation will fail if dev-db/mysql[-community] is built without -fPIC in your CFLAGS!" - ewarn "Related bug: http://bugs.gentoo.org/show_bug.cgi?id=238487" - ewarn - ewarn "To fix this, and to avoid using -fPIC globally in your make.conf (which is not recommended)," - ewarn "put the following into /etc/portage/env/dev-db/mysql (or mysql-community, depending on which you use;" - ewarn "create dirs and the file if they don't exist):" - ewarn - ewarn "CFLAGS=\"${CFLAGS} -DPIC -fPIC\"" - ewarn "CXXFLAGS=\"${CXXFLAGS} -DPIC -fPIC\"" - echo - fi - - kde4-base_pkg_setup -} +PATCHES=( "${FILESDIR}/${PN}-ipod.patch" ) src_configure() { if ! use mp3tunes; then sed -e'/mp3tunes/ s:^:#DONOTWANT :' \ - -i "${S}"/src/services/CMakeLists.txt \ - || die "Deactivating mp3tunes failed." + -i "${S}"/src/services/CMakeLists.txt \ + || die "Deactivating mp3tunes failed." fi # Remove superfluous QT_WEBKIT @@ -89,7 +70,6 @@ src_configure() { || die "Removing unnecessary -DQT_WEBKIT failed." mycmakeargs="${mycmakeargs} - -DUSE_SYSTEM_SQLITE=ON $(cmake-utils_use_with cdaudio KdeMultimedia) $(cmake-utils_use_with ipod Ipod) $(cmake-utils_use_with ifp Ifp) diff --git a/media-sound/amarok/files/2.0.2-ipod.patch b/media-sound/amarok/files/amarok-ipod.patch index d4621d1d09d..d4621d1d09d 100644 --- a/media-sound/amarok/files/2.0.2-ipod.patch +++ b/media-sound/amarok/files/amarok-ipod.patch |