net-fs/netatalk: Version BUmp, #516358

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

4 files changed, 332 insertions, 17 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 85fe3988b7fa..608f8fd729ec 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.108 2014/03/14 07:41:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.109 2014/07/06 09:05:04 jlec Exp $
+
+*netatalk-3.1.3 (06 Jul 2014)
+
+  06 Jul 2014; Justin Lecher <jlec@gentoo.org> +netatalk-3.1.3.ebuild,
+  +files/netatalk-3.1.3-gentoo.patch:
+  Version BUmp, #516358
 
 *netatalk-3.1.1 (14 Mar 2014)
 
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index c16fef7c726b..81118cbdcb8c 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -11,6 +11,7 @@ AUX netatalk-2.2.2-gentoo.patch 3562 SHA256 74b82bcd703a381016e87c67af24243a52eb
 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-3.1.3-gentoo.patch 4797 SHA256 8bf7268301d412d53ece0ae272da026ccd7ea9376685c712f2541dfdac5cac7a SHA512 606844bfcba2f14ee9dc95e2da22c4311a99c32464bf0f65ba10d51d236e24e8c809302072909f31af365e7b13f5480d82b29b7437d3f8e9e9855321cfec0255 WHIRLPOOL 2addba811c6444e2d305a6faefbb8c3326401676113e2586a34bb134439a7b26ed737f3a4a402714240d2c5d309e4cbd206837f8464728102a69b892cbbe5d55
 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
@@ -18,30 +19,32 @@ DIST netatalk-2.2.5.tar.bz2 1290761 SHA256 7658afc793ab36f1cda7df5719598acbf366e
 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
 DIST netatalk-3.1.1.tar.bz2 1789482 SHA256 1b4e45871d9f17a9b72ddbc6e1978eebd3c729ba2eeffa4ec3b710e023c07727 SHA512 e15ebb71d70b47181adfbc262998fd7d41adfec7bc07a4ffac0b4c51bf6968f696bd15136f10a9fc9f950a174346b940003e06d64a0d5d96c846878ae8c7c8ed WHIRLPOOL 7e293651b6ffb8527872115db27c4eb1ec4e99f4c50b44b845cc1a4388571b230dd782a160a06e8659d98dd3bd17505128cb35f37c1ba2166ea341e6eab0c8dc
+DIST netatalk-3.1.3.tar.bz2 1823258 SHA256 e19d289400d7c9600653e2e6155506c00bbd4f5b6fe45f2e53b1843fe15f6b37 SHA512 17082adb4218ba866fb9841bc4e2bbfa977132e1de2cf2fddb4ae8fd6561ab50921f5a23c179fb24b93bf4d59fa6832e9c4182c27ddb2a6d5c66946e98415ba2 WHIRLPOOL 1d635a8c6988dbaf6d3b3ec4e43d5889ffd0952136da4262a959c2bf4028aba95282158a5b6b6b640825e0d72c0668a75beef923ea415c087d79dcd1065ae999
 EBUILD netatalk-2.2.1-r3.ebuild 4375 SHA256 cf0d878b47ec580eeebfe39999eaaf280dbdd5724025ba97dc18ae7977a9f7b1 SHA512 0137bc319f49726023fd3316f797ba1c2e347ee080f17964918e7c9704e7f4c4f2bfcbde53cea484f0d89ab4ef228af71495046584f9acb88ff562775d3e27db WHIRLPOOL c70ad2f6a63e827f82398db0dc1e1b12492acd221e051e8a614c13c81406d95cdf84619a41e6aa60272c7a870d474b1f0f54f18afce667cbd6a45c7c157b5c19
 EBUILD netatalk-2.2.3.ebuild 4392 SHA256 5d99d0287aaecb27a274480e9449174bc78bedc5d6db30b5d2a4e8f702838ec1 SHA512 051f822be63b3ce585d952b38e1806666834a92bd755485947ca35ede7c1919bc4d01434ae81b3a8aff26fcce1c3d6cbcf2c320b0d81d35c59db852a9772b66a WHIRLPOOL f1dfcc5589a180472d1ec0bc47240f5f71570e9875fac67d57070a5d516d1fbca629a7e97ac8f7046d59fc1fb4ba9b2bbf3613c33770c5cbffaff823390c3016
 EBUILD netatalk-2.2.5.ebuild 4390 SHA256 d03c994582c773cf9735b85d9615d1e0fb4245c70025053d7f1f29e6aa93070e SHA512 8aefcbd65b301a52beeeff0d57bbc4136d3efda7d56e959546d763868550f304de2847ed52d8be6c3642857c3e18949fd9093518478358be28b19274ae2e3283 WHIRLPOOL db4e6f080b2c18e699af870d7e53475450efb9189b29be1a2e85058e096cb2a995f15e6b15af9ea968e5fbf8fa1529fbed5d30a7d44f474a088c16ff37e5d3ce
 EBUILD netatalk-3.0.5-r1.ebuild 4521 SHA256 5a57d6e81236774914e8302efcf13e6f581bc6e0be67f9f50050ad8f8600a2d2 SHA512 e091a33bcfdcef207d3075d6794b51307e70b51669e2f30caa76c098d4a70c9ec6ddd8452239e13b3822bb493cfd0c44af9a0f67e47a2dc07cc9ec1dfa9b88c1 WHIRLPOOL c4d2b6ba484e5402e406f0742898345ec41c1ed5e0146a77246063dfed97acb9bb5f6abea5dc869d2f919f29e485aedac2d7786d9f28f8d117920cfcb2f44ada
 EBUILD netatalk-3.1.0-r1.ebuild 4963 SHA256 f957d18b3f9a1e350c492b4b6150b4ff674465ffb9587cbdfc797d57465cdec1 SHA512 a96bc78c591386ef0dfa3a881ba915423272a2d4d2ef00c4bb202a684e1fa77f2c879315fcf1fe8fae26e582ff42ea0890ee35f936adad0fd6c372dc49a730f2 WHIRLPOOL 1d657d6f6ec4f227e03fd3ddcac61cb8d9d284a7affe4b8fc902815f3126f75d647606c8371a88c23e7f84ab2417fb1520f8d5c318039b0c7c69870915fe8d10
 EBUILD netatalk-3.1.1.ebuild 4965 SHA256 8d8fc1c57690356961cccb1237c0058fdb2185d6c9e0efefbdf43f4f74caae69 SHA512 a0a17183faace9665fe976ce791a75099c9274bd8130eb7bd282561c0b3f49c9768aedf0ddd7985637bd748bff5b93ae2070654a708495291751f3dfd22e677c WHIRLPOOL 00f8fb854c855cd8c0e21e011cc53a1d53f97adad8a636b93d807ca956062f491705db4fa0e2bcfefc183b6f572b16ac89dbeb4d4d702d203ab989481ba806b0
-MISC ChangeLog 18546 SHA256 83094dc112e54f697a5e0affe84a45f484991183527f764ef89ee16e1fd6305c SHA512 8ccefeb74d3d40e0562068b1d7319a58e76f08e7a886de2afeffa6f3c12d9816462dc560e0b14c113f08ae85e4888caec82c0f85a4420fee75d839cec064c07f WHIRLPOOL c76ca7f410315ecd931e6c7d6177c070e942187510915f05757e8c5ee2279eafd7efdccb83f14ff70bbd8494d29a7472203f9e6e162c4340cd197a8aeb87bdc7
+EBUILD netatalk-3.1.3.ebuild 4954 SHA256 7fcc7edfa9f63e1be7ef5ff4b23288aa34d1a6f5b8515d07dabf56562314b669 SHA512 65869bdef37d24b23ab285f4b17c7d8861b28422ce839547bce3e65dba5be8dae5e2c160dca47219dfa0509a42558bfb6b2eba84d1246affaad03fbcc560be0e WHIRLPOOL a391d8eba8f2463d47910257212bf9b74040bc3f1f9147958437c6b427adc21a51365c2d493635bebe95bb6cec74581c693a83c1666ba3da66c585d75fe4c12f
+MISC ChangeLog 18711 SHA256 aeb8081722ad09bcb35b3494b197a4b97fe0b486e07beff9ae3e06c03c4e1177 SHA512 7107a853fdab8e3e91398e7b66b3e71f9049a710a7bd363072e2c8a0ea24d281c1681764532ddc0c3ad66434c21af5752fe0ffb4e51245fcafe2a657162d315b WHIRLPOOL 22f041f3c8f6b24050115209dedd75e64f4d6a22b37fa8364277f7c377a63f1a26dd752a87e586650fa986a5f8999b9c32e2766c5e11abbb6cfe1641f21c6267
 MISC metadata.xml 1247 SHA256 e749aa01e28ac562bbb01a0b4f0fa890da57bd6f4a1e22ad91fc75bbc4fe8a76 SHA512 ce9f9f8da7fddc03389b2abcf9cdadb9e796417589eb8d6451fae69799409ca8fa4dc219509187e3dfc8ed3668ed4cf2029ad1103443a57c61a7011ff0c23b3c WHIRLPOOL 8afea3162c4300881a535fa75ce3ef7f81e9661a34976b01b8837b7df3f59ada0426a83c2baf4bb05221c76e43b58a6a79de82ac9fb0b02c146baa108b8d539c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJTIrKUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTuRFFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirHNsP/1N1qTUT2SGlR1s2YyATqTW4
-e8V00m7+GeSCnsHwwqLPm1q8hi2YItFpqvSAPT8WZqrmTgwnBWoh71MPCDap17I9
-9SFBmtunp5gf2RrVzcA81sMXg06KWWWog4GQcyhAECn68ant9ONqTYW0q6sI9zw3
-Ob5nuGh/T5PL5Za7WLdcMaCYsKYkvzllU5teKOnG7xScCFnf93m5hzN36T2se8WL
-jz86ag1ygf4IfAX3WyZRTjuyioAQmQ8uCiVyKpXx1UAhntTtOzUD46bwbQW6iMMC
-moAU2lQ2+CUEDOq8OcZA1II0fJcPAjojPDo4k3VnMIapg7kiqfnRr1kh/yEx5urG
-CPk5CWVQiSvOJFmCbVk4tmFXeQ+RsZevsVnGdFqObTrp+oki8gq/karJHlnEanCW
-KAuO2eUTgBPunqol1ACOjC9HPoukE7dU7HUvsMI8thHLOzjTpnaNc6MwEDMJnyn5
-G6EA6Sp3202iYo4SJSYkBtb9GKdY9UOSK0Hmmm2ZFByFAhNX31CRXxU/6KefK+HS
-hqcZZ93cTqIw/JQaJRH76UN2A2b6WRvT11tNEvALRqjG252AWZZT4K+KYSY8G/kf
-nXKc/ofvIwGpmvzaIwa6MYLsQM8KDhFDknxOdc8C/ql+JJHCDzJf5KMLDeO9ZBQP
-ub9GfofkckERpCgl3D5z
-=+qEj
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirOdMP/R8J+/p5lmxRWtua+1H/TIj6
+QSTbse2tzWCJkNvpwjzAhd3ZyT9nkdwx6cHhEwjZqZGhb5lUCwEDDTRNmdrXkBGX
+nHP6kNoIjAUGcZ8a5KlwSZc7bVQfb8+kNZ4lkgKKdjb/sLH+STRUfDAwAJOdZlyi
+WlWi2L9Ak39ABWAsWXs3mKgjZTwHu5mOYVVQtBGn8XbNRg1peKzIY5K+aQhHfVqF
+Pp5fBXJADA3GhqvompCfSLIt6+pZQ+ratTsx6suj8he1qO0EWcb3t6x7t+IIKHY6
+nu/coXogh8AJu0qA2KLAWEcf7gDYNWuw/FIMZhYc+bLKSIgAQuyCOamZYWpsF6ww
+0sScBEOwyyf6xuqOd7ZshlKBcPuBi8Exj91ZWfl9z8y3bFYXDRdP/ZkPFT5sbm1P
+yMl3HsMHdA64wXtReRIht3DA7Ei8TyDOLKh1a9tVxQzGigW1+YLrJQ/fyLFuGjqm
+blOt74Y7V7Y4D5fRKeIJYknmf9/KCWgPicBhBCelmOxZ51bnlg2EtYFOKpkVAsHn
+5TNpSALRbXR1fXoX6ygj3xnpEfQ1vezgVM6gI/mFUJOR6/wa1I7ce3XjNCXFoSLY
+77hBkp4GZ6TzYADfI5eSw6rgfpgmv4Q+OEhKPUHmP87WnrDoh827cSuE6JQqUVyG
+s2n9GUzHDR9UKJbKO4Ih
+=HBfZ
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/netatalk-3.1.3-gentoo.patch b/net-fs/netatalk/files/netatalk-3.1.3-gentoo.patch
new file mode 100644
index 000000000000..65f555eb6aa1
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.3-gentoo.patch
@@ -0,0 +1,127 @@
+ 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/netatalk-3.1.3.ebuild b/net-fs/netatalk/netatalk-3.1.3.ebuild
new file mode 100644
index 000000000000..8b789b476cd9
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.1.3.ebuild
@@ -0,0 +1,179 @@
+# 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.1 2014/07/06 09:05:04 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 ~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-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
+}