Unified diff between detailing changes made for acahi support.

ftpbase.diff (text/plain), 1.58 KB, created by Johannes Truschnigg on 2009-03-09 21:39:54 UTC

--- /usr/portage/net-ftp/ftpbase/ftpbase-0.01-r1.ebuild	2008-11-06 03:36:19.000000000 +0100
+++ /usr/portage/net-ftp/ftpbase/ftpbase-0.02.ebuild	2009-03-09 20:07:21.000000000 +0100
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ftpbase-0.01-r1.ebuild,v 1.7 2008/11/06 02:32:15 vapier Exp $
+# $Header: $
 
 inherit eutils pam
 
@@ -11,12 +11,14 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="pam"
+IUSE="pam avahi"
 
 DEPEND="pam? ( virtual/pam )
 	!<net-ftp/proftpd-1.2.10-r6
 	!<net-ftp/pure-ftpd-1.0.20-r2
-	!<net-ftp/vsftpd-2.0.3-r1"
+	!<net-ftp/vsftpd-2.0.3-r1
+	avahi? ( net-dns/avahi )
+	!<net-dns/avahi-0.6.24"
 
 S=${WORKDIR}
 
@@ -39,6 +41,11 @@
 		check_collision "${ROOT}etc/pam.d/ftp" "${FILESDIR}/ftp-pamd" || collide=true
 	fi
 
+	if use avahi ; then
+		check_collision "${ROOT}etc/avahi/services/ftp.service" \
+		"${FILESDIR}/ftp.service" || collide=true
+	fi
+
 	if ${collide} ; then
 		eerror
 		eerror "Those files listed above have to be removed in order to"
@@ -74,6 +81,12 @@
 	insinto /etc
 	doins "${FILESDIR}/ftpusers" || die
 
+	# If avahi is enabled and available, register the ftp service with it.
+	if use avahi ; then
+		insinto /etc/avahi/services
+		doins "${FILESDIR}/ftp.service"
+	fi
+
 	# Ideally we would create the home directory here with a dodir.
 	# But we cannot until bug #9849 is solved - so we kludge in pkg_postinst()