Fix building with =net-misc/neon-0.30* (bug #307501).

Package-Manager: portage-15801-svn/cvs/Linux x86_64

4 files changed, 35 insertions, 14 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 7b6f206f012e..1dc8f5fd2967 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.522 2010/03/03 11:00:22 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.523 2010/03/09 17:42:21 arfrever Exp $
+
+  09 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  openoffice-3.2.0.ebuild, +files/neon-remove-SSPI-support.diff:
+  Fix building with =net-misc/neon-0.30* (bug #307501).
 
   03 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
   openoffice-3.2.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index ab8d3db89dc3..fb322648ae16 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Gentoo_ODK_install.patch 868 RMD160 62a69900ce2e0250b35277d36b84a2bd8913c88d SHA1 58ebb2cb06e03a2db56e798769e3f2d9b95dd823 SHA256 9ca280d88594658c214b21075e1a0f504106b29afe1b9b68915ca4c93b4fd1c2
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX gentoo-3.1.1.diff 2229 RMD160 543824148af41cfcdeaf1198591679b6c366c61e SHA1 65602b7388e8754d6c33ea641d7622f5ede80e1b SHA256 93b4f41a59a3b79880db4c5aa6eb937c9a34f4a0de94ef28f1ea24534ca2ad4b
 AUX gentoo-3.2.0.diff 1313 RMD160 48509f072a026ee29bcd02284e6c450bcd17f738 SHA1 47cad3c984629a1bc9d3fab38cd860a1ab5d20b1 SHA256 8dfd0ffc55f39b7b76dc6eadcd02b0c3b77126a5dd61d1a74f498d09ad85ff1b
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
+AUX neon-remove-SSPI-support.diff 1091 RMD160 5dee3324b22b9c8d9f14b0e7998695a212c046a8 SHA1 e8541e791a03836d986d8e0db0d488570bb6ab36 SHA256 90d88d2fb96a0e82afe6b55e77c478ee9b1925e14dfbc998c2af0ef05edfd508
 AUX nocairofonts.diff 437 RMD160 56d7929870c122b228a1e673f4743cf91958753b SHA1 6a7e0a92155ad33e255d17961a2121857bf8a1fe SHA256 8afc0dee4778a46198ae95699243749cc62ee943229e42f0b827b55aa52c89a9
 AUX npwrap-fix-nogtk.diff 382 RMD160 557fe38a19d9a0e4505af34bed4033884f1075ab SHA1 209f73c706adabb1e2b2b3e4bc706f9afbbee172 SHA256 ad64cea66e4e4d9b351a44b3ed2774484baaaebe5e37ebea3121f4a0981d231f
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
@@ -53,13 +51,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c
-EBUILD openoffice-3.2.0.ebuild 13295 RMD160 8e811f89c1ccc19640cd2617a584fca2c85bddc6 SHA1 8d16dd24c26a14fd4891117dda4cdff47b80b2c9 SHA256 9b7cfb30e1d72ed525e9f95138d11c77c6a5d6a403461ee00202d19a43143a9f
-MISC ChangeLog 107374 RMD160 35e66de840a86c91e57db426fea9ba1121c1840e SHA1 298f47b494b2bfcdb50cc6f16a96401ed333f274 SHA256 cae0ea9cb146f6999dfcdaf6a867b46bbf541be169b7d015c8e4359ca6736844
+EBUILD openoffice-3.2.0.ebuild 13380 RMD160 8f1f6d34856f9e9d0110a749990ded73584b673d SHA1 2caa4becfc50873cc0d21addefc237d89d69b42c SHA256 5b495f9dc04907937fee6f15c688201a95ce32104cd089e1fba8708fced27e11
+MISC ChangeLog 107572 RMD160 d7210d3809ae801c5833c01308b123947d81dd77 SHA1 d535bd96ff3c83700ee6d82d264b5e3f1651cb70 SHA256 b960a69458054336177b4cdc14dd6d38f287fc483e0a7b09cf8fdf1597e70001
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuOQU0ACgkQNQqtfCuFneNs/gCfWwu+SMX/Sbc1CYjzHm7ysWBo
-yTAAn3EDReBiUZd1AXmi9eJJnBApMwom
-=BtDz
------END PGP SIGNATURE-----
diff --git a/app-office/openoffice/files/neon-remove-SSPI-support.diff b/app-office/openoffice/files/neon-remove-SSPI-support.diff
new file mode 100644
index 000000000000..5e8d6aa4f51b
--- /dev/null
+++ b/app-office/openoffice/files/neon-remove-SSPI-support.diff
@@ -0,0 +1,25 @@
+--- ucb/source/ucp/webdav/NeonSession.cxx
++++ ucb/source/ucp/webdav/NeonSession.cxx
+@@ -257,9 +257,6 @@
+ 
+ // -------------------------------------------------------------------
+ extern "C" int NeonSession_NeonAuth( void *       inUserData,
+-#ifdef NE_FEATURE_SSPI
+-                                     const char * inAuthProtocol,
+-#endif
+                                      const char * inRealm,
+                                      int          attempt,
+                                      char *       inoutUserName,
+@@ -334,12 +331,6 @@
+ 
+     bool bCanUseSystemCreds = false;
+ 
+-#ifdef NE_FEATURE_SSPI
+-    bCanUseSystemCreds = (attempt == 0) && // avoid endless loops
+-                         ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature. 
+-                         ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) ||
+-                         ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 );
+-#endif
+ 
+ 	// #i97003# (tkr): Ask XMasterPasswordHandling if we should store the 
+     // credentials persistently and give this information to the auth listener
diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
index fdb2a46776d9..1061ab492189 100644
--- a/app-office/openoffice/openoffice-3.2.0.ebuild
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.16 2010/03/03 11:00:22 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.17 2010/03/09 17:42:21 arfrever Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -222,6 +222,7 @@ src_prepare() {
 	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/qt-use-native-backend.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/npwrap-fix-nogtk.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/neon-remove-SSPI-support.diff" "${S}/patches/hotfixes" || die
 
 	#Use flag checks
 	if use java ; then