bswap_32 is linux only, BSD's use bswap32

Package-Manager: portage-2.1.3.15

4 files changed, 50 insertions, 20 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index da9a0c796847..ee50c8467925 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.153 2007/10/17 13:50:21 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.154 2007/10/19 10:57:10 uberlord Exp $
+
+  19 Oct 2007; Roy Marples <uberlord@gentoo.org>
+  +files/evolution-data-server-1.12.1-icaltz-util.patch,
+  evolution-data-server-1.12.1.ebuild:
+  bswap_32 is linux only, BSD's use bswap32
 
 *evolution-data-server-1.12.1 (17 Oct 2007)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 1bbc12733825..625952790136 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX evolution-data-server-1.10-fix-maildir-account.patch 5436 RMD160 abc9da362f59793e5eedecee65c049ed7b5f3b04 SHA1 51aacf392594f80d0e50d012a265d281dafb8821 SHA256 45560ce1c0565103e07a9b8402139a9af945813ae19533a63027ff129cb9913f
 MD5 a3d26c871abd48ce5d0d292ef165102d files/evolution-data-server-1.10-fix-maildir-account.patch 5436
 RMD160 abc9da362f59793e5eedecee65c049ed7b5f3b04 files/evolution-data-server-1.10-fix-maildir-account.patch 5436
@@ -21,6 +18,10 @@ AUX evolution-data-server-1.11.3-no-libdb.patch 570 RMD160 404dfda7aac4e9ff6504e
 MD5 5a49b18302183354a1285506d0e0b45c files/evolution-data-server-1.11.3-no-libdb.patch 570
 RMD160 404dfda7aac4e9ff6504ecd9ee5b7af6efafc969 files/evolution-data-server-1.11.3-no-libdb.patch 570
 SHA256 992602fd04cfa8afba084238f62f765b1d5caf29cc10ad739c7e63ea78291905 files/evolution-data-server-1.11.3-no-libdb.patch 570
+AUX evolution-data-server-1.12.1-icaltz-util.patch 839 RMD160 58b17c2bed830ccabf4682fada9e5bd22d3fae48 SHA1 cd9aa108ba32d38ecc46b1749ff378faff4dc870 SHA256 8d7c5c5abab727eecd5cff1980e9987bf0dcadf0324288775c347e0da4f81175
+MD5 79a5685ae3997f99e0713c3326d933c6 files/evolution-data-server-1.12.1-icaltz-util.patch 839
+RMD160 58b17c2bed830ccabf4682fada9e5bd22d3fae48 files/evolution-data-server-1.12.1-icaltz-util.patch 839
+SHA256 8d7c5c5abab727eecd5cff1980e9987bf0dcadf0324288775c347e0da4f81175 files/evolution-data-server-1.12.1-icaltz-util.patch 839
 AUX evolution-data-server-1.2.0-gentoo_etc_services.patch 815 RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 SHA1 9248c74b334534f74e027fc119509673bff4542f SHA256 a64e0e4d74ac91f69c4b7a011b6325e27af6fa28a58e20f48ff09ec2a1538c5a
 MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
 RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
@@ -83,10 +84,10 @@ EBUILD evolution-data-server-1.12.0.ebuild 4699 RMD160 02e92486de1a52d47d36321ca
 MD5 2004765c66723291f652788d201abd4b evolution-data-server-1.12.0.ebuild 4699
 RMD160 02e92486de1a52d47d36321ca8df83475f31f94c evolution-data-server-1.12.0.ebuild 4699
 SHA256 33f760bae8fcc7aa13ba6acdba07130d579c920ac280203ff7e18d195d8db525 evolution-data-server-1.12.0.ebuild 4699
-EBUILD evolution-data-server-1.12.1.ebuild 4700 RMD160 432b381409d95590b7cb83dc870dc441194839a9 SHA1 c933f9f36529869792d8170153dec02ec00b5b39 SHA256 c38180aa6bf80e9b543ae2ccee6c0eac72c781d31b106526a6d6fe3d1d5de7c6
-MD5 486d94e79f570ed4f6581b34e332269c evolution-data-server-1.12.1.ebuild 4700
-RMD160 432b381409d95590b7cb83dc870dc441194839a9 evolution-data-server-1.12.1.ebuild 4700
-SHA256 c38180aa6bf80e9b543ae2ccee6c0eac72c781d31b106526a6d6fe3d1d5de7c6 evolution-data-server-1.12.1.ebuild 4700
+EBUILD evolution-data-server-1.12.1.ebuild 4829 RMD160 ec9a5ecb417d31e79578c416dc3a475a12256139 SHA1 1d9efe1395a4ba2351ce5abb12df84a5efa421a7 SHA256 a41f4f88360f4bb0a5c6d5f479f07ee29be5127bd74484593af16dc143a40b06
+MD5 1b9022b8263548e360b625dea35ae4a2 evolution-data-server-1.12.1.ebuild 4829
+RMD160 ec9a5ecb417d31e79578c416dc3a475a12256139 evolution-data-server-1.12.1.ebuild 4829
+SHA256 a41f4f88360f4bb0a5c6d5f479f07ee29be5127bd74484593af16dc143a40b06 evolution-data-server-1.12.1.ebuild 4829
 EBUILD evolution-data-server-1.6.2-r1.ebuild 2785 RMD160 20f22647dbaeef701d4b9c5780224792fdce5a23 SHA1 a3d4ffa8322822efa21c399ec5fc9043bf1d1867 SHA256 b307865799993811ac0c5a025257efec2805ede7577c2c59edaef1ca90c59ef9
 MD5 f808bfc1dc5d5c5efa7e3196bf40cb32 evolution-data-server-1.6.2-r1.ebuild 2785
 RMD160 20f22647dbaeef701d4b9c5780224792fdce5a23 evolution-data-server-1.6.2-r1.ebuild 2785
@@ -95,10 +96,10 @@ EBUILD evolution-data-server-1.8.3-r5.ebuild 5129 RMD160 1f01c1bddbdb4e9f02be60c
 MD5 7f25fef1eb7c6a25b8b0531d7a7c8529 evolution-data-server-1.8.3-r5.ebuild 5129
 RMD160 1f01c1bddbdb4e9f02be60cb423c924b4e30df39 evolution-data-server-1.8.3-r5.ebuild 5129
 SHA256 a9d65ada66829503a40c356275ca7180af817323dfeaf4edc21fe92062ac2b91 evolution-data-server-1.8.3-r5.ebuild 5129
-MISC ChangeLog 24967 RMD160 191e0e50163dfb517629a358b83e67f0ebc09a00 SHA1 507bddc832bec6d9e3affe5c9da4a933c55ad463 SHA256 78d640104b39cd997741c0007361b3203b24cd0e6a9a518b9a95bd6b00f427b3
-MD5 32c925f73706364fd2d11b9db2a26b08 ChangeLog 24967
-RMD160 191e0e50163dfb517629a358b83e67f0ebc09a00 ChangeLog 24967
-SHA256 78d640104b39cd997741c0007361b3203b24cd0e6a9a518b9a95bd6b00f427b3 ChangeLog 24967
+MISC ChangeLog 25161 RMD160 69f916f7bf31b6c8c3217736ffd43a58f4d6e10b SHA1 caeb476ad3f41b112fea74562cebd471c5bca7bc SHA256 fdba31f3f23a585a76ba74df50857b75525f20652dd19bd3be49e8346b85f183
+MD5 a000cb12a052bc6fcb620b83f6ade25c ChangeLog 25161
+RMD160 69f916f7bf31b6c8c3217736ffd43a58f4d6e10b ChangeLog 25161
+SHA256 fdba31f3f23a585a76ba74df50857b75525f20652dd19bd3be49e8346b85f183 ChangeLog 25161
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -121,10 +122,3 @@ SHA256 c474de3fb11f9641e62deea95bc409b7d208389cf6deca8c15c08a39a0c70d14 files/di
 MD5 159e4efbb6f5fe2e3973464851a6015b files/digest-evolution-data-server-1.8.3-r5 289
 RMD160 9311383fcc0546bb79ba3632bf984e3bb2783652 files/digest-evolution-data-server-1.8.3-r5 289
 SHA256 00dcc94a5030febdfc278394de4449c744c57e0fa812818a260fa807276ecca8 files/digest-evolution-data-server-1.8.3-r5 289
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHFhMnomPajV0RnrERAkSMAJsGOMPFE93BtWPgMKeuy3uoPU7LWQCeK6gH
-002c7cOhsYgD4vgNxdJA7dE=
-=EYhh
------END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild
index 751a5fe4781b..48d4a9050cde 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild,v 1.1 2007/10/17 13:50:21 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild,v 1.2 2007/10/19 10:57:10 uberlord Exp $
 
 inherit db-use eutils flag-o-matic gnome2 autotools
 
@@ -77,6 +77,9 @@ src_unpack() {
 	# Rewind in camel-disco-diary to fix a crash
 	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
 
+	# Don't assume that endian.h and byteswap.h exist on all non sun os's
+	epatch "${FILESDIR}"/${PN}-1.12.1-icaltz-util.patch
+
 #-------------Upstream GNOME look here -----------------#
 
 	# --as-needed fixes
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch
new file mode 100644
index 000000000000..982291b274aa
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch
@@ -0,0 +1,28 @@
+diff -ur a/calendar/libical/src/libical/icaltz-util.c b/calendar/libical/src/libical/icaltz-util.c
+--- a/calendar/libical/src/libical/icaltz-util.c	2007-10-12 07:31:10 +0100
++++ b/calendar/libical/src/libical/icaltz-util.c	2007-10-19 11:34:38 +0100
+@@ -23,9 +23,11 @@
+ #include <string.h>
+ #if defined(sun) && defined(__SVR4)
+ #include <sys/byteorder.h>
+-#else
++#elif defined(__linux__)
+ #include <byteswap.h>
+ #include <endian.h>
++#else
++#include <sys/endian.h>
+ #endif
+ #include <limits.h>
+ #include <time.h>
+@@ -89,7 +91,11 @@
+     if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
+         return *(const int *) ptr;
+     else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
++#ifdef __linux__
+         return bswap_32 (*(const int *) ptr);
++#else
++         return bswap32 (*(const uint32_t *) ptr);
++#endif
+ #endif
+ 	else
+ 	{