I'll take care of netatalk from now on.

Added ~amd64 keyword.
Ebuild cleanup and Gentoo/FreeBSD compatibility.
Fixed LICENSE to BSD to all versions (was incorrectly declared as GPL-2).
Use a system-auth-like pamd file.
Package-Manager: portage-2.0.51.22-r1

11 files changed, 142 insertions, 32 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index de0ba4dd7d08..8ff258ffc565 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-fs/netatalk
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.22 2004/12/12 21:52:24 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.23 2005/06/30 23:56:56 flameeyes Exp $
+
+*netatalk-2.0.3 (30 Jun 2005)
+
+  30 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  netatalk-1.5.3.1-r1.ebuild, netatalk-1.6.2.ebuild, netatalk-1.6.3.ebuild,
+  netatalk-1.6.4.ebuild, netatalk-1.6.4-r1.ebuild, netatalk-2.0.1.ebuild,
+  +netatalk-2.0.3.ebuild:
+  I'll take care of netatalk from now on.
+  Added ~amd64 keyword.
+  Ebuild cleanup and Gentoo/FreeBSD compatibility.
+  Fixed LICENSE to BSD to all versions (was incorrectly declared as GPL-2).
+  Use a system-auth-like pamd file.
 
   12 Dec 2004; <rphillips@gentoo.org> netatalk-2.0.1.ebuild:
   fixed invalid USE variable. includes cracklib by default now and pulls in the
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index c2d1252f96ed..4ed3c1f46ceb 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,18 +1,30 @@
-MD5 d1baa9063bf7f814bdbe65ea15c1e6bf netatalk-1.6.3.ebuild 1162
-MD5 ca47349a551627eda830545623fc7818 netatalk-1.6.4-r1.ebuild 1277
-MD5 182737befc5bc6abbd54fe52970963ba netatalk-1.6.2.ebuild 1162
-MD5 3eec7d8cf70c78d35a1f66b1d9af1fea netatalk-2.0.1.ebuild 2649
-MD5 6f7992bc14acaa917877f8481083db0a netatalk-1.6.4.ebuild 1173
-MD5 ed5f17a8565df72266eae04330832143 netatalk-1.5.3.1-r1.ebuild 1157
-MD5 112c22b6e9421578e4cb9e4e5b6c0616 ChangeLog 3547
-MD5 22abbe591c68284850e50221193fd32f metadata.xml 255
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 436ad45a1a470e5206657a0876aedff4 ChangeLog 4051
+MD5 43c6b606d88eab1f3467634846a77491 metadata.xml 347
+MD5 2bcb3497b4d9ccc3c0c9daf36e113a67 netatalk-1.5.3.1-r1.ebuild 1156
+MD5 63afc065a7a07ba14f50496389687f5b netatalk-1.6.2.ebuild 1161
+MD5 94d48f8fdd7cbad718834f4a2b3e3181 netatalk-1.6.3.ebuild 1161
+MD5 8f9575d3629ca459f2ed69c5eba1cbe9 netatalk-1.6.4-r1.ebuild 1277
+MD5 e7b075a1382db326ce33b16fc52be870 netatalk-1.6.4.ebuild 1172
+MD5 594141697d7ae4313fad22dde49122c4 netatalk-2.0.1.ebuild 2646
+MD5 b522c5849f7541a1126f553bb9674a18 netatalk-2.0.3.ebuild 2439
 MD5 cff2c2aa902db847d2e3ec8e34f818fc files/atalk 1297
 MD5 3f81842125cd168666a7f1a026be463d files/atalk-rc6 2007
-MD5 6dd0a76546b70cf567b7926c0881c9b5 files/digest-netatalk-1.6.4-r1 67
+MD5 bd4410c61e921e87c00183817b6e29b9 files/atalknew-rc6 1703
 MD5 a2dcac8839ace55b372a1cfde094bfab files/digest-netatalk-1.5.3.1-r1 68
 MD5 9802f047b3ef9c6a2944bd69a9babd92 files/digest-netatalk-1.6.2 66
 MD5 2be14842a5591dde5f7a615a9e7e16c7 files/digest-netatalk-1.6.3 66
 MD5 6dd0a76546b70cf567b7926c0881c9b5 files/digest-netatalk-1.6.4 67
+MD5 6dd0a76546b70cf567b7926c0881c9b5 files/digest-netatalk-1.6.4-r1 67
 MD5 9b5e18bed7037413bf3b2d808c391b78 files/digest-netatalk-2.0.1 68
 MD5 9eeca2a8610190fcd373ff619d56a298 files/netatalk-1.6.4-tempfile.patch 557
-MD5 bd4410c61e921e87c00183817b6e29b9 files/atalknew-rc6 1703
+MD5 9ee0857567bda5d9ffabf5d04095e90b files/digest-netatalk-2.0.3 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCxIbsj5H05b2HAEkRArJgAJwNLuP7dkg861tm1Uh4QGlFZPllzQCgm17K
+WgCLxa0aV+Tc7xaXNII9QRk=
+=OKzx
+-----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/digest-netatalk-2.0.3 b/net-fs/netatalk/files/digest-netatalk-2.0.3
new file mode 100644
index 000000000000..1f207b35e1d9
--- /dev/null
+++ b/net-fs/netatalk/files/digest-netatalk-2.0.3
@@ -0,0 +1 @@
+MD5 28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2 1471804
diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
index d5a6e8e94038..69cfec555b1f 100644
--- a/net-fs/netatalk/metadata.xml
+++ b/net-fs/netatalk/metadata.xml
@@ -2,5 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-fs</herd>
-	<longdescription>kernel level implementation of the AppleTalk protocol suite</longdescription>
+<maintainer>
+	<email>flameeyes@gentoo.org</email>
+	<name>Diego Pettenò</name>
+</maintainer>
+<longdescription>kernel level implementation of the AppleTalk protocol suite</longdescription>
 </pkgmetadata>
diff --git a/net-fs/netatalk/netatalk-1.5.3.1-r1.ebuild b/net-fs/netatalk/netatalk-1.5.3.1-r1.ebuild
index 50cbf22df414..0036948e0cb4 100644
--- a/net-fs/netatalk/netatalk-1.5.3.1-r1.ebuild
+++ b/net-fs/netatalk/netatalk-1.5.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.5.3.1-r1.ebuild,v 1.4 2004/07/14 23:53:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.5.3.1-r1.ebuild,v 1.5 2005/06/30 23:56:56 flameeyes Exp $
 
 IUSE="ssl pam tcpd"
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://netatalk.sourceforge.net"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="x86 ppc"
 
 DEPEND="sys-apps/shadow
diff --git a/net-fs/netatalk/netatalk-1.6.2.ebuild b/net-fs/netatalk/netatalk-1.6.2.ebuild
index 67a8084b3a76..d65b45046d6a 100644
--- a/net-fs/netatalk/netatalk-1.6.2.ebuild
+++ b/net-fs/netatalk/netatalk-1.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.6.2.ebuild,v 1.4 2004/07/14 23:53:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.6.2.ebuild,v 1.5 2005/06/30 23:56:56 flameeyes Exp $
 
 IUSE="ssl pam tcpd"
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://netatalk.sourceforge.net"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="~x86 ~ppc"
 
 DEPEND="sys-apps/shadow
diff --git a/net-fs/netatalk/netatalk-1.6.3.ebuild b/net-fs/netatalk/netatalk-1.6.3.ebuild
index c29695ede86d..4e07c3f24bc8 100644
--- a/net-fs/netatalk/netatalk-1.6.3.ebuild
+++ b/net-fs/netatalk/netatalk-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.6.3.ebuild,v 1.4 2004/07/14 23:53:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.6.3.ebuild,v 1.5 2005/06/30 23:56:56 flameeyes Exp $
 
 IUSE="ssl pam tcpd"
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://netatalk.sourceforge.net"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="~x86 ~ppc"
 
 DEPEND="sys-apps/shadow
diff --git a/net-fs/netatalk/netatalk-1.6.4-r1.ebuild b/net-fs/netatalk/netatalk-1.6.4-r1.ebuild
index a6da7fc49c24..4be191e80187 100644
--- a/net-fs/netatalk/netatalk-1.6.4-r1.ebuild
+++ b/net-fs/netatalk/netatalk-1.6.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.6.4-r1.ebuild,v 1.5 2004/10/25 12:04:28 klieber Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.6.4-r1.ebuild,v 1.6 2005/06/30 23:56:56 flameeyes Exp $
 
 inherit eutils
 IUSE="ssl pam tcpd"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://netatalk.sourceforge.net"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="x86 ppc sparc ppc64"
 
 DEPEND="sys-apps/shadow
diff --git a/net-fs/netatalk/netatalk-1.6.4.ebuild b/net-fs/netatalk/netatalk-1.6.4.ebuild
index 6791e15e4772..2529bb608e6c 100644
--- a/net-fs/netatalk/netatalk-1.6.4.ebuild
+++ b/net-fs/netatalk/netatalk-1.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.6.4.ebuild,v 1.7 2004/07/14 23:53:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.6.4.ebuild,v 1.8 2005/06/30 23:56:56 flameeyes Exp $
 
 IUSE="ssl pam tcpd"
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://netatalk.sourceforge.net"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="x86 ppc ~sparc ppc64"
 
 DEPEND="sys-apps/shadow
diff --git a/net-fs/netatalk/netatalk-2.0.1.ebuild b/net-fs/netatalk/netatalk-2.0.1.ebuild
index 215dd250d989..d7b8bb8bcb81 100644
--- a/net-fs/netatalk/netatalk-2.0.1.ebuild
+++ b/net-fs/netatalk/netatalk-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.1.ebuild,v 1.2 2004/12/12 21:52:24 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.1.ebuild,v 1.3 2005/06/30 23:56:56 flameeyes Exp $
 
 inherit eutils flag-o-matic
 IUSE="ssl pam tcpd slp cups kerberos krb4 afs debug"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://netatalk.sourceforge.net"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="~x86 ~ppc"
 
 RDEPEND="sys-apps/shadow
@@ -46,7 +46,7 @@ src_compile() {
 			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
 	fi
 
-	# This is a fix to add -z,now to the linkflags for libraries and 
+	# 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/' \
diff --git a/net-fs/netatalk/netatalk-2.0.3.ebuild b/net-fs/netatalk/netatalk-2.0.3.ebuild
new file mode 100644
index 000000000000..96cafc84d9ad
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.0.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/06/30 23:56:56 flameeyes Exp $
+
+inherit eutils pam
+IUSE="ssl pam tcpd slp cups kerberos krb4 afs debug cracklib"
+
+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 ~x86"
+
+DEPEND=">=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 )
+	afs? ( net-fs/openafs )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )"
+
+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
+
+	# This is a fix to add -z,now to the linkflags for libraries
+	sed -i -e 's/^\([[:space:]]\+\)\(-D_PATH_AFP.*\)/\1-Wl,-z,now \2/' ${S}/bin/afppasswd/Makefile.in
+}
+
+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 afs) \
+		$(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) \
+		--enable-fhs \
+		--with-bdb=/usr \
+		${myconf} || die "netatalk configure failed"
+
+	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
+}