remove double patch, oops

Package-Manager: portage-2.0.51-r13

5 files changed, 24 insertions, 31 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5db7e5ad53c6..cd66a800e8e5 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.105 2005/01/18 17:25:32 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.106 2005/01/18 17:57:09 suka Exp $
+
+  18 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild, -files/1.1.4/gcc34-nptl-fix.patch,
+  files/1.1.4/nptl.patch:
+  Remove gcc34-nptl-fix as this is now incorporated in the regular nptl-patch
 
   18 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-1.1.4.ebuild, +files/1.1.4/nptl.patch:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 4778dba4d2e9..9e2fe22b480b 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,6 @@
-MD5 7e0741821222ffa4f1bb7ee9c531a87f openoffice-1.1.4.ebuild 16495
+MD5 828b9a93216f2dcdf4c95faf46d23fca openoffice-1.1.4.ebuild 16487
 MD5 db4fc1842f4f355e5c4c875ef6b61fdc openoffice-1.1.3.ebuild 15689
-MD5 4f5a4890e766ec6453425cf5a8c3f74c ChangeLog 23451
+MD5 a015e845ebf7c9be353538e9fe4c9aba ChangeLog 23671
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4 325
@@ -15,10 +15,9 @@ MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092
 MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
 MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
 MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
-MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.4/gcc34-nptl-fix.patch 618
 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
-MD5 19e2bc774e9b0cb39ece9be52039b803 files/1.1.4/nptl.patch 705
+MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.4/nptl.patch 785
 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.4/gcc34-sal-link-to-libsupc++.diff 405
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
diff --git a/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch b/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch
deleted file mode 100644
index 3e3360b2f422..000000000000
--- a/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./sal/osl/unx/process.c.orig	2003-07-02 15:34:17.000000000 +0200
-+++ ./sal/osl/unx/process.c	2004-11-01 15:16:40.976815960 +0100
-@@ -1017,11 +1017,6 @@
- 			for (i = 0; data.m_pszEnv[i] != NULL; i++)
- 	     		putenv(data.m_pszEnv[i]);
- 
--#if defined(LINUX)
--            /* mfe: linux likes to have just one thread when the exec family is called */
--            /*      this np function has this purpose ...                              */
--            pthread_kill_other_threads_np();
--#endif
-             OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
-      
- 			/* Connect std IO to pipe ends */
diff --git a/app-office/openoffice/files/1.1.4/nptl.patch b/app-office/openoffice/files/1.1.4/nptl.patch
index 7a17bcc79fdc..996a7ceec67d 100644
--- a/app-office/openoffice/files/1.1.4/nptl.patch
+++ b/app-office/openoffice/files/1.1.4/nptl.patch
@@ -11,11 +11,15 @@
  	InfoMemoryTypeAccess( t_short );
 *** sal/osl/unx/process.c.orig
 --- sal/osl/unx/process.c
-@@ -1020,7 +1020,7 @@
- #if defined(LINUX)
-             /* mfe: linux likes to have just one thread when the exec family is called */
-             /*      this np function has this purpose ...                              */
+@@ -1017,11 +1017,6 @@
+ 			for (i = 0; data.m_pszEnv[i] != NULL; i++)
+ 	     		putenv(data.m_pszEnv[i]);
+ 
+-#if defined(LINUX)
+-            /* mfe: linux likes to have just one thread when the exec family is called */
+-            /*      this np function has this purpose ...                              */
 -            pthread_kill_other_threads_np();
-+            /*pthread_kill_other_threads_np();*/
- #endif
+-#endif
              OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
+      
+ 			/* Connect std IO to pipe ends */
diff --git a/app-office/openoffice/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild
index edb17d76921e..7df0fc42cfe0 100644
--- a/app-office/openoffice/openoffice-1.1.4.ebuild
+++ b/app-office/openoffice/openoffice-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.13 2005/01/18 17:25:32 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.14 2005/01/18 17:57:09 suka Exp $
 
 # Notes:
 #
@@ -231,6 +231,7 @@ src_unpack() {
 		epatch ${FILESDIR}/${PV}/STLport-vector.patch
 	fi
 
+	#Fixes for nptl
 	if use nptl; then
 		epatch ${FILESDIR}/${PV}/nptl.patch
 	fi
@@ -246,15 +247,13 @@ src_unpack() {
 		epatch ${FILESDIR}/${PV}/gcc34.patch.bz2
 		epatch ${FILESDIR}/${PV}/gcc34-sal-link-to-libsupc++.diff
 		use !java && epatch ${FILESDIR}/${PV}/gcc34-nojava-fix.patch
-		use nptl && epatch ${FILESDIR}/${PV}/gcc34-nptl-fix.patch
 	fi
 
-	#phtread-fix
-	epatch ${FILESDIR}/${PV}/pthreadlink-fix.patch
-
-	#Fix for hardened
+	#Fixes for hardened
 	if use hardened; then
+		epatch ${FILESDIR}/${PV}/pthreadlink-fix.patch
 		epatch ${FILESDIR}/${PV}/hardened-link.patch
+		epatch ${FILESDIR}/${PV}/pyunolink-fix.patch
 	fi
 
 	#Do our own branding by setting gentoo linux as the vendor