net-fs/netatalk: Drop old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

13 files changed, 9 insertions, 1550 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 16047581473b..76d733e35e1f 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.113 2014/12/15 10:59:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.114 2014/12/15 11:08:19 jlec Exp $
+
+  15 Dec 2014; Justin Lecher <jlec@gentoo.org> -netatalk-2.2.3.ebuild,
+  -netatalk-2.2.5.ebuild, -netatalk-3.1.0-r1.ebuild, -netatalk-3.1.1.ebuild,
+  -netatalk-3.1.3.ebuild, -netatalk-3.1.4.ebuild,
+  -files/netatalk-2.0.5-control-pam.patch, -files/netatalk-2.2.2-gentoo.patch,
+  -files/netatalk-3.0-gentoo.patch, -files/netatalk-3.1.0-gentoo.patch,
+  -files/netatalk-3.1.3-gentoo.patch, -files/netatalk.init:
+  Drop old
 
 *netatalk-3.1.7 (15 Dec 2014)
 
diff --git a/net-fs/netatalk/files/netatalk-2.0.5-control-pam.patch b/net-fs/netatalk/files/netatalk-2.0.5-control-pam.patch
deleted file mode 100644
index 4c069dcab258..000000000000
--- a/net-fs/netatalk/files/netatalk-2.0.5-control-pam.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-don't install the pam.d file if pam is disabled
-
---- a/configure
-+++ b/configure
-@@ -28572,12 +28572,16 @@
- 		LIBS="$savedLIBS"
- 	fi
- 
--	netatalk_cv_install_pam=yes
--	if test x"$pam_found" = "xyes" -a "x$PAMDIR" = "xNONE"; then
-+	if test "x$require_pam" != "xnever"; then
-+		netatalk_cv_install_pam=yes
-+	if test x"$pam_found" = "xyes" -a "x$PAMDIR" = "xNONE" ; then
- 		{ echo "$as_me:$LINENO: WARNING: PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify the install path." >&5
- echo "$as_me: WARNING: PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify the install path." >&2;}
- 		netatalk_cv_install_pam=no
- 	fi
-+	else
-+		netatalk_cv_install_pam=no
-+	fi
- 
- 	{ echo "$as_me:$LINENO: checking whether to enable PAM support" >&5
- echo $ECHO_N "checking whether to enable PAM support... $ECHO_C" >&6; }
diff --git a/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch b/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch
deleted file mode 100644
index 6939c127d6c6..000000000000
--- a/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch
+++ /dev/null
@@ -1,86 +0,0 @@
- etc/afpd/afp_avahi.c     |    2 +-
- etc/uams/Makefile.am     |   20 ++++++++++----------
- libatalk/Makefile.am     |    2 --
- libatalk/dsi/Makefile.am |    1 +
- libatalk/vfs/Makefile.am |    1 +
- 5 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
-index 351e001..6ed695f 100644
---- a/etc/afpd/afp_avahi.c
-+++ b/etc/afpd/afp_avahi.c
-@@ -177,8 +177,8 @@ static void register_stuff(void) {
-     return;
- 
- fail:
--    time(NULL);
- //    avahi_threaded_poll_quit(ctx->threaded_poll);
-+    return;
- }
- 
- /* Called when publishing of service data completes */
-diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
-index dbe304a..8570a46 100644
---- a/etc/uams/Makefile.am
-+++ b/etc/uams/Makefile.am
-@@ -97,16 +97,16 @@ uams_dhx_pam_la_CFLAGS     = @SSL_CFLAGS@ @PAM_CFLAGS@
- uams_dhx2_pam_la_CFLAGS    = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@
- uams_gss_la_CFLAGS   	   = @GSSAPI_CFLAGS@
- 
--uams_guest_la_LDFLAGS      = -module -avoid-version
--uams_randnum_la_LDFLAGS    = -module -avoid-version @SSL_LIBS@
--uams_passwd_la_LDFLAGS     = -module -avoid-version @CRYPT_LIBS@
--uams_pam_la_LDFLAGS        = -module -avoid-version @PAM_LIBS@
--uams_pgp_la_LDFLAGS        = -module -avoid-version @SSL_LIBS@
--uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
--uams_dhx_pam_la_LDFLAGS		= -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
--uams_dhx2_passwd_la_LDFLAGS	= -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
--uams_dhx2_pam_la_LDFLAGS	= -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
--uams_gss_la_LDFLAGS   	   = -module -avoid-version @GSSAPI_LIBS@ 
-+uams_guest_la_LDFLAGS      = -shared -module -avoid-version
-+uams_randnum_la_LDFLAGS    = -shared -module -avoid-version @SSL_LIBS@
-+uams_passwd_la_LDFLAGS     = -shared -module -avoid-version @CRYPT_LIBS@
-+uams_pam_la_LDFLAGS        = -shared -module -avoid-version @PAM_LIBS@
-+uams_pgp_la_LDFLAGS        = -shared -module -avoid-version @SSL_LIBS@
-+uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
-+uams_dhx_pam_la_LDFLAGS		= -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
-+uams_dhx2_passwd_la_LDFLAGS	= -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
-+uams_dhx2_pam_la_LDFLAGS	= -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
-+uams_gss_la_LDFLAGS   	   = -shared -module -avoid-version @GSSAPI_LIBS@ 
- 
- #
- # module compilation
-diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
-index a241d94..513d5f6 100644
---- a/libatalk/Makefile.am
-+++ b/libatalk/Makefile.am
-@@ -29,8 +29,6 @@ libatalk_la_DEPENDENCIES = \
- 	unicode/libunicode.la \
- 	vfs/libvfs.la
- 
--libatalk_la_LDFLAGS = -static
--
- if USE_APPLETALK
- SUBDIRS +=  asp atp nbp netddp
- libatalk_la_LIBADD += \
-diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am
-index d64cbed..5a07c94 100644
---- a/libatalk/dsi/Makefile.am
-+++ b/libatalk/dsi/Makefile.am
-@@ -7,5 +7,6 @@ LIBS = @LIBS@
- noinst_LTLIBRARIES = libdsi.la
- 
- libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c
-+libdsi_la_LIBADD = $(WRAP_LIBS)
- 
- noinst_HEADERS = dsi_private.h
-diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am
-index 9b8d143..1cc83ec 100644
---- a/libatalk/vfs/Makefile.am
-+++ b/libatalk/vfs/Makefile.am
-@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea.c sys_ea.c ea_sys.c
- 
- if HAVE_ACLS
- libvfs_la_SOURCES += acl.c
-+libvfs_la_LIBADD = $(ACL_LIBS)
- endif
diff --git a/net-fs/netatalk/files/netatalk-3.0-gentoo.patch b/net-fs/netatalk/files/netatalk-3.0-gentoo.patch
deleted file mode 100644
index 5f85830d8081..000000000000
--- a/net-fs/netatalk/files/netatalk-3.0-gentoo.patch
+++ /dev/null
@@ -1,144 +0,0 @@
- Makefile.am              |  8 +-------
- etc/afpd/afp_avahi.c     |  2 +-
- etc/netatalk/Makefile.am |  4 +++-
- etc/uams/Makefile.am     | 20 ++++++++++----------
- libatalk/dsi/Makefile.am |  1 +
- libatalk/vfs/Makefile.am |  1 +
- macros/netatalk.m4       | 16 ++++++++--------
- 7 files changed, 25 insertions(+), 27 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 448375a..67ea35f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- # Makefile.am for top level of netatalk package
- 
--SUBDIRS = libatalk libevent bin config etc man contrib distrib include doc macros test
-+SUBDIRS = libatalk bin config etc man contrib distrib include doc macros test
- 
- EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION
- 
-@@ -11,9 +11,3 @@ if USE_BUILTIN_LIBEVENT
- 	SUBDIRS += libevent
- endif
- 
--if RUN_LDCONFIG
--install-exec-hook:
--	@printf "Running ldconfig to ensure libraries installed in system library directories are added to the dynamic linker cache ... "
--	@-@NETA_LDCONFIG@
--	@printf "done\n"
--endif
-diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
-index 5218d51..b68c266 100644
---- a/etc/afpd/afp_avahi.c
-+++ b/etc/afpd/afp_avahi.c
-@@ -174,8 +174,8 @@ static void register_stuff(void) {
-     return;
- 
- fail:
--    time(NULL);
- //    avahi_threaded_poll_quit(ctx->threaded_poll);
-+    return;
- }
- 
- /* Called when publishing of service data completes */
-diff --git a/etc/netatalk/Makefile.am b/etc/netatalk/Makefile.am
-index 10f90ce..e524602 100644
---- a/etc/netatalk/Makefile.am
-+++ b/etc/netatalk/Makefile.am
-@@ -20,4 +20,6 @@ netatalk_CFLAGS += \
- 
- netatalk_LDADD += \
- 	$(top_builddir)/libevent/libevent.la
--endif
-\ No newline at end of file
-+else
-+netatalk_LDADD += $(LIBEVENT_LIBS)
-+endif
-diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
-index 3a02b83..70a2f76 100644
---- a/etc/uams/Makefile.am
-+++ b/etc/uams/Makefile.am
-@@ -95,16 +95,16 @@ uams_dhx_pam_la_CFLAGS     = @SSL_CFLAGS@ @PAM_CFLAGS@
- uams_dhx2_pam_la_CFLAGS    = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@
- uams_gss_la_CFLAGS   	   = @GSSAPI_CFLAGS@
- 
--uams_guest_la_LDFLAGS      = -module -avoid-version
--uams_randnum_la_LDFLAGS    = -module -avoid-version @SSL_LIBS@
--uams_passwd_la_LDFLAGS     = -module -avoid-version @CRYPT_LIBS@
--uams_pam_la_LDFLAGS        = -module -avoid-version @PAM_LIBS@
--uams_pgp_la_LDFLAGS        = -module -avoid-version @SSL_LIBS@
--uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
--uams_dhx_pam_la_LDFLAGS		= -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
--uams_dhx2_passwd_la_LDFLAGS	= -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
--uams_dhx2_pam_la_LDFLAGS	= -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
--uams_gss_la_LDFLAGS   	   = -module -avoid-version @GSSAPI_LIBS@ 
-+uams_guest_la_LDFLAGS      = -shared -module -avoid-version
-+uams_randnum_la_LDFLAGS    = -shared -module -avoid-version @SSL_LIBS@
-+uams_passwd_la_LDFLAGS     = -shared -module -avoid-version @CRYPT_LIBS@
-+uams_pam_la_LDFLAGS        = -shared -module -avoid-version @PAM_LIBS@
-+uams_pgp_la_LDFLAGS        = -shared -module -avoid-version @SSL_LIBS@
-+uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
-+uams_dhx_pam_la_LDFLAGS		= -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
-+uams_dhx2_passwd_la_LDFLAGS	= -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
-+uams_dhx2_pam_la_LDFLAGS	= -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
-+uams_gss_la_LDFLAGS   	   = -shared -module -avoid-version @GSSAPI_LIBS@ 
- 
- #
- # module compilation
-diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am
-index 34fa76e..757c458 100644
---- a/libatalk/dsi/Makefile.am
-+++ b/libatalk/dsi/Makefile.am
-@@ -7,3 +7,4 @@ LIBS = @LIBS@
- noinst_LTLIBRARIES = libdsi.la
- 
- libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c
-+libdsi_la_LIBADD = $(WRAP_LIBS)
-diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am
-index aa62aeb..8ac2045 100644
---- a/libatalk/vfs/Makefile.am
-+++ b/libatalk/vfs/Makefile.am
-@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea_ad.c ea_sys.c extattr.c
- 
- if HAVE_ACLS
- libvfs_la_SOURCES += acl.c
-+libvfs_la_LIBADD = $(ACL_LIBS)
- endif
-diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
-index 3e57077..c02d750 100644
---- a/macros/netatalk.m4
-+++ b/macros/netatalk.m4
-@@ -19,15 +19,16 @@ AC_DEFUN([AC_NETATALK_LIBEVENT], [
-     AC_ARG_ENABLE(
-         bundled-libevent,
-         [AS_HELP_STRING([--disable-bundled-libevent],[whether the bundled version of libevent shall not be used (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version)
--        ])],
--        use_bundled_libevent=$enableval,
--        use_bundled_libevent=yes
-+        ])]
-     )
- 
--    if test x"$use_bundled_libevent" = x"yes" ; then
--        AC_CONFIG_SUBDIRS([libevent])
--    fi
--    AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes")
-+    AS_IF([test x"$enable_bundled_libevent" != x"no"],
-+        [AC_CONFIG_SUBDIRS([libevent])
-+        AC_MSG_RESULT([no])],
-+        [AC_MSG_RESULT([yes])
-+        PKG_CHECK_MODULES([LIBEVENT], [libevent])])
-+
-+    AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$enable_bundled_libevent" != x"no")
- ])
- 
- dnl Filesystem Hierarchy Standard (FHS) compatibility
-@@ -605,7 +606,6 @@ save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
- LDAP_CFLAGS=""
- LDAP_LDFLAGS=""
diff --git a/net-fs/netatalk/files/netatalk-3.1.0-gentoo.patch b/net-fs/netatalk/files/netatalk-3.1.0-gentoo.patch
deleted file mode 100644
index e33637f430cb..000000000000
--- a/net-fs/netatalk/files/netatalk-3.1.0-gentoo.patch
+++ /dev/null
@@ -1,140 +0,0 @@
- Makefile.am              |  6 ------
- bin/uniconv/Makefile.am  |  2 +-
- etc/afpd/afp_avahi.c     |  2 +-
- etc/netatalk/Makefile.am |  5 +++--
- etc/uams/Makefile.am     | 20 ++++++++++----------
- libatalk/dsi/Makefile.am |  3 ++-
- libatalk/vfs/Makefile.am |  1 +
- macros/netatalk.m4       |  1 -
- 8 files changed, 18 insertions(+), 22 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0100598..a7b6c22 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,9 +11,3 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION
- ACLOCAL_AMFLAGS = -I macros
- AUTOMAKE_OPTIONS = foreign
- 
--if RUN_LDCONFIG
--install-exec-hook:
--	@printf "Running ldconfig to ensure libraries installed in system library directories are added to the dynamic linker cache ... "
--	@-@NETA_LDCONFIG@
--	@printf "done\n"
--endif
-diff --git a/bin/uniconv/Makefile.am b/bin/uniconv/Makefile.am
-index 202e722..2be527e 100644
---- a/bin/uniconv/Makefile.am
-+++ b/bin/uniconv/Makefile.am
-@@ -1,6 +1,6 @@
- # Makefile.am for bin/aecho/
- 
--INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
-+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys
- 
- bin_PROGRAMS = uniconv
- 
-diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
-index 5218d51..b68c266 100644
---- a/etc/afpd/afp_avahi.c
-+++ b/etc/afpd/afp_avahi.c
-@@ -174,8 +174,8 @@ static void register_stuff(void) {
-     return;
- 
- fail:
--    time(NULL);
- //    avahi_threaded_poll_quit(ctx->threaded_poll);
-+    return;
- }
- 
- /* Called when publishing of service data completes */
-diff --git a/etc/netatalk/Makefile.am b/etc/netatalk/Makefile.am
-index 06e5a8c..2d4ef20 100644
---- a/etc/netatalk/Makefile.am
-+++ b/etc/netatalk/Makefile.am
-@@ -14,6 +14,7 @@ netatalk_LDADD = \
- 	$(top_builddir)/libatalk/libatalk.la
- 
- netatalk_LDFLAGS =
-+netatalk_CPPFLAGS =
- 
- if USE_BUILTIN_LIBEVENT
- netatalk_CFLAGS += \
-@@ -23,6 +24,6 @@ netatalk_CFLAGS += \
- netatalk_LDADD += \
- 	$(top_builddir)/libevent/libevent.la
- else
--netatalk_CFLAGS += @LIBEVENT_CFLAGS@
--netatalk_LDFLAGS += @LIBEVENT_LDFLAGS@ -levent
-+netatalk_CPPFLAGS += @LIBEVENT_CFLAGS@
-+netatalk_LDADD += @LIBEVENT_LDFLAGS@ -levent
- endif
-diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
-index 3a02b83..70a2f76 100644
---- a/etc/uams/Makefile.am
-+++ b/etc/uams/Makefile.am
-@@ -95,16 +95,16 @@ uams_dhx_pam_la_CFLAGS     = @SSL_CFLAGS@ @PAM_CFLAGS@
- uams_dhx2_pam_la_CFLAGS    = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@
- uams_gss_la_CFLAGS   	   = @GSSAPI_CFLAGS@ @KRB5_CFLAGS@
- 
--uams_guest_la_LDFLAGS      = -module -avoid-version
--uams_randnum_la_LDFLAGS    = -module -avoid-version @SSL_LIBS@
--uams_passwd_la_LDFLAGS     = -module -avoid-version @CRYPT_LIBS@
--uams_pam_la_LDFLAGS        = -module -avoid-version @PAM_LIBS@
--uams_pgp_la_LDFLAGS        = -module -avoid-version @SSL_LIBS@
--uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
--uams_dhx_pam_la_LDFLAGS		= -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
--uams_dhx2_passwd_la_LDFLAGS	= -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
--uams_dhx2_pam_la_LDFLAGS	= -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
--uams_gss_la_LDFLAGS   	   = -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@
-+uams_guest_la_LDFLAGS      = -shared -module -avoid-version
-+uams_randnum_la_LDFLAGS    = -shared -module -avoid-version @SSL_LIBS@
-+uams_passwd_la_LDFLAGS     = -shared -module -avoid-version @CRYPT_LIBS@
-+uams_pam_la_LDFLAGS        = -shared -module -avoid-version @PAM_LIBS@
-+uams_pgp_la_LDFLAGS        = -shared -module -avoid-version @SSL_LIBS@
-+uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
-+uams_dhx_pam_la_LDFLAGS		= -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
-+uams_dhx2_passwd_la_LDFLAGS	= -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
-+uams_dhx2_pam_la_LDFLAGS	= -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
-+uams_gss_la_LDFLAGS   	   = -shared -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@
- 
- #
- # module compilation
-diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am
-index 34fa76e..dbde336 100644
---- a/libatalk/dsi/Makefile.am
-+++ b/libatalk/dsi/Makefile.am
-@@ -1,9 +1,10 @@
- # Makefile.am for libatalk/dsi/
- 
--INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
-+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys
- 
- LIBS = @LIBS@
- 
- noinst_LTLIBRARIES = libdsi.la
- 
- libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c
-+libdsi_la_LIBADD = $(WRAP_LIBS)
-diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am
-index aa62aeb..8ac2045 100644
---- a/libatalk/vfs/Makefile.am
-+++ b/libatalk/vfs/Makefile.am
-@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea_ad.c ea_sys.c extattr.c
- 
- if HAVE_ACLS
- libvfs_la_SOURCES += acl.c
-+libvfs_la_LIBADD = $(ACL_LIBS)
- endif
-diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
-index 7040eb0..5b63285 100644
---- a/macros/netatalk.m4
-+++ b/macros/netatalk.m4
-@@ -613,7 +613,6 @@ save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
- LDAP_CFLAGS=""
- LDAP_LDFLAGS=""
diff --git a/net-fs/netatalk/files/netatalk-3.1.3-gentoo.patch b/net-fs/netatalk/files/netatalk-3.1.3-gentoo.patch
deleted file mode 100644
index 65f555eb6aa1..000000000000
--- a/net-fs/netatalk/files/netatalk-3.1.3-gentoo.patch
+++ /dev/null
@@ -1,127 +0,0 @@
- Makefile.am              |  6 ------
- etc/afpd/afp_avahi.c     |  2 +-
- etc/netatalk/Makefile.am |  5 +++--
- etc/uams/Makefile.am     | 20 ++++++++++----------
- libatalk/dsi/Makefile.am |  3 ++-
- libatalk/vfs/Makefile.am |  1 +
- macros/netatalk.m4       |  1 -
- 8 files changed, 18 insertions(+), 22 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0100598..a7b6c22 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,9 +11,3 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION
- ACLOCAL_AMFLAGS = -I macros
- AUTOMAKE_OPTIONS = foreign
- 
--if RUN_LDCONFIG
--install-exec-hook:
--	@printf "Running ldconfig to ensure libraries installed in system library directories are added to the dynamic linker cache ... "
--	@-@NETA_LDCONFIG@
--	@printf "done\n"
--endif
-diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
-index 5218d51..b68c266 100644
---- a/etc/afpd/afp_avahi.c
-+++ b/etc/afpd/afp_avahi.c
-@@ -174,8 +174,8 @@ static void register_stuff(void) {
-     return;
- 
- fail:
--    time(NULL);
- //    avahi_threaded_poll_quit(ctx->threaded_poll);
-+    return;
- }
- 
- /* Called when publishing of service data completes */
-diff --git a/etc/netatalk/Makefile.am b/etc/netatalk/Makefile.am
-index 06e5a8c..2d4ef20 100644
---- a/etc/netatalk/Makefile.am
-+++ b/etc/netatalk/Makefile.am
-@@ -14,6 +14,7 @@ netatalk_LDADD = \
- 	$(top_builddir)/libatalk/libatalk.la
- 
- netatalk_LDFLAGS =
-+netatalk_CPPFLAGS =
- 
- if USE_BUILTIN_LIBEVENT
- netatalk_CFLAGS += \
-@@ -23,6 +24,6 @@ netatalk_CFLAGS += \
- netatalk_LDADD += \
- 	$(top_builddir)/libevent/libevent.la
- else
--netatalk_CFLAGS += @LIBEVENT_CFLAGS@
--netatalk_LDFLAGS += @LIBEVENT_LDFLAGS@ -levent
-+netatalk_CPPFLAGS += @LIBEVENT_CFLAGS@
-+netatalk_LDADD += @LIBEVENT_LDFLAGS@ -levent
- endif
-diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
-index 3a02b83..70a2f76 100644
---- a/etc/uams/Makefile.am
-+++ b/etc/uams/Makefile.am
-@@ -95,16 +95,16 @@ uams_dhx_pam_la_CFLAGS     = @SSL_CFLAGS@ @PAM_CFLAGS@
- uams_dhx2_pam_la_CFLAGS    = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@
- uams_gss_la_CFLAGS   	   = @GSSAPI_CFLAGS@ @KRB5_CFLAGS@
- 
--uams_guest_la_LDFLAGS      = -module -avoid-version
--uams_randnum_la_LDFLAGS    = -module -avoid-version @SSL_LIBS@
--uams_passwd_la_LDFLAGS     = -module -avoid-version @CRYPT_LIBS@
--uams_pam_la_LDFLAGS        = -module -avoid-version @PAM_LIBS@
--uams_pgp_la_LDFLAGS        = -module -avoid-version @SSL_LIBS@
--uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
--uams_dhx_pam_la_LDFLAGS		= -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
--uams_dhx2_passwd_la_LDFLAGS	= -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
--uams_dhx2_pam_la_LDFLAGS	= -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
--uams_gss_la_LDFLAGS   	   = -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@
-+uams_guest_la_LDFLAGS      = -shared -module -avoid-version
-+uams_randnum_la_LDFLAGS    = -shared -module -avoid-version @SSL_LIBS@
-+uams_passwd_la_LDFLAGS     = -shared -module -avoid-version @CRYPT_LIBS@
-+uams_pam_la_LDFLAGS        = -shared -module -avoid-version @PAM_LIBS@
-+uams_pgp_la_LDFLAGS        = -shared -module -avoid-version @SSL_LIBS@
-+uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
-+uams_dhx_pam_la_LDFLAGS		= -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
-+uams_dhx2_passwd_la_LDFLAGS	= -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
-+uams_dhx2_pam_la_LDFLAGS	= -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
-+uams_gss_la_LDFLAGS   	   = -shared -module -avoid-version @GSSAPI_LIBS@ @KRB5_LIBS@
- 
- #
- # module compilation
-diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am
-index 34fa76e..dbde336 100644
---- a/libatalk/dsi/Makefile.am
-+++ b/libatalk/dsi/Makefile.am
-@@ -1,9 +1,10 @@
- # Makefile.am for libatalk/dsi/
- 
--INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
-+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys
- 
- LIBS = @LIBS@
- 
- noinst_LTLIBRARIES = libdsi.la
- 
- libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c
-+libdsi_la_LIBADD = $(WRAP_LIBS)
-diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am
-index aa62aeb..8ac2045 100644
---- a/libatalk/vfs/Makefile.am
-+++ b/libatalk/vfs/Makefile.am
-@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea_ad.c ea_sys.c extattr.c
- 
- if HAVE_ACLS
- libvfs_la_SOURCES += acl.c
-+libvfs_la_LIBADD = $(ACL_LIBS)
- endif
-diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
-index 7040eb0..5b63285 100644
---- a/macros/netatalk.m4
-+++ b/macros/netatalk.m4
-@@ -613,7 +613,6 @@ save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
- CFLAGS=""
--LDFLAGS=""
- LIBS=""
- LDAP_CFLAGS=""
- LDAP_LDFLAGS=""
diff --git a/net-fs/netatalk/files/netatalk.init b/net-fs/netatalk/files/netatalk.init
deleted file mode 100644
index 4b9410abcfee..000000000000
--- a/net-fs/netatalk/files/netatalk.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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/netatalk.init,v 1.1 2012/09/10 14:28:03 jlec Exp $
-
-command="/usr/sbin/${SVCNAME}"
-
-depend() {
-	need net
-	need avahi-daemon
-	use logger dns
-	after entropy
-}
diff --git a/net-fs/netatalk/netatalk-2.2.3.ebuild b/net-fs/netatalk/netatalk-2.2.3.ebuild
deleted file mode 100644
index b5b2cb0b4c36..000000000000
--- a/net-fs/netatalk/netatalk-2.2.3.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.3.ebuild,v 1.7 2014/08/05 11:35:37 armin76 Exp $
-
-EAPI="4"
-
-inherit pam eutils flag-o-matic multilib autotools
-
-DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
-
-RDEPEND="
-	!app-editors/yudit
-	dev-libs/libgcrypt:0
-	sys-apps/coreutils
-	>=sys-libs/db-4.2.52
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	appletalk? ( cups? ( net-print/cups ) )
-	avahi? ( net-dns/avahi[dbus] )
-	cracklib? ( sys-libs/cracklib )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	slp? ( net-libs/openslp )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-REQUIRED_USE="ldap? ( acl )"
-
-DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.2-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.3 afpd
-	newinitd "${FILESDIR}"/cnid_metad.init.2 cnid_metad
-
-	if use appletalk; then
-		newinitd "${FILESDIR}"/atalkd.init atalkd
-		newinitd "${FILESDIR}"/atalk_service.init.2 timelord
-		newinitd "${FILESDIR}"/atalk_service.init.2 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.5.ebuild b/net-fs/netatalk/netatalk-2.2.5.ebuild
deleted file mode 100644
index 22de5d395c46..000000000000
--- a/net-fs/netatalk/netatalk-2.2.5.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.5.ebuild,v 1.3 2014/08/05 11:35:37 armin76 Exp $
-
-EAPI=5
-
-inherit pam eutils flag-o-matic multilib autotools
-
-DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
-
-RDEPEND="
-	!app-editors/yudit
-	dev-libs/libgcrypt:0
-	sys-apps/coreutils
-	>=sys-libs/db-4.2.52
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	appletalk? ( cups? ( net-print/cups ) )
-	avahi? ( net-dns/avahi[dbus] )
-	cracklib? ( sys-libs/cracklib )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	slp? ( net-libs/openslp )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-REQUIRED_USE="ldap? ( acl )"
-
-DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.2-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.3 afpd
-	newinitd "${FILESDIR}"/cnid_metad.init.2 cnid_metad
-
-	if use appletalk; then
-		newinitd "${FILESDIR}"/atalkd.init atalkd
-		newinitd "${FILESDIR}"/atalk_service.init.2 timelord
-		newinitd "${FILESDIR}"/atalk_service.init.2 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-3.1.0-r1.ebuild b/net-fs/netatalk/netatalk-3.1.0-r1.ebuild
deleted file mode 100644
index c08cfa2e4deb..000000000000
--- a/net-fs/netatalk/netatalk-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-3.1.0-r1.ebuild,v 1.4 2014/08/05 11:35:37 armin76 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_{6,7} )
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
-
-DESCRIPTION="Open Source AFP server"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils"
-
-CDEPEND="
-	!app-editors/yudit
-	dev-libs/libevent
-	>=dev-libs/libgcrypt-1.2.3:0
-	sys-apps/coreutils
-	>=sys-libs/db-4.2.52
-	sys-libs/tdb
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	avahi? ( net-dns/avahi[dbus,-mdnsresponder-compat] )
-	cracklib? ( sys-libs/cracklib )
-	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tracker? ( app-misc/tracker )
-	utils? ( ${PYTHON_DEPS} )
-	"
-RDEPEND="${CDEPEND}
-	utils? (
-		dev-lang/perl
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	)"
-DEPEND="${CDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-RESTRICT="test"
-
-REQUIRED_USE="
-	ldap? ( acl )
-	utils? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if ! use utils; then
-		sed \
-			-e "s:shell_utils::g" \
-			-i contrib/Makefile.am || die
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-
-	append-flags -fno-strict-aliasing
-
-	if use acl; then
-		myeconfargs+=( --with-acls $(use_with ldap) )
-	else
-		myeconfargs+=( --without-acls --without-ldap )
-	fi
-
-	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# TODO:
-	# systemd : --with-init-style=systemd
-	myeconfargs+=(
-		--disable-silent-rules
-		$(use_enable avahi zeroconf)
-		$(use_enable debug)
-		$(use_enable debug debugging)
-		$(use_enable pgp pgp-uam)
-		$(use_enable kerberos)
-		$(use_enable kerberos krbV-uam)
-		$(use_enable quota)
-		$(use_enable tcpd tcp-wrappers)
-		$(use_with cracklib)
-		$(use_with dbus afpstats)
-		$(use_with pam)
-		$(use_with samba smbsharemodes)
-		$(use_with shadow)
-		$(use_with ssl ssl-dir)
-		$(use_with tracker)
-		$(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
-		--enable-overwrite
-		--disable-krb4-uam
-		--disable-afs
-		--with-libevent-header=/usr/include
-		--with-libevent-lib=/usr/$(get_libdir)
-		--with-bdb=/usr
-		--with-uams-path=/usr/$(get_libdir)/${PN}
-		--disable-silent-rules
-		--with-init-style=gentoo
-		--without-libevent
-		--without-tdb
-		--with-lockfile=/run/lock/${PN}
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use avahi; then
-		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
-	else
-		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
-	fi
-
-	# The pamd file isn't what we need, use pamd_mimic_system
-	rm -rf "${ED}/etc/pam.d" || die
-	pamd_mimic_system netatalk auth account password session
-
-	sed \
-		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
-		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
-		distrib/initscripts/service.systemd.tmpl \
-		> "${T}"/service.systemd || die
-	systemd_newunit "${T}"/service.systemd ${PN}.service
-
-	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
-}
-
-pkg_postinst() {
-	local fle
-	if [[ ${REPLACING_VERSIONS} < 3 ]]; then
-		for fle in afp_signature.conf afp_voluuid.conf; do
-			if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then
-				if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then
-					mv \
-						"${ROOT}"etc/netatalk/${fle} \
-						"${ROOT}"var/lib/netatalk/
-				fi
-			fi
-		done
-
-		echo ""
-		elog "Starting from version 3.0 only uses a single init script again"
-		elog "Please update your runlevels accordingly"
-		echo ""
-		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."
-		echo ""
-		elog "Following config files are obsolete now:"
-		elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
-		elog "in favour of"
-		elog "/etc/afp.conf"
-		echo ""
-		elog "Please convert your existing configs before you restart your daemon"
-		echo ""
-		elog "The new AppleDouble default backend is appledouble = ea"
-		elog "Existing entries will be updated on access, but can do an offline"
-		elog "conversion with"
-		elog "dbd -ruve /path/to/Volume"
-		echo ""
-		elog "For general notes on the upgrade, please visit"
-		elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
-		echo ""
-	fi
-}
diff --git a/net-fs/netatalk/netatalk-3.1.1.ebuild b/net-fs/netatalk/netatalk-3.1.1.ebuild
deleted file mode 100644
index 60b06001a06d..000000000000
--- a/net-fs/netatalk/netatalk-3.1.1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-3.1.1.ebuild,v 1.2 2014/08/05 11:35:37 armin76 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_{6,7} )
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
-
-DESCRIPTION="Open Source AFP server"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils"
-
-CDEPEND="
-	!app-editors/yudit
-	dev-libs/libevent
-	>=dev-libs/libgcrypt-1.2.3:0
-	sys-apps/coreutils
-	>=sys-libs/db-4.2.52
-	sys-libs/tdb
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	avahi? ( net-dns/avahi[dbus,-mdnsresponder-compat] )
-	cracklib? ( sys-libs/cracklib )
-	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tracker? ( app-misc/tracker )
-	utils? ( ${PYTHON_DEPS} )
-	"
-RDEPEND="${CDEPEND}
-	utils? (
-		dev-lang/perl
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	)"
-DEPEND="${CDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-RESTRICT="test"
-
-REQUIRED_USE="
-	ldap? ( acl )
-	utils? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.0-gentoo.patch )
-
-src_prepare() {
-	if ! use utils; then
-		sed \
-			-e "s:shell_utils::g" \
-			-i contrib/Makefile.am || die
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-
-	append-flags -fno-strict-aliasing
-
-	if use acl; then
-		myeconfargs+=( --with-acls $(use_with ldap) )
-	else
-		myeconfargs+=( --without-acls --without-ldap )
-	fi
-
-	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# TODO:
-	# systemd : --with-init-style=systemd
-	myeconfargs+=(
-		--disable-silent-rules
-		$(use_enable avahi zeroconf)
-		$(use_enable debug)
-		$(use_enable debug debugging)
-		$(use_enable pgp pgp-uam)
-		$(use_enable kerberos)
-		$(use_enable kerberos krbV-uam)
-		$(use_enable quota)
-		$(use_enable tcpd tcp-wrappers)
-		$(use_with cracklib)
-		$(use_with dbus afpstats)
-		$(use_with pam)
-		$(use_with samba smbsharemodes)
-		$(use_with shadow)
-		$(use_with ssl ssl-dir)
-		$(use_with tracker)
-		$(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
-		--enable-overwrite
-		--disable-krb4-uam
-		--disable-afs
-		--with-libevent-header=/usr/include
-		--with-libevent-lib=/usr/$(get_libdir)
-		--with-bdb=/usr
-		--with-uams-path=/usr/$(get_libdir)/${PN}
-		--disable-silent-rules
-		--with-init-style=gentoo
-		--without-libevent
-		--without-tdb
-		--with-lockfile=/run/lock/${PN}
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use avahi; then
-		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
-	else
-		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
-	fi
-
-	# The pamd file isn't what we need, use pamd_mimic_system
-	rm -rf "${ED}/etc/pam.d" || die
-	pamd_mimic_system netatalk auth account password session
-
-	sed \
-		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
-		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
-		distrib/initscripts/service.systemd.tmpl \
-		> "${T}"/service.systemd || die
-	systemd_newunit "${T}"/service.systemd ${PN}.service
-
-	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
-}
-
-pkg_postinst() {
-	local fle
-	if [[ ${REPLACING_VERSIONS} < 3 ]]; then
-		for fle in afp_signature.conf afp_voluuid.conf; do
-			if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then
-				if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then
-					mv \
-						"${ROOT}"etc/netatalk/${fle} \
-						"${ROOT}"var/lib/netatalk/
-				fi
-			fi
-		done
-
-		echo ""
-		elog "Starting from version 3.0 only uses a single init script again"
-		elog "Please update your runlevels accordingly"
-		echo ""
-		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."
-		echo ""
-		elog "Following config files are obsolete now:"
-		elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
-		elog "in favour of"
-		elog "/etc/afp.conf"
-		echo ""
-		elog "Please convert your existing configs before you restart your daemon"
-		echo ""
-		elog "The new AppleDouble default backend is appledouble = ea"
-		elog "Existing entries will be updated on access, but can do an offline"
-		elog "conversion with"
-		elog "dbd -ruve /path/to/Volume"
-		echo ""
-		elog "For general notes on the upgrade, please visit"
-		elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
-		echo ""
-	fi
-}
diff --git a/net-fs/netatalk/netatalk-3.1.3.ebuild b/net-fs/netatalk/netatalk-3.1.3.ebuild
deleted file mode 100644
index 7424527b1a15..000000000000
--- a/net-fs/netatalk/netatalk-3.1.3.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-3.1.3.ebuild,v 1.2 2014/08/05 11:35:37 armin76 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
-
-DESCRIPTION="Open Source AFP server"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils"
-
-CDEPEND="
-	!app-editors/yudit
-	dev-libs/libevent
-	>=dev-libs/libgcrypt-1.2.3:0
-	sys-apps/coreutils
-	>=sys-libs/db-4.2.52
-	sys-libs/tdb
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	avahi? ( net-dns/avahi[dbus,-mdnsresponder-compat] )
-	cracklib? ( sys-libs/cracklib )
-	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tracker? ( app-misc/tracker )
-	utils? ( ${PYTHON_DEPS} )
-	"
-RDEPEND="${CDEPEND}
-	utils? (
-		dev-lang/perl
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	)"
-DEPEND="${CDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-RESTRICT="test"
-
-REQUIRED_USE="
-	ldap? ( acl )
-	utils? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if ! use utils; then
-		sed \
-			-e "s:shell_utils::g" \
-			-i contrib/Makefile.am || die
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-
-	append-flags -fno-strict-aliasing
-
-	if use acl; then
-		myeconfargs+=( --with-acls $(use_with ldap) )
-	else
-		myeconfargs+=( --without-acls --without-ldap )
-	fi
-
-	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# TODO:
-	# systemd : --with-init-style=systemd
-	myeconfargs+=(
-		--disable-silent-rules
-		$(use_enable avahi zeroconf)
-		$(use_enable debug)
-		$(use_enable debug debugging)
-		$(use_enable pgp pgp-uam)
-		$(use_enable kerberos)
-		$(use_enable kerberos krbV-uam)
-		$(use_enable quota)
-		$(use_enable tcpd tcp-wrappers)
-		$(use_with cracklib)
-		$(use_with dbus afpstats)
-		$(use_with pam)
-		$(use_with samba smbsharemodes)
-		$(use_with shadow)
-		$(use_with ssl ssl-dir)
-		$(use_with tracker)
-		$(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
-		--enable-overwrite
-		--disable-krb4-uam
-		--disable-afs
-		--with-libevent-header=/usr/include
-		--with-libevent-lib=/usr/$(get_libdir)
-		--with-bdb=/usr
-		--with-uams-path=/usr/$(get_libdir)/${PN}
-		--disable-silent-rules
-		--with-init-style=gentoo
-		--without-libevent
-		--without-tdb
-		--with-lockfile=/run/lock/${PN}
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use avahi; then
-		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
-	else
-		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
-	fi
-
-	# The pamd file isn't what we need, use pamd_mimic_system
-	rm -rf "${ED}/etc/pam.d" || die
-	pamd_mimic_system netatalk auth account password session
-
-	sed \
-		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
-		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
-		distrib/initscripts/service.systemd.tmpl \
-		> "${T}"/service.systemd || die
-	systemd_newunit "${T}"/service.systemd ${PN}.service
-
-	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
-}
-
-pkg_postinst() {
-	local fle
-	if [[ ${REPLACING_VERSIONS} < 3 ]]; then
-		for fle in afp_signature.conf afp_voluuid.conf; do
-			if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then
-				if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then
-					mv \
-						"${ROOT}"etc/netatalk/${fle} \
-						"${ROOT}"var/lib/netatalk/
-				fi
-			fi
-		done
-
-		echo ""
-		elog "Starting from version 3.0 only uses a single init script again"
-		elog "Please update your runlevels accordingly"
-		echo ""
-		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."
-		echo ""
-		elog "Following config files are obsolete now:"
-		elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
-		elog "in favour of"
-		elog "/etc/afp.conf"
-		echo ""
-		elog "Please convert your existing configs before you restart your daemon"
-		echo ""
-		elog "The new AppleDouble default backend is appledouble = ea"
-		elog "Existing entries will be updated on access, but can do an offline"
-		elog "conversion with"
-		elog "dbd -ruve /path/to/Volume"
-		echo ""
-		elog "For general notes on the upgrade, please visit"
-		elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
-		echo ""
-	fi
-}
diff --git a/net-fs/netatalk/netatalk-3.1.4.ebuild b/net-fs/netatalk/netatalk-3.1.4.ebuild
deleted file mode 100644
index 7af3732ef824..000000000000
--- a/net-fs/netatalk/netatalk-3.1.4.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-3.1.4.ebuild,v 1.1 2014/08/10 11:37:01 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
-
-DESCRIPTION="Open Source AFP server"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="acl avahi cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils"
-
-CDEPEND="
-	!app-editors/yudit
-	dev-libs/libevent
-	>=dev-libs/libgcrypt-1.2.3:0
-	sys-apps/coreutils
-	>=sys-libs/db-4.2.52
-	sys-libs/tdb
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	avahi? ( net-dns/avahi[dbus,-mdnsresponder-compat] )
-	cracklib? ( sys-libs/cracklib )
-	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tracker? ( app-misc/tracker )
-	utils? ( ${PYTHON_DEPS} )
-	"
-RDEPEND="${CDEPEND}
-	utils? (
-		dev-lang/perl
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	)"
-DEPEND="${CDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-RESTRICT="test"
-
-REQUIRED_USE="
-	ldap? ( acl )
-	utils? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.3-gentoo.patch )
-
-src_prepare() {
-	if ! use utils; then
-		sed \
-			-e "s:shell_utils::g" \
-			-i contrib/Makefile.am || die
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-
-	append-flags -fno-strict-aliasing
-
-	if use acl; then
-		myeconfargs+=( --with-acls $(use_with ldap) )
-	else
-		myeconfargs+=( --without-acls --without-ldap )
-	fi
-
-	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# TODO:
-	# systemd : --with-init-style=systemd
-	myeconfargs+=(
-		--disable-silent-rules
-		$(use_enable avahi zeroconf)
-		$(use_enable debug)
-		$(use_enable debug debugging)
-		$(use_enable pgp pgp-uam)
-		$(use_enable kerberos)
-		$(use_enable kerberos krbV-uam)
-		$(use_enable quota)
-		$(use_enable tcpd tcp-wrappers)
-		$(use_with cracklib)
-		$(use_with dbus afpstats)
-		$(use_with pam)
-		$(use_with samba smbsharemodes)
-		$(use_with shadow)
-		$(use_with ssl ssl-dir)
-		$(use_with tracker)
-		$(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
-		--enable-overwrite
-		--disable-krb4-uam
-		--disable-afs
-		--with-libevent-header=/usr/include
-		--with-libevent-lib=/usr/$(get_libdir)
-		--with-bdb=/usr
-		--with-uams-path=/usr/$(get_libdir)/${PN}
-		--disable-silent-rules
-		--with-init-style=gentoo
-		--without-libevent
-		--without-tdb
-		--with-lockfile=/run/lock/${PN}
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use avahi; then
-		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
-	else
-		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
-	fi
-
-	# The pamd file isn't what we need, use pamd_mimic_system
-	rm -rf "${ED}/etc/pam.d" || die
-	pamd_mimic_system netatalk auth account password session
-
-	sed \
-		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
-		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
-		distrib/initscripts/service.systemd.tmpl \
-		> "${T}"/service.systemd || die
-	systemd_newunit "${T}"/service.systemd ${PN}.service
-
-	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
-}
-
-pkg_postinst() {
-	local fle
-	if [[ ${REPLACING_VERSIONS} < 3 ]]; then
-		for fle in afp_signature.conf afp_voluuid.conf; do
-			if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then
-				if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then
-					mv \
-						"${ROOT}"etc/netatalk/${fle} \
-						"${ROOT}"var/lib/netatalk/
-				fi
-			fi
-		done
-
-		echo ""
-		elog "Starting from version 3.0 only uses a single init script again"
-		elog "Please update your runlevels accordingly"
-		echo ""
-		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."
-		echo ""
-		elog "Following config files are obsolete now:"
-		elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
-		elog "in favour of"
-		elog "/etc/afp.conf"
-		echo ""
-		elog "Please convert your existing configs before you restart your daemon"
-		echo ""
-		elog "The new AppleDouble default backend is appledouble = ea"
-		elog "Existing entries will be updated on access, but can do an offline"
-		elog "conversion with"
-		elog "dbd -ruve /path/to/Volume"
-		echo ""
-		elog "For general notes on the upgrade, please visit"
-		elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
-		echo ""
-	fi
-}