4 files changed, 79 insertions, 4 deletions
diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index d64cdf442e0e..074db146ba1e 100644
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/openjade
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.48 2006/12/21 02:12:17 uberlord Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.49 2007/01/26 20:53:53 chainsaw Exp $
+
+  26 Jan 2007; Tony Vroon <chainsaw@gentoo.org>
+  +files/openjade-1.3.2-la-fix.patch, +files/openjade-1.3.2-ldflags.patch,
+  openjade-1.3.2-r1.ebuild:
+  Allow the package to build with LDFLAGS="-Wl,--as-needed", thanks to a patch
+  by Christian Heim <phreak@gentoo.org>. Closes bug #131335. Text-markup herd
+  approval: leonardop.
 
   21 Dec 2006; Roy Marples <uberlord@gentoo.org> openjade-1.3.2-r1.ebuild:
   Added ~sparc-fbsd keyword.
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
new file mode 100644
index 000000000000..eea6efabb978
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-la-fix.patch
@@ -0,0 +1,37 @@
+--- jade/Makefile.sub.orig	2002-11-15 23:46:50.000000000 +0100
++++ jade/Makefile.sub	2006-04-30 19:48:30.000000000 +0200
+@@ -4,7 +4,8 @@
+ INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style
+ # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \
+ #   ../lib/libosp.a
+-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a
++SPLIBS=-L$(splibdir) -losp
++XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a
+ 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 @@
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS) $(COBJS) $(LT_LIBS)
+-	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(SPLIBS)
+ 
+ install: $(PROG)
+ 	-test -d $(DESTDIR)$(bindir) || \
diff --git a/app-text/openjade/files/openjade-1.3.2-ldflags.patch b/app-text/openjade/files/openjade-1.3.2-ldflags.patch
new file mode 100644
index 000000000000..d557a8002088
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-ldflags.patch
@@ -0,0 +1,30 @@
+Index: openjade-1.3.2/jade/Makefile.sub
+===================================================================
+--- openjade-1.3.2.orig/jade/Makefile.sub
++++ openjade-1.3.2/jade/Makefile.sub
+@@ -4,7 +4,7 @@ OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuild
+ INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style
+ # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \
+ #   ../lib/libosp.a
+-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a
++XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a $(splibdir)/libosp.a
+ 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 d14d43ded86b..da5f6dc0c5ed 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.34 2006/12/21 02:12:17 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.2-r1.ebuild,v 1.35 2007/01/26 20:53:53 chainsaw Exp $
 
 inherit libtool sgml-catalog eutils flag-o-matic multilib
 
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-msggen.pl.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
 }
 
 src_compile() {