net-fs/netatalk: Version Bump, add myself as maintainer

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 171 insertions, 6 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index e2b0391a8362..14a71afa060d 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.82 2012/05/02 17:13:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.83 2012/05/22 20:13:30 jlec Exp $
+
+*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)
 
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 72f4e6f7b3b0..0705035a529d 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -11,15 +11,17 @@ AUX netatalk-2.2.2-gentoo.patch 3562 RMD160 2aaa95c9a71a84f9111475a1ee6f3dd16ca7
 DIST netatalk-2.0.5.tar.bz2 993882 RMD160 47247d376bf421652d9f9897c75853424215ae0a SHA1 a38f98abc123b02d26628543e393a4de04481e4f SHA256 aa11b26ad5c6cfb6043458fc849ed82b13b6d13219191a6335fce1bc76288b37
 DIST netatalk-2.2.1.tar.bz2 1227602 RMD160 bc55a591fe134d3bf05ca442aa5b5246fd766b8c SHA1 e588b89eced7769f65e213bc4b1b1e4f8035c8b3 SHA256 3ab81c6335f8c33fd01ae599459a26c8cfe3b975009ce73640cae823ddc78bbf
 DIST netatalk-2.2.2.tar.bz2 1239433 RMD160 cdedd5ff4b8bae7cf90f8c444c39db850fc210e7 SHA1 d43c75d04a66ad59c5b0c797ffa1e6e3e13b2105 SHA256 443031b90d9dd6270d98659d210f408437d8e71e8094d6f0b71706a5c481e3a0
+DIST netatalk-2.2.3.tar.bz2 1288642 RMD160 40d1dd2b6da385e48de5fc0f9cca85cdb130b309 SHA1 d6d0cf2a74e8b28e076f7687262f2973b55a07cf SHA256 b088e6cc6237f7ad98af65812a74bcc830a2d4aebeea71cfd932ace8ef93132c
 EBUILD netatalk-2.0.5-r1.ebuild 2958 RMD160 160a50569cf92f9ed740c2df67bb56801514b352 SHA1 29d1695783bac4deebca891cabe4fbb5c37cad25 SHA256 118c0091d6cec839697db7e160ab02c26c142bd9cab7f34c5073795d13aabbd0
 EBUILD netatalk-2.2.1-r3.ebuild 4397 RMD160 8659156c722ad22a21f25cf483f3900cc7b989ef SHA1 765eb86af7701c44bbc2d15649905a0ea7055cf5 SHA256 1f0e37ed2a941deabdffa263afcdddb3f3dd285b302d4f8b745f2ef5207597d7
 EBUILD netatalk-2.2.2.ebuild 4400 RMD160 9e53ccb45f85c53cb291b3f643a1f4a4d6388985 SHA1 d468198e45559935b7138eade8c8037f81a1d728 SHA256 99b1b12f318024806f80ec741aaa9072a126d274aec8479829a1699ae87fffe6
-MISC ChangeLog 13947 RMD160 26ed1545fac13e812eed47f95317695a43e8c04b SHA1 21f1f1d5e6257d2110540a67e37170b11da340b6 SHA256 695316fffd400a6601eceee9b0399d9da1acf7765cee31913521eb5a33297e79
-MISC metadata.xml 1174 RMD160 ce4e78e2bf60ca4388e66519c5a072a76c0bdeee SHA1 c6897fcce78da2f7a4d5ce0e8136b554ad360f36 SHA256 273ebca84443f0d75b36f8058bfab412888b090d003cf6acd78a9d6ce681d92b
+EBUILD netatalk-2.2.3.ebuild 4414 RMD160 9814a741e3e32045b7e798957f29f938954f7c2a SHA1 4452adbe30c74293d51e687e0e7abeb976d8952c SHA256 43fb8824120b838fc389f54fa537c348c3fe349315ea39e4c4f600fd7cccb0ba
+MISC ChangeLog 14107 RMD160 51c988f906eebf3a6563e814b28d36cd934b8db4 SHA1 3e7440ba908dd69bad73cd40e2cbef6958a6ffef SHA256 e2e869d2ca7a8c1c37a60fceb9b3744e6777496db79a50d91797f5ebd7482acd
+MISC metadata.xml 1277 RMD160 392eeb1af79ae1bdfc69b485effc66c7a1c4ff50 SHA1 d8f6b46664864854aea051036491e89c12b6eec1 SHA256 bfe9f322d5134341fff89b01406cf79429bc217a2555b3a824bdeb8f7dae273f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk+hazoACgkQgAnW8HDreRaaVgCfQOVo1u9byyH9XF/J0f4Mozl1
-IJIAnAmKVmSfsSipWukDC5VAicKzjKqm
-=Q36R
+iEYEAREKAAYFAk+783AACgkQgAnW8HDreRYF8wCfX4ONojhJxkpR5FGYlCI8pVL5
+jY4An2ieJY/ogTvmznRY+yi+BxQu3V77
+=KBZo
 -----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
index ad276f9f2b14..1215e4f6cc78 100644
--- a/net-fs/netatalk/metadata.xml
+++ b/net-fs/netatalk/metadata.xml
@@ -10,6 +10,9 @@
       partially.
     </description>
 	</maintainer>
+	<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
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 000000000000..f1411b0b52ee
--- /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.1 2012/05/22 20:13:30 jlec Exp $
+
+EAPI="4"
+
+inherit pam 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."
+}