Add patch from Mandriva for underlinking. Remove chunks of our own patches that are included in this one.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

5 files changed, 51 insertions, 35 deletions

diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index 43a51fbedefa..5830c3c8dba5 100644
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/openjade
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.52 2008/12/09 21:23:47 bluebird Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.53 2009/04/22 21:59:35 loki_val Exp $
+
+  22 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/openjade-1.3.2-deplibs.patch, files/openjade-1.3.2-la-fix.patch,
+  files/openjade-1.3.2-ldflags.patch, openjade-1.3.2-r1:
+  Add patch from Mandriva for underlinking. Remove chunks of our own patches
+  that are included in this one.
 
   09 Dec 2008; Friedrich Oslage <bluebird@gentoo.org>
   +files/openjade-1.3.2-lib64-fix.patch, openjade-1.3.2-r1.ebuild:
diff --git a/app-text/openjade/files/openjade-1.3.2-deplibs.patch b/app-text/openjade/files/openjade-1.3.2-deplibs.patch
new file mode 100644
index 000000000000..3466ad7d85e3
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-deplibs.patch
@@ -0,0 +1,40 @@
+diff -urNp openjade-1.3.2/grove/Makefile.sub devel/grove/Makefile.sub
+--- openjade-1.3.2/grove/Makefile.sub	2002-10-20 23:47:24.000000000 +0200
++++ devel/grove/Makefile.sub	2007-07-23 15:39:23.000000000 +0200
+@@ -1,4 +1,4 @@
+ LTVERSION=0:1:0
+ LIB=ogrove
+-DEPLIBS=-lm
++DEPLIBS=-lm -lstdc++
+ OBJS=Node.o LocNode.o
+diff -urNp openjade-1.3.2/spgrove/Makefile.sub devel/spgrove/Makefile.sub
+--- openjade-1.3.2/spgrove/Makefile.sub	2002-11-15 23:46:50.000000000 +0100
++++ devel/spgrove/Makefile.sub	2007-07-23 16:06:13.000000000 +0200
+@@ -1,9 +1,10 @@
+ LTVERSION=0:1:0
+ LIB=ospgrove
+ INCLUDE=-I$(srcdir)/../grove
+-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
++DEPLIBS=$(TOP)/grove/libogrove.la \
++       -lm -losp -L$(TOP)/grove/.libs \
+ 	-L$(TOP)/lib -L$(TOP)/lib/.libs \
+-	$(LIB_THREADS)
++	$(LIB_THREADS) -lstdc++
+ OBJS=GroveApp.o GroveBuilder.o SdNode.o
+ GENSRCS=grove_inst.cxx
+ 
+diff -urNp openjade-1.3.2/style/Makefile.sub devel/style/Makefile.sub
+--- openjade-1.3.2/style/Makefile.sub	2003-04-18 19:18:10.000000000 +0200
++++ devel/style/Makefile.sub	2007-07-23 16:08:26.000000000 +0200
+@@ -1,8 +1,8 @@
+ LTVERSION=0:1:0
+ LIB=ostyle
+-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
+-  -L$(TOP)/lib -L$(TOP)/lib/.libs \
+-  -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs 
++DEPLIBS=$(TOP)/grove/libogrove.la $(TOP)/spgrove/libospgrove.la \
++  -lm -losp -L$(TOP)/lib -L$(TOP)/lib/.libs -L$(TOP)/grove/.libs \
++  -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs -lstdc++
+ OBJS=LangObj.o \
+   Collector.o \
+   DssslApp.o \
diff --git a/app-text/openjade/files/openjade-1.3.2-la-fix.patch b/app-text/openjade/files/openjade-1.3.2-la-fix.patch
index eea6efabb978..9f0a13c862f1 100644
--- a/app-text/openjade/files/openjade-1.3.2-la-fix.patch
+++ b/app-text/openjade/files/openjade-1.3.2-la-fix.patch
@@ -10,20 +10,6 @@
  GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \
   HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx  TeXFOTBuilder_inst.cxx \
   TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx
---- spgrove/Makefile.sub.orig	2006-04-30 20:27:32.000000000 +0200
-+++ spgrove/Makefile.sub	2006-04-30 20:59:40.000000000 +0200
-@@ -1,8 +1,7 @@
- LTVERSION=0:1:0
- LIB=ospgrove
- INCLUDE=-I$(srcdir)/../grove
--DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
--	-L$(TOP)/lib -L$(TOP)/lib/.libs \
--	$(LIB_THREADS)
-+DEPLIBS=-lm $(TOP)/grove/libogrove.la \
-+	$(LIB_THREADS)
- OBJS=GroveApp.o GroveBuilder.o SdNode.o
- GENSRCS=grove_inst.cxx
- 
 --- Makefile.prog.in.orig	2006-05-01 19:44:33.000000000 +0200
 +++ Makefile.prog.in	2006-05-01 19:45:01.000000000 +0200
 @@ -19,7 +19,7 @@
diff --git a/app-text/openjade/files/openjade-1.3.2-ldflags.patch b/app-text/openjade/files/openjade-1.3.2-ldflags.patch
index d557a8002088..4ddd4d414854 100644
--- a/app-text/openjade/files/openjade-1.3.2-ldflags.patch
+++ b/app-text/openjade/files/openjade-1.3.2-ldflags.patch
@@ -11,20 +11,3 @@ Index: openjade-1.3.2/jade/Makefile.sub
  GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \
   HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx  TeXFOTBuilder_inst.cxx \
   TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx
-Index: openjade-1.3.2/spgrove/Makefile.sub
-===================================================================
---- openjade-1.3.2.orig/spgrove/Makefile.sub
-+++ openjade-1.3.2/spgrove/Makefile.sub
-@@ -1,9 +1,9 @@
- LTVERSION=0:1:0
- LIB=ospgrove
- INCLUDE=-I$(srcdir)/../grove
--DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
--	-L$(TOP)/lib -L$(TOP)/lib/.libs \
--	$(LIB_THREADS)
-+DEPLIBS=-lm -L$(TOP)/lib -L$(TOP)/lib/.libs \
-+	-L$(TOP)/grove -L$(TOP)/grove/.libs \
-+	$(TOP)/grove/libogrove.la $(LIB_THREADS)
- OBJS=GroveApp.o GroveBuilder.o SdNode.o
- GENSRCS=grove_inst.cxx
- 
diff --git a/app-text/openjade/openjade-1.3.2-r1.ebuild b/app-text/openjade/openjade-1.3.2-r1.ebuild
index f7c5719c078d..c7e92bbd7ad9 100644
--- a/app-text/openjade/openjade-1.3.2-r1.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.2-r1.ebuild,v 1.37 2008/12/09 21:23:47 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.2-r1.ebuild,v 1.38 2009/04/22 21:59:35 loki_val Exp $
 
 inherit libtool sgml-catalog eutils flag-o-matic multilib
 
@@ -24,6 +24,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-msggen.pl.patch
 	epatch "${FILESDIR}"/${P}-ldflags.patch
 	epatch "${FILESDIR}"/${P}-lib64-fix.patch
+	epatch "${FILESDIR}"/${P}-deplibs.patch
 }
 
 src_compile() {