change alsa-lib dep to < 1.0.0

4 files changed, 13 insertions, 8 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 18028fee8309..4eb3c7c8e6f6 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.103 2003/12/24 19:28:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.104 2003/12/24 21:09:51 caleb Exp $
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.4.ebuild,
+  kdelibs-3.2.0_beta2.ebuild:
+  Make alsa dependency < version 1.0.0 as kdelibs doesn't support it yet
 
   24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0_beta2.ebuild:
   minor cleanups
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 5979b4d69618..43f66110d020 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,10 +1,10 @@
 MD5 8be197e19e85404d68a4f5270efd4d44 kdelibs-3.1.2-r1.ebuild 2532
-MD5 77c72bf14395a96da0b4882b44605144 kdelibs-3.1.4.ebuild 2389
+MD5 160b3a3dffc104b5b4680e6d6d8e9b97 kdelibs-3.1.4.ebuild 2385
 MD5 91a9be08b638d2eb478665d154e9908e kdelibs-3.2.0_beta1.ebuild 2550
 MD5 ea339cdf171dc8b017d7df79ad1edc10 kdelibs-3.0.4-r1.ebuild 2296
 MD5 922dfd3fab1f4078d891c62afdd90148 kdelibs-3.0.5b-r1.ebuild 1990
-MD5 73966219d2503a68f7e2abe5716bc522 kdelibs-3.2.0_beta2.ebuild 2354
-MD5 fe312941be0994b90cec7a07364135e7 ChangeLog 17509
+MD5 0195776b8dda72ab3b3d4463e54e6760 kdelibs-3.2.0_beta2.ebuild 2387
+MD5 c3384a21067ffaeadbf1b9d325f478af ChangeLog 17682
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 4232704fe9aeecbb09dbed9cb45b8529 files/kdelibs-3.0.5b-khtml.patch 848
 MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
diff --git a/kde-base/kdelibs/kdelibs-3.1.4.ebuild b/kde-base/kdelibs/kdelibs-3.1.4.ebuild
index 944c4970b83a..cfc9a60b07a7 100644
--- a/kde-base/kdelibs/kdelibs-3.1.4.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.4.ebuild,v 1.11 2003/12/09 17:46:38 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.4.ebuild,v 1.12 2003/12/24 21:09:51 caleb Exp $
 inherit kde
 #don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
 
@@ -23,7 +23,7 @@ newdepend "dev-lang/perl
 	>=dev-libs/libpcre-3.5
 	>=dev-libs/libxml2-2.4.10
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alsa? ( >=media-libs/alsa-lib-0.5.9 virtual/alsa )
+	alsa? ( <media-libs/alsa-lib-1.0 virtual/alsa )
 	cups? ( >=net-print/cups-1.1.14 )
 	>=media-libs/tiff-3.5.5
 	app-admin/fam
diff --git a/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild b/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild
index bf07b33ef5fe..f9beb801f259 100644
--- a/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild,v 1.5 2003/12/24 19:28:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild,v 1.6 2003/12/24 21:09:51 caleb Exp $
 inherit kde
 
 MY_PV=3.1.94
 S=${WORKDIR}/${PN}-${MY_PV}
 
-IUSE="alsa cups ipv6 ssl doc"
+IUSE="alsa cups ipv6 ssl doc ldap"
 DESCRIPTION="KDE libraries needed by all kde programs"
 KEYWORDS="~x86"
 HOMEPAGE="http//www.kde.org/"
@@ -23,6 +23,7 @@ DEPEND="dev-lang/perl
 	dev-libs/libxml2
 	ssl? ( dev-libs/openssl )
 	cups? ( net-print/cups )
+	ldap? ( net-nds/openldap )
 	media-libs/tiff
 	app-admin/fam
 	virtual/ghostscript