[gentoo-commits] gentoo-x86 commit in net-fs/netatalk: netatalk-2.2.1-r1.ebuild ChangeLog metadata.xml

[gentoo-commits] gentoo-x86 commit in net-fs/netatalk: netatalk-2.2.1-r1.ebuild ChangeLog metadata.xml

[Diego Petteno (flameeyes)]

flameeyes    11/09/29 16:55:00

  Modified:             ChangeLog metadata.xml
  Added:                netatalk-2.2.1-r1.ebuild
  Log:
  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.
  
  (Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

Revision  Changes    Path
1.71                 net-fs/netatalk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/ChangeLog?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/ChangeLog?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/ChangeLog?r1=1.70&r2=1.71

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ChangeLog	9 Sep 2011 21:19:37 -0000	1.70
+++ ChangeLog	29 Sep 2011 16:55:00 -0000	1.71
@@ -1,6 +1,21 @@
 # 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.70 2011/09/09 21:19:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.71 2011/09/29 16:55:00 flameeyes Exp $
+
+*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)
 



1.7                  net-fs/netatalk/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/metadata.xml?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/metadata.xml?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/netatalk/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml	16 Aug 2008 03:55:05 -0000	1.6
+++ metadata.xml	29 Sep 2011 16:55:00 -0000	1.7
@@ -1,9 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-fs</herd>
-<longdescription>kernel level implementation of the AppleTalk protocol suite</longdescription>
-<use>
-	<flag name='xfs'>Enable support for XFS Quota</flag>
-</use>
+  <herd>net-fs</herd>
+  <maintainer restrict="&gt;=net-fs/netatalk-2.2.1-r1">
+    <email>flameeyes@gentoo.org</email>
+    <description>
+      CC me on the bugs so I can take a look at them. I actually use
+      this software and I know how it is supposed to work, at least
+      partially.
+    </description>
+  </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>



1.1                  net-fs/netatalk/netatalk-2.2.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/netatalk-2.2.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/netatalk-2.2.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: netatalk-2.2.1-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 2011/09/29 16:55:00 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}"

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 afpd
	newinitd "${FILESDIR}"/cnid_metad.init cnid_metad

	if use appletalk; then
		newinitd "${FILESDIR}"/atalkd.init atalkd
		newinitd "${FILESDIR}"/atalk_service.init timelord
		newinitd "${FILESDIR}"/atalk_service.init 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."
}