Revision bump, fixes bug 136090, bug 181651, bug 209706 and bug 293754

(Portage version: 2.2_rc67-r2/cvs/Linux x86_64)

5 files changed, 156 insertions, 25 deletions

diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index 5830c3c8dba5..df0fce0f8985 100644
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/openjade
-# 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 $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.54 2010/03/21 13:41:32 tommy Exp $
+
+*openjade-1.3.2-r2 (21 Mar 2010)
+
+  21 Mar 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +openjade-1.3.2-r2.ebuild, -files/openjade-1.3.2-la-fix.patch,
+  +files/openjade-1.3.2-libosp-la.patch,
+  +files/openjade-1.3.2-respect-ldflags.patch:
+  Revision bump, fixes bug 136090, bug 181651, bug 209706 and bug 293754
 
   22 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
   +files/openjade-1.3.2-deplibs.patch, files/openjade-1.3.2-la-fix.patch,
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
deleted file mode 100644
index 9f0a13c862f1..000000000000
--- a/app-text/openjade/files/openjade-1.3.2-la-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
---- 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-libosp-la.patch b/app-text/openjade/files/openjade-1.3.2-libosp-la.patch
new file mode 100644
index 000000000000..d106771b599d
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-libosp-la.patch
@@ -0,0 +1,38 @@
+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 ../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
+
+
+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) $(EXT_LIBS)
+ 
+ install: $(PROG)
+ 	-test -d $(DESTDIR)$(bindir) || \
+
diff --git a/app-text/openjade/files/openjade-1.3.2-respect-ldflags.patch b/app-text/openjade/files/openjade-1.3.2-respect-ldflags.patch
new file mode 100644
index 000000000000..51bd0b27dd42
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-respect-ldflags.patch
@@ -0,0 +1,12 @@
+diff -ru a/Makefile.lib.in b/Makefile.lib.in
+--- a/Makefile.lib.in	2002-01-22 05:57:53.000000000 -0600
++++ b/Makefile.lib.in	2009-01-04 16:15:41.000000000 -0600
+@@ -23,7 +23,7 @@
+ 	echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt
+ 
+ lib$(LIB).la: $(LT_OBJS)
+-	$(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
+ 	    -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
+ 
+ install:
diff --git a/app-text/openjade/openjade-1.3.2-r2.ebuild b/app-text/openjade/openjade-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..af91051b4fcd
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2010 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-r2.ebuild,v 1.1 2010/03/21 13:41:32 tommy Exp $
+
+EAPI=2
+
+inherit libtool sgml-catalog eutils flag-o-matic multilib
+
+DESCRIPTION="Jade is an implementation of DSSSL - an ISO standard for formatting SGML and XML documents"
+HOMEPAGE="http://openjade.sourceforge.net"
+SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-text/sgml-common
+	>=app-text/opensp-1.5.1"
+DEPEND="dev-lang/perl
+	${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{deplibs,ldflags,msggen.pl,respect-ldflags,libosp-la}.patch
+	# Please note!  Opts are disabled.  If you know what you're doing
+	# feel free to remove this line.  It may cause problems with
+	# docbook-sgml-utils among other things.
+	ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+	strip-flags
+
+	# Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
+	# on hppa. Using -O1 works fine. So I force it here.
+	use hppa && replace-flags -O2 -O1
+
+	ln -s config/configure.in configure.in
+	#eautoreconf
+	elibtoolize
+
+	SGML_PREFIX=/usr/share/sgml
+}
+
+src_configure() {
+	econf \
+		--enable-http \
+		--enable-default-catalog=/etc/sgml/catalog \
+		--enable-default-search-path=/usr/share/sgml \
+		--libdir=/usr/$(get_libdir) \
+		--datadir=/usr/share/sgml/${P}
+}
+
+src_compile() {
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)
+
+	make DESTDIR="${D}" \
+		libdir=/usr/$(get_libdir) \
+		install install-man || die "make install failed"
+
+	dosym openjade  /usr/bin/jade
+	dosym onsgmls   /usr/bin/nsgmls
+	dosym osgmlnorm /usr/bin/sgmlnorm
+	dosym ospam     /usr/bin/spam
+	dosym ospent    /usr/bin/spent
+	dosym osx       /usr/bin/sgml2xml
+
+	insinto /usr/share/sgml/${P}/
+	doins dsssl/builtins.dsl
+
+	echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${D}/usr/share/sgml/${P}/catalog
+	insinto /usr/share/sgml/${P}/dsssl
+	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
+	newins "${FILESDIR}"/${P}.dsssl-catalog catalog
+# Breaks sgml2xml among other things
+#	insinto /usr/share/sgml/${P}/unicode
+#	doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
+	insinto /usr/share/sgml/${P}/pubtext
+	doins pubtext/*
+
+	dodoc NEWS README VERSION
+	dohtml doc/*.htm
+
+	insinto /usr/share/doc/${PF}/jadedoc
+	doins jadedoc/*.htm
+	insinto /usr/share/doc/${PF}/jadedoc/images
+	doins jadedoc/images/*
+}
+
+sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
+	"/usr/share/sgml/openjade-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
+	"/usr/share/sgml/openjade-${PV}/dsssl/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
+	"/etc/sgml/${P}.cat"