public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/betagarden:master commit in: net-fs/netatalk/files/, net-fs/netatalk/
@ 2012-09-05 19:30 Justin Lecher
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2012-09-05 19:30 UTC (permalink / raw
  To: gentoo-commits

commit:     e3b95bd80ae7d47ed0eff2f3c12af16cea178ed9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 19:30:42 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 19:30:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=e3b95bd8

net-fs/netatalk: Imported from tree

(Portage version: 2.2.0_alpha124/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 net-fs/netatalk/ChangeLog                          |  402 ++++++++++++++++++++
 net-fs/netatalk/files/afpd.init.3                  |   22 +
 net-fs/netatalk/files/atalk_service.init.2         |   11 +
 net-fs/netatalk/files/atalkd.init                  |   47 +++
 net-fs/netatalk/files/cnid_metad.init.2            |   15 +
 .../files/netatalk-2.0.5-control-pam.patch         |   23 ++
 net-fs/netatalk/files/netatalk-2.2.1-gentoo.patch  |   76 ++++
 net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch  |   86 +++++
 net-fs/netatalk/files/netatalk-3.0-gentoo.patch    |  146 +++++++
 net-fs/netatalk/metadata.xml                       |   28 ++
 net-fs/netatalk/netatalk-2.0.5-r1.ebuild           |   94 +++++
 net-fs/netatalk/netatalk-2.2.1-r3.ebuild           |  153 ++++++++
 net-fs/netatalk/netatalk-2.2.2.ebuild              |  153 ++++++++
 net-fs/netatalk/netatalk-2.2.3.ebuild              |  154 ++++++++
 net-fs/netatalk/netatalk-3.0.ebuild                |  131 +++++++
 15 files changed, 1541 insertions(+), 0 deletions(-)

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
new file mode 100644
index 0000000..2f4feb4
--- /dev/null
+++ b/net-fs/netatalk/ChangeLog
@@ -0,0 +1,402 @@
+# 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.86 2012/07/29 16:13:28 armin76 Exp $
+
+*netatalk-3.0 (05 Sep 2012)
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> +netatalk-2.0.5-r1.ebuild,
+  +files/netatalk-2.0.5-control-pam.patch, +netatalk-2.2.1-r3.ebuild,
+  +files/netatalk-2.2.1-gentoo.patch, +netatalk-2.2.2.ebuild,
+  +files/netatalk-2.2.2-gentoo.patch, +netatalk-2.2.3.ebuild,
+  +netatalk-3.0.ebuild, +files/netatalk-3.0-gentoo.patch, +files/afpd.init.3,
+  +files/atalk_service.init.2, +files/atalkd.init, +files/cnid_metad.init.2,
+  +metadata.xml:
+  Imported from tree
+
+  29 Jul 2012; Raúl Porcel <armin76@gentoo.org> netatalk-2.2.1-r3.ebuild:
+  sh/sparc stable wrt #411291
+
+  08 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
+  Drop myself out of metadata.
+
+  26 Jun 2012; Zac Medico <zmedico@gentoo.org> netatalk-2.2.1-r3.ebuild,
+  netatalk-2.2.2.ebuild, netatalk-2.2.3.ebuild:
+  inherit eutils for epatch
+
+*netatalk-2.2.3 (22 May 2012)
+
+  22 May 2012; Justin Lecher <jlec@gentoo.org> +netatalk-2.2.3.ebuild,
+  metadata.xml:
+  Version Bump, add myself as maintainer
+
+*netatalk-2.2.2 (02 May 2012)
+
+  02 May 2012; Justin Lecher <jlec@gentoo.org> +netatalk-2.2.2.ebuild,
+  +files/netatalk-2.2.2-gentoo.patch, metadata.xml:
+  Version Bump
+
+  24 Apr 2012; Agostino Sarubbo <ago@gentoo.org> netatalk-2.2.1-r3.ebuild:
+  Stable for amd64, wrt bug #411291
+
+  22 Apr 2012; Markus Meier <maekke@gentoo.org> netatalk-2.2.1-r3.ebuild:
+  x86 stable, bug #411291
+
+  21 Apr 2012; Markus Meier <maekke@gentoo.org> netatalk-2.2.1-r3.ebuild:
+  arm stable, bug #411291
+
+  17 Apr 2012; Brent Baude <ranger@gentoo.org> netatalk-2.2.1-r3.ebuild:
+  Marking netatalk-2.2.1-r3 ppc64 for bug 411291
+
+  16 Apr 2012; Brent Baude <ranger@gentoo.org> netatalk-2.2.1-r3.ebuild:
+  Marking netatalk-2.2.1-r3 ppc for bug 411291
+
+  08 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> -files/afpd.init,
+  -files/afpd.init.2, -files/atalk_service.init, -files/cnid_metad.init,
+  -files/netatalk-2.2.0-path_afp_ipc.patch:
+  Also remove orphan files.
+
+*netatalk-2.2.1-r3 (08 Apr 2012)
+
+  08 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/afpd.init.3,
+  +netatalk-2.2.1-r3.ebuild, -netatalk-2.1.3.ebuild, -netatalk-2.1.5.ebuild,
+  -netatalk-2.1.6.ebuild, -netatalk-2.1.ebuild, -netatalk-2.2.0.ebuild,
+  -netatalk-2.2.1-r1.ebuild, -netatalk-2.2.1-r2.ebuild, -netatalk-2.2.1.ebuild:
+  Add a new init script to make sure that the entropy-gathering daemons are
+  started before afpd, for safety, and remove older versions.
+
+*netatalk-2.2.1-r2 (18 Oct 2011)
+
+  18 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +netatalk-2.2.1-r2.ebuild, +files/afpd.init.2, +files/atalk_service.init.2,
+  +files/cnid_metad.init.2:
+  Revbump with more OpenRC-style init scripts.
+
+  30 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/netatalk-2.2.1-gentoo.patch:
+  Fix building with USE=tcpd, closes bug #384977.
+
+  29 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> files/afpd.init:
+  Avoid false positives in apfd init dependencies.
+
+*netatalk-2.2.1-r1 (29 Sep 2011)
+
+  29 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +netatalk-2.2.1-r1.ebuild, +files/netatalk-2.2.1-gentoo.patch,
+  +files/afpd.init, +files/atalk_service.init, +files/atalkd.init,
+  +files/cnid_metad.init, metadata.xml:
+  Add new revision (that I'll maintain); this version includes a number of
+  improvements on USE flags and dependencies, replacing xfs with quota,
+  dropping the extra dependency over xfsprogs, adding proper ldap dependencies
+  rather than leaving it automagic, adding an USE flag to enable or disable
+  appletalk-based utilities, and replacing the upstream-provided init script
+  with two (or five, if using appletalk proper) services that can be started
+  standalone and properly depend on Avahi. Also describe USE flags according to
+  what they actually do.
+
+*netatalk-2.2.1 (09 Sep 2011)
+
+  09 Sep 2011; Steve Dibb <beandog@gentoo.org> +netatalk-2.2.1.ebuild:
+  Version bump
+
+*netatalk-2.1.6 (09 Sep 2011)
+
+  09 Sep 2011; Steve Dibb <beandog@gentoo.org> +netatalk-2.1.6.ebuild:
+  Version bump
+
+*netatalk-2.2.0 (02 Sep 2011)
+
+  02 Sep 2011; Steve Dibb <beandog@gentoo.org> +netatalk-2.2.0.ebuild,
+  +files/netatalk-2.2.0-path_afp_ipc.patch:
+  Version bump, bug 353177; Rename init script from atalk to netatalk; Restrict
+  test; Add avahi use flag; Add GPL-2 as license
+
+*netatalk-2.1.5 (04 Jan 2011)
+
+  04 Jan 2011; Mike Frysinger <vapier@gentoo.org> +netatalk-2.1.5.ebuild:
+  Version bump #350549 by Timothy Miller.
+
+  15 Oct 2010; Mike Frysinger <vapier@gentoo.org> netatalk-2.0.5-r1.ebuild,
+  netatalk-2.1.ebuild, netatalk-2.1.3.ebuild:
+  Drop older linux-headers dependency #339680 by Robert Lippmann.
+
+*netatalk-2.1.3 (03 Oct 2010)
+
+  03 Oct 2010; Mike Frysinger <vapier@gentoo.org> +netatalk-2.1.3.ebuild:
+  Version bump #332797 by Jon Wilson.
+
+  05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  netatalk-2.0.5-r1.ebuild, netatalk-2.1.ebuild:
+  Remove USE="krb4" because support was dropped from app-crypt/mit-krb5.
+
+*netatalk-2.1 (08 May 2010)
+
+  08 May 2010; Mike Frysinger <vapier@gentoo.org> +netatalk-2.1.ebuild:
+  Version bump #318849 by Russell Knighton.
+
+  01 Apr 2010; Raúl Porcel <armin76@gentoo.org> netatalk-2.0.5-r1.ebuild:
+  sh/sparc stable wrt #252210
+
+  09 Mar 2010; Joseph Jezak <josejx@gentoo.org> netatalk-2.0.5-r1.ebuild:
+  Marked ppc stable for bug #252210.
+
+  08 Mar 2010; Brent Baude <ranger@gentoo.org> netatalk-2.0.5-r1.ebuild:
+  Marking netatalk-2.0.5-r1 ppc64 for bug 252210
+
+  06 Mar 2010; Markus Meier <maekke@gentoo.org> netatalk-2.0.5-r1.ebuild:
+  amd64/arm stable, bug #252210
+
+  05 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
+  netatalk-2.0.5-r1.ebuild:
+  stable x86, security bug 252210
+
+*netatalk-2.0.5-r1 (11 Jan 2010)
+
+  11 Jan 2010; Doug Goldstein <cardoe@gentoo.org> +netatalk-2.0.5-r1.ebuild:
+  EAPI=2 version. fix the paths in the installed headers since we change the
+  location they're installing to
+
+*netatalk-2.0.5 (10 Jan 2010)
+
+  10 Jan 2010; Mike Frysinger <vapier@gentoo.org> +netatalk-2.0.5.ebuild,
+  +files/netatalk-2.0.5-control-pam.patch:
+  Version bump #279057 and block app-text/yudit #247972.
+
+  21 May 2009; Brent Baude <ranger@gentoo.org> netatalk-2.0.3-r4.ebuild:
+  stable ppc, bug 265037
+
+  21 Apr 2009; Raúl Porcel <armin76@gentoo.org> netatalk-2.0.3-r4.ebuild:
+  arm/sh/sparc stable wrt #265037
+
+  18 Apr 2009; Markus Meier <maekke@gentoo.org> netatalk-2.0.3-r4:
+  amd64/x86 stable, bug #265037
+
+  14 Apr 2009; Brent Baude <ranger@gentoo.org> netatalk-2.0.3-r4.ebuild:
+  Marking netatalk-2.0.3-r4 ppc64 for bug 265037
+
+*netatalk-2.0.3-r4 (15 Mar 2009)
+
+  15 Mar 2009; Mike Frysinger <vapier@gentoo.org> +netatalk-2.0.3-r4.ebuild:
+  Drop bindnow flags #227001 by Diego E. Pettenò, stop installing the
+  timeout program as coreutils does it now #259870 by Willard Dawson, and
+  cleanup the ebuild in general.
+
+  14 Mar 2009; Raúl Porcel <armin76@gentoo.org> netatalk-2.0.3-r3.ebuild:
+  Add ~arm wrt wrt #260768
+
+  16 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+  add GLEP 56 USE flag desc from use.local.desc
+
+  21 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
+  Give this back to net-fs herd.
+
+  30 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  netatalk-2.0.3-r2.ebuild:
+  Fix missing DEPEND variable, thanks to Patrick Lauer in bug #153371.
+
+*netatalk-2.0.3-r3 (23 Sep 2006)
+
+  23 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netatalk-2.0.3-xfs.patch, netatalk-2.0.3-r2.ebuild,
+  +netatalk-2.0.3-r3.ebuild:
+  Require latest autotools, fix quoting of ${S} and ${D}, add patch to provide
+  a --without-xfs switch; disable xfs for the stable version, add an xfs
+  useflag and depend on xfsprogs and an old copy of linux-headers for the new
+  version (see bug #148438). Dropped sh keyword because of missing xfsprogs.
+
+  20 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  netatalk-2.0.3-r2.ebuild:
+  Add ~x86-fbsd keyword.
+
+  20 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netatalk-2.0.3-newerdb.patch, netatalk-2.0.3-r2.ebuild:
+  Fix db detection with 4.3 and 4.4 versions.
+
+  19 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netatalk-2.0.3-db43.patch, netatalk-2.0.3-r2.ebuild:
+  Add patch to build with sys-libs/db-4.3.
+
+  31 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/netatalk-1.6.4-tempfile.patch, -netatalk-1.6.4-r1.ebuild,
+  -netatalk-2.0.3.ebuild, netatalk-2.0.3-r2.ebuild:
+  Remove old 1.6.4 and 2.0.3 versions, fix setXid handling, it's bindnow-flags
+  not bindnow_flags.
+
+  31 Dec 2005; Simon Stelling <blubb@gentoo.org> netatalk-2.0.3-r2.ebuild:
+  stable on amd64
+
+  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
+  netatalk-2.0.3-r2.ebuild:
+  Stable on ppc.
+
+  20 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  netatalk-2.0.3-r2.ebuild:
+  Stable on sparc wrt #110406
+
+  18 Dec 2005; Markus Rothe <corsair@gentoo.org> netatalk-2.0.3-r2.ebuild:
+  Stable on ppc64
+
+  13 Dec 2005; Joshua Jackson <tsunam@gentoo.org> netatalk-2.0.3-r2.ebuild:
+  Stable on x86; bug #110406
+
+*netatalk-2.0.3-r2 (13 Dec 2005)
+
+  13 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -netatalk-2.0.3-r1.ebuild, +netatalk-2.0.3-r2.ebuild:
+  Add new revision that moves away /usr/include/netatalk directory to avoid
+  collisions with glibc and freebsd's libc.
+
+  21 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> netatalk-2.0.3.ebuild:
+  Stable on sh. Bug 110406.
+
+  20 Nov 2005; Joseph Jezak <josejx@gentoo.org> netatalk-2.0.3.ebuild:
+  Marked ppc stable for bug #110406.
+
+  30 Oct 2005; Luis Medinas <metalgod@gentoo.org> netatalk-2.0.3.ebuild:
+  Marked Stable on amd64. Bug #110406.
+
+  25 Oct 2005; Brent Baude <ranger@gentoo.org> netatalk-2.0.3.ebuild:
+  marking netatalk-2.0.3 ppc64 stable per bug request 110406
+
+*netatalk-2.0.3-r1 (25 Oct 2005)
+
+  25 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netatalk-2.0.3-setXid.patch, +netatalk-2.0.3-r1.ebuild:
+  Moved here patch from Gentoo/ALT overlay to get the right bindnow flags for
+  the current used linker.
+
+  25 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
+  Fix my name on the changelog.
+
+  04 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> netatalk-1.6.4-r1.ebuild:
+  Stable on sh.
+
+  28 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> netatalk-2.0.3.ebuild:
+  Disable openafs support for now.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> netatalk-2.0.3.ebuild:
+  Added ~sparc keyword wrt bug #97586.
+
+  09 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> -files/atalk,
+  -files/atalk-rc6, -netatalk-1.5.3.1-r1.ebuild, -netatalk-1.6.2.ebuild,
+  -netatalk-1.6.3.ebuild, -netatalk-1.6.4.ebuild, -netatalk-2.0.1.ebuild:
+  Removed old 1.x series and 2.0.1 which is bugged. Left netatalk-1.6.4-r1
+  (current stable) and 2.0.3.
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> netatalk-2.0.3.ebuild:
+  added ~ppc64
+
+  01 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> netatalk-2.0.3.ebuild:
+  Added flags to search in special installation prefix for openafs.
+
+*netatalk-2.0.3 (30 Jun 2005)
+
+  30 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  netatalk-1.5.3.1-r1.ebuild, netatalk-1.6.2.ebuild, netatalk-1.6.3.ebuild,
+  netatalk-1.6.4.ebuild, netatalk-1.6.4-r1.ebuild, netatalk-2.0.1.ebuild,
+  +netatalk-2.0.3.ebuild:
+  I'll take care of netatalk from now on.
+  Added ~amd64 keyword.
+  Ebuild cleanup and Gentoo/FreeBSD compatibility.
+  Fixed LICENSE to BSD to all versions (was incorrectly declared as GPL-2).
+  Use a system-auth-like pamd file.
+
+  12 Dec 2004; <rphillips@gentoo.org> netatalk-2.0.1.ebuild:
+  fixed invalid USE variable. includes cracklib by default now and pulls in the
+  dependency
+
+*netatalk-2.0.1 (11 Dec 2004)
+
+  11 Dec 2004; <rphillips@gentoo.org> netatalk-2.0.1.ebuild:
+  Added Steven Klass' and AD Rutledge's ebuild for 2.0.x series of netatalk.
+  Fixes #69526
+
+  25 Oct 2004; Kurt Lieber <klieber@gentoo.org> netatalk-1.6.4-r1.ebuild:
+  x86 bumpage, bug #66370
+
+  09 Oct 2004; Tom Gall <tgall@gentoo.org> netatalk-1.6.4-r1.ebuild:
+  stable on ppc64, bug #66370
+
+  09 Oct 2004; Jason Wever <weeve@gentoo.org> netatalk-1.6.4-r1.ebuild:
+  Stable on sparc wrt security bug #66370.
+
+*netatalk-1.6.4-r1 (09 Oct 2004)
+
+  09 Oct 2004; <solar@gentoo.org> +files/netatalk-1.6.4-tempfile.patch,
+  +netatalk-1.6.4-r1.ebuild:
+  security bump. Insecure tempfile handling bug 66370
+
+  28 Jun 2004; Tom Gall <tgall@gentoo.org> netatalk-1.6.4.ebuild:
+  stable ppc64, bug #54188 
+
+  10 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org> netatalk-1.6.4.ebuild:
+  Added ~sparc, thanks to Belinus in #gentoo-sparc
+
+  05 Jan 2004; zhen <zhen@gentoo.org> metadata.xml:
+  changing herd to net-fs
+
+*netatalk-1.6.4 (17 Dec 2003)
+
+  17 Dec 2003; zhen <zhen@gentoo.org> netatalk-1.6.4.ebuild:
+  bumped to stable - no new bugs after a week
+
+  09 Dec 2003; zhen <zhen@gentoo.org> metadata.xml:
+  version bump, added metadata
+
+  21 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> netatalk-1.6.2.ebuild,
+  netatalk-1.6.3.ebuild:
+  sys-libs/db fixes for netatalk-1.6*, allows them to build with db>3
+
+*netatalk-1.6.3 (06 Jul 2003)
+
+  06 Jul 2003; Martin Holzer <mholzer@gentoo.org> netatalk-1.6.3.ebuild:
+  Version bumped.
+
+*netatalk-1.6.2 (01 Jul 2003)
+
+  01 Jul 2003; Martin Holzer <mholzer@gentoo.org> netatalk-1.6.2.ebuild,
+  files/atalknew-rc6:
+  Version bumped. Closes #13561.
+
+  24 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> netatalk-1.5.3.1-r1.ebuild:
+  Netatalk actually does not depend on sys-libs/db at all, only when some
+  aditional configuration options are used, which are not provided by the ebuild
+
+*netatalk-1.5.3.1-r1 (06 Apr 2003)
+
+  06 Apr 2003; Martin Holzer <mholzer@gentoo.org> netatalk-1.5.3.1-r1.ebuild:
+  Added docs.
+
+*netatalk-1.5.3.1 (26 Jun 2002)
+
+  24 Jul 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  26 Jun 2002; Seemant Kulleen <seemant@gentoo.org> netatalk-1.5.3.1.ebuild
+  files/digest-netatalk-1.5.3.1 :
+
+  Version bump.
+
+*netatalk-1.5.2 (26 Feb 2002)
+
+  26 Feb 2002; Chris Houser <chouser@gentoo.org> : files/atalk-rc6
+	 files/digest-netatalk-1.5.2 ChangeLog netatalk-1.5.2.ebuild :
+
+  - Fixed a typo in HOMEPAGE, other general cleanup.
+  - Switch to .tar.gz (the .tar.bz2 isn't available for 1.5.2)
+  - Turned on shadow password support
+  - Updated init.d script
+  - This addresses bug 762
+
+*netatalk-1.5_pre6 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
+
+  1 Jul 2001; Achim Gottinger <achim@gentoo.org> :
+
+  *** empty log message ***

diff --git a/net-fs/netatalk/files/afpd.init.3 b/net-fs/netatalk/files/afpd.init.3
new file mode 100644
index 0000000..449bb77
--- /dev/null
+++ b/net-fs/netatalk/files/afpd.init.3
@@ -0,0 +1,22 @@
+#!/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/afpd.init.3,v 1.1 2012/04/08 21:04:02 flameeyes Exp $
+
+command="/usr/sbin/${SVCNAME}"
+command_args="${EXTRA_CONF}"
+pidfile="/var/run/${SVCNAME}.pid"
+
+depend() {
+	need net cnid_metad
+	use logger dns atalkd
+	after entropy
+
+	config /etc/netatalk/afpd.conf
+
+	sed -e 's:#.*::' /etc/netatalk/afpd.conf | fgrep -q -e -ddp \
+		&& need atalkd
+
+	need avahi-daemon
+	need slpd
+}

diff --git a/net-fs/netatalk/files/atalk_service.init.2 b/net-fs/netatalk/files/atalk_service.init.2
new file mode 100644
index 0000000..fb01ee9
--- /dev/null
+++ b/net-fs/netatalk/files/atalk_service.init.2
@@ -0,0 +1,11 @@
+#!/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/atalk_service.init.2,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
+
+command="/usr/sbin/${SVCNAME}"
+
+depend() {
+	need net atalkd
+    use logger dns
+}

diff --git a/net-fs/netatalk/files/atalkd.init b/net-fs/netatalk/files/atalkd.init
new file mode 100644
index 0000000..16b6bad
--- /dev/null
+++ b/net-fs/netatalk/files/atalkd.init
@@ -0,0 +1,47 @@
+#!/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/atalkd.init,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
+
+: ${ATALK_NAME:=$(hostname -s)}
+: ${ATALK_UNIX_CHARSET:=LOCALE}
+: ${ATALK_MAC_CHARSET:=MAC_ROMAN}
+
+depend() {
+	need net
+    use logger dns
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon \
+		--start \
+		--exec /usr/sbin/${SVCNAME} --
+	eend $?
+
+	for reg in \
+		"${ATALK_NAME}:Workstation${ATALK_ZONE}" \
+		"${ATALK_NAME}:netatalk${ATALK_ZONE}"
+	do
+		ebegin "  Registering $reg"
+		nbprgstr "$reg"
+		eend $?
+	done
+}
+
+stop() {
+	for reg in \
+		"${ATALK_NAME}:Workstation${ATALK_ZONE}" \
+		"${ATALK_NAME}:netatalk${ATALK_ZONE}"
+	do
+		ebegin "  Registering $reg"
+		nbpunrgstr "$reg"
+		eend $?
+	done
+
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon \
+		--stop \
+		--exec /usr/sbin/${SVCNAME}
+	eend $?
+}

diff --git a/net-fs/netatalk/files/cnid_metad.init.2 b/net-fs/netatalk/files/cnid_metad.init.2
new file mode 100644
index 0000000..997603d
--- /dev/null
+++ b/net-fs/netatalk/files/cnid_metad.init.2
@@ -0,0 +1,15 @@
+#!/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/cnid_metad.init.2,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
+
+: ${CNID_CONFIG:=-l log_note}
+
+command="/usr/sbin/${SVCNAME}"
+command_args="${CNID_CONFIG}"
+pidfile="/var/run/${SVCNAME}.pid"
+
+depend() {
+	need net
+    use logger
+}

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
new file mode 100644
index 0000000..4c069dc
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-2.0.5-control-pam.patch
@@ -0,0 +1,23 @@
+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.1-gentoo.patch b/net-fs/netatalk/files/netatalk-2.2.1-gentoo.patch
new file mode 100644
index 0000000..d06bf3f
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-2.2.1-gentoo.patch
@@ -0,0 +1,76 @@
+Index: netatalk-2.2.1/etc/afpd/afp_avahi.c
+===================================================================
+--- netatalk-2.2.1.orig/etc/afpd/afp_avahi.c
++++ netatalk-2.2.1/etc/afpd/afp_avahi.c
+@@ -176,8 +176,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 */
+Index: netatalk-2.2.1/etc/uams/Makefile.am
+===================================================================
+--- netatalk-2.2.1.orig/etc/uams/Makefile.am
++++ netatalk-2.2.1/etc/uams/Makefile.am
+@@ -97,16 +97,16 @@ uams_dhx_pam_la_CFLAGS     = @SSL_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
+Index: netatalk-2.2.1/libatalk/Makefile.am
+===================================================================
+--- netatalk-2.2.1.orig/libatalk/Makefile.am
++++ netatalk-2.2.1/libatalk/Makefile.am
+@@ -37,5 +37,3 @@ libatalk_la_DEPENDENCIES = \
+ 	unicode/libunicode.la \
+ 	vfs/libvfs.la
+ 
+-libatalk_la_LDFLAGS = -static
+-
+Index: netatalk-2.2.1/libatalk/vfs/Makefile.am
+===================================================================
+--- netatalk-2.2.1.orig/libatalk/vfs/Makefile.am
++++ netatalk-2.2.1/libatalk/vfs/Makefile.am
+@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea.c sy
+ 
+ if HAVE_ACLS
+ libvfs_la_SOURCES += acl.c
++libvfs_la_LIBADD = $(ACL_LIBS)
+ endif
+Index: netatalk-2.2.1/libatalk/dsi/Makefile.am
+===================================================================
+--- netatalk-2.2.1.orig/libatalk/dsi/Makefile.am
++++ netatalk-2.2.1/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/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch b/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch
new file mode 100644
index 0000000..6939c12
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch
@@ -0,0 +1,86 @@
+ 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
new file mode 100644
index 0000000..59663ad
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.0-gentoo.patch
@@ -0,0 +1,146 @@
+ Makefile.am              |    8 +-------
+ etc/afpd/afp_avahi.c     |    2 +-
+ etc/netatalk/Makefile.am |    7 ++++---
+ etc/uams/Makefile.am     |   20 ++++++++++----------
+ libatalk/dsi/Makefile.am |    1 +
+ libatalk/vfs/Makefile.am |    1 +
+ macros/netatalk.m4       |   15 ++++++++-------
+ 7 files changed, 26 insertions(+), 28 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..7897055 100644
+--- a/etc/netatalk/Makefile.am
++++ b/etc/netatalk/Makefile.am
+@@ -10,8 +10,7 @@ netatalk_CFLAGS = \
+ 	-D_PATH_AFPD=\"$(sbindir)/afpd\" \
+ 	-D_PATH_CNID_METAD=\"$(sbindir)/cnid_metad\"
+ 
+-netatalk_LDADD = \
+-	$(top_builddir)/libatalk/libatalk.la
++netatalk_LDADD = $(top_builddir)/libatalk/libatalk.la
+ 
+ if USE_BUILTIN_LIBEVENT
+ netatalk_CFLAGS += \
+@@ -20,4 +19,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..765ce7a 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"$bundled_libevent" = x"no")
+ ])
+ 
+ dnl Filesystem Hierarchy Standard (FHS) compatibility

diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
new file mode 100644
index 0000000..7291e5f
--- /dev/null
+++ b/net-fs/netatalk/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-fs</herd>
+	<maintainer restrict="&gt;=net-fs/netatalk-2.2.1-r1">
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="appletalk">
+      Build support for Apple's AppleTalk (DDP) protocol and its
+      utilities (atalkd, timelord, papd).
+    </flag>
+		<flag name="cups">
+      Add support for <pkg>net-print/cups</pkg> printers in papd. This
+      flag is only considered if appletalk USE flag is enabled, and is
+      otherwise ignored.
+    </flag>
+		<flag name="quota">
+      Add support for user quota on various filesystems.
+    </flag>
+		<flag name="ssl">
+      Use <pkg>dev-libs/openssl</pkg> to provide DHX User Access
+      Modules. These are not used with most recent versions of OS X
+      and can be kept disabled without risks.
+    </flag>
+		<flag name="xfs">Enable support for XFS Quota</flag>
+	</use>
+</pkgmetadata>

diff --git a/net-fs/netatalk/netatalk-2.0.5-r1.ebuild b/net-fs/netatalk/netatalk-2.0.5-r1.ebuild
new file mode 100644
index 0000000..3b99d94
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.0.5-r1.ebuild
@@ -0,0 +1,94 @@
+# 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-2.0.5-r1.ebuild,v 1.9 2010/10/15 02:05:39 vapier Exp $
+
+EAPI=2
+
+inherit eutils pam
+
+DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="cracklib cups debug kerberos pam slp ssl tcpd xfs"
+
+RDEPEND=">=sys-libs/db-4.2.52
+	cracklib? ( sys-libs/cracklib )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	slp? ( net-libs/openslp )
+	cups? ( net-print/cups )
+	kerberos? ( virtual/krb5 )
+	>=sys-apps/coreutils-7.1
+	!app-text/yudit"
+DEPEND="${RDEPEND}
+	xfs? ( sys-fs/xfsprogs )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-control-pam.patch
+
+	# until someone that understands their config script build
+	# system gets a patch pushed upstream to make
+	# --enable-srvloc passed to configure also add slpd to the
+	# use line on the initscript, we'll need to do it this way
+	if use slp ; then
+		sed -i -e '/^[[:space:]]*use\>/s:$: slpd:' \
+			distrib/initscripts/rc.atalk.gentoo.tmpl || die
+	fi
+}
+
+src_configure() {
+	if ! use xfs ; then
+		eval $(printf '%s\n' {linux,xfs}/{dqblk_xfs,libxfs,xqm,xfs_fs}.h | \
+			sed -e 's:[/.]:_:g' -e 's:^:export ac_cv_header_:' -e 's:$:=no:')
+	fi
+
+	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having
+	# to sed the Makefiles to not do rc-update.
+	# --enable-shadow: let build system detect shadow.h in toolchain
+	econf \
+		$(use_with pam) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable tcpd tcp-wrappers) \
+		$(use_enable kerberos krbV-uam) \
+		--disable-krb4-uam \
+		$(use_enable slp srvloc) \
+		$(use_with ssl ssl-dir) \
+		$(use_with cracklib) \
+		$(use_with slp srvloc) \
+		--disable-afs \
+		--enable-fhs \
+		--with-bdb=/usr
+}
+
+src_compile() {
+	emake || die
+
+	# Create the init script manually (it's more messy to --enable-gentoo)
+	emake -C distrib/initscripts rc.atalk.gentoo || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc CONTRIBUTORS NEWS README TODO VERSION
+
+	newinitd distrib/initscripts/rc.atalk.gentoo atalk || die
+
+	# 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 -e 's/include <netatalk/include <netatalk2/g' \
+		-i "${D}"usr/include/{netatalk2,atalk}/* || die
+}

diff --git a/net-fs/netatalk/netatalk-2.2.1-r3.ebuild b/net-fs/netatalk/netatalk-2.2.1-r3.ebuild
new file mode 100644
index 0000000..6d03f35
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.2.1-r3.ebuild
@@ -0,0 +1,153 @@
+# 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-2.2.1-r3.ebuild,v 1.8 2012/07/29 16:13:28 armin76 Exp $
+
+EAPI="4"
+
+inherit pam eutils flag-o-matic multilib autotools
+
+RESTRICT="test"
+DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
+
+RDEPEND=">=sys-libs/db-4.2.52
+	avahi? ( net-dns/avahi[dbus] )
+	cracklib? ( sys-libs/cracklib )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	slp? ( net-libs/openslp )
+	kerberos? ( virtual/krb5 )
+	>=sys-apps/coreutils-7.1
+	!app-text/yudit
+	dev-libs/libgcrypt
+	appletalk? (
+		cups? ( net-print/cups )
+	)
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	ldap? (
+		net-nds/openldap
+	)
+	"
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/openrc"
+
+REQUIRED_USE="ldap? ( acl )"
+
+DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-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.2.ebuild b/net-fs/netatalk/netatalk-2.2.2.ebuild
new file mode 100644
index 0000000..808f714
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.2.2.ebuild
@@ -0,0 +1,153 @@
+# 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-2.2.2.ebuild,v 1.2 2012/06/26 04:40:58 zmedico Exp $
+
+EAPI="4"
+
+inherit pam eutils flag-o-matic multilib autotools
+
+RESTRICT="test"
+DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
+
+RDEPEND=">=sys-libs/db-4.2.52
+	avahi? ( net-dns/avahi[dbus] )
+	cracklib? ( sys-libs/cracklib )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	slp? ( net-libs/openslp )
+	kerberos? ( virtual/krb5 )
+	>=sys-apps/coreutils-7.1
+	!app-text/yudit
+	dev-libs/libgcrypt
+	appletalk? (
+		cups? ( net-print/cups )
+	)
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	ldap? (
+		net-nds/openldap
+	)
+	"
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/openrc"
+
+REQUIRED_USE="ldap? ( acl )"
+
+DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-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.3.ebuild b/net-fs/netatalk/netatalk-2.2.3.ebuild
new file mode 100644
index 0000000..59ee5c7
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.2.3.ebuild
@@ -0,0 +1,154 @@
+# 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-2.2.3.ebuild,v 1.2 2012/06/26 04:40:58 zmedico 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 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
+
+RDEPEND=">=sys-libs/db-4.2.52
+	avahi? ( net-dns/avahi[dbus] )
+	cracklib? ( sys-libs/cracklib )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	slp? ( net-libs/openslp )
+	kerberos? ( virtual/krb5 )
+	>=sys-apps/coreutils-7.1
+	!app-text/yudit
+	dev-libs/libgcrypt
+	appletalk? (
+		cups? ( net-print/cups )
+	)
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	ldap? (
+		net-nds/openldap
+	)
+	"
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/openrc"
+
+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.0.ebuild b/net-fs/netatalk/netatalk-3.0.ebuild
new file mode 100644
index 0000000..88134a6
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.0.ebuild
@@ -0,0 +1,131 @@
+# 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-2.2.3.ebuild,v 1.2 2012/06/26 04:40:58 zmedico Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils flag-o-matic multilib pam
+
+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 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl avahi cracklib cups debug gpg kerberos ldap pam quota +shadow slp ssl static-libs tcpd"
+
+RDEPEND=">=sys-libs/db-4.2.52
+	avahi? ( net-dns/avahi[dbus] )
+	cracklib? ( sys-libs/cracklib )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	slp? ( net-libs/openslp )
+	kerberos? ( virtual/krb5 )
+	>=sys-apps/coreutils-7.1
+	!app-text/yudit
+	dev-libs/libgcrypt
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	ldap? (
+		net-nds/openldap
+	)
+	"
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/openrc"
+
+RESTRICT="test"
+
+REQUIRED_USE="ldap? ( acl )"
+
+DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/DEVELOPER )
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0-gentoo.patch )
+
+src_prepare() {
+	sed \
+		-e '/^LDFLAGS/d' \
+		-i macros/netatalk.m4 || die
+	autotools-utils_src_prepare
+}
+
+
+src_configure() {
+	local myeconfargs=()
+
+	if use acl; then
+		myconf+=( --with-acls $(use_with ldap) )
+	else
+		myconf+=( --without-acls --without-ldap )
+	fi
+
+	append-flags -fno-strict-aliasing
+
+	# 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 kerberos)
+		$(use_enable kerberos krbV-uam)
+		$(use_enable quota)
+		$(use_enable slp srvloc)
+		$(use_enable tcpd tcp-wrappers)
+		$(use_with cracklib)
+		$(use_with pam)
+		$(use_with ssl ssl-dir)
+		$(use_with shadow)
+		--enable-overwrite
+		--disable-krb4-uam
+		--disable-afs
+		--disable-bundled-libevent
+		--enable-fhs
+		--with-bdb=/usr
+		--with-uams-path=/usr/$(get_libdir)/${PN}
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	newinitd "${FILESDIR}"/afpd.init.3 afpd
+	newinitd "${FILESDIR}"/cnid_metad.init.2 cnid_metad
+
+	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
+
+	# 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() {
+	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"
+	elog "  netatalk"
+	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."
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/betagarden:master commit in: net-fs/netatalk/files/, net-fs/netatalk/
@ 2012-09-10 18:06 Justin Lecher
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2012-09-10 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     f1b8c15ab5c2de336414ea1bb49044ce69405c35
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 10 18:05:52 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 18:05:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=f1b8c15a

Dropped old version

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 net-fs/netatalk/ChangeLog                          |  402 --------------------
 net-fs/netatalk/files/afpd.init.3                  |   22 -
 net-fs/netatalk/files/atalk_service.init.2         |   11 -
 net-fs/netatalk/files/atalkd.init                  |   47 ---
 net-fs/netatalk/files/cnid_metad.init.2            |   15 -
 .../files/netatalk-2.0.5-control-pam.patch         |   23 --
 net-fs/netatalk/files/netatalk-2.2.1-gentoo.patch  |   76 ----
 net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch  |   86 -----
 net-fs/netatalk/files/netatalk-3.0-gentoo.patch    |  146 -------
 net-fs/netatalk/metadata.xml                       |   28 --
 net-fs/netatalk/netatalk-2.0.5-r1.ebuild           |   94 -----
 net-fs/netatalk/netatalk-2.2.1-r3.ebuild           |  153 --------
 net-fs/netatalk/netatalk-2.2.2.ebuild              |  153 --------
 net-fs/netatalk/netatalk-2.2.3.ebuild              |  154 --------
 net-fs/netatalk/netatalk-3.0.ebuild                |  131 -------
 15 files changed, 0 insertions(+), 1541 deletions(-)

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
deleted file mode 100644
index 2f4feb4..0000000
--- a/net-fs/netatalk/ChangeLog
+++ /dev/null
@@ -1,402 +0,0 @@
-# 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.86 2012/07/29 16:13:28 armin76 Exp $
-
-*netatalk-3.0 (05 Sep 2012)
-
-  05 Sep 2012; Justin Lecher <jlec@gentoo.org> +netatalk-2.0.5-r1.ebuild,
-  +files/netatalk-2.0.5-control-pam.patch, +netatalk-2.2.1-r3.ebuild,
-  +files/netatalk-2.2.1-gentoo.patch, +netatalk-2.2.2.ebuild,
-  +files/netatalk-2.2.2-gentoo.patch, +netatalk-2.2.3.ebuild,
-  +netatalk-3.0.ebuild, +files/netatalk-3.0-gentoo.patch, +files/afpd.init.3,
-  +files/atalk_service.init.2, +files/atalkd.init, +files/cnid_metad.init.2,
-  +metadata.xml:
-  Imported from tree
-
-  29 Jul 2012; Raúl Porcel <armin76@gentoo.org> netatalk-2.2.1-r3.ebuild:
-  sh/sparc stable wrt #411291
-
-  08 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
-  Drop myself out of metadata.
-
-  26 Jun 2012; Zac Medico <zmedico@gentoo.org> netatalk-2.2.1-r3.ebuild,
-  netatalk-2.2.2.ebuild, netatalk-2.2.3.ebuild:
-  inherit eutils for epatch
-
-*netatalk-2.2.3 (22 May 2012)
-
-  22 May 2012; Justin Lecher <jlec@gentoo.org> +netatalk-2.2.3.ebuild,
-  metadata.xml:
-  Version Bump, add myself as maintainer
-
-*netatalk-2.2.2 (02 May 2012)
-
-  02 May 2012; Justin Lecher <jlec@gentoo.org> +netatalk-2.2.2.ebuild,
-  +files/netatalk-2.2.2-gentoo.patch, metadata.xml:
-  Version Bump
-
-  24 Apr 2012; Agostino Sarubbo <ago@gentoo.org> netatalk-2.2.1-r3.ebuild:
-  Stable for amd64, wrt bug #411291
-
-  22 Apr 2012; Markus Meier <maekke@gentoo.org> netatalk-2.2.1-r3.ebuild:
-  x86 stable, bug #411291
-
-  21 Apr 2012; Markus Meier <maekke@gentoo.org> netatalk-2.2.1-r3.ebuild:
-  arm stable, bug #411291
-
-  17 Apr 2012; Brent Baude <ranger@gentoo.org> netatalk-2.2.1-r3.ebuild:
-  Marking netatalk-2.2.1-r3 ppc64 for bug 411291
-
-  16 Apr 2012; Brent Baude <ranger@gentoo.org> netatalk-2.2.1-r3.ebuild:
-  Marking netatalk-2.2.1-r3 ppc for bug 411291
-
-  08 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> -files/afpd.init,
-  -files/afpd.init.2, -files/atalk_service.init, -files/cnid_metad.init,
-  -files/netatalk-2.2.0-path_afp_ipc.patch:
-  Also remove orphan files.
-
-*netatalk-2.2.1-r3 (08 Apr 2012)
-
-  08 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/afpd.init.3,
-  +netatalk-2.2.1-r3.ebuild, -netatalk-2.1.3.ebuild, -netatalk-2.1.5.ebuild,
-  -netatalk-2.1.6.ebuild, -netatalk-2.1.ebuild, -netatalk-2.2.0.ebuild,
-  -netatalk-2.2.1-r1.ebuild, -netatalk-2.2.1-r2.ebuild, -netatalk-2.2.1.ebuild:
-  Add a new init script to make sure that the entropy-gathering daemons are
-  started before afpd, for safety, and remove older versions.
-
-*netatalk-2.2.1-r2 (18 Oct 2011)
-
-  18 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org>
-  +netatalk-2.2.1-r2.ebuild, +files/afpd.init.2, +files/atalk_service.init.2,
-  +files/cnid_metad.init.2:
-  Revbump with more OpenRC-style init scripts.
-
-  30 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
-  files/netatalk-2.2.1-gentoo.patch:
-  Fix building with USE=tcpd, closes bug #384977.
-
-  29 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> files/afpd.init:
-  Avoid false positives in apfd init dependencies.
-
-*netatalk-2.2.1-r1 (29 Sep 2011)
-
-  29 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
-  +netatalk-2.2.1-r1.ebuild, +files/netatalk-2.2.1-gentoo.patch,
-  +files/afpd.init, +files/atalk_service.init, +files/atalkd.init,
-  +files/cnid_metad.init, metadata.xml:
-  Add new revision (that I'll maintain); this version includes a number of
-  improvements on USE flags and dependencies, replacing xfs with quota,
-  dropping the extra dependency over xfsprogs, adding proper ldap dependencies
-  rather than leaving it automagic, adding an USE flag to enable or disable
-  appletalk-based utilities, and replacing the upstream-provided init script
-  with two (or five, if using appletalk proper) services that can be started
-  standalone and properly depend on Avahi. Also describe USE flags according to
-  what they actually do.
-
-*netatalk-2.2.1 (09 Sep 2011)
-
-  09 Sep 2011; Steve Dibb <beandog@gentoo.org> +netatalk-2.2.1.ebuild:
-  Version bump
-
-*netatalk-2.1.6 (09 Sep 2011)
-
-  09 Sep 2011; Steve Dibb <beandog@gentoo.org> +netatalk-2.1.6.ebuild:
-  Version bump
-
-*netatalk-2.2.0 (02 Sep 2011)
-
-  02 Sep 2011; Steve Dibb <beandog@gentoo.org> +netatalk-2.2.0.ebuild,
-  +files/netatalk-2.2.0-path_afp_ipc.patch:
-  Version bump, bug 353177; Rename init script from atalk to netatalk; Restrict
-  test; Add avahi use flag; Add GPL-2 as license
-
-*netatalk-2.1.5 (04 Jan 2011)
-
-  04 Jan 2011; Mike Frysinger <vapier@gentoo.org> +netatalk-2.1.5.ebuild:
-  Version bump #350549 by Timothy Miller.
-
-  15 Oct 2010; Mike Frysinger <vapier@gentoo.org> netatalk-2.0.5-r1.ebuild,
-  netatalk-2.1.ebuild, netatalk-2.1.3.ebuild:
-  Drop older linux-headers dependency #339680 by Robert Lippmann.
-
-*netatalk-2.1.3 (03 Oct 2010)
-
-  03 Oct 2010; Mike Frysinger <vapier@gentoo.org> +netatalk-2.1.3.ebuild:
-  Version bump #332797 by Jon Wilson.
-
-  05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
-  netatalk-2.0.5-r1.ebuild, netatalk-2.1.ebuild:
-  Remove USE="krb4" because support was dropped from app-crypt/mit-krb5.
-
-*netatalk-2.1 (08 May 2010)
-
-  08 May 2010; Mike Frysinger <vapier@gentoo.org> +netatalk-2.1.ebuild:
-  Version bump #318849 by Russell Knighton.
-
-  01 Apr 2010; Raúl Porcel <armin76@gentoo.org> netatalk-2.0.5-r1.ebuild:
-  sh/sparc stable wrt #252210
-
-  09 Mar 2010; Joseph Jezak <josejx@gentoo.org> netatalk-2.0.5-r1.ebuild:
-  Marked ppc stable for bug #252210.
-
-  08 Mar 2010; Brent Baude <ranger@gentoo.org> netatalk-2.0.5-r1.ebuild:
-  Marking netatalk-2.0.5-r1 ppc64 for bug 252210
-
-  06 Mar 2010; Markus Meier <maekke@gentoo.org> netatalk-2.0.5-r1.ebuild:
-  amd64/arm stable, bug #252210
-
-  05 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
-  netatalk-2.0.5-r1.ebuild:
-  stable x86, security bug 252210
-
-*netatalk-2.0.5-r1 (11 Jan 2010)
-
-  11 Jan 2010; Doug Goldstein <cardoe@gentoo.org> +netatalk-2.0.5-r1.ebuild:
-  EAPI=2 version. fix the paths in the installed headers since we change the
-  location they're installing to
-
-*netatalk-2.0.5 (10 Jan 2010)
-
-  10 Jan 2010; Mike Frysinger <vapier@gentoo.org> +netatalk-2.0.5.ebuild,
-  +files/netatalk-2.0.5-control-pam.patch:
-  Version bump #279057 and block app-text/yudit #247972.
-
-  21 May 2009; Brent Baude <ranger@gentoo.org> netatalk-2.0.3-r4.ebuild:
-  stable ppc, bug 265037
-
-  21 Apr 2009; Raúl Porcel <armin76@gentoo.org> netatalk-2.0.3-r4.ebuild:
-  arm/sh/sparc stable wrt #265037
-
-  18 Apr 2009; Markus Meier <maekke@gentoo.org> netatalk-2.0.3-r4:
-  amd64/x86 stable, bug #265037
-
-  14 Apr 2009; Brent Baude <ranger@gentoo.org> netatalk-2.0.3-r4.ebuild:
-  Marking netatalk-2.0.3-r4 ppc64 for bug 265037
-
-*netatalk-2.0.3-r4 (15 Mar 2009)
-
-  15 Mar 2009; Mike Frysinger <vapier@gentoo.org> +netatalk-2.0.3-r4.ebuild:
-  Drop bindnow flags #227001 by Diego E. Pettenò, stop installing the
-  timeout program as coreutils does it now #259870 by Willard Dawson, and
-  cleanup the ebuild in general.
-
-  14 Mar 2009; Raúl Porcel <armin76@gentoo.org> netatalk-2.0.3-r3.ebuild:
-  Add ~arm wrt wrt #260768
-
-  16 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  21 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
-  Give this back to net-fs herd.
-
-  30 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
-  netatalk-2.0.3-r2.ebuild:
-  Fix missing DEPEND variable, thanks to Patrick Lauer in bug #153371.
-
-*netatalk-2.0.3-r3 (23 Sep 2006)
-
-  23 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
-  +files/netatalk-2.0.3-xfs.patch, netatalk-2.0.3-r2.ebuild,
-  +netatalk-2.0.3-r3.ebuild:
-  Require latest autotools, fix quoting of ${S} and ${D}, add patch to provide
-  a --without-xfs switch; disable xfs for the stable version, add an xfs
-  useflag and depend on xfsprogs and an old copy of linux-headers for the new
-  version (see bug #148438). Dropped sh keyword because of missing xfsprogs.
-
-  20 May 2006; Diego Pettenò <flameeyes@gentoo.org>
-  netatalk-2.0.3-r2.ebuild:
-  Add ~x86-fbsd keyword.
-
-  20 May 2006; Diego Pettenò <flameeyes@gentoo.org>
-  +files/netatalk-2.0.3-newerdb.patch, netatalk-2.0.3-r2.ebuild:
-  Fix db detection with 4.3 and 4.4 versions.
-
-  19 May 2006; Diego Pettenò <flameeyes@gentoo.org>
-  +files/netatalk-2.0.3-db43.patch, netatalk-2.0.3-r2.ebuild:
-  Add patch to build with sys-libs/db-4.3.
-
-  31 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
-  -files/netatalk-1.6.4-tempfile.patch, -netatalk-1.6.4-r1.ebuild,
-  -netatalk-2.0.3.ebuild, netatalk-2.0.3-r2.ebuild:
-  Remove old 1.6.4 and 2.0.3 versions, fix setXid handling, it's bindnow-flags
-  not bindnow_flags.
-
-  31 Dec 2005; Simon Stelling <blubb@gentoo.org> netatalk-2.0.3-r2.ebuild:
-  stable on amd64
-
-  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
-  netatalk-2.0.3-r2.ebuild:
-  Stable on ppc.
-
-  20 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  netatalk-2.0.3-r2.ebuild:
-  Stable on sparc wrt #110406
-
-  18 Dec 2005; Markus Rothe <corsair@gentoo.org> netatalk-2.0.3-r2.ebuild:
-  Stable on ppc64
-
-  13 Dec 2005; Joshua Jackson <tsunam@gentoo.org> netatalk-2.0.3-r2.ebuild:
-  Stable on x86; bug #110406
-
-*netatalk-2.0.3-r2 (13 Dec 2005)
-
-  13 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
-  -netatalk-2.0.3-r1.ebuild, +netatalk-2.0.3-r2.ebuild:
-  Add new revision that moves away /usr/include/netatalk directory to avoid
-  collisions with glibc and freebsd's libc.
-
-  21 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> netatalk-2.0.3.ebuild:
-  Stable on sh. Bug 110406.
-
-  20 Nov 2005; Joseph Jezak <josejx@gentoo.org> netatalk-2.0.3.ebuild:
-  Marked ppc stable for bug #110406.
-
-  30 Oct 2005; Luis Medinas <metalgod@gentoo.org> netatalk-2.0.3.ebuild:
-  Marked Stable on amd64. Bug #110406.
-
-  25 Oct 2005; Brent Baude <ranger@gentoo.org> netatalk-2.0.3.ebuild:
-  marking netatalk-2.0.3 ppc64 stable per bug request 110406
-
-*netatalk-2.0.3-r1 (25 Oct 2005)
-
-  25 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
-  +files/netatalk-2.0.3-setXid.patch, +netatalk-2.0.3-r1.ebuild:
-  Moved here patch from Gentoo/ALT overlay to get the right bindnow flags for
-  the current used linker.
-
-  25 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
-  Fix my name on the changelog.
-
-  04 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> netatalk-1.6.4-r1.ebuild:
-  Stable on sh.
-
-  28 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> netatalk-2.0.3.ebuild:
-  Disable openafs support for now.
-
-  09 Jul 2005; Jason Wever <weeve@gentoo.org> netatalk-2.0.3.ebuild:
-  Added ~sparc keyword wrt bug #97586.
-
-  09 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> -files/atalk,
-  -files/atalk-rc6, -netatalk-1.5.3.1-r1.ebuild, -netatalk-1.6.2.ebuild,
-  -netatalk-1.6.3.ebuild, -netatalk-1.6.4.ebuild, -netatalk-2.0.1.ebuild:
-  Removed old 1.x series and 2.0.1 which is bugged. Left netatalk-1.6.4-r1
-  (current stable) and 2.0.3.
-
-  07 Jul 2005; Markus Rothe <corsair@gentoo.org> netatalk-2.0.3.ebuild:
-  added ~ppc64
-
-  01 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> netatalk-2.0.3.ebuild:
-  Added flags to search in special installation prefix for openafs.
-
-*netatalk-2.0.3 (30 Jun 2005)
-
-  30 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
-  netatalk-1.5.3.1-r1.ebuild, netatalk-1.6.2.ebuild, netatalk-1.6.3.ebuild,
-  netatalk-1.6.4.ebuild, netatalk-1.6.4-r1.ebuild, netatalk-2.0.1.ebuild,
-  +netatalk-2.0.3.ebuild:
-  I'll take care of netatalk from now on.
-  Added ~amd64 keyword.
-  Ebuild cleanup and Gentoo/FreeBSD compatibility.
-  Fixed LICENSE to BSD to all versions (was incorrectly declared as GPL-2).
-  Use a system-auth-like pamd file.
-
-  12 Dec 2004; <rphillips@gentoo.org> netatalk-2.0.1.ebuild:
-  fixed invalid USE variable. includes cracklib by default now and pulls in the
-  dependency
-
-*netatalk-2.0.1 (11 Dec 2004)
-
-  11 Dec 2004; <rphillips@gentoo.org> netatalk-2.0.1.ebuild:
-  Added Steven Klass' and AD Rutledge's ebuild for 2.0.x series of netatalk.
-  Fixes #69526
-
-  25 Oct 2004; Kurt Lieber <klieber@gentoo.org> netatalk-1.6.4-r1.ebuild:
-  x86 bumpage, bug #66370
-
-  09 Oct 2004; Tom Gall <tgall@gentoo.org> netatalk-1.6.4-r1.ebuild:
-  stable on ppc64, bug #66370
-
-  09 Oct 2004; Jason Wever <weeve@gentoo.org> netatalk-1.6.4-r1.ebuild:
-  Stable on sparc wrt security bug #66370.
-
-*netatalk-1.6.4-r1 (09 Oct 2004)
-
-  09 Oct 2004; <solar@gentoo.org> +files/netatalk-1.6.4-tempfile.patch,
-  +netatalk-1.6.4-r1.ebuild:
-  security bump. Insecure tempfile handling bug 66370
-
-  28 Jun 2004; Tom Gall <tgall@gentoo.org> netatalk-1.6.4.ebuild:
-  stable ppc64, bug #54188 
-
-  10 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org> netatalk-1.6.4.ebuild:
-  Added ~sparc, thanks to Belinus in #gentoo-sparc
-
-  05 Jan 2004; zhen <zhen@gentoo.org> metadata.xml:
-  changing herd to net-fs
-
-*netatalk-1.6.4 (17 Dec 2003)
-
-  17 Dec 2003; zhen <zhen@gentoo.org> netatalk-1.6.4.ebuild:
-  bumped to stable - no new bugs after a week
-
-  09 Dec 2003; zhen <zhen@gentoo.org> metadata.xml:
-  version bump, added metadata
-
-  21 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> netatalk-1.6.2.ebuild,
-  netatalk-1.6.3.ebuild:
-  sys-libs/db fixes for netatalk-1.6*, allows them to build with db>3
-
-*netatalk-1.6.3 (06 Jul 2003)
-
-  06 Jul 2003; Martin Holzer <mholzer@gentoo.org> netatalk-1.6.3.ebuild:
-  Version bumped.
-
-*netatalk-1.6.2 (01 Jul 2003)
-
-  01 Jul 2003; Martin Holzer <mholzer@gentoo.org> netatalk-1.6.2.ebuild,
-  files/atalknew-rc6:
-  Version bumped. Closes #13561.
-
-  24 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> netatalk-1.5.3.1-r1.ebuild:
-  Netatalk actually does not depend on sys-libs/db at all, only when some
-  aditional configuration options are used, which are not provided by the ebuild
-
-*netatalk-1.5.3.1-r1 (06 Apr 2003)
-
-  06 Apr 2003; Martin Holzer <mholzer@gentoo.org> netatalk-1.5.3.1-r1.ebuild:
-  Added docs.
-
-*netatalk-1.5.3.1 (26 Jun 2002)
-
-  24 Jul 2002; Mark Guertin <gerk@gentoo.org> :
-  Added ppc to keywords
-
-  26 Jun 2002; Seemant Kulleen <seemant@gentoo.org> netatalk-1.5.3.1.ebuild
-  files/digest-netatalk-1.5.3.1 :
-
-  Version bump.
-
-*netatalk-1.5.2 (26 Feb 2002)
-
-  26 Feb 2002; Chris Houser <chouser@gentoo.org> : files/atalk-rc6
-	 files/digest-netatalk-1.5.2 ChangeLog netatalk-1.5.2.ebuild :
-
-  - Fixed a typo in HOMEPAGE, other general cleanup.
-  - Switch to .tar.gz (the .tar.bz2 isn't available for 1.5.2)
-  - Turned on shadow password support
-  - Updated init.d script
-  - This addresses bug 762
-
-*netatalk-1.5_pre6 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
-
-  1 Jul 2001; Achim Gottinger <achim@gentoo.org> :
-
-  *** empty log message ***

diff --git a/net-fs/netatalk/files/afpd.init.3 b/net-fs/netatalk/files/afpd.init.3
deleted file mode 100644
index 449bb77..0000000
--- a/net-fs/netatalk/files/afpd.init.3
+++ /dev/null
@@ -1,22 +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/afpd.init.3,v 1.1 2012/04/08 21:04:02 flameeyes Exp $
-
-command="/usr/sbin/${SVCNAME}"
-command_args="${EXTRA_CONF}"
-pidfile="/var/run/${SVCNAME}.pid"
-
-depend() {
-	need net cnid_metad
-	use logger dns atalkd
-	after entropy
-
-	config /etc/netatalk/afpd.conf
-
-	sed -e 's:#.*::' /etc/netatalk/afpd.conf | fgrep -q -e -ddp \
-		&& need atalkd
-
-	need avahi-daemon
-	need slpd
-}

diff --git a/net-fs/netatalk/files/atalk_service.init.2 b/net-fs/netatalk/files/atalk_service.init.2
deleted file mode 100644
index fb01ee9..0000000
--- a/net-fs/netatalk/files/atalk_service.init.2
+++ /dev/null
@@ -1,11 +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/atalk_service.init.2,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
-
-command="/usr/sbin/${SVCNAME}"
-
-depend() {
-	need net atalkd
-    use logger dns
-}

diff --git a/net-fs/netatalk/files/atalkd.init b/net-fs/netatalk/files/atalkd.init
deleted file mode 100644
index 16b6bad..0000000
--- a/net-fs/netatalk/files/atalkd.init
+++ /dev/null
@@ -1,47 +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/atalkd.init,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
-
-: ${ATALK_NAME:=$(hostname -s)}
-: ${ATALK_UNIX_CHARSET:=LOCALE}
-: ${ATALK_MAC_CHARSET:=MAC_ROMAN}
-
-depend() {
-	need net
-    use logger dns
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon \
-		--start \
-		--exec /usr/sbin/${SVCNAME} --
-	eend $?
-
-	for reg in \
-		"${ATALK_NAME}:Workstation${ATALK_ZONE}" \
-		"${ATALK_NAME}:netatalk${ATALK_ZONE}"
-	do
-		ebegin "  Registering $reg"
-		nbprgstr "$reg"
-		eend $?
-	done
-}
-
-stop() {
-	for reg in \
-		"${ATALK_NAME}:Workstation${ATALK_ZONE}" \
-		"${ATALK_NAME}:netatalk${ATALK_ZONE}"
-	do
-		ebegin "  Registering $reg"
-		nbpunrgstr "$reg"
-		eend $?
-	done
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon \
-		--stop \
-		--exec /usr/sbin/${SVCNAME}
-	eend $?
-}

diff --git a/net-fs/netatalk/files/cnid_metad.init.2 b/net-fs/netatalk/files/cnid_metad.init.2
deleted file mode 100644
index 997603d..0000000
--- a/net-fs/netatalk/files/cnid_metad.init.2
+++ /dev/null
@@ -1,15 +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/cnid_metad.init.2,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
-
-: ${CNID_CONFIG:=-l log_note}
-
-command="/usr/sbin/${SVCNAME}"
-command_args="${CNID_CONFIG}"
-pidfile="/var/run/${SVCNAME}.pid"
-
-depend() {
-	need net
-    use logger
-}

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 4c069dc..0000000
--- 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.1-gentoo.patch b/net-fs/netatalk/files/netatalk-2.2.1-gentoo.patch
deleted file mode 100644
index d06bf3f..0000000
--- a/net-fs/netatalk/files/netatalk-2.2.1-gentoo.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Index: netatalk-2.2.1/etc/afpd/afp_avahi.c
-===================================================================
---- netatalk-2.2.1.orig/etc/afpd/afp_avahi.c
-+++ netatalk-2.2.1/etc/afpd/afp_avahi.c
-@@ -176,8 +176,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 */
-Index: netatalk-2.2.1/etc/uams/Makefile.am
-===================================================================
---- netatalk-2.2.1.orig/etc/uams/Makefile.am
-+++ netatalk-2.2.1/etc/uams/Makefile.am
-@@ -97,16 +97,16 @@ uams_dhx_pam_la_CFLAGS     = @SSL_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
-Index: netatalk-2.2.1/libatalk/Makefile.am
-===================================================================
---- netatalk-2.2.1.orig/libatalk/Makefile.am
-+++ netatalk-2.2.1/libatalk/Makefile.am
-@@ -37,5 +37,3 @@ libatalk_la_DEPENDENCIES = \
- 	unicode/libunicode.la \
- 	vfs/libvfs.la
- 
--libatalk_la_LDFLAGS = -static
--
-Index: netatalk-2.2.1/libatalk/vfs/Makefile.am
-===================================================================
---- netatalk-2.2.1.orig/libatalk/vfs/Makefile.am
-+++ netatalk-2.2.1/libatalk/vfs/Makefile.am
-@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea.c sy
- 
- if HAVE_ACLS
- libvfs_la_SOURCES += acl.c
-+libvfs_la_LIBADD = $(ACL_LIBS)
- endif
-Index: netatalk-2.2.1/libatalk/dsi/Makefile.am
-===================================================================
---- netatalk-2.2.1.orig/libatalk/dsi/Makefile.am
-+++ netatalk-2.2.1/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/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 6939c12..0000000
--- 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 59663ad..0000000
--- a/net-fs/netatalk/files/netatalk-3.0-gentoo.patch
+++ /dev/null
@@ -1,146 +0,0 @@
- Makefile.am              |    8 +-------
- etc/afpd/afp_avahi.c     |    2 +-
- etc/netatalk/Makefile.am |    7 ++++---
- etc/uams/Makefile.am     |   20 ++++++++++----------
- libatalk/dsi/Makefile.am |    1 +
- libatalk/vfs/Makefile.am |    1 +
- macros/netatalk.m4       |   15 ++++++++-------
- 7 files changed, 26 insertions(+), 28 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..7897055 100644
---- a/etc/netatalk/Makefile.am
-+++ b/etc/netatalk/Makefile.am
-@@ -10,8 +10,7 @@ netatalk_CFLAGS = \
- 	-D_PATH_AFPD=\"$(sbindir)/afpd\" \
- 	-D_PATH_CNID_METAD=\"$(sbindir)/cnid_metad\"
- 
--netatalk_LDADD = \
--	$(top_builddir)/libatalk/libatalk.la
-+netatalk_LDADD = $(top_builddir)/libatalk/libatalk.la
- 
- if USE_BUILTIN_LIBEVENT
- netatalk_CFLAGS += \
-@@ -20,4 +19,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..765ce7a 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"$bundled_libevent" = x"no")
- ])
- 
- dnl Filesystem Hierarchy Standard (FHS) compatibility

diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
deleted file mode 100644
index 7291e5f..0000000
--- a/net-fs/netatalk/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>net-fs</herd>
-	<maintainer restrict="&gt;=net-fs/netatalk-2.2.1-r1">
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="appletalk">
-      Build support for Apple's AppleTalk (DDP) protocol and its
-      utilities (atalkd, timelord, papd).
-    </flag>
-		<flag name="cups">
-      Add support for <pkg>net-print/cups</pkg> printers in papd. This
-      flag is only considered if appletalk USE flag is enabled, and is
-      otherwise ignored.
-    </flag>
-		<flag name="quota">
-      Add support for user quota on various filesystems.
-    </flag>
-		<flag name="ssl">
-      Use <pkg>dev-libs/openssl</pkg> to provide DHX User Access
-      Modules. These are not used with most recent versions of OS X
-      and can be kept disabled without risks.
-    </flag>
-		<flag name="xfs">Enable support for XFS Quota</flag>
-	</use>
-</pkgmetadata>

diff --git a/net-fs/netatalk/netatalk-2.0.5-r1.ebuild b/net-fs/netatalk/netatalk-2.0.5-r1.ebuild
deleted file mode 100644
index 3b99d94..0000000
--- a/net-fs/netatalk/netatalk-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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-2.0.5-r1.ebuild,v 1.9 2010/10/15 02:05:39 vapier Exp $
-
-EAPI=2
-
-inherit eutils pam
-
-DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="cracklib cups debug kerberos pam slp ssl tcpd xfs"
-
-RDEPEND=">=sys-libs/db-4.2.52
-	cracklib? ( sys-libs/cracklib )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	slp? ( net-libs/openslp )
-	cups? ( net-print/cups )
-	kerberos? ( virtual/krb5 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit"
-DEPEND="${RDEPEND}
-	xfs? ( sys-fs/xfsprogs )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-control-pam.patch
-
-	# until someone that understands their config script build
-	# system gets a patch pushed upstream to make
-	# --enable-srvloc passed to configure also add slpd to the
-	# use line on the initscript, we'll need to do it this way
-	if use slp ; then
-		sed -i -e '/^[[:space:]]*use\>/s:$: slpd:' \
-			distrib/initscripts/rc.atalk.gentoo.tmpl || die
-	fi
-}
-
-src_configure() {
-	if ! use xfs ; then
-		eval $(printf '%s\n' {linux,xfs}/{dqblk_xfs,libxfs,xqm,xfs_fs}.h | \
-			sed -e 's:[/.]:_:g' -e 's:^:export ac_cv_header_:' -e 's:$:=no:')
-	fi
-
-	# Ignore --enable-gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# --enable-shadow: let build system detect shadow.h in toolchain
-	econf \
-		$(use_with pam) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_enable kerberos krbV-uam) \
-		--disable-krb4-uam \
-		$(use_enable slp srvloc) \
-		$(use_with ssl ssl-dir) \
-		$(use_with cracklib) \
-		$(use_with slp srvloc) \
-		--disable-afs \
-		--enable-fhs \
-		--with-bdb=/usr
-}
-
-src_compile() {
-	emake || die
-
-	# Create the init script manually (it's more messy to --enable-gentoo)
-	emake -C distrib/initscripts rc.atalk.gentoo || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CONTRIBUTORS NEWS README TODO VERSION
-
-	newinitd distrib/initscripts/rc.atalk.gentoo atalk || die
-
-	# 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 -e 's/include <netatalk/include <netatalk2/g' \
-		-i "${D}"usr/include/{netatalk2,atalk}/* || die
-}

diff --git a/net-fs/netatalk/netatalk-2.2.1-r3.ebuild b/net-fs/netatalk/netatalk-2.2.1-r3.ebuild
deleted file mode 100644
index 6d03f35..0000000
--- a/net-fs/netatalk/netatalk-2.2.1-r3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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-2.2.1-r3.ebuild,v 1.8 2012/07/29 16:13:28 armin76 Exp $
-
-EAPI="4"
-
-inherit pam eutils flag-o-matic multilib autotools
-
-RESTRICT="test"
-DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
-
-RDEPEND=">=sys-libs/db-4.2.52
-	avahi? ( net-dns/avahi[dbus] )
-	cracklib? ( sys-libs/cracklib )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	slp? ( net-libs/openslp )
-	kerberos? ( virtual/krb5 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit
-	dev-libs/libgcrypt
-	appletalk? (
-		cups? ( net-print/cups )
-	)
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	ldap? (
-		net-nds/openldap
-	)
-	"
-DEPEND="${RDEPEND}"
-RDEPEND="sys-apps/openrc"
-
-REQUIRED_USE="ldap? ( acl )"
-
-DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-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.2.ebuild b/net-fs/netatalk/netatalk-2.2.2.ebuild
deleted file mode 100644
index 808f714..0000000
--- a/net-fs/netatalk/netatalk-2.2.2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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-2.2.2.ebuild,v 1.2 2012/06/26 04:40:58 zmedico Exp $
-
-EAPI="4"
-
-inherit pam eutils flag-o-matic multilib autotools
-
-RESTRICT="test"
-DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
-
-RDEPEND=">=sys-libs/db-4.2.52
-	avahi? ( net-dns/avahi[dbus] )
-	cracklib? ( sys-libs/cracklib )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	slp? ( net-libs/openslp )
-	kerberos? ( virtual/krb5 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit
-	dev-libs/libgcrypt
-	appletalk? (
-		cups? ( net-print/cups )
-	)
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	ldap? (
-		net-nds/openldap
-	)
-	"
-DEPEND="${RDEPEND}"
-RDEPEND="sys-apps/openrc"
-
-REQUIRED_USE="ldap? ( acl )"
-
-DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-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.3.ebuild b/net-fs/netatalk/netatalk-2.2.3.ebuild
deleted file mode 100644
index 59ee5c7..0000000
--- a/net-fs/netatalk/netatalk-2.2.3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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-2.2.3.ebuild,v 1.2 2012/06/26 04:40:58 zmedico 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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
-
-RDEPEND=">=sys-libs/db-4.2.52
-	avahi? ( net-dns/avahi[dbus] )
-	cracklib? ( sys-libs/cracklib )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	slp? ( net-libs/openslp )
-	kerberos? ( virtual/krb5 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit
-	dev-libs/libgcrypt
-	appletalk? (
-		cups? ( net-print/cups )
-	)
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	ldap? (
-		net-nds/openldap
-	)
-	"
-DEPEND="${RDEPEND}"
-RDEPEND="sys-apps/openrc"
-
-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.0.ebuild b/net-fs/netatalk/netatalk-3.0.ebuild
deleted file mode 100644
index 88134a6..0000000
--- a/net-fs/netatalk/netatalk-3.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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-2.2.3.ebuild,v 1.2 2012/06/26 04:40:58 zmedico Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic multilib pam
-
-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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="acl avahi cracklib cups debug gpg kerberos ldap pam quota +shadow slp ssl static-libs tcpd"
-
-RDEPEND=">=sys-libs/db-4.2.52
-	avahi? ( net-dns/avahi[dbus] )
-	cracklib? ( sys-libs/cracklib )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	slp? ( net-libs/openslp )
-	kerberos? ( virtual/krb5 )
-	>=sys-apps/coreutils-7.1
-	!app-text/yudit
-	dev-libs/libgcrypt
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	ldap? (
-		net-nds/openldap
-	)
-	"
-DEPEND="${RDEPEND}"
-RDEPEND="sys-apps/openrc"
-
-RESTRICT="test"
-
-REQUIRED_USE="ldap? ( acl )"
-
-DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/DEVELOPER )
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0-gentoo.patch )
-
-src_prepare() {
-	sed \
-		-e '/^LDFLAGS/d' \
-		-i macros/netatalk.m4 || die
-	autotools-utils_src_prepare
-}
-
-
-src_configure() {
-	local myeconfargs=()
-
-	if use acl; then
-		myconf+=( --with-acls $(use_with ldap) )
-	else
-		myconf+=( --without-acls --without-ldap )
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# 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 kerberos)
-		$(use_enable kerberos krbV-uam)
-		$(use_enable quota)
-		$(use_enable slp srvloc)
-		$(use_enable tcpd tcp-wrappers)
-		$(use_with cracklib)
-		$(use_with pam)
-		$(use_with ssl ssl-dir)
-		$(use_with shadow)
-		--enable-overwrite
-		--disable-krb4-uam
-		--disable-afs
-		--disable-bundled-libevent
-		--enable-fhs
-		--with-bdb=/usr
-		--with-uams-path=/usr/$(get_libdir)/${PN}
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newinitd "${FILESDIR}"/afpd.init.3 afpd
-	newinitd "${FILESDIR}"/cnid_metad.init.2 cnid_metad
-
-	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
-
-	# 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() {
-	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"
-	elog "  netatalk"
-	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."
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-09-10 18:06 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-05 19:30 [gentoo-commits] proj/betagarden:master commit in: net-fs/netatalk/files/, net-fs/netatalk/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2012-09-10 18:06 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox