Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 69526 | Differences between
and this patch

Collapse All | Expand All

(-)netatalk-2.0.1.ebuild.orig (-12 / +17 lines)
Lines 20-27 Link Here
20
	slp? ( net-libs/openslp )
20
	slp? ( net-libs/openslp )
21
	cups? ( net-print/cups )
21
	cups? ( net-print/cups )
22
	afs? ( net-fs/openafs )
22
	afs? ( net-fs/openafs )
23
	kerberos? ( app-crypt/mit-krb5 )
23
	kerberos? ( virtual/krb5 )
24
	krb4? ( app-crypt/mit-krb5 )
24
	krb4? ( virtual/krb5 )
25
	cracklib? ( sys-libs/cracklib )"
25
	cracklib? ( sys-libs/cracklib )"
26
	
26
	
27
DEPEND="${RDEPEND}
27
DEPEND="${RDEPEND}
Lines 42-55 Link Here
42
	# -AD Rutledge
42
	# -AD Rutledge
43
	if use slp; then
43
	if use slp; then
44
		myconf="${myconf} --enable-srvloc"
44
		myconf="${myconf} --enable-srvloc"
45
		mv ${S}/distrib/initscripts/rc.atalk.gentoo.tmpl ${S}/distrib/initscripts/rc.atalk.gentoo.tmpl.orig
45
		sed -i -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \
46
		sed -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \
46
			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
47
			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl.orig > ${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
48
	fi
47
	fi
49
48
50
	# FIXME: Make autoconf put these on whatever line builds
49
	# This is a fix to add -z,now to the linkflags for libraries and 
51
	# afppasswd.
50
	# to stop the braindead makefiles upstream hands us from running
52
	append-ldflags -Wl,-z,now
51
	# rc-update and causing an access violation
52
	sed -i -e 's/^\(@USE_GENTOO_TRUE@[[:space:]]\+-rc-update add atalk default[[:space:]]*\)/#\1/' \
53
		${S}/distrib/initscripts/Makefile.in
54
	sed -i -e 's/^\([[:space:]]\+\)\(-D_PATH_AFP.*\)/\1-Wl,-z,now \2/' ${S}/bin/afppasswd/Makefile.in
53
55
54
	econf \
56
	econf \
55
		$(use_with pam) \
57
		$(use_with pam) \
Lines 64-69 Link Here
64
		--enable-gentoo \
66
		--enable-gentoo \
65
		${myconf} || die "netatalk configure failed"
67
		${myconf} || die "netatalk configure failed"
66
68
69
	# This is a fix for the very nasty behavior of running rc-update
70
	# in the Makefile.
71
	sed -i -e 's/^\([[:space:]\t]*-rc-update add atalk default[[:space:]\t]*\)/#\1/' \
72
		${S}/distrib/initscripts/Makefile
73
67
	emake || die "netatalk emake failed"
74
	emake || die "netatalk emake failed"
68
}
75
}
69
76
Lines 71-81 Link Here
71
	make DESTDIR=${D} install || die "netatalk make install failed"
78
	make DESTDIR=${D} install || die "netatalk make install failed"
72
79
73
	# install docs
80
	# install docs
74
	dodoc CONTRIBUTORS COPYING COPYRIGHT
81
	dodoc CONTRIBUTORS
75
	dodoc NEWS README TODO VERSION
82
	dodoc NEWS README TODO VERSION
76
83
77
	# install init script
84
	# install init script
78
	dodir /etc/init.d
85
	doinitd ${S}/distrib/initscripts/atalk
79
	exeinto /etc/init.d
80
	doexe ${S}/distrib/initscripts/atalk
81
}
86
}

Return to bug 69526