net-fs/netatalk: Version Bump, #436908

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

5 files changed, 300 insertions, 8 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 6aa01fe34549..d0a47b629529 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.88 2012/09/12 06:33:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.89 2012/10/06 12:41:07 jlec Exp $
+
+*netatalk-3.0.1 (06 Oct 2012)
+
+  06 Oct 2012; Justin Lecher <jlec@gentoo.org> netatalk-3.0.ebuild,
+  +netatalk-3.0.1.ebuild, +files/netatalk-3.0.1-gentoo.patch:
+  Version Bump, #436908
 
   12 Sep 2012; Justin Lecher <jlec@gentoo.org> netatalk-3.0.ebuild:
   Add missing DEP on dev-libs/libevent, #434758
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index ba6ed9c32ffd..014b81bd9080 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -9,20 +9,23 @@ AUX netatalk-2.0.5-control-pam.patch 997 SHA256 4cf74450782f9f6395436d1d433d4d46
 AUX netatalk-2.2.1-gentoo.patch 3476 SHA256 23fd2cb02789191ddc38b867f3cc76373e096a9a1150c64563534afa8922b529 SHA512 cb8dd6de6dae6f4461730186fbbb1f5476e66ff0e08ee8b99e31065a5cb9c26d1fc0210ce49aebc20bdc7c6fedc1b5963294c14be3479ad3af0882a07db96fe4 WHIRLPOOL 14c426f57ea7aa9f2bc8c9ab998a19cca3ca99850dd8c4bdfd93f22d39151c390c4ec31d744b4995e3f5cae0e71efe3aff349fa769caf542d41243657d8c5de4
 AUX netatalk-2.2.2-gentoo.patch 3562 SHA256 74b82bcd703a381016e87c67af24243a52ebc0672101adfec3434a621cc0df10 SHA512 51bcb8418a5e63e23dd88db2f73510f0e04807c31b8c5c8456ec84c2ccd6f0e3247e76e0933442762a937e0d186a62dd3a811b8127ea65f73dae4259fce6a17c WHIRLPOOL 10a9325dd31ed463ceea1c7865152da056e7bdd27b3fff73bb052f015d8e3514033a2d89876c513a2bb72f2fd0849aa00887d30af99b8e3ead6d8e16a32a8a68
 AUX netatalk-3.0-gentoo.patch 5538 SHA256 b9a8be8e0efe21d69d75ed8943d72b836edbd2f4dde7230d104bef1f3e6de1ab SHA512 96282f0f0e494cd4d462d8565276bec0aa9c57e3362602f4173acfe1429a8e4c93589a213c55d6167544b3c73ab33e5170e9186d8abc1b10feb3d3223ed6274c WHIRLPOOL 4d755cd85db2474bf3522bfc0a9d48bc133bd8df949ecd5a658ba6cf1f71ef84409ed97e966505ee94818136409400963cae6c03ccd59e17b9c3a59bdb68e18e
+AUX netatalk-3.0.1-gentoo.patch 5139 SHA256 482efc764b349d2d1374cc90e62c296314828d6ec28fc385b2272ce65b6df304 SHA512 3b85d2ab3199eaa0177af31fae42d5ccec30aa96ed8f725aba063a16b3dc9b7768f2799674b47e055554c6405727a59e28256f9aaeaf87099a94f48bf1b7800b WHIRLPOOL 555190ac46b48fa9fb77695f384d6016e9bfb5974a904bd6e7823be6bf28bdbd7ef1b13213f2e90e70c950b133469c9b96cb1eea67ee701b5b54968eb6936b4c
 AUX netatalk.init 339 SHA256 fbd73f6315d2e72c7768a222654635a7033797374624eeb0dac2f319a8d1aa33 SHA512 26b4d26ea77d7774351c13ddd71724aa5f21801b8edbbb2dc6a1975c3a6cb6164ae9aacf3046c36e8b94dafd370b1503e8939ce8ce02f26c9f6802eee302e83d WHIRLPOOL 949d181565a0b13effaa72b8213245557d8e9af295405e7e0a2ce210f0ef8dff4ee345a12d37acd393900924bfdaed0a1c922b9f2047335c0e6672c1d38ed4ca
 DIST netatalk-2.2.1.tar.bz2 1227602 SHA256 3ab81c6335f8c33fd01ae599459a26c8cfe3b975009ce73640cae823ddc78bbf SHA512 1a487f7a4f56d1b4e5a9e8c961ac8de0ff7148e33e45cd1bf268cfcd35ecf70fc55c1ddcb4c4ba421b3a96c34cd57eed5518c9e6733495aaefd04b6a5719b683 WHIRLPOOL c5cf18d21986d08d8f81fe5681722cdb58d9ce79071d0870c5c2c079172a509727381ae077e54d01a3f73e3b38e01ba94c407b51ffdc09be09492ff0b2cdf038
 DIST netatalk-2.2.3.tar.bz2 1288642 SHA256 b088e6cc6237f7ad98af65812a74bcc830a2d4aebeea71cfd932ace8ef93132c SHA512 ecadbc6129efc8f7518b6221beeadf1623e934fe23889a993e57275e9d1417359cbcd6cbb552985c7b54f3fc5b3dc959ed006ab03a5b2c5ab5fa098c3ec2b596 WHIRLPOOL d3bd1b5f3154dc5497d5f68ef157ffb46d096d8bd95204989a142b4cde4fdb134469d1cea1cdb9545a8497fecd6b13198f3862fe9d2e17516d8d52bef2b66749
+DIST netatalk-3.0.1.tar.bz2 1633970 SHA256 31f2a30d8eac0de5a8b8beddbd7b3418ba898a0d60b4d20c3ed6b568e91cc203 SHA512 97b0f02716052b1faaa064ec7feb681fd44ac8283c254aa88884d82f1858b5cf015f2a7eec1fbb630c582000064e2a8c9c1329274ce844b5e5a442814386e075 WHIRLPOOL ddf5cbaf936cab13555bbc0cf971ad9d97a7f67bb138fc5955fca47ddc482968e43b791d1556334b9b291be23ae1f4a01f93f7e4b723617c8b22a37c9f307d6a
 DIST netatalk-3.0.tar.bz2 1628026 SHA256 b7babbc986dbd6f0fca55103637de6947892b29287cb7cfbbaaa77dea3ead54c SHA512 690fa21a72ef1ef119b930cf9aba160dff6e780a7e9aa4668f962d232d00abc21b8b256c1eef99e2a977ddd286fed7405c6b704da27036a4fa89397cf9ad446b WHIRLPOOL ac81c1cc1ec06e5c13dbbf7a688b946f79e846cfa587a187ab088569ed9bbd887f206c4d10016bd86f685420712382ed8f47ce189ee392ab03e797df04651c36
 EBUILD netatalk-2.2.1-r3.ebuild 4393 SHA256 dd4260a41f82eb2aa52f49d627ab047e2b67235d872bc51e6e33f62d5c15bc10 SHA512 e62dc7d44e41c60fe7907ff65347ed8bee5d03c7e95193ae677c70daa0065d13af37ad2df361633af5c0c1b05ed139153f0b151195d671ec3e6c7c0252262136 WHIRLPOOL 514de01217057ccceafbe800730bb729766bf8749cc735cb05ccfd680da0c4c26aaf7b79030274614cc87cd75d41057a81c5efa6767dadeecc6c140bf771792c
 EBUILD netatalk-2.2.3.ebuild 4411 SHA256 0ea8e8f655cf86620cec89d39fdfa8aac5aa7023aa734e2f96637a5199701df8 SHA512 c874a50bf1bf96cd17e95c533947922806b3e57043318df7d34be80044aa6a9249e6f8e322b02851786dc5d7b5d9cbe87de1ca7f1a1c3c99f0720c1e6eab7caa WHIRLPOOL 2c5d9bbeded245bdd8f66b54e5f648210305660bffec355a39946f5e0afe639dfb1537a3eccb4df1df04808614b8145e9cfcfc4c9f01420e9d1cac54362e0098
-EBUILD netatalk-3.0.ebuild 3774 SHA256 1ec1c92d39b91ee4e29d78c2ced9aa447dbb59b6b103edbb6eba30573af57e5e SHA512 d41c91af040920d3017cbe20557b7766613d9d8c13e0bd7257bb695cfd9f6fd959dcc4d67824154789ae5f5874863eb726ae5621fbfe1b40cb8926d98c6f6452 WHIRLPOOL c1a4f843630bf6b6d96208ac49ecf7c7ac4139af3500387ae2dd4861f5b3a00a33332e1c225a6f35176bb3149350e958cb5738afda09bfbe09cd85646d5dcd2f
-MISC ChangeLog 14894 SHA256 4967cb8cb16bb786a9957d48fdf1fafceb9c2ca1481092446cac7f22b5e118ab SHA512 dabc77793838555d39ae9b7ba8d0774e9e44c851144c4a8a6e0769920b20f4294428f62f9483bd192c56c41ad67fb215f1440a81951e39f829308b4d0a934f9d WHIRLPOOL 313095fbc5adeb011121b47191f77aa07720ecc1838c73beaac49b1574944f61b81ec67e13fc75b78f950011c0b9937ada610d1c6e3055a2e4f86b86c226c761
+EBUILD netatalk-3.0.1.ebuild 3860 SHA256 0ee7030bd9c858bff0e1c29d210eed4de62bbd8f56e80c291037af0dc49c00b5 SHA512 98d0f92f8c3c43cad9f4e204b0c5231bafd0f7e5a307288b8fa4f201cad2806d2864c24a0b1c2d75c59254258272b509f6212c58e5521894fb12e5eae257e0bd WHIRLPOOL ff83a246adb2943e472933bb35c50c985824863131e687cd8851c868dcee13a1e2b3cf35bdd806b61182a7d24ec0654b4c9f2f1b83533bb153caa6636b2d055f
+EBUILD netatalk-3.0.ebuild 3736 SHA256 cf4c9c0c417c36b3bcd2bfba5dcf76751bceccd926730802e1852af77950c60e SHA512 d47595c180a0ebfe0171508dbc623c5aa8d4951dd8aa683e646d988f2cabe5d2d67a7291df73f2f9554d5c780451c07da12708154de8b4d1be629c6fe78cc8b0 WHIRLPOOL 4260469400f416d18a82b5aa18e9d764a726a34ba8a3fc0ea2f86ab8b5c3965e7cdcd23ca19283efbb6f1c5fa9b071111037c658d01725dbf954fa96cf297802
+MISC ChangeLog 15080 SHA256 023237d0c98c08c223aeb4e641f18d64d1ebc5eb8972a05fb1b45670229258f6 SHA512 6c2bcba1ee044c8a00a8ab17e51933d6d3c502cef7828cbbeeb4720f11e6e038382c43ea4fe3580754d319d49b3dc1992efe1234696856b405157d2d8bfb5831 WHIRLPOOL 19bf805ebc606d81d984bbb43cc069aa6e8bbf769e13ddae37356565364f3d59cc2018fdb0888e402069b51adf2db92dbf78a467c5043f4a933371b5e5f3cec1
 MISC metadata.xml 1087 SHA256 96259ebef2dfc90225c952b18146a3224ccb85374441c946865661826c14829d SHA512 e9336c19f587969a2eb9b6deff748af0232c086c67ad3a419bae43aa2cfc94d1ff996f6b26051fe7771fc80131e7abea9532709c0b64d86824cfa450e82749b4 WHIRLPOOL 6c57b2450a6ebc68b2b68e60ddf9d8c7ef50b9fe4b0e75b3fdb6be3d38f04645a498482fc377da9722ab01feab96d72159d18c4507795c504373445bd99ea36d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBQLMoACgkQgAnW8HDreRaR3ACfe48qLYBwgpsxxqSg24LTxf73
-QaYAn33sbL59rEznNLSeXDh5OR6n2rpw
-=co+5
+iEYEAREIAAYFAlBwJuYACgkQgAnW8HDreRbcEACfRlAMuXfC4mzu3pyFSzZwBMUT
+c2wAniUtazdta5LMnbEecBBT4QmO+bdB
+=8mUV
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/netatalk-3.0.1-gentoo.patch b/net-fs/netatalk/files/netatalk-3.0.1-gentoo.patch
new file mode 100644
index 000000000000..6a416786888a
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.0.1-gentoo.patch
@@ -0,0 +1,140 @@
+ 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@
+ 
+-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..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/netatalk-3.0.1.ebuild b/net-fs/netatalk/netatalk-3.0.1.ebuild
new file mode 100644
index 000000000000..542a2bf0a190
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.0.1.ebuild
@@ -0,0 +1,143 @@
+# 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-3.0.1.ebuild,v 1.1 2012/10/06 12:41:07 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils flag-o-matic multilib pam
+
+DESCRIPTION="Open Source AFP server"
+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 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl avahi cracklib debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tcpd"
+
+RDEPEND="
+	!app-text/yudit
+	dev-libs/libevent
+	dev-libs/libgcrypt
+	sys-apps/coreutils
+	>=sys-libs/db-4.2.52
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	avahi? ( net-dns/avahi[dbus] )
+	cracklib? ( sys-libs/cracklib )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	"
+DEPEND="${RDEPEND}"
+PDEPEND="sys-apps/openrc"
+
+RESTRICT="test"
+
+REQUIRED_USE="ldap? ( acl )"
+
+DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/DEVELOPER )
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	local myeconfargs=()
+
+	append-flags -fno-strict-aliasing
+
+	if use acl; then
+		myconf+=( --with-acls $(use_with ldap) )
+	else
+		myconf+=( --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 pam)
+		$(use_with samba smbsharemodes)
+		$(use_with shadow)
+		$(use_with ssl ssl-dir)
+		--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
+		)
+	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 "${D}/etc/pam.d"
+	pamd_mimic_system netatalk auth account password session
+}
+
+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.0.ebuild b/net-fs/netatalk/netatalk-3.0.ebuild
index 5b478142e579..e00e6c0f6d31 100644
--- a/net-fs/netatalk/netatalk-3.0.ebuild
+++ b/net-fs/netatalk/netatalk-3.0.ebuild
@@ -1,6 +1,6 @@
 # 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-3.0.ebuild,v 1.2 2012/09/12 06:33:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-3.0.ebuild,v 1.3 2012/10/06 12:41:07 jlec Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ AUTOTOOLS_AUTORECONF=yes
 
 inherit autotools-utils flag-o-matic multilib pam
 
-DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
+DESCRIPTION="Open Source AFP server"
 HOMEPAGE="http://netatalk.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"