Revbump with more OpenRC-style init scripts.

(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)

5 files changed, 208 insertions, 1 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 96700f986def..9db195d4e340 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.73 2011/09/30 10:37:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.74 2011/10/18 07:37:57 flameeyes Exp $
+
+*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:
diff --git a/net-fs/netatalk/files/afpd.init.2 b/net-fs/netatalk/files/afpd.init.2
new file mode 100644
index 000000000000..222802593397
--- /dev/null
+++ b/net-fs/netatalk/files/afpd.init.2
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/afpd.init.2,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
+
+command="/usr/sbin/${SVCNAME}"
+command_args="${EXTRA_CONF}"
+pidfile="/var/run/${SVCNAME}.pid"
+
+depend() {
+	need net cnid_metad
+	use logger dns atalkd
+
+	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 000000000000..74d986548da9
--- /dev/null
+++ b/net-fs/netatalk/files/atalk_service.init.2
@@ -0,0 +1,11 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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/cnid_metad.init.2 b/net-fs/netatalk/files/cnid_metad.init.2
new file mode 100644
index 000000000000..4268025825a4
--- /dev/null
+++ b/net-fs/netatalk/files/cnid_metad.init.2
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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/netatalk-2.2.1-r2.ebuild b/net-fs/netatalk/netatalk-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..e202dcb014d2
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.2.1-r2.ebuild
@@ -0,0 +1,153 @@
+# 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.1-r2.ebuild,v 1.1 2011/10/18 07:37:57 flameeyes Exp $
+
+EAPI="4"
+
+inherit pam 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.2 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."
+}