Stable on ppc64

4 files changed, 62 insertions, 28 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 2d510e42164c..9e342b6cb2be 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.59 2004/12/30 04:39:52 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.60 2004/12/30 10:20:14 corsair Exp $
+
+  30 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  +files/mit-krb5-1.3.6-ppc64.patch, mit-krb5-1.3.6.ebuild:
+  Added patch for ppc64 and marked stable
 
   29 Dec 2004; Hardave Riar <hardave@gentoo.org> mit-krb5-1.3.6.ebuild:
   Stable on mips, bug #75143
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 74d7e4e88cd6..8bfab2a3831b 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,38 +1,39 @@
-MD5 973a633c7f812aa79e83a5c82c5b75e1 mit-krb5-1.3.4.ebuild 4332
-MD5 679ff451b45c63eb436f39d3351f6a88 mit-krb5-1.3.5-r1.ebuild 4354
+MD5 1ece5c646afcb4594bcb104de63481c4 ChangeLog 10050
+MD5 43c3a7a1974ef9610bb9458e1a3a4d87 metadata.xml 353
 MD5 b44e7aba0b12d5f8ee680ed75a65a15b mit-krb5-1.3.1-r1.ebuild 4209
-MD5 e297009942fe44de67125a716d9e013b mit-krb5-1.3.6.ebuild 4166
 MD5 25c6e801e8e65ed06eb6995545b7f9a6 mit-krb5-1.3.1.ebuild 4176
-MD5 375c7c56158fa761abec14671e1e455f mit-krb5-1.3.4-r1.ebuild 4380
+MD5 ca478361a3fb4943c5f0d6a13d380d50 mit-krb5-1.3.3-r1.ebuild 4310
 MD5 0c1b0790ee360b15d69f2570f90c3bef mit-krb5-1.3.3.ebuild 4204
+MD5 375c7c56158fa761abec14671e1e455f mit-krb5-1.3.4-r1.ebuild 4380
+MD5 973a633c7f812aa79e83a5c82c5b75e1 mit-krb5-1.3.4.ebuild 4332
+MD5 679ff451b45c63eb436f39d3351f6a88 mit-krb5-1.3.5-r1.ebuild 4354
 MD5 73e725dcff1255556054a6b8fc6477a7 mit-krb5-1.3.5.ebuild 4298
-MD5 ca478361a3fb4943c5f0d6a13d380d50 mit-krb5-1.3.3-r1.ebuild 4310
-MD5 f027b330ba4e02a0085787f9ef4671b2 ChangeLog 9898
-MD5 43c3a7a1974ef9610bb9458e1a3a4d87 metadata.xml 353
-MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.4-autoheader.patch.bz2 379
-MD5 1300b7bf5dff7e1b837041f55c565081 files/mit-krb5-1.3.5-suid_fix.patch.bz2 269
-MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
-MD5 d7dcbbab51ce1849c77c083b8d363c15 files/krb5.initd 1486
-MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
+MD5 16f541f042c7c76242fc83ab67b721ac mit-krb5-1.3.6.ebuild 4202
 MD5 7b9b25de3cffdafa3d572dee9644f83e files/2004-002-patch_1.3.4.txt 7196
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.5-res_search.patch.bz2 1992
-MD5 65a524c259b87b884c0f77739cc686e1 files/mit-krb5-1.3.4-tempfile.patch.bz2 791
-MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.5-autoheader.patch.bz2 379
-MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
-MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1-r1 63
-MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3-r1 60
-MD5 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4-r1 60
-MD5 8f275083c0b04344cbb068d883cda623 files/digest-mit-krb5-1.3.5-r1 60
 MD5 6ddd962c015b6986004819321295aecd files/2004-003-patch_1.3.4.txt 592
-MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.3-res_search.patch.bz2 1992
 MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1 63
+MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1-r1 63
 MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3 60
+MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3-r1 60
 MD5 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4 60
+MD5 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4-r1 60
 MD5 8f275083c0b04344cbb068d883cda623 files/digest-mit-krb5-1.3.5 60
-MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6 67
-MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.3-autoheader.patch.bz2 379
+MD5 8f275083c0b04344cbb068d883cda623 files/digest-mit-krb5-1.3.5-r1 60
+MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
+MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
+MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
+MD5 d7dcbbab51ce1849c77c083b8d363c15 files/krb5.initd 1486
 MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.1-res_search.patch.bz2 1992
 MD5 95cba23977319310f6cf67be1f97a65f files/mit-krb5-1.3.3-aname.patch.bz2 1829
-MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
+MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.3-autoheader.patch.bz2 379
+MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.3-res_search.patch.bz2 1992
+MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.4-autoheader.patch.bz2 379
 MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.4-res_search.patch.bz2 1992
+MD5 65a524c259b87b884c0f77739cc686e1 files/mit-krb5-1.3.4-tempfile.patch.bz2 791
+MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.5-autoheader.patch.bz2 379
+MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.5-res_search.patch.bz2 1992
+MD5 1300b7bf5dff7e1b837041f55c565081 files/mit-krb5-1.3.5-suid_fix.patch.bz2 269
+MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
+MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
+MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6 67
+MD5 fa5e3bd6fb521c29db85ce623905087b files/mit-krb5-1.3.6-ppc64.patch 923
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.6-ppc64.patch b/app-crypt/mit-krb5/files/mit-krb5-1.3.6-ppc64.patch
new file mode 100644
index 000000000000..8ed8659d0ba8
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.6-ppc64.patch
@@ -0,0 +1,28 @@
+--- src/aclocal.m4.orig	2004-12-30 08:05:58.039924632 +0000
++++ src/aclocal.m4	2004-12-30 08:07:55.232945888 +0000
+@@ -1229,10 +1229,21 @@
+     AC_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , -lnsl)))
+   KRB5_AC_ENABLE_DNS
+   if test "$enable_dns" = yes ; then
+-    AC_CHECK_FUNC(res_search, , AC_CHECK_LIB(resolv, res_search,
+-	LIBS="$LIBS -lresolv" ; RESOLV_LIB=-lresolv,
+-	AC_MSG_ERROR(Cannot find resolver support routine res_search in -lresolv.)
+-    ))
++    AC_MSG_CHECKING(for res_search)
++	AC_TRY_LINK_FUNC(res_search, AC_MSG_RESULT(yes),
++	  AC_MSG_RESULT(no))
++	saved_LIBS="$LIBS"
++	LIBS="$LIBS -lresolv"
++	AC_MSG_CHECKING(for res_search in -lresolv)
++	AC_LINK_IFELSE([[
++#include <resolv.h>
++int main()
++{
++	res_search (0, 0, 0, 0, 0);
++	return 0;
++}]],
++    LIBS="$LIBS -lresolv"; RESOLV_LIB=-lresolv; AC_MSG_RESULT(yes),
++	LIBS="$saved_LIBS"; AC_MSG_RESULT(no))
+   fi
+   AC_SUBST(RESOLV_LIB)
+   ])
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.6.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.6.ebuild
index 3a90caf3091d..1df9c5249e81 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.3.6.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.6.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/app-crypt/mit-krb5/mit-krb5-1.3.6.ebuild,v 1.3 2004/12/30 04:39:52 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.6.ebuild,v 1.4 2004/12/30 10:20:14 corsair Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/1.3/${MY_P}-signed.tar"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 mips ~ppc ppc64 ~s390 sparc ~x86"
 IUSE="krb4 static"
 
 DEPEND="virtual/libc
@@ -26,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 	tar -zxf ${MY_P}.tar.gz
 	cd ${S}
+	epatch ${FILESDIR}/${P}-ppc64.patch
 }
 
 src_compile() {