Require latest autotools, fix quoting of ${S} and ${D}, add patch to provide a --without-xfs switch; disable xfs for the stable version, add an xfs useflag and depend on xfsprogs and an old copy of linux-headers for the new version (see bug #148438). Dropped sh keyword because of missing xfsprogs.

(Portage version: 2.1.2_pre1-r1)

5 files changed, 149 insertions, 10 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 99b6763e44b8..943978db1631 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.45 2006/05/20 14:51:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.46 2006/09/23 13:29:32 flameeyes Exp $
+
+*netatalk-2.0.3-r3 (23 Sep 2006)
+
+  23 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netatalk-2.0.3-xfs.patch, netatalk-2.0.3-r2.ebuild,
+  +netatalk-2.0.3-r3.ebuild:
+  Require latest autotools, fix quoting of ${S} and ${D}, add patch to provide
+  a --without-xfs switch; disable xfs for the stable version, add an xfs
+  useflag and depend on xfsprogs and an old copy of linux-headers for the new
+  version (see bug #148438). Dropped sh keyword because of missing xfsprogs.
 
   20 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   netatalk-2.0.3-r2.ebuild:
diff --git a/net-fs/netatalk/files/digest-netatalk-2.0.3-r3 b/net-fs/netatalk/files/digest-netatalk-2.0.3-r3
new file mode 100644
index 000000000000..63044205ed9e
--- /dev/null
+++ b/net-fs/netatalk/files/digest-netatalk-2.0.3-r3
@@ -0,0 +1,3 @@
+MD5 28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2 1471804
+RMD160 29b763400a45797ac4a8e499d5328aa91a091c91 netatalk-2.0.3.tar.bz2 1471804
+SHA256 25e004732f471de0dd9a21ab129ee799da018fce3b313d4ab5e6f52e6e9e3998 netatalk-2.0.3.tar.bz2 1471804
diff --git a/net-fs/netatalk/files/netatalk-2.0.3-xfs.patch b/net-fs/netatalk/files/netatalk-2.0.3-xfs.patch
new file mode 100644
index 000000000000..e91ebcebd225
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-2.0.3-xfs.patch
@@ -0,0 +1,22 @@
+Index: netatalk-2.0.3/configure.in
+===================================================================
+--- netatalk-2.0.3.orig/configure.in
++++ netatalk-2.0.3/configure.in
+@@ -694,12 +694,16 @@ fi
+ #		AC_MSG_RESULT([enabling quotactl wrapper])
+ #	)
+ 
++AC_ARG_WITH([xfs],
++	AS_HELP_STRING([--without-xfs], [Build without XFS filesystem quota support]))
++
++if test "x$with_xfs" != "xno"; then
+         # For quotas on Linux XFS filesystems
+         AC_CHECK_HEADERS(linux/xqm.h linux/xfs_fs.h)
+         AC_CHECK_HEADERS(xfs/libxfs.h xfs/xqm.h xfs/xfs_fs.h)
+         # For linux > 2.5.56
+         AC_CHECK_HEADERS(linux/dqblk_xfs.h)
+-
++fi
+ 
+ 	dnl ----- as far as I can tell, dbtob always does the wrong thing
+ 	dnl ----- on every single version of linux I've ever played with.
diff --git a/net-fs/netatalk/netatalk-2.0.3-r2.ebuild b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
index 6c0d233def5f..fb5c3984092f 100644
--- a/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
+++ b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r2.ebuild,v 1.11 2006/05/20 14:51:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r2.ebuild,v 1.12 2006/09/23 13:29:32 flameeyes Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
 
 inherit eutils pam flag-o-matic autotools
 IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib"
@@ -25,7 +28,7 @@ RDEPEND=">=sys-libs/db-4.2.52
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# until someone that understands their config script build
 	# system gets a patch pushed upstream to make
@@ -34,12 +37,13 @@ src_unpack() {
 	if use slp; then
 		myconf="${myconf} --enable-srvloc"
 		sed -i -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \
-			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
+			"${S}"/distrib/initscripts/rc.atalk.gentoo.tmpl
 	fi
 
 	epatch "${FILESDIR}/${P}-setXid.patch"
 	epatch "${FILESDIR}/${P}-db43.patch"
 	epatch "${FILESDIR}/${P}-newerdb.patch"
+	epatch "${FILESDIR}/${P}-xfs.patch"
 	AT_M4DIR="macros" eautoreconf
 }
 
@@ -57,6 +61,7 @@ src_compile() {
 		$(use_enable slp srvloc) \
 		$(use_with cracklib) \
 		$(use_with elibc_glibc shadow) \
+		--without-xfs \
 		--disable-afs \
 		--enable-fhs \
 		--with-bdb=/usr \
@@ -67,25 +72,25 @@ src_compile() {
 	emake || die "netatalk emake failed"
 
 	# Create the init script manually (it's more messy to --enable-gentoo)
-	cd ${S}/distrib/initscripts
+	cd "${S}"/distrib/initscripts
 	emake rc.atalk.gentoo
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "netatalk make install failed"
+	make DESTDIR="${D}" install || die "netatalk make install failed"
 
 	dodoc CONTRIBUTORS NEWS README TODO VERSION
 
-	newinitd ${S}/distrib/initscripts/rc.atalk.gentoo atalk
+	newinitd "${S}"/distrib/initscripts/rc.atalk.gentoo atalk
 
 	# The pamd file isn't what we need, use pamd_mimic_system
-	rm -rf ${D}/etc/pam.d
+	rm -rf "${D}/etc/pam.d"
 	pamd_mimic_system netatalk auth account password session
 
 	# Move /usr/include/netatalk to /usr/include/netatalk2 to avoid collisions
 	# with /usr/include/netatalk/at.h provided by glibc (strange, uh?)
 	# Packages that wants to link to netatalk should then probably change the
-	# includepath then, but right now, nothing users netatalk.
+	# includepath then, but right now, nothing uses netatalk.
 	# On a side note, it also solves collisions with freebsd-lib and other libcs
-	mv ${D}/usr/include/netatalk{,2}
+	mv "${D}"/usr/include/netatalk{,2}
 }
diff --git a/net-fs/netatalk/netatalk-2.0.3-r3.ebuild b/net-fs/netatalk/netatalk-2.0.3-r3.ebuild
new file mode 100644
index 000000000000..501065bc4ce6
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.0.3-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r3.ebuild,v 1.1 2006/09/23 13:29:32 flameeyes Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils pam flag-o-matic autotools
+IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib xfs"
+
+DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://netatalk.sourceforge.net"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND=">=sys-libs/db-4.2.52
+	cracklib? ( sys-libs/cracklib )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	slp? ( net-libs/openslp )
+	cups? ( net-print/cups )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	xfs? ( sys-fs/xfsprogs
+		<sys-kernel/linux-headers-2.6.16 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# until someone that understands their config script build
+	# system gets a patch pushed upstream to make
+	# --enable-srvloc passed to configure also add slpd to the
+	# use line on the initscript, we'll need to do it this way
+	if use slp; then
+		myconf="${myconf} --enable-srvloc"
+		sed -i -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \
+			"${S}"/distrib/initscripts/rc.atalk.gentoo.tmpl
+	fi
+
+	epatch "${FILESDIR}/${P}-setXid.patch"
+	epatch "${FILESDIR}/${P}-db43.patch"
+	epatch "${FILESDIR}/${P}-newerdb.patch"
+	epatch "${FILESDIR}/${P}-xfs.patch"
+	AT_M4DIR="macros" eautoreconf
+}
+
+src_compile() {
+	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having to
+	# sed the Makefiles to not do rc-update.
+	econf \
+		$(use_with pam) \
+		$(use_enable cups) \
+		$(use_enable ssl) \
+		$(use_enable debug) \
+		$(use_enable tcpd tcp-wrappers) \
+		$(use_enable kerberos krbV-uam) \
+		$(use_enable krb4 krb4-uam) \
+		$(use_enable slp srvloc) \
+		$(use_with cracklib) \
+		$(use_with elibc_glibc shadow) \
+		$(use_with xfs) \
+		--disable-afs \
+		--enable-fhs \
+		--with-bdb=/usr \
+		${myconf} || die "netatalk configure failed"
+
+	sed -i -e "s:@BINDNOW_FLAGS@:$(bindnow-flags):" bin/afppasswd/Makefile
+
+	emake || die "netatalk emake failed"
+
+	# Create the init script manually (it's more messy to --enable-gentoo)
+	cd "${S}"/distrib/initscripts
+	emake rc.atalk.gentoo
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "netatalk make install failed"
+
+	dodoc CONTRIBUTORS NEWS README TODO VERSION
+
+	newinitd "${S}"/distrib/initscripts/rc.atalk.gentoo atalk
+
+	# The pamd file isn't what we need, use pamd_mimic_system
+	rm -rf "${D}/etc/pam.d"
+	pamd_mimic_system netatalk auth account password session
+
+	# Move /usr/include/netatalk to /usr/include/netatalk2 to avoid collisions
+	# with /usr/include/netatalk/at.h provided by glibc (strange, uh?)
+	# Packages that wants to link to netatalk should then probably change the
+	# includepath then, but right now, nothing uses netatalk.
+	# On a side note, it also solves collisions with freebsd-lib and other libcs
+	mv "${D}"/usr/include/netatalk{,2}
+}