From: Marcus D. Hanwell <cryos@gentoo.org>
Date: Sun, 25 Mar 2007 18:25:25 +0000 (+0000)
Subject: Fix alsa configure issue, closes bug 152321, patch from upstream SVN commit.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8924dde86c8d95a09be398acbaa110277a2b1bda;p=gentoo.git

Fix alsa configure issue, closes bug 152321, patch from upstream SVN commit.
Package-Manager: portage-2.1.2.2
---

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 105c5e1ce508..1147011da061 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.184 2007/03/17 12:09:35 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.185 2007/03/25 18:25:25 cryos Exp $
+
+  25 Mar 2007; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/k3b-1.0-alsa-fix.patch, k3b-1.0.ebuild:
+  Fix alsa configure issue, closes bug 152321, patch from upstream SVN commit.
 
 *k3b-1.0 (17 Mar 2007)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index d5ee3d4b409e..c3cdb74a9335 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -9,6 +9,10 @@ AUX k3b-0.12.17-flac-beta.patch 1282 RMD160 c91a54ca3f54e34cd6805b39e5bbbdc058ea
 MD5 346499b52a07847a38dbd070a384c9f4 files/k3b-0.12.17-flac-beta.patch 1282
 RMD160 c91a54ca3f54e34cd6805b39e5bbbdc058eaa394 files/k3b-0.12.17-flac-beta.patch 1282
 SHA256 6f74700e5920ac2ec751ee16a8933cb3de5a6b3d6ea90d3a4e1d3d3815b7b8bc files/k3b-0.12.17-flac-beta.patch 1282
+AUX k3b-1.0-alsa-fix.patch 669 RMD160 0e4ac67c18db77d655f482d2607cffef2ba9d0ab SHA1 b036e9932eb31ecc037ddfa0a58320248319f97f SHA256 31ac29a43f931786a4c71d3824a15abbb36a4439977eace2c668bcd53912536f
+MD5 4620cbaa9fa65400c40353a62cd3505d files/k3b-1.0-alsa-fix.patch 669
+RMD160 0e4ac67c18db77d655f482d2607cffef2ba9d0ab files/k3b-1.0-alsa-fix.patch 669
+SHA256 31ac29a43f931786a4c71d3824a15abbb36a4439977eace2c668bcd53912536f files/k3b-1.0-alsa-fix.patch 669
 DIST k3b-0.12.14.tar.bz2 4096391 RMD160 fc06fce15d7f4140de9810257c46a217f022caf9 SHA1 02cef09cb6d8f3bfcfd60099aa55fb2706dd5a8e SHA256 00e88c3c1f04b0f8c5e124fced6729bfc7e078fe5d1d449bb07b1f3746eb6ead
 DIST k3b-0.12.17.tar.bz2 4008650 RMD160 bb791d7d003285f6623229eae213cf224fd3a128 SHA1 ae23be594b6e2c116fd4c2af8cefb438423d1285 SHA256 067ef9d621bed9a1c385c201b13810f11305edf03a7da0793cb059bb578700b7
 DIST k3b-1.0.tar.bz2 5102225 RMD160 27c2cf0a96a037f0807a7b4f6ae393c1c68a2442 SHA1 b6879517825c336df36f65b212a871ef77762981 SHA256 b1ab85ad003b3362a964e7516ba21ecb238b199379e449980041a4292d8d2294
@@ -24,18 +28,18 @@ EBUILD k3b-0.12.17.ebuild 3419 RMD160 df2e1baa173c34423522df391fdc2888f2256308 S
 MD5 334097dbea1f4e30d4feea4f452cd2f3 k3b-0.12.17.ebuild 3419
 RMD160 df2e1baa173c34423522df391fdc2888f2256308 k3b-0.12.17.ebuild 3419
 SHA256 0fb65ffcd8fd3a6b9f7f48ea1696b0210f6d3d18a73384a593c27677804774e9 k3b-0.12.17.ebuild 3419
-EBUILD k3b-1.0.ebuild 4060 RMD160 bc2e807a7dda73243b9561e8bf7a3717b340abaf SHA1 abb1ae8c6ad5cb077e0a543f8d67a068a874359d SHA256 4e18dae1c8e94776f620e3eba02a74874825d1fd5ae9c00b1bb809def264c3a4
-MD5 a032133c6dbd1a8e1de34a3c67babf1e k3b-1.0.ebuild 4060
-RMD160 bc2e807a7dda73243b9561e8bf7a3717b340abaf k3b-1.0.ebuild 4060
-SHA256 4e18dae1c8e94776f620e3eba02a74874825d1fd5ae9c00b1bb809def264c3a4 k3b-1.0.ebuild 4060
+EBUILD k3b-1.0.ebuild 4103 RMD160 80e1ab02c31de94483d5db990af383a4692bd06b SHA1 5a43f39775fb53ad8f3eb9b825b791009ac63260 SHA256 a54d4860e7dad3636e22451ea96a2845b39df7a6a00d92e765a622366d6cf639
+MD5 43ebcacfcba3b897b8f4122ce182e850 k3b-1.0.ebuild 4103
+RMD160 80e1ab02c31de94483d5db990af383a4692bd06b k3b-1.0.ebuild 4103
+SHA256 a54d4860e7dad3636e22451ea96a2845b39df7a6a00d92e765a622366d6cf639 k3b-1.0.ebuild 4103
 EBUILD k3b-1.0_rc6.ebuild 4084 RMD160 6076bd97722315a6b579428f3a2b22a2be19e160 SHA1 ae8cd6a7bdeb98979f4da039650394f5daaa3d43 SHA256 ccb7773f657939bac837b93cc3103be1af9b9c5bfca254f710fad803fa7cbc69
 MD5 dba61e8bc90dc54b67f5d2feae49b430 k3b-1.0_rc6.ebuild 4084
 RMD160 6076bd97722315a6b579428f3a2b22a2be19e160 k3b-1.0_rc6.ebuild 4084
 SHA256 ccb7773f657939bac837b93cc3103be1af9b9c5bfca254f710fad803fa7cbc69 k3b-1.0_rc6.ebuild 4084
-MISC ChangeLog 26824 RMD160 bf3b6c0a1341855f253f8f942b4a08a3217b2db9 SHA1 cb59bb979c8bc26ec8958edacc3927e1ffe81b9a SHA256 a3141873717b0501ca514a9077e33f3336d6521b443f21084c3c33d5286b7dd6
-MD5 47734f87de498cc1c6af27577953ae88 ChangeLog 26824
-RMD160 bf3b6c0a1341855f253f8f942b4a08a3217b2db9 ChangeLog 26824
-SHA256 a3141873717b0501ca514a9077e33f3336d6521b443f21084c3c33d5286b7dd6 ChangeLog 26824
+MISC ChangeLog 27005 RMD160 275d68ee78c714f2a39d37da61b2609f52f75e2f SHA1 ff01e470597be4994d61e36549a3f89d0fa1aa92 SHA256 1cf825899718a468c3a834ff4532dd6271a07aeac10e2676d52b09cbe349d857
+MD5 a43adb9dba076785d23527d245efca31 ChangeLog 27005
+RMD160 275d68ee78c714f2a39d37da61b2609f52f75e2f ChangeLog 27005
+SHA256 1cf825899718a468c3a834ff4532dd6271a07aeac10e2676d52b09cbe349d857 ChangeLog 27005
 MISC metadata.xml 183 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f SHA1 44581aca775d8ca4854c53861174b6147da706b4 SHA256 d004a7535807ea599189a046ac582ca032a91f868bbcf4b72195773dfaf15462
 MD5 6cac9f56ab7373612097cef824badcf7 metadata.xml 183
 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f metadata.xml 183
@@ -55,7 +59,7 @@ SHA256 e5a4cf4d6730729ae9e0bd3c308e25e5cea0592e54a039b7e51daa8ed9fc5946 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF+9qLntT9W3vfTuoRAkyrAJ4t4CVY2LNsdTqfSIfpnFooMeUYLwCePv/X
-Lyg6SyeXgSihV3ZYbv5aNRs=
-=zgTA
+iD8DBQFGBr6gntT9W3vfTuoRAn4FAJ9FrxGujdc+25whWX4e+wdInnH6nwCfTmQG
+TINFZmZ8XKv8Q6337TU0owM=
+=f/a/
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/files/k3b-1.0-alsa-fix.patch b/app-cdr/k3b/files/k3b-1.0-alsa-fix.patch
new file mode 100644
index 000000000000..431242b7d0d6
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0-alsa-fix.patch
@@ -0,0 +1,19 @@
+diff -ur k3b-1.0.orig/plugins/audiooutput/alsa/configure.in.in k3b-1.0/plugins/audiooutput/alsa/configure.in.in
+--- k3b-1.0.orig/plugins/audiooutput/alsa/configure.in.in	2007-03-25 19:13:45.000000000 +0100
++++ k3b-1.0/plugins/audiooutput/alsa/configure.in.in	2007-03-25 19:14:09.000000000 +0100
+@@ -5,8 +5,6 @@
+   PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [have_alsa=yes], [have_alsa=no])
+   AC_SUBST([ALSA_CFLAGS])
+   AC_SUBST([ALSA_LIBS])
+-
+-  AM_CONDITIONAL(include_ALSA, [test "x$have_alsa" = "xyes"])
+ ])
+ 
+ AC_ARG_WITH(alsa,
+@@ -23,4 +21,6 @@
+   fi
+ fi
+ 
++AM_CONDITIONAL(include_ALSA, [test "x$have_alsa" = "xyes"])
++
+ dnl --------- ALSA CHECK END ---------------
diff --git a/app-cdr/k3b/k3b-1.0.ebuild b/app-cdr/k3b/k3b-1.0.ebuild
index 59b5ae687ae6..2df752505c4c 100644
--- a/app-cdr/k3b/k3b-1.0.ebuild
+++ b/app-cdr/k3b/k3b-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.ebuild,v 1.1 2007/03/17 12:09:35 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.ebuild,v 1.2 2007/03/25 18:25:25 cryos Exp $
 
 inherit kde eutils
 
@@ -49,7 +49,9 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
-need-kde 3.2
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-alsa-fix.patch"
 
 # The following commented lines will have to be uncommented once the final
 # release is done. This pre-release version does not support i18n.