Version bump, bug 353177; Rename init script from atalk to netatalk; Restrict test; Add avahi use flag; Add GPL-2 as license

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 121 insertions, 12 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index cb40ceb4843a..ca269394cbfa 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.67 2011/01/04 20:26:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.68 2011/09/02 17:11:23 beandog Exp $
+
+*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)
 
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index b389e8efaa93..ca5df31082dc 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX netatalk-2.0.5-control-pam.patch 997 RMD160 a7b11647dd7827288517fa3c7696a37182ec219e SHA1 113f318c15870c6638da6a8a76033d954ca6b41a SHA256 4cf74450782f9f6395436d1d433d4d4662ea63fad48961dacec76adafdd35f47
+AUX netatalk-2.2.0-path_afp_ipc.patch 546 RMD160 d033e1dfe1db461116ac4cdffc687378a1f145a0 SHA1 3bef900e9d6b070b4266b495cdad3c44fb11d7ef SHA256 469b5b4c928a453f7d50489dcb7cf5855a848d3fa09b86fe5796df929de89857
 DIST netatalk-2.0.5.tar.bz2 993882 RMD160 47247d376bf421652d9f9897c75853424215ae0a SHA1 a38f98abc123b02d26628543e393a4de04481e4f SHA256 aa11b26ad5c6cfb6043458fc849ed82b13b6d13219191a6335fce1bc76288b37
 DIST netatalk-2.1.3.tar.bz2 1122920 RMD160 de9810c014549099e412bbc52fb3bb5e780b30e5 SHA1 a1a3fa649ecb454c4ed2e476e27877ba06a338d9 SHA256 472f283c495c6c39020eeedea0b71610aa10008812f491a80617555f999216b4
 DIST netatalk-2.1.5.tar.bz2 1125946 RMD160 9265b34f303a21b89c78401c24ed464c61041ff3 SHA1 689856ed96ccf34f2f7b83d70c97d30213638a70 SHA256 11fcce36cc5179de60c5c0b10032ff9e042ed8b8c6e0b99d2d7200c8d0749038
 DIST netatalk-2.1.tar.bz2 1120025 RMD160 c71e3b48bdb1fa1ab8acd2f78d39eb7cd8e953a3 SHA1 2c44829c5dfbacf0996db804d8b136396e16e87d SHA256 7302b06096dd915e8cf066275e7f0fa1da982cceb234975a274b92f3f56d753c
+DIST netatalk-2.2.0.tar.bz2 1216174 RMD160 192175b3dbd93c9cb0867110be0bb4a2e05c829f SHA1 cee946cca2564ea133f9f6d55e32c9156098cbba SHA256 31bf7c1ea311f876d9be6d4be9faed24d170a89e6ce692304fc2cb525f25143b
 EBUILD netatalk-2.0.5-r1.ebuild 2958 RMD160 160a50569cf92f9ed740c2df67bb56801514b352 SHA1 29d1695783bac4deebca891cabe4fbb5c37cad25 SHA256 118c0091d6cec839697db7e160ab02c26c142bd9cab7f34c5073795d13aabbd0
 EBUILD netatalk-2.1.3.ebuild 2851 RMD160 85bd05416fa2740eb5af156a8c462f516e66a289 SHA1 b99d00d439e301af59b395c15c3e37bb35ed4b8e SHA256 cec2fb9094d8325205c4f79cea1ba071b674d32aab37a932824b11d5fd6711ae
 EBUILD netatalk-2.1.5.ebuild 2851 RMD160 9978fa39c59f7d291f1c8fea72e1d0a2ea8ca408 SHA1 ff1c34fa7cd8f39da1582e6842e75aa7d67ce9bb SHA256 5aee40d6ef64724486826b1e02239b656fe4b3b0e02a74eab87772105bd73a98
 EBUILD netatalk-2.1.ebuild 2909 RMD160 0f17ff6ee31309903073daf11deab411ff852c76 SHA1 447658644d1abb1f2ecc54f10804723467dc6fd3 SHA256 6466888f3073c4ee72c5352f8d831b9ce153ffc4270e5bb2dd9eaedd21bc6e09
-MISC ChangeLog 10674 RMD160 18bc89db76b6125b53b2481480d9d9b8b6eedc78 SHA1 f9aad198aa96ca1b93566257060950cc0538a983 SHA256 a18485e0ff37ffecf6ea5905fca4eaa6c70f69e06310f7e20f6bf89b6b83bb94
+EBUILD netatalk-2.2.0.ebuild 3028 RMD160 a69d37d84a7be3a5ed5c3f4e1ee40899079231dd SHA1 1513fce1407571607c6c64139f9c11db15a40965 SHA256 e1a1cbda0c4e7a7453a63b9b24c02e48689d3fa72eb3836b4b742b6d859f2d22
+MISC ChangeLog 10951 RMD160 7dcec7bd21f009054bc10530bcd49e57ba38be58 SHA1 b94865726575a8dfe9579268b944764321ce7f48 SHA256 84582c16cd9e373597b413400d0dc53ab5bd326d490d61226d337db64c08afab
 MISC metadata.xml 321 RMD160 4cf5a812670dc659b0325e35aa5813f24a8e7499 SHA1 bc376e37383b2f1876644258113fc0e954f8b5f0 SHA256 1f2660dd2dd2f8a210ed6df840e16e23bc9a19d5777a3776cbaecad689bcdeee
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iF0EAREIAAYFAk0jgjoACgkQaC/OocHi7Ja/PgD4sIehyxAiUqNMNFqnFhP3tvMj
-NmI90honZAf8+nwPAQD+KRejXSwK10cAzK819rYmsrT6o58rLJOsHcEmEmtm7Ck=
-=gE56
------END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/netatalk-2.2.0-path_afp_ipc.patch b/net-fs/netatalk/files/netatalk-2.2.0-path_afp_ipc.patch
new file mode 100644
index 000000000000..9b1a340edd52
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-2.2.0-path_afp_ipc.patch
@@ -0,0 +1,15 @@
+--- include/atalk/paths.h	2011-07-27 07:55:39.000000000 -0400
++++ include/atalk/paths.h	2011-08-13 20:19:13.000000000 -0400
+@@ -71,11 +71,11 @@
+  * afpd paths
+  */
+ #define _PATH_AFPTKT		"/tmp/AFPtktXXXXXX"
++#define _PATH_AFP_IPC       ATALKPATHCAT(_PATH_LOCKDIR,"afpd_ipc")
+ #if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+ #  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
+ #else
+ #  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
+-#define _PATH_AFP_IPC       ATALKPATHCAT(_PATH_LOCKDIR,"afpd_ipc")
+ #endif
+ 
+ /*
\ No newline at end of file
diff --git a/net-fs/netatalk/netatalk-2.2.0.ebuild b/net-fs/netatalk/netatalk-2.2.0.ebuild
new file mode 100644
index 000000000000..6d88e086fb11
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.2.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.0.ebuild,v 1.1 2011/09/02 17:11:23 beandog Exp $
+
+EAPI="2"
+
+inherit pam
+
+RESTRICT="test"
+DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
+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="+avahi cracklib cups debug kerberos pam slp ssl tcpd xfs"
+
+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 )
+	cups? ( net-print/cups )
+	kerberos? ( virtual/krb5 )
+	>=sys-apps/coreutils-7.1
+	!app-text/yudit
+	dev-libs/libgcrypt"
+DEPEND="${RDEPEND}
+	xfs? ( sys-fs/xfsprogs )"
+
+src_prepare() {
+	# 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
+	epatch "${FILESDIR}/${P}-path_afp_ipc.patch" || die "epatch failed"
+}
+
+src_configure() {
+	use xfs || eval $(printf 'export ac_cv_header_%s=no\n' {linux,xfs}_{dqblk_xfs,libxfs,xqm,xfs_fs}_h)
+
+	# 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 avahi zeroconf) \
+		$(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) \
+		--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 VERSION AUTHORS doc/README.AppleTalk
+
+	newinitd distrib/initscripts/rc.atalk.gentoo netatalk || 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 -i \
+		-e 's/include <netatalk/include <netatalk2/g' \
+		"${D}"usr/include/{netatalk2,atalk}/* || die
+}