stable

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index a1f6a882eaa6bff86941a3500eb84c0ae2a79b78..90c6981dece5b527053b346de89bc00dee70540a 100644 (file)
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.63 2005/01/01 12:35:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.64 2005/01/01 20:37:53 blubb Exp $
+
+  01 Jan 2005; Simon Stelling <blubb@gentoo.org>
+  +files/mit-krb5-1.3.6-64bit.patch, -files/mit-krb5-1.3.6-ppc64.patch,
+  mit-krb5-1.3.6-r1.ebuild:
+  stable on amd64; bug #75143
 
 *mit-krb5-1.3.6-r1 (31 Dec 2004)
 
@@ -8,7 +13,7 @@
   mit-krb5-1.3.6.ebuild:
   implemented Koon's suggestions from bug #75143
 
-  30 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> mit-krb5-1.3.6.ebuild:
+  30 Dec 2004; Bryan Ã\83Â\98stergaard <kloeri@gentoo.org> mit-krb5-1.3.6.ebuild:
   Stable on alpha, bug 75143.
 
   30 Dec 2004; Markus Rothe <corsair@gentoo.org>
@@ -48,7 +53,7 @@
   15 Oct 2004; Jason Wever <weeve@gentoo.org> mit-krb5-1.3.4-r1.ebuild:
   Stable on sparc wrt security bug #66359.
 
-  15 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> mit-krb5-1.3.4-r1.ebuild:
+  15 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> mit-krb5-1.3.4-r1.ebuild:
   Stable on alpha, bug 66359.
 
   15 Oct 2004; <SeJo@gentoo.org> mit-krb5-1.3.4-r1.ebuild:
@@ -91,7 +96,7 @@
   02 Sep 2004; Hardave Riar <hardave@gentoo.org> mit-krb5-1.3.4.ebuild:
   Stable on mips. Bug #62417
 
-  02 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> mit-krb5-1.3.4.ebuild:
+  02 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> mit-krb5-1.3.4.ebuild:
   Stable on alpha, bug 62417.
 
   01 Sep 2004; <SeJo@gentoo.org> mit-krb5-1.3.4.ebuild:
@@ -143,7 +148,7 @@
   17 Jun 2004; Jason Wever <weeve@gentoo.org> mit-krb5-1.3.3-r1.ebuild:
   Marked stable on sparc wrt bug #52744.
 
-  17 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> mit-krb5-1.3.3-r1.ebuild:
+  17 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> mit-krb5-1.3.3-r1.ebuild:
   Stable on alpha, see bug #52744.
 
 *mit-krb5-1.3.3-r1 (15 Jun 2004)
@@ -237,7 +242,7 @@
   Added Martti Rannajarvi's fixes. Fixes #3480
 
   07 Dec 2002; Dave Love <dlove@cashmeresoftware.com>, 
-  Martti Rannanjärvi <grypt@kapsi.net>:
+  Martti Rannanjärvi <grypt@kapsi.net>:
   
   Optional kerberos4 support by krb4 USE flag, default configuration
   files and an init.d script. --localstatedir to /etc.

diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index dce2254e180e23e2eb28eeaeb58df54a12730eb2..8eb94b9c17f55a40172dfa5606ddca08da8c4e07 100644 (file)
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,41 +1,41 @@
-MD5 038169dbbb2391fcb8cc0f4a710eb7e6 ChangeLog 10345
 MD5 43c3a7a1974ef9610bb9458e1a3a4d87 metadata.xml 353
 MD5 e0d32f4e4a830c3cba1dc81930488aa6 mit-krb5-1.3.1-r1.ebuild 4215
 MD5 738e47cc713ee703aa340c6e414143f7 mit-krb5-1.3.1.ebuild 4182
-MD5 b4a6865066a31de57fc8c2ad7625f537 mit-krb5-1.3.3.ebuild 4207
 MD5 3e40cc8a9ecfc37cc8b83c9cd0ac4b12 mit-krb5-1.3.3-r1.ebuild 4313
-MD5 398a1fae4a8f3d39ad5192b2a4721565 mit-krb5-1.3.4.ebuild 4337
-MD5 019c6e7077c4cd18818a2fcf7a3b06b3 mit-krb5-1.3.5.ebuild 4301
+MD5 b4a6865066a31de57fc8c2ad7625f537 mit-krb5-1.3.3.ebuild 4207
 MD5 1f0ab28ecf3a6a659e80896becd2ed4e mit-krb5-1.3.4-r1.ebuild 4384
+MD5 398a1fae4a8f3d39ad5192b2a4721565 mit-krb5-1.3.4.ebuild 4337
 MD5 0a8d58d17a8674e8e4ba1c206a04e699 mit-krb5-1.3.5-r1.ebuild 4355
+MD5 019c6e7077c4cd18818a2fcf7a3b06b3 mit-krb5-1.3.5.ebuild 4301
 MD5 4f44fd6d264495d9a34e01f48d8fe4e9 mit-krb5-1.3.6.ebuild 4168
-MD5 b645fd3a2d086c915e76c2de18e72749 mit-krb5-1.3.6-r1.ebuild 4223
+MD5 0d963a1de876954b86f061db975d0f74 mit-krb5-1.3.6-r1.ebuild 4222
+MD5 e4489af0a910b0e51e9a9ff1d5048a42 ChangeLog 10526
+MD5 7b9b25de3cffdafa3d572dee9644f83e files/2004-002-patch_1.3.4.txt 7196
+MD5 6ddd962c015b6986004819321295aecd files/2004-003-patch_1.3.4.txt 592
 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 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 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4-r1 60
-MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
-MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
-MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3-r1 60
 MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.3-autoheader.patch.bz2 379
-MD5 8f275083c0b04344cbb068d883cda623 files/digest-mit-krb5-1.3.5-r1 60
-MD5 7b9b25de3cffdafa3d572dee9644f83e files/2004-002-patch_1.3.4.txt 7196
-MD5 6ddd962c015b6986004819321295aecd files/2004-003-patch_1.3.4.txt 592
-MD5 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4 60
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.4-res_search.patch.bz2 1992
-MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6 67
-MD5 8f275083c0b04344cbb068d883cda623 files/digest-mit-krb5-1.3.5 60
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.1-res_search.patch.bz2 1992
 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 65a524c259b87b884c0f77739cc686e1 files/mit-krb5-1.3.4-tempfile.patch.bz2 791
-MD5 fa5e3bd6fb521c29db85ce623905087b files/mit-krb5-1.3.6-ppc64.patch 923
+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 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6-r1 67
+MD5 fa5e3bd6fb521c29db85ce623905087b files/mit-krb5-1.3.6-64bit.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-64bit.patch
similarity index 100%
rename from app-crypt/mit-krb5/files/mit-krb5-1.3.6-ppc64.patch
rename to app-crypt/mit-krb5/files/mit-krb5-1.3.6-64bit.patch

diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.6-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.6-r1.ebuild
index b525d098ae01bacfe708821e55c013631ceb9557..82ab983c5d9b6358cab22ea8e45b8215397170d4 100644 (file)
--- a/app-crypt/mit-krb5/mit-krb5-1.3.6-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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-r1.ebuild,v 1.2 2005/01/01 12:35:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.6-r1.ebuild,v 1.3 2005/01/01 20:37:53 blubb Exp $
 
-inherit eutils
+inherit eutils 64-bit
 
 MY_P=${PN/mit-}-${PV}
 S=${WORKDIR}/${MY_P}/src
@@ -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,7 +26,7 @@ src_unpack() {
        unpack ${A}
        tar -zxf ${MY_P}.tar.gz
        cd ${S}
-       use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
+       64-bit && epatch ${FILESDIR}/${P}-64-bit.patch
 }
 
 src_compile() {