summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomáš Chvátal <scarabeus@gentoo.org>2009-07-30 16:36:59 +0200
committerTomáš Chvátal <scarabeus@gentoo.org>2009-07-30 16:38:46 +0200
commit103c10c74ac5637b83f04a1961aa0a323a43e359 (patch)
tree21caced20a4e1200b3c54230929888ad0ca7ed1a
parentf263619ac3c37b2355829e176de1553b331c94a9 (diff)
downloadkde-103c10c74ac5637b83f04a1961aa0a323a43e359.tar.gz
kde-103c10c74ac5637b83f04a1961aa0a323a43e359.tar.bz2
kde-103c10c74ac5637b83f04a1961aa0a323a43e359.zip
[kde-base/phonon-kde] Make alsa optional.
-rw-r--r--kde-base/phonon-kde/Manifest6
-rw-r--r--kde-base/phonon-kde/phonon-kde-4.3.0.ebuild7
-rw-r--r--kde-base/phonon-kde/phonon-kde-4.3.9999.ebuild7
-rw-r--r--kde-base/phonon-kde/phonon-kde-9999.ebuild7
4 files changed, 18 insertions, 9 deletions
diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest
index 9f36c5c5348..3b7018039fc 100644
--- a/kde-base/phonon-kde/Manifest
+++ b/kde-base/phonon-kde/Manifest
@@ -2,8 +2,8 @@ DIST kdebase-runtime-4.2.98.tar.bz2 7251725 RMD160 767badf5e835dab57b8333cc8ca53
DIST kdebase-runtime-4.3.0.tar.bz2 7257353 RMD160 fc1a0c1670409a30775dffb89b3b8171f6646537 SHA1 8c0934bf132d0e88ea97296bc065bfc19d49d100 SHA256 db770f279f9a93debd301407c8c294d4daa469c7181012373aedb74b9b249ab3
DIST kdebase-runtime-4.3.61.tar.lzma 6448759 RMD160 85cc58f1096c8fa300016a5b1187683e7a6b207e SHA1 b625771e653c0019201bdf30a4853a45762d2e0c SHA256 a6fdfd04a4ae0913d5546bc4deab94ef5542d0d10ea66de310c1662fb20bf15a
EBUILD phonon-kde-4.2.98.ebuild 1042 RMD160 632c8b39a18416b5f0f068f7cb66b96d9aeb28eb SHA1 f0f89da33886059e00dbf50bb909b666b92dd6a5 SHA256 5c103e67e606a7db7ab3c9dccc4ed19b9c9a8883edb119f013f1beb2abc759f1
-EBUILD phonon-kde-4.3.0.ebuild 1042 RMD160 632c8b39a18416b5f0f068f7cb66b96d9aeb28eb SHA1 f0f89da33886059e00dbf50bb909b666b92dd6a5 SHA256 5c103e67e606a7db7ab3c9dccc4ed19b9c9a8883edb119f013f1beb2abc759f1
+EBUILD phonon-kde-4.3.0.ebuild 1219 RMD160 8e6355ee337972c0aae44743023052ffd56f2e14 SHA1 d38423e7fe3a76acef24aaa860bb9870d55b4ba3 SHA256 e668df8ab8b078dfe32e1e999b13a1b0bee3d0859974ea8ee5db13e76cf14aee
EBUILD phonon-kde-4.3.61.ebuild 1042 RMD160 632c8b39a18416b5f0f068f7cb66b96d9aeb28eb SHA1 f0f89da33886059e00dbf50bb909b666b92dd6a5 SHA256 5c103e67e606a7db7ab3c9dccc4ed19b9c9a8883edb119f013f1beb2abc759f1
-EBUILD phonon-kde-4.3.9999.ebuild 1000 RMD160 6b2aded3e6b7ada22883b239d149d6d5a09275ba SHA1 130edf8a21cc8a1a215f4f6859cf60225d7b26c8 SHA256 83a2755d931943ec519715ca2ad01ff1859899c00b25958cbdaa54d56419dc80
-EBUILD phonon-kde-9999.ebuild 1000 RMD160 6b2aded3e6b7ada22883b239d149d6d5a09275ba SHA1 130edf8a21cc8a1a215f4f6859cf60225d7b26c8 SHA256 83a2755d931943ec519715ca2ad01ff1859899c00b25958cbdaa54d56419dc80
+EBUILD phonon-kde-4.3.9999.ebuild 1177 RMD160 783bbe0c9a534ac565f6f8a9a57a2a472052197d SHA1 2564573ffe67144ceafe2f270cc9ff0183c3711d SHA256 0ef28bd984a5b8aa7da35b75d4c664511017e9d7c8ca4f3803802fe84f543ff6
+EBUILD phonon-kde-9999.ebuild 1177 RMD160 783bbe0c9a534ac565f6f8a9a57a2a472052197d SHA1 2564573ffe67144ceafe2f270cc9ff0183c3711d SHA256 0ef28bd984a5b8aa7da35b75d4c664511017e9d7c8ca4f3803802fe84f543ff6
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/phonon-kde/phonon-kde-4.3.0.ebuild b/kde-base/phonon-kde/phonon-kde-4.3.0.ebuild
index 2124fad14c7..d12b02eecd1 100644
--- a/kde-base/phonon-kde/phonon-kde-4.3.0.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.3.0.ebuild
@@ -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,12 +32,15 @@ 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)"
diff --git a/kde-base/phonon-kde/phonon-kde-4.3.9999.ebuild b/kde-base/phonon-kde/phonon-kde-4.3.9999.ebuild
index 78e000fb5ef..49bab7fec77 100644
--- a/kde-base/phonon-kde/phonon-kde-4.3.9999.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.3.9999.ebuild
@@ -13,11 +13,11 @@ HOMEPAGE="http://phonon.kde.org"
KEYWORDS=""
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,12 +32,15 @@ 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)"
diff --git a/kde-base/phonon-kde/phonon-kde-9999.ebuild b/kde-base/phonon-kde/phonon-kde-9999.ebuild
index 78e000fb5ef..49bab7fec77 100644
--- a/kde-base/phonon-kde/phonon-kde-9999.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-9999.ebuild
@@ -13,11 +13,11 @@ HOMEPAGE="http://phonon.kde.org"
KEYWORDS=""
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,12 +32,15 @@ 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)"