summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-08-12 16:47:25 +0200
committerJohannes Huber <johu@gentoo.org>2012-08-12 16:47:25 +0200
commit69a7268b8e3595c90c5554b505d9e51f80b77527 (patch)
tree86080ba4ca3668c4f5f4ca99302a3254446ef8af
parent381733c7e8edd1bc43042fc21e9c74bf318e595e (diff)
downloadkde-69a7268b8e3595c90c5554b505d9e51f80b77527.tar.gz
kde-69a7268b8e3595c90c5554b505d9e51f80b77527.tar.bz2
kde-69a7268b8e3595c90c5554b505d9e51f80b77527.zip
[kde-base/kmix] Introduce canberra use flag to fix automagic dependencies wrt bug #430804 by Joost Ruis <joost.ruis@sabayonlinux.org>.
(Portage version: 2.2.0_alpha121/git/Linux x86_64, unsigned Manifest commit)
-rw-r--r--kde-base/kmix/kmix-4.9.49.9999.ebuild6
-rw-r--r--kde-base/kmix/kmix-9999.ebuild6
-rw-r--r--kde-base/kmix/metadata.xml5
3 files changed, 12 insertions, 5 deletions
diff --git a/kde-base/kmix/kmix-4.9.49.9999.ebuild b/kde-base/kmix/kmix-4.9.49.9999.ebuild
index 6e21fd18d45..1a16e903161 100644
--- a/kde-base/kmix/kmix-4.9.49.9999.ebuild
+++ b/kde-base/kmix/kmix-4.9.49.9999.ebuild
@@ -10,18 +10,20 @@ inherit kde4-base
DESCRIPTION="KDE mixer gui"
KEYWORDS=""
-IUSE="alsa debug pulseaudio"
+IUSE="alsa debug canberra pulseaudio"
DEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.14a )
+ canberra? ( media-libs/libcanberra )
pulseaudio? ( >=media-sound/pulseaudio-0.9.12 )
"
RDEPEND="${DEPEND}"
src_configure() {
mycmakeargs=(
- $(cmake-utils_use_with pulseaudio PulseAudio)
$(cmake-utils_use_with alsa)
+ $(cmake-utils_use_with canberra)
+ $(cmake-utils_use_with pulseaudio PulseAudio)
)
kde4-base_src_configure
diff --git a/kde-base/kmix/kmix-9999.ebuild b/kde-base/kmix/kmix-9999.ebuild
index 6e21fd18d45..1a16e903161 100644
--- a/kde-base/kmix/kmix-9999.ebuild
+++ b/kde-base/kmix/kmix-9999.ebuild
@@ -10,18 +10,20 @@ inherit kde4-base
DESCRIPTION="KDE mixer gui"
KEYWORDS=""
-IUSE="alsa debug pulseaudio"
+IUSE="alsa debug canberra pulseaudio"
DEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.14a )
+ canberra? ( media-libs/libcanberra )
pulseaudio? ( >=media-sound/pulseaudio-0.9.12 )
"
RDEPEND="${DEPEND}"
src_configure() {
mycmakeargs=(
- $(cmake-utils_use_with pulseaudio PulseAudio)
$(cmake-utils_use_with alsa)
+ $(cmake-utils_use_with canberra)
+ $(cmake-utils_use_with pulseaudio PulseAudio)
)
kde4-base_src_configure
diff --git a/kde-base/kmix/metadata.xml b/kde-base/kmix/metadata.xml
index 8d1e86a9cef..5607e0b850a 100644
--- a/kde-base/kmix/metadata.xml
+++ b/kde-base/kmix/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
+ <herd>kde</herd>
+ <use>
+ <flag name='canberra'>Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
+ </use>
</pkgmetadata>