diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-07-30 14:44:56 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-07-30 14:44:56 +0000 |
| commit | 4a0856af9848403c3aadd89372444d69b06ac143 (patch) | |
| tree | cb9f453388e4cd262e9cd32d4ed7460fcc4ac8fd /kde-base | |
| parent | Obsolete entries. (diff) | |
| download | gentoo-2-4a0856af9848403c3aadd89372444d69b06ac143.tar.gz gentoo-2-4a0856af9848403c3aadd89372444d69b06ac143.tar.bz2 gentoo-2-4a0856af9848403c3aadd89372444d69b06ac143.zip | |
Make alsa optional. Per bug #276052.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/phonon-kde/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/phonon-kde/phonon-kde-4.2.4.ebuild | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog index 47b6ec510e6a..ce461bc8097f 100644 --- a/kde-base/phonon-kde/ChangeLog +++ b/kde-base/phonon-kde/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/phonon-kde # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.18 2009/06/14 11:54:07 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.19 2009/07/30 14:44:56 scarabeus Exp $ + + 30 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> + phonon-kde-4.2.4.ebuild: + Make alsa optional. Per bug #276052. 14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> -phonon-kde-4.2.3.ebuild: Drop KDE 4.2.3 diff --git a/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild b/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild index 3dbfecf82625..58c90859b064 100644 --- a/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild +++ b/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild,v 1.1 2009/06/04 13:49:25 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.4.ebuild,v 1.2 2009/07/30 14:44:56 scarabeus Exp $ EAPI="2" @@ -13,11 +13,11 @@ HOMEPAGE="http://phonon.kde.org" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" LICENSE="GPL-2" -IUSE="debug pulseaudio +xine" +IUSE="alsa debug pulseaudio +xine" DEPEND=" - media-libs/alsa-lib media-sound/phonon[xine?] + alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) " RDEPEND="${DEPEND} @@ -32,14 +32,17 @@ src_prepare() { # Disable automagic sed -e 's/find_package(Xine)/macro_optional_find_package(Xine)/' \ -i phonon/kcm/xine/CMakeLists.txt || die "Failed to make xine optional" + sed -e "s:FIND_PACKAGE(Alsa):macro_optional_find_package(Alsa):" + -i phonon/CMakeLists.txt || die "Failed to make alsa optional" kde4-meta_src_prepare } src_configure() { mycmakeargs="${mycmakeargs} + $(cmake-utils_use_with alsa) $(cmake-utils_use_with pulseaudio PulseAudio) - $(cmake-utils_use_with xine Xine)" + $(cmake-utils_use_with xine)" kde4-meta_src_configure } |