Fix ldap compile bug #203285.

Package-Manager: portage-2.1.4_rc10

3 files changed, 17 insertions, 22 deletions

diff --git a/sys-fs/quota/ChangeLog b/sys-fs/quota/ChangeLog
index 7168df2d3a89..8e5f072e3101 100644
--- a/sys-fs/quota/ChangeLog
+++ b/sys-fs/quota/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/quota
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.32 2007/12/24 12:00:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/ChangeLog,v 1.33 2007/12/28 02:16:56 robbat2 Exp $
+
+  28 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> quota-3.15.ebuild:
+  Fix ldap compile bug #203285.
 
 *quota-3.15 (24 Dec 2007)
 
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 46e95de56255..e66341e49e46 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX quota-3.06-no-stripping.patch 583 RMD160 7ccf602a30a714284b2f1fb205c6b7f36601a64f SHA1 f2ba9a26a260fdaec8028f8e7dd18c276f5f561d SHA256 89840a957563191b3bec910c8564fc46c00f972e46409aa3bc329d6966985d25
 MD5 e7dd5ca4d40c611ea2f88232e50431e9 files/quota-3.06-no-stripping.patch 583
 RMD160 7ccf602a30a714284b2f1fb205c6b7f36601a64f files/quota-3.06-no-stripping.patch 583
@@ -39,14 +36,14 @@ EBUILD quota-3.14-r1.ebuild 2007 RMD160 c16706afbaefe5be2a717f936a17c46582726434
 MD5 f01a537ebb8f9cc788c470018dea2c3c quota-3.14-r1.ebuild 2007
 RMD160 c16706afbaefe5be2a717f936a17c46582726434 quota-3.14-r1.ebuild 2007
 SHA256 e155d0556edef16ceca5c23c30509f1994c10f129b6ecce0c6248568941330ef quota-3.14-r1.ebuild 2007
-EBUILD quota-3.15.ebuild 1851 RMD160 477b77a777406c27fcc86e79764ab5dbf2a48f93 SHA1 67a14789d9bc2eb239a4974126ef644de2bbf69b SHA256 9e24f1774266aeacb317cbb307b8050d81441b4faf255d63c5e4924ae59a1336
-MD5 e6d57c3d496604ca488cc973810b9ffd quota-3.15.ebuild 1851
-RMD160 477b77a777406c27fcc86e79764ab5dbf2a48f93 quota-3.15.ebuild 1851
-SHA256 9e24f1774266aeacb317cbb307b8050d81441b4faf255d63c5e4924ae59a1336 quota-3.15.ebuild 1851
-MISC ChangeLog 8436 RMD160 03699db0a63897b5542fc2830bd28acc5adc16ad SHA1 7eef8967aec58cbfe03cb487629d84a7af59b9ee SHA256 4f6a0b1621debcd53f296275495c5585cfd63d656b6c7d1baa0985fbd26b0cb5
-MD5 137d65dd6917cd7f15ed26d8e4d0b7a9 ChangeLog 8436
-RMD160 03699db0a63897b5542fc2830bd28acc5adc16ad ChangeLog 8436
-SHA256 4f6a0b1621debcd53f296275495c5585cfd63d656b6c7d1baa0985fbd26b0cb5 ChangeLog 8436
+EBUILD quota-3.15.ebuild 1935 RMD160 a0f3577d5c686c730745e42722c594bc6ad62a0a SHA1 699b65f18e82681d420dd532cabddfa0137481b8 SHA256 186fbad6ab04335a6ba298fd4091705f950d8dedc729d93d13ee43db6ab6cdd2
+MD5 aabdd346100a556b725131f867d3a975 quota-3.15.ebuild 1935
+RMD160 a0f3577d5c686c730745e42722c594bc6ad62a0a quota-3.15.ebuild 1935
+SHA256 186fbad6ab04335a6ba298fd4091705f950d8dedc729d93d13ee43db6ab6cdd2 quota-3.15.ebuild 1935
+MISC ChangeLog 8542 RMD160 f0cd263cdf242e15527a4f54d03ff6da8a505273 SHA1 a2c1bc35366b5babbecec8a4f061e8c8c9de817f SHA256 30b2450367373bf266fc82b9954ee274b2d724ca85fb86dffac2d170a09335b7
+MD5 1dec04b98b778848f773fc8b4384b3da ChangeLog 8542
+RMD160 f0cd263cdf242e15527a4f54d03ff6da8a505273 ChangeLog 8542
+SHA256 30b2450367373bf266fc82b9954ee274b2d724ca85fb86dffac2d170a09335b7 ChangeLog 8542
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -57,10 +54,3 @@ SHA256 96ade84b7117b1ccb61ead95571b069cd5b95cc2f9a93c42c247a81fc9984a31 files/di
 MD5 eddb2f455395df754a72a4e3815d7a8a files/digest-quota-3.15 232
 RMD160 06bb6332eb9e38e022347c02925b1177904d0be2 files/digest-quota-3.15 232
 SHA256 12a9db7281941cedd3a979ea7d38393d1feab380a546286df86f68f0e8b8b93f files/digest-quota-3.15 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkdvnu8ACgkQj9hvisErhMKl6ACeNxDFvvqps6geZeIht4utKsUI
-j+UAoL/crm396hEPgpXMNokiWeXDy3F/
-=hYuF
------END PGP SIGNATURE-----
diff --git a/sys-fs/quota/quota-3.15.ebuild b/sys-fs/quota/quota-3.15.ebuild
index 25637ad375f2..94697c0f1258 100644
--- a/sys-fs/quota/quota-3.15.ebuild
+++ b/sys-fs/quota/quota-3.15.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/sys-fs/quota/quota-3.15.ebuild,v 1.1 2007/12/24 12:00:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-3.15.ebuild,v 1.2 2007/12/28 02:16:56 robbat2 Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="nls tcpd ldap rpc"
 
-RDEPEND="ldap? ( net-nds/openldap )
+RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 )
 	tcpd? ( sys-apps/tcp-wrappers )
 	rpc? ( net-nds/portmap )"
 DEPEND="${RDEPEND}
@@ -32,7 +32,9 @@ src_unpack() {
 	# Don't strip binaries (from Fedora)
 	epatch "${FILESDIR}"/quota-3.06-no-stripping.patch
 
-	append-cppflags -DLDAP_DEPRECATED=1
+	# This was for openldap-2.2 support before,
+	# Now we only support >=2.3
+	append-cppflags -DLDAP_DEPRECATED=0
 
 	sed -i -e "s:,LIBS=\"\$saved_LIBS=\":;LIBS=\"\$saved_LIBS\":" configure
 }