summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomáš Chvátal <scarabeus@gentoo.org>2009-07-31 15:49:06 +0200
committerTomáš Chvátal <scarabeus@gentoo.org>2009-07-31 15:50:37 +0200
commit0275e23ab7f6bc6ca0fdd2076c56186e49818c5b (patch)
tree2c5d007b442c11d518c885eb3e5d1d1e52d99a19
parentca4ebdbecdd1349f141741f422382b33fe817f99 (diff)
downloadkde-0275e23ab7f6bc6ca0fdd2076c56186e49818c5b.tar.gz
kde-0275e23ab7f6bc6ca0fdd2076c56186e49818c5b.tar.bz2
kde-0275e23ab7f6bc6ca0fdd2076c56186e49818c5b.zip
[kde-base/phonon-kde] Try to make -alsa build work.
-rw-r--r--kde-base/phonon-kde/Manifest6
-rw-r--r--kde-base/phonon-kde/phonon-kde-4.3.0.ebuild8
-rw-r--r--kde-base/phonon-kde/phonon-kde-4.3.9999.ebuild8
-rw-r--r--kde-base/phonon-kde/phonon-kde-9999.ebuild8
4 files changed, 27 insertions, 3 deletions
diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest
index 7d7e0700dd2..4326c91b61e 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 1221 RMD160 e96e3c97f3dd7dce9cb3b59f279766e1afeae6d2 SHA1 7b882c8d778570f76e2c973d5650252b99070465 SHA256 05f5228030302d608a2ad09a4e369a62ec8bdc3a16b1d8875fd5d19773643f8e
+EBUILD phonon-kde-4.3.0.ebuild 1514 RMD160 e4a5b7422248af7b79271a010482dcf140130a25 SHA1 624697f7ba66e9cb9b9c72df2a892822feeea79b SHA256 1a02967ca394c96c4d00b5b008998a5dafb345ba6fafe216332e9a93ba56d02b
EBUILD phonon-kde-4.3.61.ebuild 1042 RMD160 632c8b39a18416b5f0f068f7cb66b96d9aeb28eb SHA1 f0f89da33886059e00dbf50bb909b666b92dd6a5 SHA256 5c103e67e606a7db7ab3c9dccc4ed19b9c9a8883edb119f013f1beb2abc759f1
-EBUILD phonon-kde-4.3.9999.ebuild 1179 RMD160 75d70f3a3111abcff4e388832c09d496e7edef43 SHA1 32cace5819b97e5cad840ac67512ac40816cc3e9 SHA256 76d2209385631addae096435e582c60d14231f717f53751cd30aa94a022bb6ce
-EBUILD phonon-kde-9999.ebuild 1179 RMD160 75d70f3a3111abcff4e388832c09d496e7edef43 SHA1 32cace5819b97e5cad840ac67512ac40816cc3e9 SHA256 76d2209385631addae096435e582c60d14231f717f53751cd30aa94a022bb6ce
+EBUILD phonon-kde-4.3.9999.ebuild 1472 RMD160 fe830681d2972c789afe3d56ff74325b1778495a SHA1 b5ff15d8bd0bd0df28d1bc3667c961dc5b09e1f7 SHA256 b21bb858ccb439eac182552c8adb61d00610d46e95f7b4f86f32c61ba9eb4987
+EBUILD phonon-kde-9999.ebuild 1472 RMD160 fe830681d2972c789afe3d56ff74325b1778495a SHA1 b5ff15d8bd0bd0df28d1bc3667c961dc5b09e1f7 SHA256 b21bb858ccb439eac182552c8adb61d00610d46e95f7b4f86f32c61ba9eb4987
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 4bcbd6f1622..0c34d228bc5 100644
--- a/kde-base/phonon-kde/phonon-kde-4.3.0.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.3.0.ebuild
@@ -35,6 +35,14 @@ src_prepare() {
sed -e "s:FIND_PACKAGE(Alsa):macro_optional_find_package(Alsa):" \
-i phonon/CMakeLists.txt || die "Failed to make alsa optional"
+ if ! use alsa; then
+ sed -i \
+ -e "s/ALSA_CONFIGURE_FILE/#DONOTWANT/" \
+ phonon/CMakeLists.txt || die "Failed to disable alsa check with disabled alsa"
+ sed -i \
+ -e "s/alsa_version_string/#DONOTWANT/" \
+ phonon/kded-module/CMakeLists.txt || die "Failed to disable alsa checks"
+ fi
kde4-meta_src_prepare
}
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 e86b67133f4..93638bf6758 100644
--- a/kde-base/phonon-kde/phonon-kde-4.3.9999.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.3.9999.ebuild
@@ -35,6 +35,14 @@ src_prepare() {
sed -e "s:FIND_PACKAGE(Alsa):macro_optional_find_package(Alsa):" \
-i phonon/CMakeLists.txt || die "Failed to make alsa optional"
+ if ! use alsa; then
+ sed -i \
+ -e "s/ALSA_CONFIGURE_FILE/#DONOTWANT/" \
+ phonon/CMakeLists.txt || die "Failed to disable alsa check with disabled alsa"
+ sed -i \
+ -e "s/alsa_version_string/#DONOTWANT/" \
+ phonon/kded-module/CMakeLists.txt || die "Failed to disable alsa checks"
+ fi
kde4-meta_src_prepare
}
diff --git a/kde-base/phonon-kde/phonon-kde-9999.ebuild b/kde-base/phonon-kde/phonon-kde-9999.ebuild
index e86b67133f4..93638bf6758 100644
--- a/kde-base/phonon-kde/phonon-kde-9999.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-9999.ebuild
@@ -35,6 +35,14 @@ src_prepare() {
sed -e "s:FIND_PACKAGE(Alsa):macro_optional_find_package(Alsa):" \
-i phonon/CMakeLists.txt || die "Failed to make alsa optional"
+ if ! use alsa; then
+ sed -i \
+ -e "s/ALSA_CONFIGURE_FILE/#DONOTWANT/" \
+ phonon/CMakeLists.txt || die "Failed to disable alsa check with disabled alsa"
+ sed -i \
+ -e "s/alsa_version_string/#DONOTWANT/" \
+ phonon/kded-module/CMakeLists.txt || die "Failed to disable alsa checks"
+ fi
kde4-meta_src_prepare
}