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 | 2a38aaacaed780e82b0b7d9764b739b01fe99d49 (patch) | |
| tree | b744f11104b0b28de6ae52171d0627a479e1c38b /kde-base/phonon-kde | |
| parent | Major version bump to 23, with only one little patch for xz support (diff) | |
| download | historical-2a38aaacaed780e82b0b7d9764b739b01fe99d49.tar.gz historical-2a38aaacaed780e82b0b7d9764b739b01fe99d49.tar.bz2 historical-2a38aaacaed780e82b0b7d9764b739b01fe99d49.zip | |
Make alsa optional. Per bug #276052.
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'kde-base/phonon-kde')
| -rw-r--r-- | kde-base/phonon-kde/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/phonon-kde/Manifest | 10 | ||||
| -rw-r--r-- | kde-base/phonon-kde/phonon-kde-4.2.4.ebuild | 11 |
3 files changed, 17 insertions, 10 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/Manifest b/kde-base/phonon-kde/Manifest index 24e6ca82ba0c..cd81aace030b 100644 --- a/kde-base/phonon-kde/Manifest +++ b/kde-base/phonon-kde/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST kdebase-runtime-4.2.4.tar.bz2 69327797 RMD160 926abd1fbc54ba312035349c0cfafb4ac854b6bc SHA1 dd829270b5fb21e4c24db5e7d16db6e99fe51c1d SHA256 1e3acfd6a6efea9360a3031d42282eeb6254b2fb2b61215fde2be35299b1a2cb -EBUILD phonon-kde-4.2.4.ebuild 1152 RMD160 48fbde16342747010ba09873aac234256404e7dc SHA1 284dcc6f289fad858cbb83784fab0e2df65f5d98 SHA256 77ffe82661109b3a09f5a805a34570d2c2f843068edf1e0bd677160fdcabd50c -MISC ChangeLog 2864 RMD160 cd8a42aafd34c3b2268581fb5d3b2c20fb54c165 SHA1 38a6df5f84e966d9a055a6dbcdce53c8f8ca30be SHA256 87850f034ed5e2f5b3e64aa3ddd7762b76fb5d47c81064b209da6d744ad84d05 +EBUILD phonon-kde-4.2.4.ebuild 1327 RMD160 284fca9ab81b47939cc857e47028e1ea56d96cd0 SHA1 ba7ae9c714186e912c689a50f609f90c851ca827 SHA256 45467108adebdce073af1baf16f611065e60e0497a80857c470de43ef2b7ac7c +MISC ChangeLog 2989 RMD160 fe35772c8616f40eaddf9c8af9a0a78d15fae446 SHA1 a0c320c7fc44e7977102096a515b0da96247bda4 SHA256 2cbddb8dcc440a606614dad2a4bd421e89de3e169e2322e6e329797ff936a417 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAko05OUACgkQ5BmOA85PVLh2nwCfXDEEYsSFV1Cmh4roekv/h2ow -C60An0/ncA3W0+eU4W20C6TEK7vyALRb -=LQR6 +iEYEARECAAYFAkpxsfMACgkQHB6c3gNBRYcXPACeOYiwktE7mQV+MJaNxY1cxArW +LD8AoJ34Ckk152mVF5Yzr4jEm51I+chE +=Agcy -----END PGP SIGNATURE----- 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 } |