From ab8a7bb73e36f9291e4b6dc0db89ff570fdae8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 4 May 2011 19:49:28 +0200 Subject: [PATCH] app-text/openjade-1.3.2-r3 backport from main tree. This version does not fail to build if .la files are removed. R=davidjames,raymes BUG=none TEST=emerge on chroot system itself. Change-Id: Id2086a62ddf05c4e5331ba91f817ebd335b84abb --- .../files/openjade-1.3.2-deplibs.patch | 40 ++++++++ .../files/openjade-1.3.2-ldflags.patch | 13 +++ .../files/openjade-1.3.2-libosp-la.patch | 38 ++++++++ .../files/openjade-1.3.2-msggen.pl.patch | 11 +++ .../openjade-1.3.2-respect-ldflags.patch | 12 +++ .../files/openjade-1.3.2.dsssl-catalog | 4 + .../openjade/openjade-1.3.2-r3.ebuild | 97 +++++++++++++++++++ 7 files changed, 215 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-deplibs.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-ldflags.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-libosp-la.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-respect-ldflags.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2.dsssl-catalog create mode 100644 sdk_container/src/third_party/portage-stable/app-text/openjade/openjade-1.3.2-r3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-deplibs.patch b/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-deplibs.patch new file mode 100644 index 0000000000..3466ad7d85 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-ldflags.patch b/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-ldflags.patch new file mode 100644 index 0000000000..4ddd4d4148 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-ldflags.patch @@ -0,0 +1,13 @@ +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 diff --git a/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-libosp-la.patch b/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-libosp-la.patch new file mode 100644 index 0000000000..d106771b59 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch b/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch new file mode 100644 index 0000000000..e9fc485be2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch @@ -0,0 +1,11 @@ +--- msggen.pl 2003-02-19 10:57:37.000000000 -0800 ++++ msggen.pl 2003-02-19 10:58:06.000000000 -0800 +@@ -61,7 +61,7 @@ + else { + $field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");; + $type[$num] = substr($field[0], 0, 1); +- $argc = int(substr($field[0], 1, 1)); ++ $argc = substr($field[0], 1, 1); + } + $nargs[$num] = $argc; + $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag"); diff --git a/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-respect-ldflags.patch b/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2-respect-ldflags.patch new file mode 100644 index 0000000000..51bd0b27dd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2.dsssl-catalog b/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2.dsssl-catalog new file mode 100644 index 0000000000..11bc0425af --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/openjade/files/openjade-1.3.2.dsssl-catalog @@ -0,0 +1,4 @@ +PUBLIC "-//James Clark//DTD DSSSL Flow Object Tree//EN" "fot.dtd" +PUBLIC "ISO/IEC 10179:1996//DTD DSSSL Architecture//EN" "dsssl.dtd" +PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" "style-sheet.dtd" +PUBLIC "-//OpenJade//DTD DSSSL Style Sheet//EN" "style-sheet.dtd" diff --git a/sdk_container/src/third_party/portage-stable/app-text/openjade/openjade-1.3.2-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-text/openjade/openjade-1.3.2-r3.ebuild new file mode 100644 index 0000000000..ca5f0d3dcf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/openjade/openjade-1.3.2-r3.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2011 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-r3.ebuild,v 1.8 2011/01/12 10:35:56 xarthisius 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 x86 ~sparc-fbsd ~x86-fbsd" +IUSE="static-libs" + +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} \ + $(use_enable static-libs static) +} + +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"