net-fs/netatalk: Version Bump, #489756

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 350 insertions, 16 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index bcdd484955ff..6f1dad047e33 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.102 2013/11/02 11:34:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.103 2013/11/02 11:59:14 jlec Exp $
+
+  02 Nov 2013; Justin Lecher <jlec@gentoo.org> +netatalk-3.1.0.ebuild,
+  +files/netatalk-3.1.0-gentoo.patch, metadata.xml:
+  Version Bump, #489756
+
+*netatalk-3.1.0 (02 Nov 2013)
+
+  02 Nov 2013; Justin Lecher <jlec@gentoo.org> +netatalk-3.1.0.ebuild,
+  +files/netatalk-3.1.0-gentoo.patch:
+  Version Bump, #489756
 
 *netatalk-3.0.5-r1 (02 Nov 2013)
 
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index a60c68473a27..829b78877b5b 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -10,31 +10,34 @@ AUX netatalk-2.2.1-gentoo.patch 3476 SHA256 23fd2cb02789191ddc38b867f3cc76373e09
 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-3.1.0-gentoo.patch 5175 SHA256 d1af3ff9b81abaa223ff1cf3796f3304c16c30097bc12782715ab28384e0cb8e SHA512 6a51539986ade66af9b254d3e1398e1fc6146e80396417cbb5798905587d2fba6032f77388e64bcc7149f1064acb944e7058fd9d427a16a863699e724f006301 WHIRLPOOL 32bf23e00d3bfa228ce8948fd621989f01fa270aa67a2f06f704bdd29026cbcaece3d0e3b309fffa894d35639dec9dc660c848104664a802c72ba3800b62af2b
 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-2.2.5.tar.bz2 1290761 SHA256 7658afc793ab36f1cda7df5719598acbf366e213e27be1cbbc2d93631c368869 SHA512 77a9b0a49825a0803dfbf16ebf8df0efd7b9244f6cdaed6755936c0af8a62ccb834cac30d47d205ce378bbfb91cf11590eef88896f1d48e6ddbaa8b45e71c612 WHIRLPOOL 1c3c68e9bb7b12f3443c7cbcbc20dc2e77df419f74616998023a26639903c31446f407f7b33f92652aa0e7ebc0fd5a3a0fd4e73219b3bdc13d28b94fd7732e7b
 DIST netatalk-3.0.5.tar.bz2 1713998 SHA256 884247728b56b510347785f576be2df76afb293649870c4cd7fdb3048a64b4a9 SHA512 255bfe379a95949872b0c6d6836617d14701c9a11a5ec838242076696f3cb82158b7459d7a15eec350b3c74ed14c2174c3ac06db6fb9d12a810bd568fa5b3d6a WHIRLPOOL e41ac0f622c5cb0e32b31ab58a858bd5d32ffbd7d0607858a742b9b1f7cfd93295b1e332276ece4d743b41fa7db481dde9e1a5887becdd7d0d64ff3831b3fbad
+DIST netatalk-3.1.0.tar.bz2 1802913 SHA256 18626e1674e4eace896ece44f06650e75f70130f4bf5403dd17152ad3d620db5 SHA512 3f71508c27fabf7fdc25a109857448fcabf6526444a4288a7b40eb62f79e05e27cd11ba43bd9835b3a26b62d452b47898c11f9b6b6c666d2e3df89755ecfb2dc WHIRLPOOL 585afa397695729f8b8bb9f78d89fc3d727e501a1a6d0295bce298be085d63093169f0332d3c42c0e440685d2abb6ce159900e69d9074a53b2e6541fd3ec626c
 EBUILD netatalk-2.2.1-r3.ebuild 4371 SHA256 a75052c870d87e062e4e652d617b42240431d193f641874a95ce3543f8eea30d SHA512 539d3a236279adbfc0ad4fa80c62951975d83b31ceb63aa74b2092a3e89fde1f86ebd729d6239db5952fa5acc621507bfe3c464f0fa685e3b834f88826267380 WHIRLPOOL 5e59fcb3ed961191da38b07260e0867020ff2e6dbb6047c61725cf78ca8482346748e2ef7e0830f4ca91f6a0f15858eec74d5922cd5559e6bb06b8a2399d7a33
 EBUILD netatalk-2.2.3.ebuild 4388 SHA256 7f88dbc7474bcb64cec330d9cafbe0a68b1a659eee40c2c3ae0a5b648723c498 SHA512 e83614525eb214e14136a039e92a589dfcd68cbe8e1fff8e700906e8b5aa44802d57064bbc4ba53c290a2f0ed2510d50bda87a8a99c3c4f382a8158a328d722f WHIRLPOOL 15bdde95498956e06aab44dd25ea7f9c84a0fb6eb95e44d3e688293086da5a06ef515a5f83f8eea48cedceed4a82da4056a79fead5b31f77d337e587e3f3c861
 EBUILD netatalk-2.2.5.ebuild 4386 SHA256 d47703f033199c47aa11b96665ce2290fff5399dcf3148d98d9379be7aaeca44 SHA512 d0105d25937d7ce80f65f2d8fab851c080483e39856abdcacf708b45b40a3123e4d1a16b093d3f44d6c0de5114ddc2b3aa4ec6fbda4dacfed8991c12a60fb299 WHIRLPOOL c8dd31a3bfe91426990e06ae5a731b5dbd4ef37e24226b052d2dcdeb6ea655300322805f578af34ca45922b833d91ba5c06501af9123d51ec935aa311866b534
 EBUILD netatalk-3.0.5-r1.ebuild 4496 SHA256 8d735b15c072e3dda393041737c3f860abc24f8ee4f884c789db6591c39b150c SHA512 c751330e46f047471bf1489dc6f4bbc4866a3db9947d17f592c3419c62b5c502d3bbf74ecb431ffc417f0491d03fbc4d4b0ffd98f8044f2c89eb17f3818f245b WHIRLPOOL ec11295f297195384322d1371f46683da366f5e104d66393dd60e1b2671ddc4108e0bcc2f05abcaf7dbc7d2068101637c115675a7c4c7b8b54185345839807cb
-MISC ChangeLog 17451 SHA256 ce3b3fa387362865656ccd3bb5a2202d9f0ebcc3c01cd4d6e49d9cc1535bbab8 SHA512 14859197ba7eef2262d28ad21eec36ff558be5002752be1c903b7d88ad83a938a273adb0cf49b65a4829047967bfaeac2543f9de6890e676c6aef1fe4845b678 WHIRLPOOL 841a9df13be450721e59870d6d4c204e3acc44f52d41e6c70f64d07b2adeedcd4d07f0ea295cd0c2b722bce19f8012493ebe3edd0cb97c8a6ed73d44571e9487
-MISC metadata.xml 1169 SHA256 613ed65fadd393571a5e56d860b2664233fc0c744184dd5ee61fad579c08d9ef SHA512 de1490f028008001f0882f0d6e51b632e1b5a132be30daf82a2138625a4f6fd3821a22365f8afbd60cfc1bf644258fb6fb9944f1bf48650935fa1ce11d64d734 WHIRLPOOL 2f37d1940733a9d875a222731394f9dece2df9880be7ae65acc7e900f3d056f758666b1417d205bb06f89204efd3cee89f3b08b6527e7d24da8a9dadd3e5dedc
+EBUILD netatalk-3.1.0.ebuild 4798 SHA256 b70e13fb4be9b953dd6be6a6ec087dcb8c42a767645dd7df94829698c7cbd14a SHA512 d57c6b5a6b1c8fab9607379a409e43097c959f9bcdca339b1caa29ee9e318e4943a02f7fdb939b73589a0e7a5b7c14679b12c7543bee51e866f29adf4279e520 WHIRLPOOL 05bdf967f530273ea782eee99f56ef38f15f7cce65a4685bad4be30be1ab43c774f1da60021d6b625da8c03d5997cf77bfc3cfd6d20b6a8560e667128a2a2453
+MISC ChangeLog 17764 SHA256 1efa2fe76c63d67de708cb13cbcea65ddc12ffb17387a49e8d558ce02fdd3d65 SHA512 0e2bc007baa05745756308b9f366ed16357e2d956766a1155c47e04a15d14e5c6f08b387f9bacdacc99cbcdcc81c2ad04883e3406f666758f6525690ff6c0379 WHIRLPOOL e222f383846f52e1641f4a1a4fe23985adecbc481d25e44b38c5e7ee44eae1354e3ee726279a6efda72012af9a08d8df1f1ba3098bb37e0e2187c1808cab0322
+MISC metadata.xml 1247 SHA256 e749aa01e28ac562bbb01a0b4f0fa890da57bd6f4a1e22ad91fc75bbc4fe8a76 SHA512 ce9f9f8da7fddc03389b2abcf9cdadb9e796417589eb8d6451fae69799409ca8fa4dc219509187e3dfc8ed3668ed4cf2029ad1103443a57c61a7011ff0c23b3c WHIRLPOOL 8afea3162c4300881a535fa75ce3ef7f81e9661a34976b01b8837b7df3f59ada0426a83c2baf4bb05221c76e43b58a6a79de82ac9fb0b02c146baa108b8d539c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSdONAAAoJELnU8jG9FVircHQP/jUWHlhNuUsBqmuh1W5bhMOd
-Z6EDFKuuVpo5P+RBa7eML2MM841ZCotpmvjfr5F85V3Kf/VuWALxNLkGSSKinO3N
-9Gcw9ettWdKNn6TO6wY8MvO3cMivmOvbyLhx5W5TVKJQRFRzziItlEl0py7HF4ZN
-W9MnLmKCkHiMElztjZlKDVuw9ara+QlkTuRzKf3xfaDX5cu8Vo9ozCYYHIaGQm5L
-I5X8fa9mmPVHIu70/qp74ft76gclM9LXyVtbLLvHUgbpykQlwpMm/z5hkgenOh1V
-Lg6edjSttzmswecCmOdimemhiGvfixzoMaZ7TPKAGY89NXAen1f8MEdRC4pLeUlW
-q9kU8+oobIcOrHyG0HGOpEb1Prwww95hVYKcdxL/lrOAsH1elPTUrvQ9xnA/KUl2
-QRlXfTPF+5d8Q4Dfgl1nphLP+LEoLxegHk3wUl2Uf07YEOuBFQFPIncV55JyTek7
-PQ4cwBA30eM6+S2wCZZ86pkhBYLa0tuIFfRhUQ/cGeFA3cIFwt7CSJfk+k6TFnWD
-9r50Bcc2w9O24ocJV+8PcpStstBJV6Zpx+7hfsoKWJjMngB5JbKXw/PigYwkmMui
-nxP7/8wQ4du2xz4mQDojY5kIN6BadTWCC3yDWiPJSK/Pbfi5I7nWj0GV5mTVh2HW
-NP6m+d0z4tA61N5HJprG
-=8u70
+iQIcBAEBCgAGBQJSdOkTAAoJELnU8jG9FVirn1MP/RbyZu9jITwW9SpWEenxhEJq
+AexZwPH6DnC0IJl8r+zeBbFwOAsC7vmdpuXp71WVXOfxayj9WNBiFyWg9hM6C60f
+WNNFUlxLneYIubs/uhbFDjFUsHjSK1hRQ8DCgxXCZay2JUN+r56oGKtqiV2lJzLq
+zzga/BB9nMQccHA1/VnjVSkU3dgVZJpK5ryS3D+wS67egT5CDfY467Ga5XwacaoJ
+RaIIDsm66vwMJBUc8RZ2dL0WF6aNbqsUqEgsPw6sxZO/lDjQ+XDYiSUb64UUbOfC
+y5IyJYHoFqfh5NjxK5BsSIpd29ld1UyD0/hroYNIzmp8u71AH7LMHZOPg+l7LAV0
+vTYVxnF9EKV4Lacxu9vHegEjdUBbTnusvPgO7lkTh0puUxmOpmP1LEHkxeISlFlt
+WOoBR9PNS6gR3WKuCDz8AEHnhkM6MIgd7vlMUgxvdGS6o51PLlfAnJHKwbyMxPN4
+yHBxanTYRE0JGAhBK3y5fe0o9sIQ15w6bFrF0aDzN09qM0sP41xwWKMx6KtO+zpb
+cFrAs2lQB2KVLMArxzTaYiyegl7xiXzfq1XN3dkkK/N8yb6fjkuuhK+Phj0DZTXZ
+/hf3M5sS4LjxvkhRkhjRATGLEFXWI0AP2u+aEBQFBkecdD016x6ULt6ouS1ds72r
+HGjhsXfl9xP+GkpKR0w3
+=0/cY
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/netatalk-3.1.0-gentoo.patch b/net-fs/netatalk/files/netatalk-3.1.0-gentoo.patch
new file mode 100644
index 000000000000..e33637f430cb
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.0-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@ @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/metadata.xml b/net-fs/netatalk/metadata.xml
index ac8debc4ec50..3f4ded485f3e 100644
--- a/net-fs/netatalk/metadata.xml
+++ b/net-fs/netatalk/metadata.xml
@@ -27,6 +27,9 @@
     <flag name="shadow">
 			Add shadow support
 		</flag>
+    <flag name="tracker">
+			Add support for spotlight like tracker
+		</flag>
     <flag name="utils">
 			Install afpstats script
 		</flag>
diff --git a/net-fs/netatalk/netatalk-3.1.0.ebuild b/net-fs/netatalk/netatalk-3.1.0.ebuild
new file mode 100644
index 000000000000..bc3da90b5045
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.1.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2013 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.ebuild,v 1.1 2013/11/02 11:59:14 jlec 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 ~sh ~sparc ~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
+	sys-apps/coreutils
+	>=sys-libs/db-4.2.52
+	sys-libs/tdb
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	avahi? ( net-dns/avahi[dbus] )
+	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 tracker /dev/null )
+		--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
+}