Add upstream fix for building on FreeBSD, bug #271359

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 71 insertions, 5 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index bff5e19c4491..083c1dacf8e1 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.147 2009/05/14 07:39:36 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.148 2009/06/30 07:50:28 aballier Exp $
+
+  30 Jun 2009; Alexis Ballier <aballier@gentoo.org>
+  gnome-keyring-2.26.1-r1.ebuild, +files/gnome-keyring-2.26.1-dlopen.patch:
+  Add upstream fix for building on FreeBSD, bug #271359
 
 *gnome-keyring-2.26.1-r1 (14 May 2009)
 
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index ef6cd8321e37..b526a103a121 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-keyring-2.22.3-pkg-libtasn1.patch 1079 RMD160 8ddeb815ef69fd3a32b256fc144883c5ab9ca6f8 SHA1 84d93848fac4141aea4ddd5f221b5a3431a6774f SHA256 14332fdb39ab870bab747e148d2098f339758af5105504b9fc83c0582394303c
 AUX gnome-keyring-2.22.3-warnings.patch 780 RMD160 3f3e04754189b67720f2f1e7eebb5e24b9612cd2 SHA1 95077ed5efcc493e35b64b943548c569eef1cfff SHA256 03206a46f86675ed1d2773740a23b02eaa1221c8dbbd3caea0a30a42c82a7d82
+AUX gnome-keyring-2.26.1-dlopen.patch 1273 RMD160 a0e181e8d2ccfd9c32a163dfb0c18863f1858081 SHA1 5aebfbdc2d558092c97a396e56ede6a4766af3de SHA256 161bae39b70239383e26481cbb563fae3f30367cbe64ef48ad02b518855a2c2e
 DIST gnome-keyring-2.22.3.tar.bz2 894308 RMD160 551f4a4d734e0196522be9276ae7e76110a96556 SHA1 0f52095590a684920cc683d1985ac66263702114 SHA256 1e14eed00d386763352896e540929760264885e1296ac11cfb8ca1c08dcea7f6
 DIST gnome-keyring-2.24.1.tar.bz2 1125993 RMD160 17c6701ef7b35902780b6c72b79a3f0eaafe2378 SHA1 93e92e01daecd85b1c0ae9dda09d5cc808989642 SHA256 3c9eb7f45dd0026340635b9e1ee18c36a47541610aa5a7ef604ca645aa4763f9
 DIST gnome-keyring-2.26.1.tar.bz2 2738687 RMD160 0975197ae8e58a8d98a2ff11c062ec6c9cf74a79 SHA1 3ff24987392b3f51109709b2c020af3557155ef8 SHA256 47a79a7963652c19d9f566289fdb49ca286bfb1bef32b7e1032eb36c49bf7926
 EBUILD gnome-keyring-2.22.3-r1.ebuild 1432 RMD160 35e519fe4972b504b00159e599782bf81dbdb6f6 SHA1 d7f5032be41b5ac8e7a2080dc63cab5d6b5d0ef8 SHA256 469730467d0c8bd3aa9ec84de37a248836274b71198e45d2c987364348bd533a
 EBUILD gnome-keyring-2.24.1.ebuild 1470 RMD160 631eb138f3f1e46b4e5e23c4711061d020c530f4 SHA1 adc78bfc15dfc76829e49a7a4ae543c95a2c65aa SHA256 bcdc993a032b069f0221621f2bb95c032b63b7cb248bd33cab5d439b19daba3c
-EBUILD gnome-keyring-2.26.1-r1.ebuild 1699 RMD160 553e1d13bb23391203025e6b8c51b65833f55e9a SHA1 53aa68b78a1236f83812e022cc2f66eff6454335 SHA256 f94a95848298bf1c2b481f453a9eb1273c0f091eb522332aa2d0e0348b675715
-MISC ChangeLog 18861 RMD160 4f5450c54fcbe546eec638529a1a6c14982236d1 SHA1 55549dad85cae615c0f5b2daecd23252986848f4 SHA256 29e81012666360f79fceef3f4379de84af8ce835b48a622f243e29ea440f14b4
+EBUILD gnome-keyring-2.26.1-r1.ebuild 1894 RMD160 e48b041f0ab0c017e949802c33c7b9c901ea0e1a SHA1 ea0a4d81390f512d95c8505cddc09216c27cb9e0 SHA256 168527a046c095a6314ce510971ce193150cbdc7fd0e803a727a4555a8ff1508
+MISC ChangeLog 19046 RMD160 ff211ab966cfb4a1d9a40c8b8a934551423a8024 SHA1 41fce41543f2d238bf61e197330bc402b1cb04e9 SHA256 b1127eb20bb813b258aeef85978464063d8f4c710f6763ced5ca6cf5907caef5
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEARECAAYFAkpJw9AACgkQvFcC4BYPU0rIeACeLZz8Q2PqViEklH5XOPV3QxYA
+N6kAoIscUkbs1UWbjXsRNmcj7NlBImMi
+=xhr4
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch
new file mode 100644
index 000000000000..8fd0aa0d6203
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch
@@ -0,0 +1,43 @@
+commit 6ddb14eef4368d63ce7055ee52718010a8f8190a
+Author: Stef Walter <stef@memberwebs.com>
+Date:   Fri Jun 26 15:13:04 2009 +0000
+
+    Fix linking problem on FreeBSD.
+    
+    The dlopen function is in libc rather than libdl, so add a check for
+    that in configure.in. Fixes bug #584307
+
+diff --git a/configure.in b/configure.in
+index a0e1e9a..287a391 100644
+--- a/configure.in
++++ b/configure.in
+@@ -278,6 +278,17 @@ if test "$enable_pam" != "no"; then
+ fi
+ 
+ # --------------------------------------------------------------------
++# Find DL functionality
++
++AC_CHECK_LIB(c, dlopen, DL_LIBS="",
++	AC_CHECK_LIB(dl, dlopen, DL_LIBS="-ldl",
++		AC_MSG_ERROR([Could not find a library with the dlopen function])
++	)
++)
++
++AC_SUBST(DL_LIBS)
++
++# --------------------------------------------------------------------
+ # Disable ACL Prompts
+ 
+ AC_ARG_ENABLE(acl-prompts, 
+diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
+index 0f085f3..45da903 100644
+--- a/pkcs11/rpc-layer/Makefile.am
++++ b/pkcs11/rpc-layer/Makefile.am
+@@ -58,6 +58,6 @@ gck_rpc_daemon_standalone_SOURCES = \
+ 	gck-rpc-daemon-standalone.c
+ 	
+ gck_rpc_daemon_standalone_LDADD = \
+-	-ldl libgck-rpc-layer.la \
++	$(DL_LIBS) libgck-rpc-layer.la \
+ 	$(top_builddir)/common/libgkr-common.la
+ 	
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
index 2bf6691ff018..7de0c6e13e42 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild,v 1.1 2009/05/14 07:39:36 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild,v 1.2 2009/06/30 07:50:28 aballier Exp $
 
 EAPI="2"
 
-inherit gnome2 pam virtualx
+inherit gnome2 pam virtualx eutils autotools
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -54,6 +54,14 @@ src_prepare() {
 
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
+	# Detect where dlopen functions are rather than hardcoding -ldl
+	# Fixes build on BSD
+	# Bug #271359
+	# Gnome bug #584307
+	epatch "${FILESDIR}/${P}-dlopen.patch"
+	eautoreconf
+
 }
 
 src_test() {