[patch] Patch with fixes for direct rc-update, virtual/krb5 use, doc install, and coding style fixes

netatalk-2.0.1.patch (text/plain), 2.10 KB, created by AD Rutledge on 2004-11-10 23:07:11 UTC

--- netatalk-2.0.1.ebuild.orig	2004-11-11 00:52:27.809984760 -0600
+++ netatalk-2.0.1.ebuild	2004-11-11 00:51:34.434099128 -0600
@@ -20,8 +20,8 @@
 	slp? ( net-libs/openslp )
 	cups? ( net-print/cups )
 	afs? ( net-fs/openafs )
-	kerberos? ( app-crypt/mit-krb5 )
-	krb4? ( app-crypt/mit-krb5 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )
 	cracklib? ( sys-libs/cracklib )"
 	
 DEPEND="${RDEPEND}
@@ -42,14 +42,16 @@
 	# -AD Rutledge
 	if use slp; then
 		myconf="${myconf} --enable-srvloc"
-		mv ${S}/distrib/initscripts/rc.atalk.gentoo.tmpl ${S}/distrib/initscripts/rc.atalk.gentoo.tmpl.orig
-		sed -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \
-			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl.orig > ${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
+		sed -i -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \
+			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
 	fi
 
-	# FIXME: Make autoconf put these on whatever line builds
-	# afppasswd.
-	append-ldflags -Wl,-z,now
+	# This is a fix to add -z,now to the linkflags for libraries and 
+	# to stop the braindead makefiles upstream hands us from running
+	# rc-update and causing an access violation
+	sed -i -e 's/^\(@USE_GENTOO_TRUE@[[:space:]]\+-rc-update add atalk default[[:space:]]*\)/#\1/' \
+		${S}/distrib/initscripts/Makefile.in
+	sed -i -e 's/^\([[:space:]]\+\)\(-D_PATH_AFP.*\)/\1-Wl,-z,now \2/' ${S}/bin/afppasswd/Makefile.in
 
 	econf \
 		$(use_with pam) \
@@ -64,6 +66,11 @@
 		--enable-gentoo \
 		${myconf} || die "netatalk configure failed"
 
+	# This is a fix for the very nasty behavior of running rc-update
+	# in the Makefile.
+	sed -i -e 's/^\([[:space:]\t]*-rc-update add atalk default[[:space:]\t]*\)/#\1/' \
+		${S}/distrib/initscripts/Makefile
+
 	emake || die "netatalk emake failed"
 }
 
@@ -71,11 +78,9 @@
 	make DESTDIR=${D} install || die "netatalk make install failed"
 
 	# install docs
-	dodoc CONTRIBUTORS COPYING COPYRIGHT
+	dodoc CONTRIBUTORS
 	dodoc NEWS README TODO VERSION
 
 	# install init script
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	doexe ${S}/distrib/initscripts/atalk
+	doinitd ${S}/distrib/initscripts/atalk
 }