diff -Nru mit-krb5.orig/ChangeLog mit-krb5/ChangeLog
--- mit-krb5.orig/ChangeLog	2003-03-30 20:50:49.000000000 +0300
+++ mit-krb5/ChangeLog	2003-04-06 21:47:28.000000000 +0300
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /home/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.4 2003/03/30 17:40:52 aliz Exp $
+# $Header: $
+
+  date; name <mail> mit-krb5-1.2.7.ebuild :
+  Initd script split, merge mit packages into one mit-krb5 ebuild,
+  support for static build with USE="static", have html docs installed, pass
+  $CFLAGS and $CXXFLAGS to configure, remove the unnecessary 1.2.2 patch.
 
 *mit-krb5-1.2.7 (30 Mar 2003)
 
diff -Nru mit-krb5.orig/files/mit-krb5kadmind.initd mit-krb5/files/mit-krb5kadmind.initd
--- mit-krb5.orig/files/mit-krb5kadmind.initd	1970-01-01 02:00:00.000000000 +0200
+++ mit-krb5/files/mit-krb5kadmind.initd	2003-04-06 20:51:54.000000000 +0300
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+
+#---------------------------------------------------------------------------
+# This script starts/stops the MIT Kerberos 5 Admin daemon
+#---------------------------------------------------------------------------
+
+daemon="MIT Kerberos 5 Admin daemon"	
+exec="/usr/sbin/kadmind"
+
+opts="start stop restart"
+
+depend() {
+	need net mit-krb5kdc 
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() { 
+        ebegin "Stopping $daemon"
+        start-stop-daemon --stop --quiet --oknodo --exec ${exec} 1>&2
+        eend $? "Error stopping $daemon"
+}
+
+restart() {
+   svc_stop
+   svc_start
+}
diff -Nru mit-krb5.orig/files/mit-krb5kdc.initd mit-krb5/files/mit-krb5kdc.initd
--- mit-krb5.orig/files/mit-krb5kdc.initd	1970-01-01 02:00:00.000000000 +0200
+++ mit-krb5/files/mit-krb5kdc.initd	2003-04-06 20:51:54.000000000 +0300
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+
+#---------------------------------------------------------------------------
+# This script starts/stops the MIT Kerberos 5 KDC
+#---------------------------------------------------------------------------
+
+daemon="MIT Kerberos 5 KDC"	
+exec="/usr/sbin/krb5kdc"
+
+opts="start stop restart"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() { 
+        ebegin "Stopping $daemon"
+        start-stop-daemon --stop --quiet --oknodo --exec ${exec} 1>&2
+        eend $? "Error stopping $daemon"
+}
+
+restart() {
+   svc_stop
+   svc_start
+}
diff -Nru mit-krb5.orig/mit-krb5-1.2.7.ebuild mit-krb5/mit-krb5-1.2.7.ebuild
--- mit-krb5.orig/mit-krb5-1.2.7.ebuild	2003-03-31 11:50:50.000000000 +0300
+++ mit-krb5/mit-krb5-1.2.7.ebuild	2003-04-06 21:16:00.000000000 +0300
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.2.7.ebuild,v 1.2 2003/03/31 08:27:40 aliz Exp $
+# $Header: $
 
 inherit eutils
 
@@ -12,10 +12,10 @@
         http://web.mit.edu/kerberos/www/advisories/2003-004-krb4_patchkit.tar.gz"
 DESCRIPTION="MIT Kerberos V"
 HOMEPAGE="http://web.mit.edu/kerberos/www/"
-IUSE="krb4"
+IUSE="krb4 static"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86"
+KEYWORDS="x86 sparc ppc alpha"
 PROVIDE="virtual/krb5"
 DEPEND="virtual/glibc"
 
@@ -35,7 +35,7 @@
           | xargs -n1 perl -pi.orig -e '
                 $.==1 && s/^/#include <errno.h>\n/;
                 s/extern\s+int\s+errno\s*\;//;'
-        eend 0
+        eend $?
 }
 
 src_compile() {
@@ -44,10 +44,14 @@
 	use krb4 && myconf="${myconf} --with-krb4 --enable-krb4" \
 		|| myconf="${myconf} --without-krb4 --disable-krb4"
 
+	use static && myconf="${myconf} --disable-shared --enable-static" \
+		|| myconf="${myconf} --enable-shared --disable-static"
+
 	econf \
-		--mandir=/usr/share/man \
+		--with-cc="${CC}" \
+		--with-ccopts="${CFLAGS}" \
+		--with-cppopts="${CXXFLAGS}" \
 		--localstatedir=/etc \
-		--enable-shared \
 		--host=${CHOST} \
 		--prefix=/usr \
 		--enable-dns \
@@ -58,8 +62,10 @@
 
 src_install () {
 	make DESTDIR=${D} install || die
+	
 	cd ..
 	dodoc README
+	dohtml doc/*.html
 
 	# Begin client rename and install
 	for i in {telnetd,ftpd}
@@ -74,17 +80,18 @@
 	done
 										
 	insinto /etc
-	newins ${FILESDIR}/krb5.conf krb5.conf
+		newins ${FILESDIR}/krb5.conf krb5.conf
 	insinto /etc/krb5kdc
-	newins ${FILESDIR}/kdc.conf kdc.conf
-	insinto /etc/conf.d
-	newins ${FILESDIR}/krb5.confd krb5
+		newins ${FILESDIR}/kdc.conf kdc.conf
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/krb5.initd krb5
+		newexe ${FILESDIR}/mit-krb5kadmind.initd mit-krb5kadmind
+		newexe ${FILESDIR}/mit-krb5kdc.initd mit-krb5kdc
 }
 
 pkg_postinst() {
-	einfo "Configuration files are now under /etc."
-	einfo "The client apps are now installed with the k prefix"
+	einfo "See /usr/share/doc/${MY_P}/html/admin.html for documentation."
+	echo ""
+	einfo "The client apps are installed with the k prefix"
 	einfo "(ie. kftp, kftpd, ktelnet, ktelnetd, etc...)"
+	echo ""
 }