Fix building on BSD with upstream patch, bug #362469 by Yuta SATOH.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 121 insertions, 2 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index cfcf1793902f..eb69a50b679c 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.205 2011/04/11 04:39:23 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.206 2011/07/11 11:42:48 pacho Exp $
+
+*gnome-keyring-2.32.1-r1 (11 Jul 2011)
+
+  11 Jul 2011; Pacho Ramos <pacho@gentoo.org> +gnome-keyring-2.32.1-r1.ebuild,
+  +files/gnome-keyring-2.32.1-fix-undefined.patch:
+  Fix building on BSD with upstream patch, bug #362469 by Yuta SATOH.ç
 
   11 Apr 2011; Mart Raudsepp <leio@gentoo.org> -gnome-keyring-2.28.2.ebuild,
   gnome-keyring-2.32.1.ebuild:
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 24827f7f6c0e..bb110c7f4141 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnome-keyring-2.32.1-fix-undefined.patch 783 RMD160 76c20ef4bf5aaa1ed4d7b06a48fb6951729fa375 SHA1 f15c02accedad0890fcbcd98c2125dac582d6296 SHA256 a7b0d99728960af4e81e97941fc1aa9f06e49b7ed06669ab17d72628cd05e408
 DIST gnome-keyring-2.32.1.tar.bz2 1619245 RMD160 cb72f171f5918ff26f40feb7bba90dc7e2e120ec SHA1 3d0ecc3e29f426ecfcaa488ea17d3e330fe34eb6 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
+EBUILD gnome-keyring-2.32.1-r1.ebuild 2060 RMD160 f0a165004cdf67b45e3ab0fe716e67ea47bef461 SHA1 cadccd89f178dc9dfe1bab4ae86f89b7e5f071a5 SHA256 b989947ad5c295c920564044416876e5faf61141f3f216155bcfde4a4d4f3871
 EBUILD gnome-keyring-2.32.1.ebuild 1977 RMD160 030a2705ce3022ca94e224a29eb5c10e42cc14c8 SHA1 220870dfcd9b733277925629184c16891ef437b7 SHA256 87e5e15e57d3212bb7cd84f79cf3519461e68dcb416a1abfb4e83de6f654c587
-MISC ChangeLog 28321 RMD160 43b92b080fbb6f6893db55c54a70b6186fabb21d SHA1 432bbb0eb155e34b8be4e05706fbdaaa15efb031 SHA256 25c133f22c798dd8668a91f598d13529776afcf3390185fdafb6c634635dd48b
+MISC ChangeLog 28565 RMD160 7186df1cd91314622657e06f482575d496ee9e39 SHA1 7f3b0ac1b5c105b14b99ed76b7de1ede39b6e010 SHA256 f1b3e5239c439e66759fce90370747d0f45082232341e9864a8344e0ffc5296d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4a4b0ACgkQCaWpQKGI+9S+zACeNl5pUjaUc0H2rZrPEuezibZq
+e9UAn2BrlkNCM6nXN3Ccla/5Fp2RVvQ6
+=pyVN
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-fix-undefined.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-fix-undefined.patch
new file mode 100644
index 000000000000..28103ba5d594
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-fix-undefined.patch
@@ -0,0 +1,26 @@
+From 4050d583e8fe6c5c4bb71f0fd4ba6498cdf5a1b6 Mon Sep 17 00:00:00 2001
+From: Ryan Stonecipher <Ryan.Stonecipher.Fisher@gmail.com>
+Date: Mon, 24 Jan 2011 20:42:02 +0000
+Subject: Fix undefined type in egg-asn1x.c
+
+Mac OSX doesn't have a ulong type
+
+https://bugzilla.gnome.org/show_bug.cgi?id=640362
+---
+diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
+index 122cedf..10bd92c 100644
+--- a/egg/egg-asn1x.c
++++ b/egg/egg-asn1x.c
+@@ -2064,8 +2064,8 @@ anode_write_integer_ulong (gulong value, guchar *data, gsize *n_data)
+ 	guchar buf[sizeof (gulong)];
+ 	gint bytes, i, off;
+ 
+-	for (i = 0; i < sizeof (ulong); ++i) {
+-		off = sizeof (ulong) - (i + 1);
++	for (i = 0; i < sizeof (gulong); ++i) {
++		off = sizeof (gulong) - (i + 1);
+ 		buf[i] = (value >> (off * 8)) & 0xFF;
+ 	}
+ 
+--
+cgit v0.9
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild
new file mode 100644
index 000000000000..866cf5ad97e1
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 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.32.1-r1.ebuild,v 1.1 2011/07/11 11:42:48 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2 multilib pam virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="debug doc pam test"
+# USE=valgrind is probably not a good idea for the tree
+
+RDEPEND=">=dev-libs/glib-2.25:2
+	>=x11-libs/gtk+-2.20:2
+	gnome-base/gconf:2
+	>=sys-apps/dbus-1.0
+	pam? ( virtual/pam )
+	>=dev-libs/libgcrypt-1.2.2
+	>=dev-libs/libtasn1-1"
+#	valgrind? ( dev-util/valgrind )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+PDEPEND="gnome-base/libgnome-keyring"
+# eautoreconf needs:
+#	>=dev-util/gtk-doc-am-1.9
+
+# tests fail in several ways, they should be fixed in the next cycle (bug #340283),
+# revisit then.
+RESTRICT="test"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable test tests)
+		$(use_enable pam)
+		$(use_with pam pam-dir $(getpam_mod_dir))
+		--with-root-certs=${EPREFIX}/usr/share/ca-certificates/
+		--enable-acl-prompts
+		--enable-ssh-agent
+		--enable-gpg-agent
+		--with-gtk=2.0"
+#		$(use_enable valgrind)
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove silly CFLAGS
+	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
+		-i configure.in configure || die "sed failed"
+
+	# Remove DISABLE_DEPRECATED flags
+	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
+		-i configure.in configure || die "sed 2 failed"
+
+	# Fix undefined type in egg-asn1x.c
+	epatch "${FILESDIR}/${PN}-2.32.1-fix-undefined.patch"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "emake check failed!"
+}