Fix gnome-keyring build on freebsd. Bug #157926

(Portage version: 2.1.2_rc2-r5)

3 files changed, 44 insertions, 3 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index e7d00e7f0898..0bad9e77f31f 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.79 2006/12/12 16:28:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.80 2006/12/13 23:00:58 dang Exp $
+
+  13 Dec 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gnome-keyring-0.6.0-fbsd.patch, gnome-keyring-0.6.0.ebuild:
+  Fix gnome-keyring build on freebsd.  Bug #157926
 
   12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   gnome-keyring-0.6.0.ebuild:
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-0.6.0-fbsd.patch b/gnome-base/gnome-keyring/files/gnome-keyring-0.6.0-fbsd.patch
new file mode 100644
index 000000000000..7f0acffdab2b
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-0.6.0-fbsd.patch
@@ -0,0 +1,31 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN gnome-keyring-0.6.0.orig/gnome-keyring.c gnome-keyring-0.6.0/gnome-keyring.c
+--- gnome-keyring-0.6.0.orig/gnome-keyring.c	2006-08-28 06:04:36.000000000 -0400
++++ gnome-keyring-0.6.0/gnome-keyring.c	2006-12-13 17:49:57.000000000 -0500
+@@ -275,9 +275,9 @@ write_credentials_byte_sync (int socket)
+   msg.msg_control = (caddr_t) &cmsg;
+   msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+   memset (&cmsg, 0, sizeof (cmsg));
+-  cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+-  cmsg->cmsg_level = SOL_SOCKET;
+-  cmsg->cmsg_type = SCM_CREDS;
++  cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
++  cmsg.hdr.cmsg_level = SOL_SOCKET;
++  cmsg.hdr.cmsg_type = SCM_CREDS;
+ #endif
+ 
+  again:
+@@ -324,10 +324,10 @@ write_credentials_byte (GnomeKeyringOper
+ 
+   msg.msg_control = (caddr_t) &cmsg;
+   msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+-  memset (cmsg, 0, sizeof (cmsg));
+-  cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+-  cmsg->cmsg_level = SOL_SOCKET;
+-  cmsg->cmsg_type = SCM_CREDS;
++  memset (&cmsg, 0, sizeof (cmsg));
++  cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
++  cmsg.hdr.cmsg_level = SOL_SOCKET;
++  cmsg.hdr.cmsg_type = SCM_CREDS;
+ #endif
+ 
+  again:
diff --git a/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild
index fa4de608e8bd..65edb9d1f134 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild,v 1.5 2006/12/12 16:28:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild,v 1.6 2006/12/13 23:00:58 dang Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -19,3 +19,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}/${P}-fbsd.patch"
+}