Allow more flags (#209829)

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 7 insertions, 116 deletions

diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index 0bab71bac9d8..8db0912ed5dd 100644
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/openjade
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.75 2013/09/11 19:29:04 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.76 2013/10/12 20:50:00 pacho Exp $
+
+  12 Oct 2013; Pacho Ramos <pacho@gentoo.org> -openjade-1.3.2-r5.ebuild,
+  openjade-1.3.2-r6.ebuild:
+  Allow more flags (#209829)
 
 *openjade-1.3.2-r6 (11 Sep 2013)
 
diff --git a/app-text/openjade/openjade-1.3.2-r5.ebuild b/app-text/openjade/openjade-1.3.2-r5.ebuild
deleted file mode 100644
index 9f40d560e74d..000000000000
--- a/app-text/openjade/openjade-1.3.2-r5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 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-r5.ebuild,v 1.2 2013/01/02 21:38:35 floppym Exp $
-
-EAPI=2
-
-inherit autotools 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="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-msggen.pl.patch
-	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
-	epatch "${FILESDIR}"/${P}-libosp-la.patch
-	epatch "${FILESDIR}"/${P}-gcc46.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.ac || die
-	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
-	rm config/missing || die
-
-	AT_NOEAUTOMAKE=yes
-	eautoreconf
-
-	SGML_PREFIX=/usr/share/sgml
-}
-
-src_configure() {
-	econf \
-		--enable-http \
-		--enable-default-catalog=/etc/sgml/catalog \
-		--enable-default-search-path=/usr/share/sgml \
-		--enable-splibdir=/usr/$(get_libdir) \
-		--libdir=/usr/$(get_libdir) \
-		--datadir=/usr/share/sgml/${P} \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	# Bug 412725.
-	unset INCLUDE
-
-	emake -j1 SHELL=/bin/bash || die "make failed"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)
-
-	make DESTDIR="${D}" \
-		libdir=/usr/$(get_libdir) \
-		SHELL=/bin/bash \
-		install install-man || die "make install failed"
-
-	prune_libtool_files
-
-	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-r6.ebuild b/app-text/openjade/openjade-1.3.2-r6.ebuild
index 3b525beda710..605f065b9eff 100644
--- a/app-text/openjade/openjade-1.3.2-r6.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r6.ebuild,v 1.1 2013/09/11 19:29:04 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.2-r6.ebuild,v 1.2 2013/10/12 20:50:00 pacho Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ src_prepare() {
 	# 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"
+	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
 	strip-flags
 
 	# Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault