From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 696191381F3 for ; Sat, 6 Jul 2013 17:14:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40594E0A60; Sat, 6 Jul 2013 17:14:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CA14E0A60 for ; Sat, 6 Jul 2013 17:14:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31AF133BE40 for ; Sat, 6 Jul 2013 17:14:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CE60FE468F for ; Sat, 6 Jul 2013 17:14:44 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1373130562.25a96d2777f2b5c53acda9298c44d3857dd8a2cc.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-sound/amarok/ X-VCS-Repository: proj/kde X-VCS-Files: media-sound/amarok/amarok-2.7.90.ebuild media-sound/amarok/amarok-9999.ebuild X-VCS-Directories: media-sound/amarok/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 25a96d2777f2b5c53acda9298c44d3857dd8a2cc X-VCS-Branch: master Date: Sat, 6 Jul 2013 17:14:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f42f317c-6b1a-492c-bae5-7df358122f2a X-Archives-Hash: a6edbbf5035f3c4b0218db776b670f93 commit: 25a96d2777f2b5c53acda9298c44d3857dd8a2cc Author: Manuel Rüger gentoo org> AuthorDate: Sat Jul 6 17:09:22 2013 +0000 Commit: Manuel Rüger rueg eu> CommitDate: Sat Jul 6 17:09:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=25a96d27 [media-sound/amarok] Clean up CVS header and sync with live ebuild Package-Manager: portage-2.1.12.11 --- media-sound/amarok/amarok-2.7.90.ebuild | 2 +- 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 5ddf08f..a4bc4b1 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 5bd74e2..a4bc4b1 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."