From efe6fc7b2f8895010492fbcc94856b0b243b2235 Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Mon, 8 Jan 2007 20:56:09 +0000 Subject: [PATCH] Fixing #160158 and removing unneeded files. Package-Manager: portage-2.1.2_rc4-r6 --- dev-libs/cyrus-sasl/ChangeLog | 10 +++++++++- dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild | 11 +---------- dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild | 11 +---------- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index 1f7b44da3ea4..44af9944a53f 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/cyrus-sasl # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.175 2007/01/08 15:29:45 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.176 2007/01/08 20:56:09 tove Exp $ + + 08 Jan 2007; Torsten Veller + -files/cyrus-sasl-2.1.20-configdir.patch, + -files/cyrus-sasl-2.1.20-gcc4.patch, -files/saslauthd-2.1.20.conf, + -files/cyrus-sasl-2.1.21-configure.patch, -files/saslauthd.pam, + -cyrus-sasl-2.1.21-r2.ebuild, -cyrus-sasl-2.1.21-r3.ebuild, + cyrus-sasl-2.1.22.ebuild, cyrus-sasl-2.1.22-r1.ebuild: + Fixing #160158 and removing unneeded files. 08 Jan 2007; Diego Pettenò cyrus-sasl-2.1.21-r2.ebuild, cyrus-sasl-2.1.21-r3.ebuild, diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild index c98463bcf5ae..55f7da4305b6 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild,v 1.13 2007/01/08 15:29:46 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r1.ebuild,v 1.14 2007/01/08 20:56:09 tove Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="1.7" @@ -70,18 +70,9 @@ src_unpack() { sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \ -i saslauthd/auth_rimap.c || die "sed failed" - # Fixed upstream. Add openldap 2.3 compile patch - bug #113914 - # epatch "${FILESDIR}/${PN}-2.1.21-configure.patch" - - # Fixed upstream. Add configdir support. - # epatch "${FILESDIR}/${PN}-2.1.20-configdir.patch" - # Fix include path for newer PostgreSQL versions. epatch "${FILESDIR}/${PN}-2.1.17-pgsql-include.patch" - # Fixed upstream. Fix for gcc-4.0 - # epatch "${FILESDIR}/${PN}-2.1.20-gcc4.patch" - # UNSUPPORTED ntlm patch. Bug #81342 use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}" diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild index 8772171838f1..b1184cafb220 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild,v 1.21 2007/01/08 15:29:46 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild,v 1.22 2007/01/08 20:56:09 tove Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="1.9" @@ -72,18 +72,9 @@ src_unpack() { sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \ -i saslauthd/auth_rimap.c || die "sed failed" - # Fixed upstream. Add openldap 2.3 compile patch - bug #113914 - # epatch "${FILESDIR}/${PN}-2.1.21-configure.patch" - - # Fixed upstream. Add configdir support. - # epatch "${FILESDIR}/${PN}-2.1.20-configdir.patch" - # Fix include path for newer PostgreSQL versions. epatch "${FILESDIR}/${PN}-2.1.17-pgsql-include.patch" - # Fixed upstream. Fix for gcc-4.0 - # epatch "${FILESDIR}/${PN}-2.1.20-gcc4.patch" - # UNSUPPORTED ntlm patch. Bug #81342 use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}" -- 2.26.2