# HG changeset patch
# User Binki <ohnobinki@ohnopublishing.net>
# Date 2009-11-24 21:16:14
# Node ID 83ec3373f1c52663bba21004341f7755ea8a07cd
# Parent  3c7d72a33482581dbcdbd2e94acf350cb110b5f3

app-text/openjade: fixed patch and patch ordering
this ebuild will be in temporarily, until bug 293754 is fixed

diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -1,10 +1,11 @@
 AUX openjade-1.3.2-deplibs.patch 1506 RMD160 146495883763799a655bf3884966668630041d06 SHA1 f5f54ab8d6f2f132930b6c160bcdcff32d0ab050 SHA256 93905d0b4878f580fece323c1ebb4b5d5db05f1e6f06dde39cfd9b2dd0a95433
-AUX openjade-1.3.2-la-fix.patch 1180 RMD160 339ca71f9e29184b2d1381ee61e8405e5b5f2292 SHA1 1e9f0ae718a26be82b8533ad2695f18a67c0ed6e SHA256 5fdcb8abdf277c1680e2c5e6c0167f35fba2518d95579ac86b363eedab7e7e7e
+AUX openjade-1.3.2-la-fix.patch 1725 RMD160 5a84181aeeb1306ab5a63b1257e037115914f303 SHA1 5952f56ba22f9b0aa5a7ce106efb3bdba1bce9a3 SHA256 c0922350016fbd2784f9080a67b0f8d6171884d506216d7983dfdf95ef15ab11
 AUX openjade-1.3.2-ldflags.patch 819 RMD160 38223c38e115836b9b8e74c73a9a488154e59200 SHA1 a0735e43ecd493d0218f347b6c3fcfdc9a43b32d SHA256 7fd651fb682d70a3f5062a65d0da60bebdc5b958cc936d7980339f49b360c3a0
 AUX openjade-1.3.2-lib64-fix.patch 878 RMD160 fbb94a712420754744e5fa4cb0edb54538a5eefd SHA1 05db472e5dda4ee9ffd1ba809f111e79103e6b59 SHA256 9b8437048682378902c71dca0b7ae4c72ae441fb6aad5994013dca991f760917
 AUX openjade-1.3.2-msggen.pl.patch 418 RMD160 6af41427403575117dd03e157d8a5d057ed4743c SHA1 fa30539b34b7fda9d74a384465c69cb25dfc3660 SHA256 4dfb6018f13fcc0ec17637fc24fe69785e6efe6531d5ed248407046d31832449
 AUX openjade-1.3.2.dsssl-catalog 269 RMD160 fc328d135bf956fe7ae60f705979accd08bf74a8 SHA1 934043c60ca37fc9ce0fdee13c6706df89fb5acc SHA256 f33d7ce1b564b91bbdf5b8983f21ce4c6a0e420f0e8676a8439f460a49b16abc
 DIST openjade-1.3.2.tar.gz 894834 RMD160 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 SHA1 54e1999f41450fbd62c5d466002d79d3efca2321 SHA256 1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
-EBUILD openjade-1.3.2-r1.ebuild 2935 RMD160 0e7436168def91b516f5cec590eb9134919a1656 SHA1 3b6e41bdfef87f4f7a517a490b4ac73f2abef9e0 SHA256 bb7f559bf79c312e5b70b8d886bbe4e563dd5a2ea85a86c2137644d70b1183a8
+EBUILD openjade-1.3.2-r1.ebuild 2935 RMD160 67f6917b05bb00a8c49432a6382b96f672968914 SHA1 7784453098bcba0795340bad561c383592b68556 SHA256 0817fe972ac34d1bf4fc98bd7ccf33b6a4f554c7a52cf2a1ccf904547b0adea2
 MISC ChangeLog 8007 RMD160 e851c3adfe86ea6aa36f19e516d1ef5e6ada2e9b SHA1 a28f513bc7775fdd57a685c2ebed33f2efdf8f3a SHA256 a32e4d7a63371834eb91f593f25daf8e1c1b99739f4c8d5fe2b9b3b696b9c9e6
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
+MISC openjade-1.3.2-r1.ebuild~ 2935 RMD160 0e7436168def91b516f5cec590eb9134919a1656 SHA1 3b6e41bdfef87f4f7a517a490b4ac73f2abef9e0 SHA256 bb7f559bf79c312e5b70b8d886bbe4e563dd5a2ea85a86c2137644d70b1183a8
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
--- a/app-text/openjade/files/openjade-1.3.2-la-fix.patch
+++ b/app-text/openjade/files/openjade-1.3.2-la-fix.patch
@@ -1,23 +1,38 @@
---- jade/Makefile.sub.orig	2002-11-15 23:46:50.000000000 +0100
-+++ jade/Makefile.sub	2006-04-30 19:48:30.000000000 +0200
+diff -u /var/tmp/portage/app-text/openjade-1.3.2-r1/work/openjade-1.3.2/jade/Makefile.sub /tmp/buffer-content-5978gFR
+--- a/jade/Makefile.sub	2009-11-19 17:21:46.000000000 -0500
++++ b/jade/Makefile.sub	2009-11-19 17:23:24.000000000 -0500
 @@ -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
+-XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a $(splibdir)/libosp.a
++XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a -losp
++EXT_LIBS=-L$(splibdir) -losp $(LIBS)
  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
---- 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 -u /var/tmp/portage/app-text/openjade-1.3.2-r1/work/openjade-1.3.2/Makefile.prog.in /tmp/buffer-content-5978T7K
+--- a/Makefile.prog.in	2002-01-22 06:57:53.000000000 -0500
++++ b/Makefile.prog.in	2009-11-19 17:23:05.000000000 -0500
+@@ -10,16 +10,15 @@
+ top_builddir=@TOP@
+ LINKFLAGS = @LINKFLAGS@
+ 
+-ALL_LIBS = $(XLIBS) $(LIBS)
+ Makefile.lt:
+-	echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
++	echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
+ 
+ PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
+ 
  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)
++	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(EXT_LIBS)
  
  install: $(PROG)
  	-test -d $(DESTDIR)$(bindir) || \
+
diff --git a/app-text/openjade/openjade-1.3.2-r1.ebuild b/app-text/openjade/openjade-1.3.2-r1.ebuild
--- a/app-text/openjade/openjade-1.3.2-r1.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r1.ebuild
@@ -21,11 +21,11 @@ DEPEND="dev-lang/perl
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-la-fix.patch
 	epatch "${FILESDIR}"/${P}-msggen.pl.patch
 	epatch "${FILESDIR}"/${P}-ldflags.patch
 	epatch "${FILESDIR}"/${P}-lib64-fix.patch
 	epatch "${FILESDIR}"/${P}-deplibs.patch
+	epatch "${FILESDIR}"/${P}-la-fix.patch
 }
 
 src_compile() {