diff options
| -rw-r--r-- | media-sound/amarok/amarok-2.7.90.ebuild | 2 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-9999.ebuild | 29 |
2 files changed, 13 insertions, 18 deletions
diff --git a/media-sound/amarok/amarok-2.7.90.ebuild b/media-sound/amarok/amarok-2.7.90.ebuild index 5ddf08f0959..a4bc4b199d6 100644 --- a/media-sound/amarok/amarok-2.7.90.ebuild +++ b/media-sound/amarok/amarok-2.7.90.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: $ EAPI=5 diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild index 5bd74e2d5df..a4bc4b199d6 100644 --- a/media-sound/amarok/amarok-9999.ebuild +++ b/media-sound/amarok/amarok-9999.ebuild @@ -4,11 +4,11 @@ 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_HANDBOOK="optional" -VIRTUALX_REQUIRED="test" +KDE_LINGUAS="ca ca@valencia cs da de el es et eu fi fr ga gl hu it ja lt lv nb +nl 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." @@ -28,7 +28,7 @@ LICENSE="GPL-2" SLOT="4" IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils" -if [[ ${KDE_BUILD_TYPE} == live ]]; then +if [[ ${PV} == *9999* ]]; then RESTRICT="test" fi @@ -76,20 +76,12 @@ RDEPEND="${COMMONDEPEND} $(add_kdebase_dep phonon-kde) " -src_prepare() { - if [[ ${KDE_BUILD_TYPE} != live ]]; then - mv doc/en_US doc/en || die - sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die - 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 - local mycmakeargs=( + mycmakeargs=( -DWITH_PLAYER=ON -DWITH_Libgcrypt=OFF -DWITH_SPECTRUM_ANALYZER=OFF @@ -100,6 +92,9 @@ src_configure() { $(cmake-utils_use_with mtp) $(cmake-utils_use_with mp3tunes MP3Tunes) $(cmake-utils_use_with ofa LibOFA) + ) + + mycmakeargs+=( $(cmake-utils_use_with utils UTILITIES) ) @@ -109,7 +104,7 @@ src_configure() { pkg_postinst() { kde4-base_pkg_postinst - if use daap && ! has_version www-servers/mongrel ; 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." |