summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2007-12-26 16:55:59 +0000
committerDoug Goldstein <cardoe@gentoo.org>2007-12-26 16:55:59 +0000
commit6afbe7397362fe96bb5c79efe4eb79d7f9190c09 (patch)
treefe903f96af46fca521fa125c79aca729f6b894b7
parentStable on x86 wrt bug #203348 (diff)
downloadgentoo-2-6afbe7397362fe96bb5c79efe4eb79d7f9190c09.tar.gz
gentoo-2-6afbe7397362fe96bb5c79efe4eb79d7f9190c09.tar.bz2
gentoo-2-6afbe7397362fe96bb5c79efe4eb79d7f9190c09.zip
Fix LDAP + CUPS issue once and for all. CUPS used older, deprecated API calls to be compatible with all LDAP implementations out there. You must define LDAP_DEPRECATED so that th headers define them.
(Portage version: 2.1.4_rc11)
-rw-r--r--net-print/cups/ChangeLog8
-rw-r--r--net-print/cups/cups-1.2.12-r2.ebuild7
-rw-r--r--net-print/cups/cups-1.2.12-r3.ebuild7
-rw-r--r--net-print/cups/cups-1.2.12-r4.ebuild7
-rw-r--r--net-print/cups/cups-1.3.5.ebuild7
5 files changed, 30 insertions, 6 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index cbd6cfd52a9a..02db9cf052aa 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-print/cups
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.279 2007/12/18 20:57:22 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.280 2007/12/26 16:55:59 cardoe Exp $
+
+ 26 Dec 2007; Doug Klima <cardoe@gentoo.org> cups-1.2.12-r2.ebuild,
+ cups-1.2.12-r3.ebuild, cups-1.2.12-r4.ebuild, cups-1.3.5.ebuild:
+ Fix LDAP + CUPS issue once and for all. CUPS used older, deprecated API
+ calls to be compatible with all LDAP implementations out there. You must
+ define LDAP_DEPRECATED so that th headers define them.
*cups-1.3.5 (18 Dec 2007)
*cups-1.2.12-r4 (18 Dec 2007)
diff --git a/net-print/cups/cups-1.2.12-r2.ebuild b/net-print/cups/cups-1.2.12-r2.ebuild
index d40719b3df88..36cd50d0f352 100644
--- a/net-print/cups/cups-1.2.12-r2.ebuild
+++ b/net-print/cups/cups-1.2.12-r2.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/net-print/cups/cups-1.2.12-r2.ebuild,v 1.9 2007/11/20 03:03:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r2.ebuild,v 1.10 2007/12/26 16:55:59 cardoe Exp $
WANT_AUTOMAKE=latest
@@ -96,6 +96,11 @@ src_unpack() {
src_compile() {
export DSOFLAGS="${LDFLAGS}"
+
+ if use ldap; then
+ append-flags -DLDAP_DEPRECATED
+ fi
+
econf \
--with-cups-user=lp \
--with-cups-group=lp \
diff --git a/net-print/cups/cups-1.2.12-r3.ebuild b/net-print/cups/cups-1.2.12-r3.ebuild
index a246263902e5..4d95419521a5 100644
--- a/net-print/cups/cups-1.2.12-r3.ebuild
+++ b/net-print/cups/cups-1.2.12-r3.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/net-print/cups/cups-1.2.12-r3.ebuild,v 1.8 2007/12/10 17:53:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r3.ebuild,v 1.9 2007/12/26 16:55:59 cardoe Exp $
WANT_AUTOMAKE=latest
@@ -98,6 +98,11 @@ src_unpack() {
src_compile() {
export DSOFLAGS="${LDFLAGS}"
+
+ if use ldap; then
+ append-flags -DLDAP_DEPRECATED
+ fi
+
econf \
--with-cups-user=lp \
--with-cups-group=lp \
diff --git a/net-print/cups/cups-1.2.12-r4.ebuild b/net-print/cups/cups-1.2.12-r4.ebuild
index 548ab173d90f..4e0efa08af35 100644
--- a/net-print/cups/cups-1.2.12-r4.ebuild
+++ b/net-print/cups/cups-1.2.12-r4.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/net-print/cups/cups-1.2.12-r4.ebuild,v 1.1 2007/12/18 20:57:22 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r4.ebuild,v 1.2 2007/12/26 16:55:59 cardoe Exp $
WANT_AUTOMAKE=latest
@@ -98,6 +98,11 @@ src_unpack() {
src_compile() {
export DSOFLAGS="${LDFLAGS}"
+
+ if use ldap; then
+ append-flags -DLDAP_DEPRECATED
+ fi
+
econf \
--with-cups-user=lp \
--with-cups-group=lp \
diff --git a/net-print/cups/cups-1.3.5.ebuild b/net-print/cups/cups-1.3.5.ebuild
index cc6b542fe64c..de35e522d2ab 100644
--- a/net-print/cups/cups-1.3.5.ebuild
+++ b/net-print/cups/cups-1.3.5.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/net-print/cups/cups-1.3.5.ebuild,v 1.1 2007/12/18 20:57:22 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.5.ebuild,v 1.2 2007/12/26 16:55:59 cardoe Exp $
inherit autotools eutils flag-o-matic multilib pam
@@ -118,7 +118,10 @@ src_compile() {
fi
export DSOFLAGS="${LDFLAGS}"
- cd "${S}"
+
+ if use ldap; then
+ append-flags -DLDAP_DEPRECATED
+ fi
local myconf