From 87517e114bdcae0bf08a299d48509e50b1592e9e Mon Sep 17 00:00:00 2001
From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Tue, 13 Dec 2005 00:20:28 +0000
Subject: Add new revision that moves away /usr/include/netatalk directory to
 avoid collisions with glibc and freebsd's libc. Package-Manager:
 portage-2.0.53

---
 net-fs/netatalk/ChangeLog                      |  9 ++-
 net-fs/netatalk/Manifest                       | 26 ++++---
 net-fs/netatalk/files/digest-netatalk-2.0.3-r1 |  1 -
 net-fs/netatalk/files/digest-netatalk-2.0.3-r2 |  1 +
 net-fs/netatalk/netatalk-2.0.3-r1.ebuild       | 86 ------------------------
 net-fs/netatalk/netatalk-2.0.3-r2.ebuild       | 93 ++++++++++++++++++++++++++
 6 files changed, 120 insertions(+), 96 deletions(-)
 delete mode 100644 net-fs/netatalk/files/digest-netatalk-2.0.3-r1
 create mode 100644 net-fs/netatalk/files/digest-netatalk-2.0.3-r2
 delete mode 100644 net-fs/netatalk/netatalk-2.0.3-r1.ebuild
 create mode 100644 net-fs/netatalk/netatalk-2.0.3-r2.ebuild

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 2d3df15c9daf..fbcf902004ba 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.35 2005/11/21 13:56:49 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.36 2005/12/13 00:20:27 flameeyes Exp $
+
+*netatalk-2.0.3-r2 (13 Dec 2005)
+
+  13 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -netatalk-2.0.3-r1.ebuild, +netatalk-2.0.3-r2.ebuild:
+  Add new revision that moves away /usr/include/netatalk directory to avoid
+  collisions with glibc and freebsd's libc.
 
   21 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> netatalk-2.0.3.ebuild:
   Stable on sh. Bug 110406.
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index e22d03f14cd1..b76a58bf0984 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,11 +1,21 @@
-MD5 1d1f52ebdb13ae16f98bfae6a1edd400 netatalk-2.0.3-r1.ebuild 2493
-MD5 725e95b5d90ddc8ad32795170e447286 netatalk-1.6.4-r1.ebuild 1277
-MD5 70079668b1a40270670877da571a57cc netatalk-2.0.3.ebuild 2431
-MD5 c6c8a6275f66f25fd1d7d2b9ce62823a ChangeLog 5724
-MD5 43c6b606d88eab1f3467634846a77491 metadata.xml 347
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 64a405e14875a27467e098fe4bf95241 ChangeLog 5991
+MD5 bd4410c61e921e87c00183817b6e29b9 files/atalknew-rc6 1703
 MD5 6dd0a76546b70cf567b7926c0881c9b5 files/digest-netatalk-1.6.4-r1 67
 MD5 9ee0857567bda5d9ffabf5d04095e90b files/digest-netatalk-2.0.3 68
-MD5 bb9fcf495bb4dfd88b684b4c0f934beb files/netatalk-2.0.3-setXid.patch 545
+MD5 9ee0857567bda5d9ffabf5d04095e90b files/digest-netatalk-2.0.3-r2 68
 MD5 9eeca2a8610190fcd373ff619d56a298 files/netatalk-1.6.4-tempfile.patch 557
-MD5 bd4410c61e921e87c00183817b6e29b9 files/atalknew-rc6 1703
-MD5 9ee0857567bda5d9ffabf5d04095e90b files/digest-netatalk-2.0.3-r1 68
+MD5 bb9fcf495bb4dfd88b684b4c0f934beb files/netatalk-2.0.3-setXid.patch 545
+MD5 43c6b606d88eab1f3467634846a77491 metadata.xml 347
+MD5 725e95b5d90ddc8ad32795170e447286 netatalk-1.6.4-r1.ebuild 1277
+MD5 aed4d87f09e0163c1de7b51b007cdc51 netatalk-2.0.3-r2.ebuild 2885
+MD5 70079668b1a40270670877da571a57cc netatalk-2.0.3.ebuild 2431
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDnhPjAiZjviIA2XgRAhS3AKCMtVeijOXmmSkNYrkcHpbvlA68gwCgiheC
+00IbZyibzNhZfU88ZsWGm6w=
+=ccAO
+-----END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/digest-netatalk-2.0.3-r1 b/net-fs/netatalk/files/digest-netatalk-2.0.3-r1
deleted file mode 100644
index 1f207b35e1d9..000000000000
--- a/net-fs/netatalk/files/digest-netatalk-2.0.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2 1471804
diff --git a/net-fs/netatalk/files/digest-netatalk-2.0.3-r2 b/net-fs/netatalk/files/digest-netatalk-2.0.3-r2
new file mode 100644
index 000000000000..1f207b35e1d9
--- /dev/null
+++ b/net-fs/netatalk/files/digest-netatalk-2.0.3-r2
@@ -0,0 +1 @@
+MD5 28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2 1471804
diff --git a/net-fs/netatalk/netatalk-2.0.3-r1.ebuild b/net-fs/netatalk/netatalk-2.0.3-r1.ebuild
deleted file mode 100644
index 0238edefc2cc..000000000000
--- a/net-fs/netatalk/netatalk-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r1.ebuild,v 1.1 2005/10/25 05:55:56 flameeyes Exp $
-
-inherit eutils pam flag-o-matic autotools
-IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib"
-
-DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://netatalk.sourceforge.net"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-RDEPEND=">=sys-libs/db-4.2.52
-	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 )
-	krb4? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# 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
-		myconf="${myconf} --enable-srvloc"
-		sed -i -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \
-			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
-	fi
-
-	epatch ${FILESDIR}/${P}-setXid.patch
-	AT_M4DIR="macros" eautoreconf
-}
-
-src_compile() {
-	# 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_with pam) \
-		$(use_enable cups) \
-		$(use_enable ssl) \
-		$(use_enable debug) \
-		$(use_enable tcpd tcp-wrappers) \
-		$(use_enable kerberos krbV-uam) \
-		$(use_enable krb4 krb4-uam) \
-		$(use_enable slp srvloc) \
-		$(use_with cracklib) \
-		$(use_with elibc_glibc shadow) \
-		--disable-afs \
-		--enable-fhs \
-		--with-bdb=/usr \
-		${myconf} || die "netatalk configure failed"
-
-	sed -i -e "s:@BINDNOW_FLAGS@:$(bindnow_flags):" bin/afppasswd/Makefile
-
-	emake || die "netatalk emake failed"
-
-	# Create the init script manually (it's more messy to --enable-gentoo)
-	cd ${S}/distrib/initscripts
-	emake rc.atalk.gentoo
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "netatalk make install failed"
-
-	dodoc CONTRIBUTORS NEWS README TODO VERSION
-
-	newinitd ${S}/distrib/initscripts/rc.atalk.gentoo atalk
-
-	# 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
-}
diff --git a/net-fs/netatalk/netatalk-2.0.3-r2.ebuild b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..0b9c347e6b87
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r2.ebuild,v 1.1 2005/12/13 00:20:27 flameeyes Exp $
+
+inherit eutils pam flag-o-matic autotools
+IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib"
+
+DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://netatalk.sourceforge.net"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+RDEPEND=">=sys-libs/db-4.2.52
+	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 )
+	krb4? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# 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
+		myconf="${myconf} --enable-srvloc"
+		sed -i -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \
+			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
+	fi
+
+	epatch ${FILESDIR}/${P}-setXid.patch
+	AT_M4DIR="macros" eautoreconf
+}
+
+src_compile() {
+	# 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_with pam) \
+		$(use_enable cups) \
+		$(use_enable ssl) \
+		$(use_enable debug) \
+		$(use_enable tcpd tcp-wrappers) \
+		$(use_enable kerberos krbV-uam) \
+		$(use_enable krb4 krb4-uam) \
+		$(use_enable slp srvloc) \
+		$(use_with cracklib) \
+		$(use_with elibc_glibc shadow) \
+		--disable-afs \
+		--enable-fhs \
+		--with-bdb=/usr \
+		${myconf} || die "netatalk configure failed"
+
+	sed -i -e "s:@BINDNOW_FLAGS@:$(bindnow_flags):" bin/afppasswd/Makefile
+
+	emake || die "netatalk emake failed"
+
+	# Create the init script manually (it's more messy to --enable-gentoo)
+	cd ${S}/distrib/initscripts
+	emake rc.atalk.gentoo
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "netatalk make install failed"
+
+	dodoc CONTRIBUTORS NEWS README TODO VERSION
+
+	newinitd ${S}/distrib/initscripts/rc.atalk.gentoo atalk
+
+	# 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 users netatalk.
+	# On a side note, it also solves collisions with freebsd-lib and other libcs
+	mv ${D}/usr/include/netatalk{,2}
+}
-- 
cgit v1.2.3-65-gdbad