| 1 |
commit: ca66b32375566e4364c44254c7c48ee7742607ec |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 4 11:26:59 2013 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 4 11:26:59 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ca66b323 |
| 7 |
|
| 8 |
[media-sound/amarok] KDE actually is required. Fix docbook installation. Misc improvements. |
| 9 |
|
| 10 |
Package-Manager: portage-2.1.12.2 |
| 11 |
|
| 12 |
--- |
| 13 |
media-sound/amarok/amarok-9999.ebuild | 21 ++++++++++++--------- |
| 14 |
1 file changed, 12 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild |
| 17 |
index a87423a..544a30f 100644 |
| 18 |
--- a/media-sound/amarok/amarok-9999.ebuild |
| 19 |
+++ b/media-sound/amarok/amarok-9999.ebuild |
| 20 |
@@ -7,8 +7,8 @@ EAPI=5 |
| 21 |
KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr |
| 22 |
ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian |
| 23 |
sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW" |
| 24 |
-KDE_REQUIRED="never" |
| 25 |
-VIRTUALX_REQUIRED=test |
| 26 |
+KDE_HANDBOOK="optional" |
| 27 |
+VIRTUALX_REQUIRED="test" |
| 28 |
inherit flag-o-matic kde4-base |
| 29 |
|
| 30 |
DESCRIPTION="Advanced audio player based on KDE framework." |
| 31 |
@@ -28,7 +28,7 @@ LICENSE="GPL-2" |
| 32 |
SLOT="4" |
| 33 |
IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils" |
| 34 |
|
| 35 |
-if [[ ${PV} == *9999* ]]; then |
| 36 |
+if [[ ${KDE_BUILD_TYPE} == live ]]; then |
| 37 |
RESTRICT="test" |
| 38 |
fi |
| 39 |
|
| 40 |
@@ -76,12 +76,18 @@ RDEPEND="${COMMONDEPEND} |
| 41 |
$(add_kdebase_dep phonon-kde) |
| 42 |
" |
| 43 |
|
| 44 |
+src_prepare() { |
| 45 |
+ mv doc/en_US doc/en || die |
| 46 |
+ sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die |
| 47 |
+ |
| 48 |
+ kde4-base_src_prepare |
| 49 |
+} |
| 50 |
+ |
| 51 |
src_configure() { |
| 52 |
# Append minimal-toc cflag for ppc64, see bug 280552 and 292707 |
| 53 |
use ppc64 && append-flags -mminimal-toc |
| 54 |
- local mycmakeargs |
| 55 |
|
| 56 |
- mycmakeargs=( |
| 57 |
+ local mycmakeargs=( |
| 58 |
-DWITH_PLAYER=ON |
| 59 |
-DWITH_Libgcrypt=OFF |
| 60 |
-DWITH_SPECTRUM_ANALYZER=OFF |
| 61 |
@@ -92,9 +98,6 @@ src_configure() { |
| 62 |
$(cmake-utils_use_with mtp) |
| 63 |
$(cmake-utils_use_with mp3tunes MP3Tunes) |
| 64 |
$(cmake-utils_use_with ofa LibOFA) |
| 65 |
- ) |
| 66 |
- |
| 67 |
- mycmakeargs+=( |
| 68 |
$(cmake-utils_use_with utils UTILITIES) |
| 69 |
) |
| 70 |
|
| 71 |
@@ -104,7 +107,7 @@ src_configure() { |
| 72 |
pkg_postinst() { |
| 73 |
kde4-base_pkg_postinst |
| 74 |
|
| 75 |
- if use daap; then |
| 76 |
+ if use daap && ! has_version www-servers/mongrel ; then |
| 77 |
echo |
| 78 |
elog "You have installed amarok with daap support." |
| 79 |
elog "You may be interested in installing www-servers/mongrel as well." |
Archives