Add new revision that moves away /usr/include/netatalk directory to avoid collisions with glibc and freebsd's libc.

(Portage version: 2.0.53)

4 files changed, 25 insertions, 9 deletions

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..8b3f76aaf74c 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,11 +1,13 @@
-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
+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 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 9ee0857567bda5d9ffabf5d04095e90b files/digest-netatalk-2.0.3-r2 68
+MD5 9eeca2a8610190fcd373ff619d56a298 files/netatalk-1.6.4-tempfile.patch 557
+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 1d1f52ebdb13ae16f98bfae6a1edd400 netatalk-2.0.3-r1.ebuild 2493
+MD5 5543ac27acc8a14b9b3418758a34185c netatalk-2.0.3-r2.ebuild 2885
+MD5 70079668b1a40270670877da571a57cc netatalk-2.0.3.ebuild 2431
diff --git a/net-fs/netatalk/files/digest-netatalk-2.0.3-r1 b/net-fs/netatalk/files/digest-netatalk-2.0.3-r2
index 1f207b35e1d9..1f207b35e1d9 100644
--- a/net-fs/netatalk/files/digest-netatalk-2.0.3-r1
+++ b/net-fs/netatalk/files/digest-netatalk-2.0.3-r2
diff --git a/net-fs/netatalk/netatalk-2.0.3-r1.ebuild b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
index 0238edefc2cc..0b9c347e6b87 100644
--- a/net-fs/netatalk/netatalk-2.0.3-r1.ebuild
+++ b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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"
@@ -83,4 +83,11 @@ src_install() {
 	# 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}
 }