Fix building with newer gcc versions and add sh love.

(Portage version: 2.1_pre3-r1)

3 files changed, 39 insertions, 18 deletions

diff --git a/app-crypt/kth-krb/ChangeLog b/app-crypt/kth-krb/ChangeLog
index ee464e7c55dc..9562a468c279 100644
--- a/app-crypt/kth-krb/ChangeLog
+++ b/app-crypt/kth-krb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/kth-krb
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/ChangeLog,v 1.31 2005/07/29 13:16:08 seemant Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/ChangeLog,v 1.32 2006/01/13 11:23:25 vapier Exp $
+
+  13 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/kth-krb-1.2.2-gcc.patch, kth-krb-1.2.2-r2.ebuild:
+  Fix building with newer gcc versions and add sh love.
 
   29 Jul 2005; Seemant Kulleen <seemant@gentoo.org> metadata.xml,
   -kth-krb-1.2.ebuild, -kth-krb-1.2.1.ebuild, -kth-krb-1.2.2.ebuild,
diff --git a/app-crypt/kth-krb/files/kth-krb-1.2.2-gcc.patch b/app-crypt/kth-krb/files/kth-krb-1.2.2-gcc.patch
new file mode 100644
index 000000000000..92fc7a5ac0b2
--- /dev/null
+++ b/app-crypt/kth-krb/files/kth-krb-1.2.2-gcc.patch
@@ -0,0 +1,18 @@
+--- lib/roken/getifaddrs.c
++++ lib/roken/getifaddrs.c
+@@ -669,6 +669,7 @@
+ 	    case IFLA_QDISC:
+ 	      break;
+ 	    default:
++	      ;
+ 	    }
+ 	    break;
+ 	  case RTM_NEWADDR:
+@@ -709,6 +710,7 @@
+ 	    case IFA_CACHEINFO:
+ 	      break;
+ 	    default:
++	      ;
+ 	    }
+ 	  }
+ 	}
diff --git a/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild b/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild
index e8e5d1665e32..b4a77b26787d 100644
--- a/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild
+++ b/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild,v 1.9 2005/09/05 20:08:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild,v 1.10 2006/01/13 11:23:25 vapier Exp $
 
 inherit eutils
 
@@ -10,26 +10,28 @@ SRC_URI="ftp://ftp.pdc.kth.se/pub/krb/src/krb4-${PV}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc s390 sh sparc x86"
 IUSE="ssl afs"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
-	!amd64? ( afs? ( >=net-fs/openafs-1.2.2-r7 ) )
+	afs? ( >=net-fs/openafs-1.2.2-r7 )
 	sys-devel/autoconf"
 
 S=${WORKDIR}/krb4-${PV}
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A}
+	cd "${S}"
 
-	epatch ${FILESDIR}/kth-gentoo.patch
-	epatch ${FILESDIR}/kth-gentoo-ssl.patch
-	epatch ${FILESDIR}/${P}-berkdb.patch
-	epatch ${FILESDIR}/${P}-fPIC.patch
-	epatch ${FILESDIR}/${P}-no_libedit.patch
+	epatch "${FILESDIR}"/kth-gentoo.patch
+	epatch "${FILESDIR}"/kth-gentoo-ssl.patch
+	epatch "${FILESDIR}"/${P}-berkdb.patch
+	epatch "${FILESDIR}"/${P}-fPIC.patch
+	epatch "${FILESDIR}"/${P}-no_libedit.patch
+	epatch "${FILESDIR}"/${P}-gcc.patch
 
+	libtoolize --copy --force || die
 	autoreconf || die
-	libtoolize --copy --force
 }
 
 src_compile() {
@@ -44,9 +46,7 @@ src_compile() {
 }
 
 src_install() {
-
-	make DESTDIR=${D} sysconfdir=${D}/etc \
-		install || die
+	make DESTDIR="${D}" sysconfdir=${D}/etc install || die
 
 	# Doesn't get install otherwise (for some reason, look into this).
 	if use ssl ; then
@@ -58,8 +58,7 @@ src_install() {
 		cd ${S}
 	fi
 
-	dodir /etc/env.d
-	cp ${FILESDIR}/02kth-krb ${D}/etc/env.d
+	doenvd "${FILESDIR}"/02kth-krb
 
 	dodoc ChangeLog README NEWS PROBLEMS TODO