Add a new init script to make sure that the entropy-gathering daemons are started before afpd, for safety, and remove older versions.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

11 files changed, 43 insertions, 724 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 9db195d4e340..5bd7bbd397a6 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-fs/netatalk
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.74 2011/10/18 07:37:57 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.75 2012/04/08 21:04:02 flameeyes Exp $
+
+*netatalk-2.2.1-r3 (08 Apr 2012)
+
+  08 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/afpd.init.3,
+  +netatalk-2.2.1-r3.ebuild, -netatalk-2.1.3.ebuild, -netatalk-2.1.5.ebuild,
+  -netatalk-2.1.6.ebuild, -netatalk-2.1.ebuild, -netatalk-2.2.0.ebuild,
+  -netatalk-2.2.1-r1.ebuild, -netatalk-2.2.1-r2.ebuild, -netatalk-2.2.1.ebuild:
+  Add a new init script to make sure that the entropy-gathering daemons are
+  started before afpd, for safety, and remove older versions.
 
 *netatalk-2.2.1-r2 (18 Oct 2011)
 
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 50ed6600e05c..a01d7e034bb4 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX afpd.init 758 RMD160 f3b2c5b96a350b88ad8e408f3ef29af92d93a895 SHA1 bc70981161b01a6f80b8ce85ce43f37b3f4fc340 SHA256 955f6bc2706a81ff34840d5c64dda06652f3b99d8f88fadf4df6de6b4af4367f
 AUX afpd.init.2 534 RMD160 223ac75c7df796d58b0da660e070a3b8696ee20a SHA1 da638647505e4720bc9084defe051414c7551032 SHA256 1c94c4654b1daebc3f107e43f414194fa33e4a3f418583bc9fb351ca40aa920c
+AUX afpd.init.3 549 RMD160 679b146403b3ddd4dca5663c26c188d984b36607 SHA1 a3f8f95c173e48d297ce83b98cbfbba3f7310efe SHA256 3583467680406b993602c90e83a7faf8d1ba8612944e99eb66dd3e9a00437799
 AUX atalk_service.init 524 RMD160 7eb489b743d5406184d4ccf0d28ef5b2cb0b7282 SHA1 c392350057d118d4f98aedeca6ef5e3713ee7094 SHA256 69e907b5b4bff01b30fe9d5ceb378da23ec60063f78e83fe0d47e99d9e19e090
 AUX atalk_service.init.2 327 RMD160 a1f4afc22fff083a706bd43a55bbb5c481776b62 SHA1 fc717fa70e7aa683d223980e9d86e4d6e81de093 SHA256 1592e048af693af36a1c010779eb98f356774ad92c4a41a6199edfe88603c9a2
 AUX atalkd.init 947 RMD160 390b0da96fbe2ff829485760b4a9249f0348992d SHA1 9077f80ef9f232e90482db1c1ca6a7386814f8f5 SHA256 bb91f2a6455ff515a3cc4a10932fd3f1526df78e8876be7553aff0dec3da9877
@@ -12,27 +13,15 @@ AUX netatalk-2.0.5-control-pam.patch 997 RMD160 a7b11647dd7827288517fa3c7696a371
 AUX netatalk-2.2.0-path_afp_ipc.patch 546 RMD160 d033e1dfe1db461116ac4cdffc687378a1f145a0 SHA1 3bef900e9d6b070b4266b495cdad3c44fb11d7ef SHA256 469b5b4c928a453f7d50489dcb7cf5855a848d3fa09b86fe5796df929de89857
 AUX netatalk-2.2.1-gentoo.patch 3476 RMD160 fd9cde22f6c949091e329e452cb92d27a65c5973 SHA1 d3b8b989e0ec128d3d378fc41f75ad5fc703f96e SHA256 23fd2cb02789191ddc38b867f3cc76373e096a9a1150c64563534afa8922b529
 DIST netatalk-2.0.5.tar.bz2 993882 RMD160 47247d376bf421652d9f9897c75853424215ae0a SHA1 a38f98abc123b02d26628543e393a4de04481e4f SHA256 aa11b26ad5c6cfb6043458fc849ed82b13b6d13219191a6335fce1bc76288b37
-DIST netatalk-2.1.3.tar.bz2 1122920 RMD160 de9810c014549099e412bbc52fb3bb5e780b30e5 SHA1 a1a3fa649ecb454c4ed2e476e27877ba06a338d9 SHA256 472f283c495c6c39020eeedea0b71610aa10008812f491a80617555f999216b4
-DIST netatalk-2.1.5.tar.bz2 1125946 RMD160 9265b34f303a21b89c78401c24ed464c61041ff3 SHA1 689856ed96ccf34f2f7b83d70c97d30213638a70 SHA256 11fcce36cc5179de60c5c0b10032ff9e042ed8b8c6e0b99d2d7200c8d0749038
-DIST netatalk-2.1.6.tar.bz2 1128137 RMD160 c36e60b5611e21211c4276977b900ff2179fbf29 SHA1 b6753e5aa3c21736a50de11942cc778e139d9098 SHA256 f332e6e99422d10158ac2256a7a7000f9e2cbfc0c65503008a75a01f28973873
-DIST netatalk-2.1.tar.bz2 1120025 RMD160 c71e3b48bdb1fa1ab8acd2f78d39eb7cd8e953a3 SHA1 2c44829c5dfbacf0996db804d8b136396e16e87d SHA256 7302b06096dd915e8cf066275e7f0fa1da982cceb234975a274b92f3f56d753c
-DIST netatalk-2.2.0.tar.bz2 1216174 RMD160 192175b3dbd93c9cb0867110be0bb4a2e05c829f SHA1 cee946cca2564ea133f9f6d55e32c9156098cbba SHA256 31bf7c1ea311f876d9be6d4be9faed24d170a89e6ce692304fc2cb525f25143b
 DIST netatalk-2.2.1.tar.bz2 1227602 RMD160 bc55a591fe134d3bf05ca442aa5b5246fd766b8c SHA1 e588b89eced7769f65e213bc4b1b1e4f8035c8b3 SHA256 3ab81c6335f8c33fd01ae599459a26c8cfe3b975009ce73640cae823ddc78bbf
 EBUILD netatalk-2.0.5-r1.ebuild 2958 RMD160 160a50569cf92f9ed740c2df67bb56801514b352 SHA1 29d1695783bac4deebca891cabe4fbb5c37cad25 SHA256 118c0091d6cec839697db7e160ab02c26c142bd9cab7f34c5073795d13aabbd0
-EBUILD netatalk-2.1.3.ebuild 2851 RMD160 85bd05416fa2740eb5af156a8c462f516e66a289 SHA1 b99d00d439e301af59b395c15c3e37bb35ed4b8e SHA256 cec2fb9094d8325205c4f79cea1ba071b674d32aab37a932824b11d5fd6711ae
-EBUILD netatalk-2.1.5.ebuild 2851 RMD160 9978fa39c59f7d291f1c8fea72e1d0a2ea8ca408 SHA1 ff1c34fa7cd8f39da1582e6842e75aa7d67ce9bb SHA256 5aee40d6ef64724486826b1e02239b656fe4b3b0e02a74eab87772105bd73a98
-EBUILD netatalk-2.1.6.ebuild 2852 RMD160 958e78ccf8a29df324f7c18ab5ef0cf3d8948bfd SHA1 d6cd0bcdd679e28bbd243849fa9c77d4e129f47d SHA256 fcad578f1e6a2e4399b9ecbef9e6a88ec526d40c3f1f67242801973487b09c91
-EBUILD netatalk-2.1.ebuild 2909 RMD160 0f17ff6ee31309903073daf11deab411ff852c76 SHA1 447658644d1abb1f2ecc54f10804723467dc6fd3 SHA256 6466888f3073c4ee72c5352f8d831b9ce153ffc4270e5bb2dd9eaedd21bc6e09
-EBUILD netatalk-2.2.0.ebuild 3028 RMD160 a69d37d84a7be3a5ed5c3f4e1ee40899079231dd SHA1 1513fce1407571607c6c64139f9c11db15a40965 SHA256 e1a1cbda0c4e7a7453a63b9b24c02e48689d3fa72eb3836b4b742b6d859f2d22
-EBUILD netatalk-2.2.1-r1.ebuild 4374 RMD160 89c3d3a4fc64a0c25d565a3d3d0840656f5ff857 SHA1 9c67463eaf4f3993e4143ba67b9bf3d64f886626 SHA256 f5790e9e765136fb444edf9c728cb1f78b5c8ba4b904f8097766053b9970bb35
-EBUILD netatalk-2.2.1-r2.ebuild 4408 RMD160 a5f4e5da9efef060503a72a3908f9da4cfec301f SHA1 83a0a663e5711a96e4e3621a3d4471df5b6e59cc SHA256 e4ca6edef189c88c1c4dda80a30c1152d400ad9c3dc0d077788cdd843db0200e
-EBUILD netatalk-2.2.1.ebuild 2959 RMD160 1a6e7e672c8d06466f726c52ce04dafc857a4849 SHA1 928aef4ec42342dae025a370b76e365d839e9a43 SHA256 39f93a8c8a8f62c6bb6872a124134bebe8e6e71139c2a1b4931a5511fb48cc56
-MISC ChangeLog 12526 RMD160 4d40fe4f605e479680e0471f3228ab77c4a11aa9 SHA1 ce026a16227ba0b8b4592354c7fb1e50bcc36e63 SHA256 94f1b0be3a52b10c61a7435cde475724370c56519c34d8d75c874ba283293dd5
+EBUILD netatalk-2.2.1-r3.ebuild 4408 RMD160 8986a9815bf571915affde582cf0f3a40cc6767b SHA1 170cf314779199c2c1a27bf6b5f72d5c2dbbfc95 SHA256 92f1d47733cfa4ddaef9ac26d80d853c984f55c50546e8664ba0e148183075a0
+MISC ChangeLog 13004 RMD160 914301403858632cf229c14ff87734de63465850 SHA1 d68e1c9d9b3e171d9ab65f44c4870b45ead8f09e SHA256 32b20d86f9786c98cbf8f1ac3ec9e60c41fe7d0165f66c61217e19a07e743bfc
 MISC metadata.xml 1193 RMD160 6304fb244d9b7c84f8cb205271d39cd76870374d SHA1 f7a1f8c01d001ec1f35e2a8d760dfb21f33090b4 SHA256 fd546310c3a5e7267926e3a90cc7a6392d642c9178bf68d7f8a620deed27dc25
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk6dLI8ACgkQAiZjviIA2XhiAQCfbXkF8piguqrmZpUD8EX5nhej
-WTEAoMbin8TLmaV9NscKbh1+mwtIFIqK
-=o6Fm
+iEYEARECAAYFAk+B/UUACgkQAiZjviIA2XjhEgCgoRtg9cLv8MUYaBLsKkR14e+K
+S7AAn0MrSLkPyD/8+Bthy04o4tI0hXQo
+=WYQe
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/afpd.init.3 b/net-fs/netatalk/files/afpd.init.3
new file mode 100644
index 000000000000..449bb774ceab
--- /dev/null
+++ b/net-fs/netatalk/files/afpd.init.3
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/afpd.init.3,v 1.1 2012/04/08 21:04:02 flameeyes Exp $
+
+command="/usr/sbin/${SVCNAME}"
+command_args="${EXTRA_CONF}"
+pidfile="/var/run/${SVCNAME}.pid"
+
+depend() {
+	need net cnid_metad
+	use logger dns atalkd
+	after entropy
+
+	config /etc/netatalk/afpd.conf
+
+	sed -e 's:#.*::' /etc/netatalk/afpd.conf | fgrep -q -e -ddp \
+		&& need atalkd
+
+	need avahi-daemon
+	need slpd
+}
diff --git a/net-fs/netatalk/netatalk-2.1.3.ebuild b/net-fs/netatalk/netatalk-2.1.3.ebuild
deleted file mode 100644
index edf541603560..000000000000
--- a/net-fs/netatalk/netatalk-2.1.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.1.3.ebuild,v 1.2 2010/10/15 02:05:39 vapier Exp $
-
-EAPI="2"
-
-inherit pam
-
-DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cracklib cups debug kerberos pam slp ssl tcpd xfs"
-
-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 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit"
-DEPEND="${RDEPEND}
-	xfs? ( sys-fs/xfsprogs )"
-
-src_prepare() {
-	# 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
-		sed -i -e '/^[[:space:]]*use\>/s:$: slpd:' \
-			distrib/initscripts/rc.atalk.gentoo.tmpl || die
-	fi
-}
-
-src_configure() {
-	use xfs || eval $(printf 'export ac_cv_header_%s=no\n' {linux,xfs}_{dqblk_xfs,libxfs,xqm,xfs_fs}_h)
-
-	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# --enable-shadow: let build system detect shadow.h in toolchain
-	econf \
-		$(use_with pam) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_enable kerberos krbV-uam) \
-		--disable-krb4-uam \
-		$(use_enable slp srvloc) \
-		$(use_with ssl ssl-dir) \
-		$(use_with cracklib) \
-		$(use_with slp srvloc) \
-		--disable-afs \
-		--enable-fhs \
-		--with-bdb=/usr
-}
-
-src_compile() {
-	emake || die
-
-	# Create the init script manually (it's more messy to --enable-gentoo)
-	emake -C distrib/initscripts rc.atalk.gentoo || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CONTRIBUTORS NEWS README TODO VERSION
-
-	newinitd distrib/initscripts/rc.atalk.gentoo atalk || die
-
-	# 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} || die
-	sed -i \
-		-e 's/include <netatalk/include <netatalk2/g' \
-		"${D}"usr/include/{netatalk2,atalk}/* || die
-}
diff --git a/net-fs/netatalk/netatalk-2.1.5.ebuild b/net-fs/netatalk/netatalk-2.1.5.ebuild
deleted file mode 100644
index 4e5a05880c39..000000000000
--- a/net-fs/netatalk/netatalk-2.1.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.1.5.ebuild,v 1.1 2011/01/04 20:26:10 vapier Exp $
-
-EAPI="2"
-
-inherit pam
-
-DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cracklib cups debug kerberos pam slp ssl tcpd xfs"
-
-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 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit"
-DEPEND="${RDEPEND}
-	xfs? ( sys-fs/xfsprogs )"
-
-src_prepare() {
-	# 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
-		sed -i -e '/^[[:space:]]*use\>/s:$: slpd:' \
-			distrib/initscripts/rc.atalk.gentoo.tmpl || die
-	fi
-}
-
-src_configure() {
-	use xfs || eval $(printf 'export ac_cv_header_%s=no\n' {linux,xfs}_{dqblk_xfs,libxfs,xqm,xfs_fs}_h)
-
-	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# --enable-shadow: let build system detect shadow.h in toolchain
-	econf \
-		$(use_with pam) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_enable kerberos krbV-uam) \
-		--disable-krb4-uam \
-		$(use_enable slp srvloc) \
-		$(use_with ssl ssl-dir) \
-		$(use_with cracklib) \
-		$(use_with slp srvloc) \
-		--disable-afs \
-		--enable-fhs \
-		--with-bdb=/usr
-}
-
-src_compile() {
-	emake || die
-
-	# Create the init script manually (it's more messy to --enable-gentoo)
-	emake -C distrib/initscripts rc.atalk.gentoo || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CONTRIBUTORS NEWS README TODO VERSION
-
-	newinitd distrib/initscripts/rc.atalk.gentoo atalk || die
-
-	# 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} || die
-	sed -i \
-		-e 's/include <netatalk/include <netatalk2/g' \
-		"${D}"usr/include/{netatalk2,atalk}/* || die
-}
diff --git a/net-fs/netatalk/netatalk-2.1.6.ebuild b/net-fs/netatalk/netatalk-2.1.6.ebuild
deleted file mode 100644
index 0af89852d3db..000000000000
--- a/net-fs/netatalk/netatalk-2.1.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.1.6.ebuild,v 1.1 2011/09/09 21:13:31 beandog Exp $
-
-EAPI="2"
-
-inherit pam
-
-DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cracklib cups debug kerberos pam slp ssl tcpd xfs"
-
-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 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit"
-DEPEND="${RDEPEND}
-	xfs? ( sys-fs/xfsprogs )"
-
-src_prepare() {
-	# 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
-		sed -i -e '/^[[:space:]]*use\>/s:$: slpd:' \
-			distrib/initscripts/rc.atalk.gentoo.tmpl || die
-	fi
-}
-
-src_configure() {
-	use xfs || eval $(printf 'export ac_cv_header_%s=no\n' {linux,xfs}_{dqblk_xfs,libxfs,xqm,xfs_fs}_h)
-
-	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# --enable-shadow: let build system detect shadow.h in toolchain
-	econf \
-		$(use_with pam) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_enable kerberos krbV-uam) \
-		--disable-krb4-uam \
-		$(use_enable slp srvloc) \
-		$(use_with ssl ssl-dir) \
-		$(use_with cracklib) \
-		$(use_with slp srvloc) \
-		--disable-afs \
-		--enable-fhs \
-		--with-bdb=/usr
-}
-
-src_compile() {
-	emake || die
-
-	# Create the init script manually (it's more messy to --enable-gentoo)
-	emake -C distrib/initscripts rc.atalk.gentoo || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CONTRIBUTORS NEWS README TODO VERSION
-
-	newinitd distrib/initscripts/rc.atalk.gentoo atalk || die
-
-	# 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} || die
-	sed -i \
-		-e 's/include <netatalk/include <netatalk2/g' \
-		"${D}"usr/include/{netatalk2,atalk}/* || die
-}
diff --git a/net-fs/netatalk/netatalk-2.1.ebuild b/net-fs/netatalk/netatalk-2.1.ebuild
deleted file mode 100644
index 1d5cbd85cbb6..000000000000
--- a/net-fs/netatalk/netatalk-2.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.1.ebuild,v 1.3 2010/10/15 02:05:39 vapier Exp $
-
-EAPI="2"
-
-inherit pam
-
-DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cracklib cups debug kerberos pam slp ssl tcpd xfs"
-
-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 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit"
-DEPEND="${RDEPEND}
-	xfs? ( sys-fs/xfsprogs )"
-
-src_prepare() {
-	# 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
-		sed -i -e '/^[[:space:]]*use\>/s:$: slpd:' \
-			distrib/initscripts/rc.atalk.gentoo.tmpl || die
-	fi
-}
-
-src_configure() {
-	if ! use xfs ; then
-		eval $(printf '%s\n' {linux,xfs}/{dqblk_xfs,libxfs,xqm,xfs_fs}.h | \
-			sed -e 's:[/.]:_:g' -e 's:^:export ac_cv_header_:' -e 's:$:=no:')
-	fi
-
-	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# --enable-shadow: let build system detect shadow.h in toolchain
-	econf \
-		$(use_with pam) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_enable kerberos krbV-uam) \
-		--disable-krb4-uam \
-		$(use_enable slp srvloc) \
-		$(use_with ssl ssl-dir) \
-		$(use_with cracklib) \
-		$(use_with slp srvloc) \
-		--disable-afs \
-		--enable-fhs \
-		--with-bdb=/usr
-}
-
-src_compile() {
-	emake || die
-
-	# Create the init script manually (it's more messy to --enable-gentoo)
-	emake -C distrib/initscripts rc.atalk.gentoo || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CONTRIBUTORS NEWS README TODO VERSION
-
-	newinitd distrib/initscripts/rc.atalk.gentoo atalk || die
-
-	# 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} || die
-	sed -e 's/include <netatalk/include <netatalk2/g' \
-		-i "${D}"usr/include/{netatalk2,atalk}/* || die
-}
diff --git a/net-fs/netatalk/netatalk-2.2.0.ebuild b/net-fs/netatalk/netatalk-2.2.0.ebuild
deleted file mode 100644
index 6d88e086fb11..000000000000
--- a/net-fs/netatalk/netatalk-2.2.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.0.ebuild,v 1.1 2011/09/02 17:11:23 beandog Exp $
-
-EAPI="2"
-
-inherit pam
-
-RESTRICT="test"
-DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+avahi cracklib cups debug kerberos pam slp ssl tcpd xfs"
-
-RDEPEND=">=sys-libs/db-4.2.52
-	avahi? ( net-dns/avahi[dbus] )
-	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 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit
-	dev-libs/libgcrypt"
-DEPEND="${RDEPEND}
-	xfs? ( sys-fs/xfsprogs )"
-
-src_prepare() {
-	# 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
-		sed -i -e '/^[[:space:]]*use\>/s:$: slpd:' \
-			distrib/initscripts/rc.atalk.gentoo.tmpl || die
-	fi
-	epatch "${FILESDIR}/${P}-path_afp_ipc.patch" || die "epatch failed"
-}
-
-src_configure() {
-	use xfs || eval $(printf 'export ac_cv_header_%s=no\n' {linux,xfs}_{dqblk_xfs,libxfs,xqm,xfs_fs}_h)
-
-	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# --enable-shadow: let build system detect shadow.h in toolchain
-	econf \
-		$(use_with pam) \
-		$(use_enable avahi zeroconf) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_enable kerberos krbV-uam) \
-		--disable-krb4-uam \
-		$(use_enable slp srvloc) \
-		$(use_with ssl ssl-dir) \
-		$(use_with cracklib) \
-		--disable-afs \
-		--enable-fhs \
-		--with-bdb=/usr
-}
-
-src_compile() {
-	emake || die
-
-	# Create the init script manually (it's more messy to --enable-gentoo)
-	emake -C distrib/initscripts rc.atalk.gentoo || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk
-
-	newinitd distrib/initscripts/rc.atalk.gentoo netatalk || die
-
-	# 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} || die
-	sed -i \
-		-e 's/include <netatalk/include <netatalk2/g' \
-		"${D}"usr/include/{netatalk2,atalk}/* || die
-}
diff --git a/net-fs/netatalk/netatalk-2.2.1-r1.ebuild b/net-fs/netatalk/netatalk-2.2.1-r1.ebuild
deleted file mode 100644
index 3eed265006fd..000000000000
--- a/net-fs/netatalk/netatalk-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.1-r1.ebuild,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
-
-EAPI="4"
-
-inherit pam flag-o-matic multilib autotools
-
-RESTRICT="test"
-DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
-
-RDEPEND=">=sys-libs/db-4.2.52
-	avahi? ( net-dns/avahi[dbus] )
-	cracklib? ( sys-libs/cracklib )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	slp? ( net-libs/openslp )
-	kerberos? ( virtual/krb5 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit
-	dev-libs/libgcrypt
-	appletalk? (
-		cups? ( net-print/cups )
-	)
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	ldap? (
-		net-nds/openldap
-	)
-	"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="ldap? ( acl )"
-
-DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	if use appletalk; then
-		myconf+=" --enable-ddp --enable-timelord $(use_enable cups)"
-	else
-		myconf+=" --disable-ddp --disable-timelord --disable-cups"
-	fi
-
-	if use acl; then
-		myconf+=" --with-acls $(use_with ldap)"
-	else
-		myconf+=" --without-acls --without-ldap"
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# 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_enable avahi zeroconf) \
-		$(use_enable debug) \
-		$(use_enable kerberos krbV-uam) \
-		$(use_enable quota) \
-		$(use_enable slp srvloc) \
-		$(use_enable static-libs static) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_with cracklib) \
-		$(use_with pam) \
-		$(use_with ssl ssl-dir) \
-		--disable-krb4-uam \
-		--disable-afs \
-		--enable-fhs \
-		--with-bdb=/usr \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/afpd.init afpd
-	newinitd "${FILESDIR}"/cnid_metad.init cnid_metad
-
-	if use appletalk; then
-		newinitd "${FILESDIR}"/atalkd.init atalkd
-		newinitd "${FILESDIR}"/atalk_service.init timelord
-		newinitd "${FILESDIR}"/atalk_service.init papd
-	fi
-
-	use avahi || sed -i -e '/need avahi-daemon/d' "${D}"/etc/init.d/afpd
-	use slp || sed -i -e '/need slpd/d' "${D}"/etc/init.d/afpd
-
-	use ldap || rm "${D}"/etc/netatalk/afp_ldap.conf
-
-	rm "${D}"/etc/netatalk/netatalk.conf
-
-	# 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} || die
-	sed -i \
-		-e 's/include <netatalk/include <netatalk2/g' \
-		"${D}"usr/include/{netatalk2,atalk}/* || die
-
-	# These are not used at all, as the uams are loaded with their .so
-	# extension.
-	rm "${D}"/usr/$(get_libdir)/netatalk/*.la
-
-	use static-libs || rm "${D}"/usr/$(get_libdir)/*.la
-}
-
-pkg_postinst() {
-	elog "Starting from version 2.2.1-r1 the netatalk init script has been split"
-	elog "into different services depending on what you need to start."
-	elog "This was done to make sure that all services are started and reported"
-	elog "properly."
-	elog ""
-	elog "The new services are:"
-	elog "  cnid_metad"
-	elog "  afpd"
-	if use appletalk; then
-		elog "  atalkd"
-		elog "  timelord"
-		elog "  papd"
-	fi
-	elog ""
-	elog "Dependencies should be resolved automatically depending on settings"
-	elog "but please report issues with this on https://bugs.gentoo.org/ if"
-	elog "you find any."
-	elog ""
-	elog "The old configuration file /etc/netatalk/netatalk.conf is no longer"
-	elog "installed, and will be ignored. The new configuration is supposed"
-	elog "to be done through individual /etc/conf.d files, for everything that"
-	elog "cannot be set already through their respective configuration files."
-}
diff --git a/net-fs/netatalk/netatalk-2.2.1-r2.ebuild b/net-fs/netatalk/netatalk-2.2.1-r3.ebuild
index e202dcb014d2..6ec993ebfb14 100644
--- a/net-fs/netatalk/netatalk-2.2.1-r2.ebuild
+++ b/net-fs/netatalk/netatalk-2.2.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.1-r2.ebuild,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.1-r3.ebuild,v 1.1 2012/04/08 21:04:02 flameeyes Exp $
 
 EAPI="4"
 
@@ -90,7 +90,7 @@ src_configure() {
 src_install() {
 	default
 
-	newinitd "${FILESDIR}"/afpd.init.2 afpd
+	newinitd "${FILESDIR}"/afpd.init.3 afpd
 	newinitd "${FILESDIR}"/cnid_metad.init.2 cnid_metad
 
 	if use appletalk; then
diff --git a/net-fs/netatalk/netatalk-2.2.1.ebuild b/net-fs/netatalk/netatalk-2.2.1.ebuild
deleted file mode 100644
index d4385606f643..000000000000
--- a/net-fs/netatalk/netatalk-2.2.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.1.ebuild,v 1.1 2011/09/09 21:19:37 beandog Exp $
-
-EAPI="2"
-
-inherit pam
-
-RESTRICT="test"
-DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+avahi cracklib cups debug kerberos pam slp ssl tcpd xfs"
-
-RDEPEND=">=sys-libs/db-4.2.52
-	avahi? ( net-dns/avahi[dbus] )
-	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 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit
-	dev-libs/libgcrypt"
-DEPEND="${RDEPEND}
-	xfs? ( sys-fs/xfsprogs )"
-
-src_prepare() {
-	# 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
-		sed -i -e '/^[[:space:]]*use\>/s:$: slpd:' \
-			distrib/initscripts/rc.atalk.gentoo.tmpl || die
-	fi
-}
-
-src_configure() {
-	use xfs || eval $(printf 'export ac_cv_header_%s=no\n' {linux,xfs}_{dqblk_xfs,libxfs,xqm,xfs_fs}_h)
-
-	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# --enable-shadow: let build system detect shadow.h in toolchain
-	econf \
-		$(use_with pam) \
-		$(use_enable avahi zeroconf) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_enable kerberos krbV-uam) \
-		--disable-krb4-uam \
-		$(use_enable slp srvloc) \
-		$(use_with ssl ssl-dir) \
-		$(use_with cracklib) \
-		--disable-afs \
-		--enable-fhs \
-		--with-bdb=/usr
-}
-
-src_compile() {
-	emake || die
-
-	# Create the init script manually (it's more messy to --enable-gentoo)
-	emake -C distrib/initscripts rc.atalk.gentoo || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk
-
-	newinitd distrib/initscripts/rc.atalk.gentoo netatalk || die
-
-	# 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} || die
-	sed -i \
-		-e 's/include <netatalk/include <netatalk2/g' \
-		"${D}"usr/include/{netatalk2,atalk}/* || die
-}