Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/netatalk: netatalk-2.2.1-r1.ebuild ChangeLog metadata.xml
Date: Thu, 29 Sep 2011 16:55:10
Message-Id: 20110929165500.AA33920036@flycatcher.gentoo.org
1 flameeyes 11/09/29 16:55:00
2
3 Modified: ChangeLog metadata.xml
4 Added: netatalk-2.2.1-r1.ebuild
5 Log:
6 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.
7
8 (Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.71 net-fs/netatalk/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/ChangeLog?rev=1.71&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/ChangeLog?rev=1.71&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/ChangeLog?r1=1.70&r2=1.71
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v
20 retrieving revision 1.70
21 retrieving revision 1.71
22 diff -u -r1.70 -r1.71
23 --- ChangeLog 9 Sep 2011 21:19:37 -0000 1.70
24 +++ ChangeLog 29 Sep 2011 16:55:00 -0000 1.71
25 @@ -1,6 +1,21 @@
26 # ChangeLog for net-fs/netatalk
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.70 2011/09/09 21:19:37 beandog Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.71 2011/09/29 16:55:00 flameeyes Exp $
30 +
31 +*netatalk-2.2.1-r1 (29 Sep 2011)
32 +
33 + 29 Sep 2011; Diego E. Pettenò <flameeyes@g.o>
34 + +netatalk-2.2.1-r1.ebuild, +files/netatalk-2.2.1-gentoo.patch,
35 + +files/afpd.init, +files/atalk_service.init, +files/atalkd.init,
36 + +files/cnid_metad.init, metadata.xml:
37 + Add new revision (that I'll maintain); this version includes a number of
38 + improvements on USE flags and dependencies, replacing xfs with quota,
39 + dropping the extra dependency over xfsprogs, adding proper ldap dependencies
40 + rather than leaving it automagic, adding an USE flag to enable or disable
41 + appletalk-based utilities, and replacing the upstream-provided init script
42 + with two (or five, if using appletalk proper) services that can be started
43 + standalone and properly depend on Avahi. Also describe USE flags according to
44 + what they actually do.
45
46 *netatalk-2.2.1 (09 Sep 2011)
47
48
49
50
51 1.7 net-fs/netatalk/metadata.xml
52
53 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/metadata.xml?rev=1.7&view=markup
54 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/metadata.xml?rev=1.7&content-type=text/plain
55 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/metadata.xml?r1=1.6&r2=1.7
56
57 Index: metadata.xml
58 ===================================================================
59 RCS file: /var/cvsroot/gentoo-x86/net-fs/netatalk/metadata.xml,v
60 retrieving revision 1.6
61 retrieving revision 1.7
62 diff -u -r1.6 -r1.7
63 --- metadata.xml 16 Aug 2008 03:55:05 -0000 1.6
64 +++ metadata.xml 29 Sep 2011 16:55:00 -0000 1.7
65 @@ -1,9 +1,33 @@
66 <?xml version="1.0" encoding="UTF-8"?>
67 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
68 <pkgmetadata>
69 -<herd>net-fs</herd>
70 -<longdescription>kernel level implementation of the AppleTalk protocol suite</longdescription>
71 -<use>
72 - <flag name='xfs'>Enable support for XFS Quota</flag>
73 -</use>
74 + <herd>net-fs</herd>
75 + <maintainer restrict="&gt;=net-fs/netatalk-2.2.1-r1">
76 + <email>flameeyes@g.o</email>
77 + <description>
78 + CC me on the bugs so I can take a look at them. I actually use
79 + this software and I know how it is supposed to work, at least
80 + partially.
81 + </description>
82 + </maintainer>
83 + <use>
84 + <flag name='appletalk'>
85 + Build support for Apple's AppleTalk (DDP) protocol and its
86 + utilities (atalkd, timelord, papd).
87 + </flag>
88 + <flag name='cups'>
89 + Add support for <pkg>net-print/cups</pkg> printers in papd. This
90 + flag is only considered if appletalk USE flag is enabled, and is
91 + otherwise ignored.
92 + </flag>
93 + <flag name='quota'>
94 + Add support for user quota on various filesystems.
95 + </flag>
96 + <flag name='ssl'>
97 + Use <pkg>dev-libs/openssl</pkg> to provide DHX User Access
98 + Modules. These are not used with most recent versions of OS X
99 + and can be kept disabled without risks.
100 + </flag>
101 + <flag name='xfs'>Enable support for XFS Quota</flag>
102 + </use>
103 </pkgmetadata>
104
105
106
107 1.1 net-fs/netatalk/netatalk-2.2.1-r1.ebuild
108
109 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/netatalk/netatalk-2.2.1-r1.ebuild?rev=1.1&view=markup
110 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
111
112 Index: netatalk-2.2.1-r1.ebuild
113 ===================================================================
114 # Copyright 1999-2011 Gentoo Foundation
115 # Distributed under the terms of the GNU General Public License v2
116 # $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 $
117
118 EAPI="4"
119
120 inherit pam flag-o-matic multilib autotools
121
122 RESTRICT="test"
123 DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
124 HOMEPAGE="http://netatalk.sourceforge.net/"
125 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
126
127 LICENSE="GPL-2 BSD"
128 SLOT="0"
129 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
130 IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
131
132 RDEPEND=">=sys-libs/db-4.2.52
133 avahi? ( net-dns/avahi[dbus] )
134 cracklib? ( sys-libs/cracklib )
135 pam? ( virtual/pam )
136 ssl? ( dev-libs/openssl )
137 tcpd? ( sys-apps/tcp-wrappers )
138 slp? ( net-libs/openslp )
139 kerberos? ( virtual/krb5 )
140 >=sys-apps/coreutils-7.1
141 !app-text/yudit
142 dev-libs/libgcrypt
143 appletalk? (
144 cups? ( net-print/cups )
145 )
146 acl? (
147 sys-apps/attr
148 sys-apps/acl
149 )
150 ldap? (
151 net-nds/openldap
152 )
153 "
154 DEPEND="${RDEPEND}"
155
156 REQUIRED_USE="ldap? ( acl )"
157
158 DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk )
159
160 src_prepare() {
161 epatch "${FILESDIR}"/${P}-gentoo.patch
162 eautoreconf
163 }
164
165 src_configure() {
166 local myconf=
167
168 if use appletalk; then
169 myconf+=" --enable-ddp --enable-timelord $(use_enable cups)"
170 else
171 myconf+=" --disable-ddp --disable-timelord --disable-cups"
172 fi
173
174 if use acl; then
175 myconf+=" --with-acls $(use_with ldap)"
176 else
177 myconf+=" --without-acls --without-ldap"
178 fi
179
180 append-flags -fno-strict-aliasing
181
182 # Ignore --enable-gentoo, we install the init.d by hand and we avoid having
183 # to sed the Makefiles to not do rc-update.
184 econf \
185 $(use_enable avahi zeroconf) \
186 $(use_enable debug) \
187 $(use_enable kerberos krbV-uam) \
188 $(use_enable quota) \
189 $(use_enable slp srvloc) \
190 $(use_enable static-libs static) \
191 $(use_enable tcpd tcp-wrappers) \
192 $(use_with cracklib) \
193 $(use_with pam) \
194 $(use_with ssl ssl-dir) \
195 --disable-krb4-uam \
196 --disable-afs \
197 --enable-fhs \
198 --with-bdb=/usr \
199 ${myconf}
200 }
201
202 src_install() {
203 default
204
205 newinitd "${FILESDIR}"/afpd.init afpd
206 newinitd "${FILESDIR}"/cnid_metad.init cnid_metad
207
208 if use appletalk; then
209 newinitd "${FILESDIR}"/atalkd.init atalkd
210 newinitd "${FILESDIR}"/atalk_service.init timelord
211 newinitd "${FILESDIR}"/atalk_service.init papd
212 fi
213
214 use avahi || sed -i -e '/need avahi-daemon/d' "${D}"/etc/init.d/afpd
215 use slp || sed -i -e '/need slpd/d' "${D}"/etc/init.d/afpd
216
217 use ldap || rm "${D}"/etc/netatalk/afp_ldap.conf
218
219 rm "${D}"/etc/netatalk/netatalk.conf
220
221 # The pamd file isn't what we need, use pamd_mimic_system
222 rm -rf "${D}/etc/pam.d"
223 pamd_mimic_system netatalk auth account password session
224
225 # Move /usr/include/netatalk to /usr/include/netatalk2 to avoid collisions
226 # with /usr/include/netatalk/at.h provided by glibc (strange, uh?)
227 # Packages that wants to link to netatalk should then probably change the
228 # includepath then, but right now, nothing uses netatalk.
229 # On a side note, it also solves collisions with freebsd-lib and other libcs
230 mv "${D}"/usr/include/netatalk{,2} || die
231 sed -i \
232 -e 's/include <netatalk/include <netatalk2/g' \
233 "${D}"usr/include/{netatalk2,atalk}/* || die
234
235 # These are not used at all, as the uams are loaded with their .so
236 # extension.
237 rm "${D}"/usr/$(get_libdir)/netatalk/*.la
238
239 use static-libs || rm "${D}"/usr/$(get_libdir)/*.la
240 }
241
242 pkg_postinst() {
243 elog "Starting from version 2.2.1-r1 the netatalk init script has been split"
244 elog "into different services depending on what you need to start."
245 elog "This was done to make sure that all services are started and reported"
246 elog "properly."
247 elog ""
248 elog "The new services are:"
249 elog " cnid_metad"
250 elog " afpd"
251 if use appletalk; then
252 elog " atalkd"
253 elog " timelord"
254 elog " papd"
255 fi
256 elog ""
257 elog "Dependencies should be resolved automatically depending on settings"
258 elog "but please report issues with this on https://bugs.gentoo.org/ if"
259 elog "you find any."
260 elog ""
261 elog "The old configuration file /etc/netatalk/netatalk.conf is no longer"
262 elog "installed, and will be ignored. The new configuration is supposed"
263 elog "to be done through individual /etc/conf.d files, for everything that"
264 elog "cannot be set already through their respective configuration files."
265 }