summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-05-21 21:12:15 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-05-21 21:12:15 +0000
commitc91ad4ef9ebbe7d2858f21e1b3e46a8c695e33aa (patch)
tree1abbef78fc4e799658a4b5f31b0937782f9f5a17
parentresolve bug (diff)
downloadgentoo-2-c91ad4ef9ebbe7d2858f21e1b3e46a8c695e33aa.tar.gz
gentoo-2-c91ad4ef9ebbe7d2858f21e1b3e46a8c695e33aa.tar.bz2
gentoo-2-c91ad4ef9ebbe7d2858f21e1b3e46a8c695e33aa.zip
final resolve to keep my sanity intact
-rw-r--r--dev-libs/cyrus-sasl/ChangeLog9
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild (renamed from dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r2.ebuild)11
-rw-r--r--dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r4 (renamed from dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r2)0
3 files changed, 17 insertions, 3 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 9053d9a38ea4..b008ba93bd31 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/cyrus-sasl
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.4 2002/05/05 19:51:10 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.5 2002/05/21 21:12:15 azarah Exp $
+
+*cyrus-sasl-1.5.27-r4 (21 May 2002)
+
+ 21 May 2002; Martin Schlemmer <azarah@gentoo.org>:
+
+ Update it to use automake-1.5, hopefully finally resolving
+ bug #2319 and co.
*cyrus-sasl-1.5.27-r3 (5 May 2002)
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild
index 9570a5a80f5e..8cb9482112b0 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild
@@ -1,16 +1,22 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r2.ebuild,v 1.1 2002/05/04 02:05:19 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r4.ebuild,v 1.1 2002/05/21 21:12:15 azarah Exp $
DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
S=${WORKDIR}/${P}
SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-DEPEND="virtual/glibc >=sys-libs/db-3.2 >=sys-libs/pam-0.75"
LICENSE="as-is"
SLOT="1"
+DEPEND="virtual/glibc
+ >=sys-libs/db-3.2
+ >=sys-libs/pam-0.75
+ >=sys-devel/automake-1.6.1-r2"
+# need automake for fixed automake-1.5 support.
+
+
src_unpack() {
unpack ${A} ; cd ${S}
# some nice patches... thanks mandrake ;-)
@@ -20,6 +26,7 @@ src_unpack() {
patch -p1 < ${FILESDIR}/${PN}-1.5.24-rpath.patch || die
patch -p0 < ${FILESDIR}/${PN}-1.5.27-scram.patch || die
libtoolize --copy --force
+ export WANT_AUTOMAKE_1_5=1
aclocal -I cmulocal || die
automake --add-missing || die
autoconf || die
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r2 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r4
index 477dd8cc141c..477dd8cc141c 100644
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r2
+++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r4