4 files changed, 13 insertions, 127 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/Manifest b/app-text/openjade/Manifest
index 437ecc52d225..77f1a8b276d2 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -12,18 +12,13 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 SHA256 498b8c9eb8eb4adea6bbe63c3e85
 AUX openjade-1.3.2.dsssl-catalog 269 SHA256 f33d7ce1b564b91bbdf5b8983f21ce4c6a0e420f0e8676a8439f460a49b16abc SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340 WHIRLPOOL 64a4089857fe045cf24b2d41f36ed5cfe336b5779f2ed8a927fd11091ef70eaace398b29be12d1a4923464fd47e98128d87029fe59daece3afb556c79528b297
 DIST openjade-1.3.2.tar.gz 894834 SHA256 1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1 WHIRLPOOL 3affbfe811a5650a6adcc70e698eb75bafcbc1f1b205a384bd3bf5cd8885cb049a28d818bf3d807e7f9b00f7f998a39c09f68e55e3283abcc42d90d042ddab20
 EBUILD openjade-1.3.2-r3.ebuild 3058 SHA256 95836e8c4f710e946e231355a6c6ea660c52b7c013a1d6774df62e2d684e7952 SHA512 1214ae58f6158bcb2653fcf5b66f5494eefcdb919caf95c900b6cc63ae6e830b0da953e61be30125cb6f63feaef9e4d5551874cb3ab8d9c1d99679ef579d838e WHIRLPOOL a8102a8233ef1b4acb32b9fd812b457dc0818c93a7ebf543527cea6f14c99a51b64ad4a8ee31e94b5f5e0c0a55533ca8d2b1497a3a328944cb6e2a8e3963d87e
-EBUILD openjade-1.3.2-r5.ebuild 3293 SHA256 8e01b0a71e347b03cc5583edb81ec129a136189f73c6c23b3df230502d32f181 SHA512 21559facb670facef614622817a8b87dcb6392e99ba55846d6be27be21c8ecaf207ce214a171752dc0da836ac4a14c1973023db8a128a5ab749a1d94a5a78de5 WHIRLPOOL 7ca4995cb34bcb9d1eb14cb38b8d628b3ee6bd7c8476c0e2dc88f4e31b152e70fd3a014bb7fa78a24ad883da0da32a30584c93ef22d50917b0def00c219e2631
-EBUILD openjade-1.3.2-r6.ebuild 3548 SHA256 629861abdb9ac0fca3b3c463068f16cbdc2ae2687b8c3606464b2970002e0119 SHA512 73f5efb85888d887538c139bc33fefc7d05650ea8c207ea4d10673905cfa12734557765e7475f9bba6ab2f97feaf462a96325fea432baa6ed6cf55197e410773 WHIRLPOOL 931c933e322459733e56c012ee3cb2e95267bcb2e241002b9b21b6d4d531f207c0d119555a5022b23f1c4fc094a000007bd0f03d08ebf8748ec2d55ed96915b7
-MISC ChangeLog 11337 SHA256 a612f5c5ba0809c07616af29e6578536f24272fa681ee95940a06129737987fc SHA512 d84e884bc63a335b8ed6bb8890d4093cce70f1b1d4cf1a22553f7c4dd3a7e0a23bc631fd7f0b8200bb750540b917b811403ab16a9cea4f8861f0b7024577193a WHIRLPOOL ec0f278ada5151c03a6580249b2b7587cbb0bd7cc772f3c0b3e885c27a1fd2dcd5db93e084b37f54b28cd08fe507dbf7f2e0331597dde590b7cc504c0cb616ad
+EBUILD openjade-1.3.2-r6.ebuild 3548 SHA256 0eef1aa7c2b34f80585368ef4b09643328b90348bcc4437ddee7a571ffb312d5 SHA512 32432bc7ac7c9ebdec6d40202a6dfed2cb0000e9b40a0bb8ebe5eff9bc0ae6758a750762d9661f5d3566c6243868c6e77aef10d6c9576a2ecca0311e532f1f95 WHIRLPOOL 2b66aa05553b757c1e52b9b99e1a6e40206f5f3a3bee0cdd58cd966f9624569b17cd99593fea2088e7941bc030e940c2e286b455d71e5cf3db4ec824c1c048e2
+MISC ChangeLog 11467 SHA256 f75d31d4adafac007339b3cc382cc674a9bc6e903b9074a8856968174413181a SHA512 618a963cd849716bc37012ba658f5bbee1cce3b03db069d9f21f9aabf0929f31fb4e9fa83b75c73404e69ce4ae99b02f525de2a9f47cee0e03851a7e5147063b WHIRLPOOL 1d103284eebd3e3046831aa164a4f89329c59a45aa400bf09b576ba64cbd7e5cb44bd0b57167c281e9e78c2437ffa643301d416cf89af6ac94ebf2eb05c1eda4
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSMMSFAAoJEOeBhlrCAAWGbfQH/3bAG2H6CotLTlKTfdyKUqjw
-GIVO0tgW4j7GheOooVzmXnTX7Ieo79RpIZPY2V33TKOlTMG1icXZTJ+kxiBOLxVx
-4yWiwZCLf/hkCdpBzWweIBl6h4dROCsglH8bI/fhWrJW+prWQRGGS0DdFigk8oez
-FuQnJkJcL9QbVKz9pA4pB4vL44y5qXJAjhm7JhRqyV6l6xQJchejjKBBtAxRbxmv
-QqJgD8p/xtzjSMszSzc83iFvMl35vhZ9Bjdy97OoKYAXm0saZQngg9IKrclVS0v8
-Y3LqC3kO2JVilYAV1KjXwej6ZPgjIux8tLMDw+wTOk0fwzNNY/1RBZZcMi3kZAI=
-=p/bu
+iEYEAREIAAYFAlJZtfkACgkQCaWpQKGI+9TnDgCfWDt+ZnCPrHpDPOsumx4qUcqk
+MFkAnRrEivAzKxzD10nMtAtsKukBYLM6
+=3+kE
 -----END PGP SIGNATURE-----
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