Fix alpha compilation, bug 69112.

3 files changed, 42 insertions, 31 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 8e1d0ab22fe2..9f6757e17127 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.106 2004/12/16 10:20:05 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.107 2004/12/16 18:56:29 kloeri Exp $
+
+  16 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  cyrus-sasl-2.1.20.ebuild:
+  Fix alpha compilation, bug 69112.
 
   16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> cyrus-sasl-2.1.20.ebuild:
   Stable on amd64.
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 66a3d1f7c4ef..f52f612ba58d 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,38 +1,48 @@
-MD5 9d8b09bf5df7fd5b03a5d4634b3bb27f ChangeLog 19098
-MD5 04ab88578310e66a55032b38819541a1 cyrus-sasl-2.1.18-r2.ebuild 5427
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fd793424adfedf7c2cbbcda3d09c1648 ChangeLog 19214
 MD5 b6b628180f01eae601d52e9ca5faf725 cyrus-sasl-2.1.19-r1.ebuild 7156
-MD5 811b1beea622694a12feb4d37c1edde4 cyrus-sasl-2.1.20.ebuild 7458
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
-MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
+MD5 04ab88578310e66a55032b38819541a1 cyrus-sasl-2.1.18-r2.ebuild 5427
+MD5 97209eb0ef10fc23c507720fee274660 cyrus-sasl-2.1.20.ebuild 7329
+MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934
 MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
-MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
+MD5 41c1024f02bc0725406a23eeff93edd5 files/saslauthd-2.1.20.conf 906
+MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890
 MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
-MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
-MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
-MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
-MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
+MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540
 MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
-MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
-MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
-MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
+MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
 MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.19-configdir.patch 8231
+MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
+MD5 c355c365d74408c00cdaa25beea6d4f7 files/digest-cyrus-sasl-2.1.20 70
+MD5 c38995773eff23cf7f05b23fe7fba6d3 files/saslauthd.rc6 525
+MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
 MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529
-MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.20-configdir.patch 8231
 MD5 f8ad054201be2531b337375299c4c39b files/cyrus-sasl-2.1.20-gcc4.patch 462
-MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
-MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
+MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906
+MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752
 MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
 MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
+MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
+MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.20-configdir.patch 8231
+MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
+MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
+MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
 MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70
-MD5 d6d8b3c7c3a2aacf656f970a043d3158 files/digest-cyrus-sasl-2.1.19-r1 70
-MD5 c355c365d74408c00cdaa25beea6d4f7 files/digest-cyrus-sasl-2.1.20 70
-MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934
-MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540
-MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906
-MD5 41c1024f02bc0725406a23eeff93edd5 files/saslauthd-2.1.20.conf 906
-MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890
+MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
+MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
+MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
+MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
 MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
-MD5 c38995773eff23cf7f05b23fe7fba6d3 files/saslauthd.rc6 525
-MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752
-MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
+MD5 d6d8b3c7c3a2aacf656f970a043d3158 files/digest-cyrus-sasl-2.1.19-r1 70
+MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBwdpwugEuf3OQ0akRAtlpAJ4kwoPpj4NSHG4QrRAzp+5/iGW0sQCffLr6
+lzCikMGzeR524iVHqYA7Qig=
+=1Vu8
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
index 9f2f23c951c0..1cc817f6dc74 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.20.ebuild,v 1.6 2004/12/16 10:20:05 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild,v 1.7 2004/12/16 18:56:29 kloeri Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
@@ -138,9 +138,6 @@ src_compile() {
 		myconf="${myconf} --with-dblib=none"
 	fi
 
-	# Compaq-sdk checks for -D_REENTRANT and -pthread takes care the cpp stuff.
-	use alpha && append-flags -D_REENTRANT -pthread
-
 	# Detect mips systems properly.
 	gnuconfig_update