net-fs/netatalk: Version BUmp, #522052

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

4 files changed, 331 insertions, 16 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 685d22e1eecb..0edf65c06e42 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.111 2014/08/10 11:37:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.112 2014/09/15 18:17:13 jlec Exp $
+
+*netatalk-3.1.6 (15 Sep 2014)
+
+  15 Sep 2014; Justin Lecher <jlec@gentoo.org> +netatalk-3.1.6.ebuild,
+  +files/netatalk-3.1.6-gentoo.patch:
+  Version BUmp, #522052
 
 *netatalk-3.1.4 (10 Aug 2014)
 
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 43c827a53e30..00454950eb21 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -12,6 +12,7 @@ AUX netatalk-3.0-gentoo.patch 5538 SHA256 b9a8be8e0efe21d69d75ed8943d72b836edbd2
 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-3.1.6-gentoo.patch 4817 SHA256 9107159e20269f3c912d91ce4fc2ad1ec4df4fd28e8a9a0547ceb296c1147d8f SHA512 f9df5c810d1e3aeca740d0518ada89358baa44b0b808477fe39a5e0962609eb5d821fa69ab65489f2ea04e08e86047c76c86179936bb7fbc44db0be7dc78167d WHIRLPOOL 08187b07a2dc6f9fd26f8111bea136a468e4aedef9d3191e5dd0a441d646646100b6deb1d9081510e43ba05de48b490befa5997472b5cf9c16e5c416994e5ea8
 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
@@ -21,6 +22,7 @@ DIST netatalk-3.1.0.tar.bz2 1802913 SHA256 18626e1674e4eace896ece44f06650e75f701
 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
 DIST netatalk-3.1.4.tar.bz2 1821078 SHA256 cac45e24110507d39ac001c73e55835b06c0adc38a82007b53764a6751b2774b SHA512 9b71fc354733f3bc31e0cc4e3ad80f5691d2ed8512ed2a7ec49b3f3d27500a8ca6c3928f70724bc8e49ff1879220bc119afcea1d4d1d5810083e403c723d0d8f WHIRLPOOL c17607edc183295069d500dc02fd38de6f4954b7d2c661909ee9e830d3d39a16e21e1f2969239d1895964fdee627b0dcc79ce29533ee92c3dd6653ee3247bbe3
+DIST netatalk-3.1.6.tar.bz2 1817059 SHA256 2df2b3b12be3f11eddb0fc2f88cb39d09a8c95792a4d97d9dd22127c5a5efb21 SHA512 36bfd3df30f1a3228a6f8f05e7744f9551d01d5a59d9c05e581f731e4fe9417bc1a7178e2e6af1128ea9a5c848bfa9a447ecf22691daa201f1fa37adcbe19be8 WHIRLPOOL 9f52d774487781aa43444bfe920fc07d9b7fe6bece45bca7cb44a9b7bc498ed17662c42d64db0628f668098c0bf7b6cb3f9c813d39e0fdac9f59b7eeae359d5d
 EBUILD netatalk-2.2.1-r3.ebuild 4367 SHA256 571e04fffc950c1f6a43fba901ca05df502880af0876ba5fa97cb7753b26d41e SHA512 0fd4ea4c591ddcc196d7e289bb10b2c291d3569e7d0d36acd08858020f71ecf2846c9fcfe01fbe89741e0e3ca238fe00b1dfde1c3770a3d167b4c7f349c19aca WHIRLPOOL 2857bf36f5285761b6eaf2ed82489ba60bd3cbaa5ed43a741549bce774f4d2864aed436aa6ca0fa258b82817b04718e4bf7d5959626a17f4aea7b6359138c3b1
 EBUILD netatalk-2.2.3.ebuild 4382 SHA256 a8e527661d1d41783064f1e8a4cebaf34d5215bd8ce926e4f2f73cfffc1b0d49 SHA512 eeece6919a8daad56df2eb0a98bacca5ea56b2b58233973b2508e35b8745987419da52369b8e2c4b153e6404075e771c3635119fed2cde28d9cf23f2eb990efe WHIRLPOOL f951ec735b4e4ca2688c89075f6e9cec6015a7e8cc9acd1e321a777ecac8012aa7dd19cfcf1d0e4115ca90499bb8c651d5d5d8ed34490717733a7f0941860c40
 EBUILD netatalk-2.2.5.ebuild 4380 SHA256 6a33dc936a17cedbfe72118fd97b04430b2952bae443fca32c352fd9809c37a9 SHA512 815b00278d3588095f0eb9363548644ae919b44b5529c3bd9284b330378209735db350c6908597dcbba54b03a33dc41448a4047aa8894d6b02f165ad6a13786c WHIRLPOOL eefbcc28e8d71519d2268620dca0de7d1b79f35b684994a60904d44d86fbcc24de4bae0c6887f05b0f6a2d18f808f09b259d69de173479ffd755b1649e726c21
@@ -29,24 +31,25 @@ EBUILD netatalk-3.1.0-r1.ebuild 4953 SHA256 096dac0e556e9a14c58a4fdb7148b3006ddd
 EBUILD netatalk-3.1.1.ebuild 4958 SHA256 11c5580561b4421d54e4fd0d374d467c6f7d93b951b2ddfe5de9c943afabe362 SHA512 bc8a155d1176b92baf49e55bdeac8d0632fe6a7324d7ff75d7e5171693a0d385f5ecf5c027f76800da4c7e0f34c5f95ed8bdaf1781c60d9691a1df4bd811a727 WHIRLPOOL e570e517f2e4cb1810e79d8a99f77b31bf139bc30e82f641a7946b21b541b18a0e3e0df3a6174f24ccacb79d887fdcbe5504897e7aa088b9f74ac7ba8b2e1dff
 EBUILD netatalk-3.1.3.ebuild 4946 SHA256 8376860c2ded76726d44678fefab7bd5ab2c3e13a4e1c24ae13b8f7b5cf8ddd8 SHA512 dc74f1b65791ff66db0dd1d4f658e0199dd4951ecaa1e021bb171cdfa10ff0e1d466e481b091af50b204a4e7bad38dfbda538a772d0990f74695aa6699b5a3e1 WHIRLPOOL 1c2eb2ca203834b33d8c168f703ff1b12b9ad6683eae267e6524142d06b955a0b4d8037af8fb813a8d195ef4fe274b6427cc4ac41a424cf9869510d69313d865
 EBUILD netatalk-3.1.4.ebuild 4950 SHA256 a0984a74e878dcbfdb44f1ac38038a56feb36b0c346031744afeab46ca37e910 SHA512 23881cbfa260f03703f9d29548d7f079778eb0d80a67893ee0c00eeeb9f14febcaeecddda5dc3cd806d02b70fe8e83cd182d6a9544c89f22fefbdba4fe56c729 WHIRLPOOL 089eba6d58f521baa1dd1370d360d3c9c00f11cbc7eb25b16b06cb5637778213423582e9a45ae9dcddf404b7d9461ca988a671227027f1e9e5bef63b0c1c5a60
-MISC ChangeLog 19087 SHA256 556fc3ccb2cf308b28851cda10521828aff40cd101803ee273f8489f2eaf5666 SHA512 2d090d6640486772215b2211ade356651bb7457ac1d0f8be9eb32de79b3f1e1011190a39cdf7740fbbe53afc7895c39f7613eb761f00d611f63ecdbc12be5df9 WHIRLPOOL 2688767a954f809ef14ffd0b90d571da6bacef8651bcb8ace3fbc151ff80de220ef36fb6fa19624b1728ea0f2344df87a9f9227d91c77ce2391ce7ad90d9dad1
+EBUILD netatalk-3.1.6.ebuild 4943 SHA256 3e23d9fa054c7c321df5562893b9ea64290ade5c3133afce36f22b33fca15310 SHA512 2320636fc4720a22a21291a262a69fafc4829b8795c63aa027c6db769ebc346c34b1126660528f229fe15fde08c53db1d2af7e60cd66de021aa628aef257726a WHIRLPOOL 1726a246062a30de3de770e6c3451e60ab91d200d9417485daf6602db47526ec6b4adaa7b25ed207f50aa441d31bcbea1b3e47f2bb90e6667c3a42598d7cf483
+MISC ChangeLog 19252 SHA256 89e5d3f7555208d69f126c66a9de892d8a036f6d8c566c2b0e68d46eabb84a05 SHA512 8baf0b99c9adbb4c813e3a8bbfefc99f1b94e265884a4d9c04d6e8e68ce48ed98f893f04b706b4ad54805773f677955fcf764219de92ab06c906fdedef0f25ff WHIRLPOOL 5f49594bf172aea9bd7f1ad551048e4bad3a55c377dcf848efc4515b60c7f9b0e442c0aaaa07412fa917d6ed37d4e31e10389c74b65d290837e5360afa26b3ca
 MISC metadata.xml 1247 SHA256 e749aa01e28ac562bbb01a0b4f0fa890da57bd6f4a1e22ad91fc75bbc4fe8a76 SHA512 ce9f9f8da7fddc03389b2abcf9cdadb9e796417589eb8d6451fae69799409ca8fa4dc219509187e3dfc8ed3668ed4cf2029ad1103443a57c61a7011ff0c23b3c WHIRLPOOL 8afea3162c4300881a535fa75ce3ef7f81e9661a34976b01b8837b7df3f59ada0426a83c2baf4bb05221c76e43b58a6a79de82ac9fb0b02c146baa108b8d539c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJT51ljXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUFy0cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirk5YP/AqDchyLaEGqg/XrjofFx6xs
-SQKful/h8RMNQzbODdgo6TRQTedGJr4/7eXX9qUV516Er8l3/rojTGw1n7zTnr3w
-WplBr6ePAYaJeM51TwJvKgtiO/ZXilHD8zjsFK7CYhMxmWr+a/G+nGkedKHx+m2w
-i8ievKQXbc0mTJGo2yDzjUPuYi+co9FNif00LiA01ncVsA2t1mGGP+jTYmaPBM+4
-WPpPrXQT4RZFp9YypbaIVXYf+fq+9wvFMuqA0sBWxTrXwQLTuRe/HqA+I6Y7znMk
-8KHhrSWZxuuhIDul189MzRuJwx31yRUN3yn82bc/hzibk5mCZnaMmdAAQKPD0Eak
-kl/c8EF/4rjCNs2xWVLmCmr3+viIkxCFZO0ZLBi1thjyupBaxXzRkqyr11h/BnLh
-HasuPp09BkSXnBB/IxsTU2P32IoQFQHAIRVC8YWhZ/Px7zNWyIuwsqec0BZLylHX
-OWUAtb9xf2+bB9kYkF/Nb2gtWUZAOySA3fIX+SM0wr5lh/tiFNY7Ohefh314TbcH
-20FvjC2bKcDxX39JpXk9I5s04jrwlPzMDPIT8KnOJyvRJTUcawi2wtcdyxKXAyMC
-yDUYY7IZnyy54vlmvKarNPmk72dEMZQ9IHFM+D20F3Pwqhgb5nbxC+c3AT08+sas
-ZUnu+5fiEcVcKyPfTL1E
-=BrtP
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirm2wP/3NVjP/5qKLJsT3plWUZ6/L5
+d7VbmE5NMzP/6DfaZSfo6Zoo/O2HDSbsOPectt0eO8bNqUlp/KwCs3dAlmr5tE23
+X4ShIc1ZtApZeJR53I9b0DdenuqSGVM9HIgceMUOxDy6jrfckw4UwETHVR/gtPdd
+F5w55apAjNlcjhsnkT1EaghenVxNbL48rGq6LNpQccSL2wYanSniNOsQdYOFZZZv
+YFO92hxH4zBFPsPSgc5ljBAeZysqIq1kUjR+NkcfIWujob4bVRXDcc/9yPh157lM
+WsE5QLs7bQ/bVOtQCX2I85NfJGE18RJaTiJjflbfOhB5/cOb02dqWfHYoi53MbM7
+iDOzc17p/wqCtmZD1uoRG4eRpVWPeTH9TuqgI3bQXt6sFZewUi+hiMmhsCD6DQPE
+MY1woQeQ4dy2cE/L+UkChYthmwH5zDiq6DhM+nnN1egLpy6jbQXo2h+UY617Zrl2
+tqSbSdxmh+pMoBtGRyLPQpO8MsUZbNfhZb740DaOt6RRIF0m4nzwO8vPekoCFrao
+tjBv+cnjKAzajbCDt0dZrAPeV9c8IX/oUrQ2dSvcCFbK8YBy3sb3zbl1DJo3kQbK
+bJh1XfbmymBsMEFAsfFhp12xm6MXTDolOQ1Rm9xiAzKhp/HEaS9NOMDBxFn/rMfm
+7cbAAEV6v2mzoZEfC1vK
+=jG68
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch b/net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch
new file mode 100644
index 000000000000..e5e396b68d2f
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.6-gentoo.patch
@@ -0,0 +1,127 @@
+ Makefile.am              |  6 ------
+ etc/netatalk/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/netatalk/afp_avahi.c b/etc/netatalk/afp_avahi.c
+index 5218d51..b68c266 100644
+--- a/etc/netatalk/afp_avahi.c
++++ b/etc/netatalk/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.6.ebuild b/net-fs/netatalk/netatalk-3.1.6.ebuild
new file mode 100644
index 000000000000..d1f77fc9edc0
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.1.6.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.6.ebuild,v 1.1 2014/09/15 18:17:13 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}"/${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
+}