ok, just install to regular locations -- no more custom location stuff -- at least, not for now

Package-Manager: portage-2.0.51.22-r1

3 files changed, 42 insertions, 45 deletions

diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 91e0477de73f..e22ae770e6f6 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,13 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5adff93564f96e3d6c8bb7744a4bb8fb ChangeLog 14044
-MD5 f3ea9dd1d52f37139fbc4d101044f821 metadata.xml 241
-MD5 d1f151f61415d07f3b2865c3e160a480 mit-krb5-1.4.ebuild 2489
 MD5 825f0126519fefa7b4e9fb330c9e81b3 mit-krb5-1.3.6-r2.ebuild 4276
-MD5 a02d4871edc472776ad7ccc23fb8331d files/digest-mit-krb5-1.4 65
-MD5 07a38334b351973026f8616b79662cfb files/mit-krb5-1.4-2005-001.patch 2758
-MD5 1db67f7788b8dbae908d29565c7fca2b files/mit-krb5-1.3.6-gcc4.patch 1139
+MD5 f3ea9dd1d52f37139fbc4d101044f821 metadata.xml 241
+MD5 5adff93564f96e3d6c8bb7744a4bb8fb ChangeLog 14044
+MD5 28f4fce6e3525361a12f6f5320078f82 mit-krb5-1.4.ebuild 2111
 MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
 MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
 MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
@@ -17,10 +11,7 @@ MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
 MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
 MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6-r2 67
 MD5 00e92c082ffe700b74cfd14c64260d18 files/mit-krb5-1.3.6-telnet.patch.bz2 841
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCn6oUCRZPokWLroQRAtIBAJ91BH/H/YncJmSAfTdzSLnQUDHg2wCeJHhS
-6z0bMHtbyUXs/Gy+ofqJaTE=
-=fREN
------END PGP SIGNATURE-----
+MD5 a02d4871edc472776ad7ccc23fb8331d files/digest-mit-krb5-1.4 65
+MD5 07a38334b351973026f8616b79662cfb files/mit-krb5-1.4-2005-001.patch 2758
+MD5 ae7e2bde0b20e580f49d5a3c524b445b files/mit-krb5-1.4-lazyldflags.patch 509
+MD5 1db67f7788b8dbae908d29565c7fca2b files/mit-krb5-1.3.6-gcc4.patch 1139
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.4-lazyldflags.patch b/app-crypt/mit-krb5/files/mit-krb5-1.4-lazyldflags.patch
new file mode 100644
index 000000000000..ad2adc1dd0dc
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.4-lazyldflags.patch
@@ -0,0 +1,19 @@
+--- krb5-1.4/src/clients/ksu/Makefile.in.orig	2004-04-29 18:51:10.000000000 -0400
++++ krb5-1.4/src/clients/ksu/Makefile.in	2005-04-28 16:51:37.000000000 -0400
+@@ -8,6 +8,7 @@
+ PROG_RPATH=$(KRB5_LIBDIR)
+ 
+ KSU_LIBS=@KSU_LIBS@
++LAZY_LDFLAGS=-Wl,-z,now
+ 
+ SRCS = \
+ 	$(srcdir)/krb_auth_su.c \
+@@ -28,7 +29,7 @@
+ all:: ksu
+ 
+ ksu: $(OBJS) $(KRB5_BASE_DEPLIBS)
+-	$(CC_LINK) -o $@ $(OBJS) $(KRB5_BASE_LIBS) $(KSU_LIBS)
++	$(CC_LINK) -o $@ $(OBJS) $(KRB5_BASE_LIBS) $(KSU_LIBS) $(LAZY_LDFLAGS)
+ 
+ clean::
+ 	$(RM) ksu
diff --git a/app-crypt/mit-krb5/mit-krb5-1.4.ebuild b/app-crypt/mit-krb5/mit-krb5-1.4.ebuild
index ae12d509a0a5..b3a06ce068ee 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.4.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.4 2005/04/08 20:41:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.ebuild,v 1.5 2005/06/06 13:44:47 seemant Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="krb4 static tcltk ipv6 doc tetex"
 
-RDEPEND="virtual/libc"
-#	!virtual/krb5"
+RDEPEND="virtual/libc
+	!virtual/krb5"
 
 DEPEND="${RDEPEND}
 	sys-libs/com_err
@@ -27,8 +27,9 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/krb5"
 
 src_unpack() {
-	unpack ${A}; tar -zxf ${MY_P}.tar.gz; cd ${S}
+	unpack ${A}; tar zxf ${MY_P}.tar.gz; cd ${S}
 	epatch ${FILESDIR}/${P}-2005-001.patch
+	epatch ${FILESDIR}/${P}-lazyldflags.patch
 }
 
 src_compile() {
@@ -36,34 +37,24 @@ src_compile() {
 	export DB_LIB="/usr/$(get_libdir)/libdb.so"
 
 	econf \
-		$(use_enable static) \
 		$(use_with krb4) \
-		$(use_enable ipv6) \
 		$(use_with tcltk tcl) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
 		--enable-shared \
 		--with-system-et --with-system-ss --with-system-db \
 		--enable-dns-for-realm \
-		--program-prefix=mit- \
-		--sysconfdir=/etc/kerberos \
-		--libdir=/usr/$(get_libdir)/kerberos/mit \
-		--includedir=/usr/include/kerberos/mit || die
-
-	emake || die
+		|| die
 
-	# Now, remake the ksu binary with -Wl,-z,now in CFLAGS
-	append-ldflags "-Wl,-z,now"
-	emake -C clients/ksu clean || die
-	emake LDFLAGS="${LDFLAGS}" -C clients/ksu || die
+	MAKEOPTS=-j1 emake || die
 
-	if use doc
-	then
+	if use doc ; then
 		cd ../doc
 		rm man2html && ln -sf ${ROOT}/usr/bin/man2html
 
 		make || die
 
-		if use tetex
-		then
+		if use tetex ; then
 			cd api
 			make || die
 		fi
@@ -76,13 +67,6 @@ src_install() {
 		EXAMPLEDIR=/usr/share/doc/${PF}/examples \
 		install || die
 
-	# Fix remaining namespace issues
-	mv ${D}/usr/bin/{,mit-}krb5-config
-	mv ${D}/usr/sbin/{,mit-}kadmin
-	mv ${D}/usr/sbin/{,mit-}kadmind
-	mv ${D}/usr/sbin/{,mit-}ktutil
-
-
 	cd ..
 	dodoc README
 	doinfo doc/*.texinfo
@@ -91,13 +75,16 @@ src_install() {
 	then
 		dohtml -r doc
 		use tetex \
-			&& dodoc doc/api/*.ps \
-			|| dodoc doc/api/*.{tex,sty}
+			&& dodoc doc/api/*.{tex,sty} \
+			|| dodoc doc/api/*.ps
 
 	fi
 
 	newinitd ${FILESDIR}/mit-krb5kadmind.initd mit-krb5kadmind
 	newinitd ${FILESDIR}/mit-krb5kdc.initd mit-krb5kdc
+
+	insinto /etc
+	doins ${FILESDIR}/k{rb5,dc}.conf
 }
 
 pkg_postinst() {