# HG changeset patch # User Binki # Date 2009-11-24 20:30:36 # Node ID 1a3a9333d83d32d13255318086345b94371880c3 # Parent 7cee093e32be60ebbb51c23a5071d0fc47ca260d Ooops and ugh, I should fix my script diff --git a/app-text/openjade.fixed/ChangeLog b/app-text/openjade.fixed/ChangeLog deleted file mode 100644 --- a/app-text/openjade.fixed/ChangeLog +++ /dev/null @@ -1,211 +0,0 @@ -# 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 $ - - 22 Apr 2009; Peter Alfredsen - +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 - +files/openjade-1.3.2-lib64-fix.patch, openjade-1.3.2-r1.ebuild: - Fix unreliable check for libosp.la, bug #235610 - - 11 Jun 2007; Marijn Schouten openjade-1.3.2-r1.ebuild: - provide die's with error messages, remove die from econf - - 12 Mar 2007; Leonardo Boshell metadata.xml: - Replacing text-markup herd with the new sgml herd. - - 26 Jan 2007; Tony Vroon - +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 . Closes bug #131335. Text-markup herd - approval: leonardop. - - 21 Dec 2006; Roy Marples openjade-1.3.2-r1.ebuild: - Added ~sparc-fbsd keyword. - - 23 Nov 2006; Leonardo Boshell - openjade-1.3.2-r1.ebuild: - Update opensp dependency to >=1.5.1 since 1.5-r1 can cause problems such as - bug #143833. - - 05 Apr 2006; Diego Pettenò - openjade-1.3.2-r1.ebuild: - Add ~x86-fbsd keyword. - - 16 Mar 2006; Martin Ehmsen openjade-1.3.2-r1.ebuild: - Don't install COPYING, found by QA script. - - 25 Jun 2005; Alastair Tse openjade-1.3.2-r1.ebuild: - add march to allowed flags. (#78284) - - 06 Jun 2005; Leonardo Boshell metadata.xml: - Adding metadata.xml - - 05 Jun 2005; Simon Stelling openjade-1.3.2-r1.ebuild: - fully multilibified openjade - - 22 May 2005; Mamoru KOMACHI openjade-1.3.2-r1.ebuild: - Install manpage. This closes bug #91934. - - 09 Sep 2004; Hardave Riar openjade-1.3.2-r1.ebuild: - Added gnuconfig_update for mips - - 09 Sep 2004; Travis Tilley openjade-1.3.2-r1.ebuild: - made openjade $(get_libdir)-aware for installing to lib64/lib32 - - 08 Sep 2004; Mamoru KOMACHI openjade-1.3.2-r1.ebuild: - Don't unset C[XX]FLAGS. This closes bug #59514. - - 07 Aug 2004; Tom Martin openjade-1.3.1-r5.ebuild, - openjade-1.3.1-r6.ebuild, openjade-1.3.2-r1.ebuild: - Typo in DESCRIPTION: implemetation -> implementation. Bug 59717. - - 01 Jul 2004; Jeremy Huddleston - openjade-1.3.1-r5.ebuild, openjade-1.3.1-r6.ebuild: - virtual/glibc -> virtual/libc - - 28 Jun 2004; Tom Gall openjade-1.3.2-r1.ebuild: - stable on ppc64, bug #54792 - - 15 Apr 2004; Michael McCabe openjade-1.3.2-r1.ebuild: - adding s390 keywords - - 21 Mar 2004; Joshua Kinard openjade-1.3.2-r1.ebuild: - Marked stable on mips. - - 04 Mar 2004; Joshua Kinard openjade-1.3.2-r1.ebuild: - Added ~mips to KEYWORDS to satisfy repoman deps. - - 24 Nov 2003; Jason Wever openjade-1.3.2-r1.ebuild: - Marked stable on sparc, fixes bug #33913. - - 21 Nov 2003; Jason Wever openjade-1.3.2-r1.ebuild: - Added ~sparc keyword. - - 17 Nov 2003; Aron Griffis openjade-1.3.2-r1.ebuild: - Stable on alpha - - 14 Sep 2003; David Holm openjade-1.3.2-r1.ebuild: - Added to ~ppc, tested by Chris Lyttle . - - 07 Aug 2003; Lisa Seelye openjade-1.3.2-r1.ebuild: - Changed make to emake so it builds in parallel (for distcc..) - - 15 Jul 2003; Alastair Tse openjade-1.3.2-r1.ebuild: - unmasking since opensp got unmasked without this. hmm - -*openjade-1.3.2-r1 (07 May 2003) - - 23 Jul 2003; Guy Martin openjade-1.3.2-r1.ebuild : - Added fix and keyword for hppa. - - 07 May 2003; Alastair Tse openjade-1.3.2-r1.ebuild, - openjade-1.3.2.ebuild: - rev bump to force opensp update - -*openjade-1.3.2 (28 Apr 2003) - - 28 Apr 2003; Alastair Tse openjade-1.3.2.ebuild, - files/openjade-1.3.2-msggen.pl.patch, files/openjade-1.3.2.dsssl-catalog: - version bump. opensp has been moved into a seperate package (app-text/opensp) - - -*openjade-1.3.1-r6 (30 Dec 2002) - - 03 Jun 2003; Guy Martin openjade-1.3.1-r6.ebuild : - Forcing CFLAGS=CXXFLAGS="-O1" for hppa. Otherwise it segfault. - - 10 Feb 2003; Guy Martin openjade-1.3.1-r6.ebuild : - Added hppa to keywords. - - 30 Dec 2002; Matthew Turk : - changed to inherit sgml-catalog and better deal with catalogs. - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*openjade-1.3.1-r5 (04 Oct 2002) - - 19 Oct 2002; Daniel Ahlberg openjade-1.3.1-r5.ebuild : - Updated to mirror://sourceforge in SRC_URI. - - 4 Oct 2002; Matthew Turk openjade-1.3.1-r5.ebuild: - Hoping to fix most of our problems. Filtering out ALL optimizations, - as A) this is a small, low-overhead package and B) they seem to cause - most of the headaches I've been having over the last few months. - -*openjade-1.3.1-r4 (28 Jun 2002) - - 19 Oct 2002; Daniel Ahlberg openjade-1.3.1-r4.ebuild : - Updated to mirror://sourceforge in SRC_URI. - - 4 Aug 2002; Spider openjade-1.3.1-r4.ebuild : - filter out -fno-exceptions - - 2 Aug 2002; phoen][x openjade-1.3.1-r4.ebuild : - Added SLOT. - - 15 Jul 2002; Owen Stampflee : - - Added PPC to KEYWORDS. - - 28 Jun 2002; Seemant Kulleen openjade-1.3.1-r4.ebuild - files/digest-openjade-1.3.1-r4 : - - header files go in a flat /usr/include/OpenSP instead of into a hierarchy - of subdirectories. This is consistent with Mandrake's src.rpm as well. - Thanks again to Peter Simons. Bug #3994 closed. - -*openjade-1.3.1-r3 (28 Jun 2002) - - 28 Jun 2002; Seemant Kulleen openjade-1.3.1-r3.ebuild - files/digest-openjade-1.3.1-r3 : - - elibtoolized, added SLOT and LICENSE, and install header files into - /usr/include/OpenSP instead of /usr/include/sp. Thanks to - simons+gentoo@cryp.to (Peter Simons) in bug #3994 - -*openjade-1.3.1-r2 (23 Apr 2002) - - 19 Oct 2002; Daniel Ahlberg openjade-1.3.1-r2.ebuild : - Updated to mirror://sourceforge in SRC_URI. - - 2 Aug 2002; phoen][x openjade-1.3.1-r2.ebuild : - Added LICENSE, SLOT. - - 23 Apr 2002; M.Schlemmer openjade-1.3.1-r2.ebuild : - - Removed the unicode catalog again, as it breaks sgml2xml among things. - -*openjade-1.3.1-r1 (06 Apr 2002) - - 07 Apr 2002; M.Schlemmer openjade-1.3.1-r1.ebuild : - - Another libtool "relink" bug bites the dust ... libtoolized it. Also - added the catalog removing again. - -*openjade-1.3.1 (06 Apr 2002) - - 06 Apr 2002; Geert Bevin openjade-1.3.1.ebuild : - - Version upgrade, this version is compatible with gcc 3. - -*openjade-1.3-r2 (21 Mar 2002) - - 21 Mar 2002; Seemant Kulleen openjade-1.3-r2.ebuild : - - HTML documentation no longer gzipped; reported by stefan@mdy.univie.ac.at - -*openjade-1.3-r2 (1 Feb 2002) - - 1 Feb 2002; G.Bevin ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/app-text/openjade.fixed/Manifest b/app-text/openjade.fixed/Manifest deleted file mode 100644 --- a/app-text/openjade.fixed/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -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-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 -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~ 2895 RMD160 88f2cba906dbc9ea5e2369141b02b597d0b92d55 SHA1 23f305a7f6e470ce35995545ae83620080e99713 SHA256 3a9c532e8373ec78e9cb7dad5393310c9970cb26e98a852f7ecba8fdebc8933b diff --git a/app-text/openjade.fixed/files/openjade-1.3.2-deplibs.patch b/app-text/openjade.fixed/files/openjade-1.3.2-deplibs.patch deleted file mode 100644 --- a/app-text/openjade.fixed/files/openjade-1.3.2-deplibs.patch +++ /dev/null @@ -1,40 +0,0 @@ -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.fixed/files/openjade-1.3.2-la-fix.patch b/app-text/openjade.fixed/files/openjade-1.3.2-la-fix.patch deleted file mode 100644 --- a/app-text/openjade.fixed/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.fixed/files/openjade-1.3.2-ldflags.patch b/app-text/openjade.fixed/files/openjade-1.3.2-ldflags.patch deleted file mode 100644 --- a/app-text/openjade.fixed/files/openjade-1.3.2-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/app-text/openjade.fixed/files/openjade-1.3.2-lib64-fix.patch b/app-text/openjade.fixed/files/openjade-1.3.2-lib64-fix.patch deleted file mode 100644 --- a/app-text/openjade.fixed/files/openjade-1.3.2-lib64-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -See https://bugs.gentoo.org/show_bug.cgi?id=235610 - ---- config/configure.in -+++ config/configure.in -@@ -53,7 +53,7 @@ - esac - # On PPC64 libosp is to be found in /usr/lib64; thus - # fall back to this directory --test -d ${osplibdir}64 && osplibdir=${osplibdir}64 -+test -f ${osplibdir}64/libosp.la && osplibdir=${osplibdir}64 - AC_MSG_CHECKING(location of OpenSP Library) - AC_ARG_ENABLE(splibdir, - [ --enable-splibdir=pathlist ---- configure -+++ configure -@@ -1753,7 +1753,7 @@ - esac - # On PPC64 libosp is to be found in /usr/lib64; thus - # fall back to this directory --test -d ${osplibdir}64 && osplibdir=${osplibdir}64 -+test -f ${osplibdir}64/libosp.la && osplibdir=${osplibdir}64 - echo "$as_me:$LINENO: checking location of OpenSP Library" >&5 - echo $ECHO_N "checking location of OpenSP Library... $ECHO_C" >&6 - # Check whether --enable-splibdir or --disable-splibdir was given. diff --git a/app-text/openjade.fixed/files/openjade-1.3.2-msggen.pl.patch b/app-text/openjade.fixed/files/openjade-1.3.2-msggen.pl.patch deleted file mode 100644 --- a/app-text/openjade.fixed/files/openjade-1.3.2-msggen.pl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/app-text/openjade.fixed/files/openjade-1.3.2.dsssl-catalog b/app-text/openjade.fixed/files/openjade-1.3.2.dsssl-catalog deleted file mode 100644 --- a/app-text/openjade.fixed/files/openjade-1.3.2.dsssl-catalog +++ /dev/null @@ -1,4 +0,0 @@ -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/app-text/openjade.fixed/metadata.xml b/app-text/openjade.fixed/metadata.xml deleted file mode 100644 --- a/app-text/openjade.fixed/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - sgml - diff --git a/app-text/openjade.fixed/openjade-1.3.2-r1.ebuild b/app-text/openjade.fixed/openjade-1.3.2-r1.ebuild deleted file mode 100644 --- a/app-text/openjade.fixed/openjade-1.3.2-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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.38 2009/04/22 21:59:35 loki_val Exp $ - -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_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 -} - -src_compile() { - # 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 - elibtoolize - - SGML_PREFIX=/usr/share/sgml - - 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} - - emake || die "make failed" -} - -src_install() { - dodir /usr - dodir /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" diff --git a/app-text/openjade.fixed/openjade-1.3.2-r1.ebuild~ b/app-text/openjade.fixed/openjade-1.3.2-r1.ebuild~ deleted file mode 100644 --- a/app-text/openjade.fixed/openjade-1.3.2-r1.ebuild~ +++ /dev/null @@ -1,98 +0,0 @@ -# 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.38 2009/04/22 21:59:35 loki_val Exp $ - -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_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-msggen.pl.patch - epatch "${FILESDIR}"/${P}-ldflags.patch - epatch "${FILESDIR}"/${P}-lib64-fix.patch - epatch "${FILESDIR}"/${P}-deplibs.patch -} - -src_compile() { - # 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 - elibtoolize - - SGML_PREFIX=/usr/share/sgml - - 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} - - emake || die "make failed" -} - -src_install() { - dodir /usr - dodir /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" 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,6 +21,7 @@ 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