added prefix support

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 174 insertions, 5 deletions

diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index c4a853fb316d..0bab71bac9d8 100644
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,6 +1,12 @@
 # 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.74 2013/07/21 10:07:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.75 2013/09/11 19:29:04 ottxor Exp $
+
+*openjade-1.3.2-r6 (11 Sep 2013)
+
+  11 Sep 2013; Christoph Junghans <ottxor@gentoo.org>
+  +files/openjade-1.3.2-darwin.patch, +openjade-1.3.2-r6.ebuild:
+  added prefix support
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> -openjade-1.3.2-r4.ebuild,
   metadata.xml:
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index e7bf26d814cd..437ecc52d225 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX openjade-1.3.2-acinclude.m4 1922 SHA256 89e781bf9acc4c02a5cc0c737cadc6cb38254de527974b3ea023cb4738127260 SHA512 76915d34e746f85eb15d2c79cc7a030070e5d266e3b2520d2321195f19c13aebc9a28fc4298006ab90a73148baebda568b3dc29517505224b78a8c244c2c0fdb WHIRLPOOL d10c70f455c645d2477c90d0a2afb4051196f34936ef44ae26224f9938e12849d6ad738bdef4c1059b5e3b33ce09bcbf1cc4f3ada58918587a681cc99c9be5c9
+AUX openjade-1.3.2-darwin.patch 1109 SHA256 ccd1be234f2ed49d2a0f43784d001215f014ffa0f5b216a98f746196b675e4c2 SHA512 ba6a5a78ee9bbc1c9a598bdfcc1bd1ab78a0220c1ad130b2aeff8911854cfe211026a1b30377e3d3fa56b5a3cd6519b58c1b1f2158bae82b63dc38031e126c68 WHIRLPOOL 933482a69551df4f8fadbb6f2f43cf680ef10b12a4bf6e58f3123e9c27f15e57add01d4a577b6d3af4b333315a147864256b3b0cdf752dee0c742841234bd95f
 AUX openjade-1.3.2-deplibs.patch 1506 SHA256 93905d0b4878f580fece323c1ebb4b5d5db05f1e6f06dde39cfd9b2dd0a95433 SHA512 4a7df423c8b8ad15a1a39900c1bb6882157534c981a9c0679b2c6d71a435b6bf3adf27052799a9eb1dd4f6ecd7e19be72889d9a55c7511ffde9dd11f4c558d9e WHIRLPOOL 40d7d622c11ceda74bacd05e188bf321f25b61fb03c5aa8c84383606fbdbbc80eecc7c559a4f1f710285e0867c950cc656c4f8b8907cf2eede0adeb8f33b22c6
 AUX openjade-1.3.2-gcc46.patch 2164 SHA256 fb873273dc31becdab60ff669c683bbb363ad3abb08949ad0ac54cfc28cf2214 SHA512 df222938e4a04d27618540592e61b8d71fe42caaa4d8aeb90bfcd338efb1ff7903ea860dc460b65a69adf1ccf300a7d67459ff4950a35d9a35569fb8b3ed1438 WHIRLPOOL 2bc00a4f01e8c5af941ceaf87171231064b96131bf1575c6d6f506a6c83c40c20e789691d8602cc98ef00cc8d1e899d2594e8a937315b08ee0b3af4611277e51
 AUX openjade-1.3.2-ldflags.patch 819 SHA256 7fd651fb682d70a3f5062a65d0da60bebdc5b958cc936d7980339f49b360c3a0 SHA512 6112fbc474f0f2c3c024040b42b13290ba2763381b7f99071d7d9d4f8d11bf1087a2c319eba9f0006e2cc067a14a52cedde98444338b180f9566172b52c044ec WHIRLPOOL 2d0d5a6bce8d438dcd2f4406fafbc87ef1b1ec54b6ba0411eb5df11e17e2f2406dbc086b476135aca4512f75595425b45306f656087bac5d66b9110327ba65ee
@@ -12,12 +13,17 @@ AUX openjade-1.3.2.dsssl-catalog 269 SHA256 f33d7ce1b564b91bbdf5b8983f21ce4c6a0e
 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
-MISC ChangeLog 11159 SHA256 8347e47bf4cc70c9cb247fb96a15714099835c3cfbabf3769a5e00d0d7f3991b SHA512 9c18a46187e17819440c5e607f775fe3a3a0245bea3d1662c49183f8aadb042d1fc578b01b5b67f5cd23e59a9f5586b8dc3d4929ceac7fd8889ce88f0063ab7d WHIRLPOOL c148b7eba1c5379b766628ac0ecde04b048519b788d46fc10421f9d984eddccc690cd08b714bf7a3b2a1e32aa890e459ce89e740ca45958a8f2c164b1f66cfcf
+EBUILD openjade-1.3.2-r6.ebuild 3548 SHA256 629861abdb9ac0fca3b3c463068f16cbdc2ae2687b8c3606464b2970002e0119 SHA512 73f5efb85888d887538c139bc33fefc7d05650ea8c207ea4d10673905cfa12734557765e7475f9bba6ab2f97feaf462a96325fea432baa6ed6cf55197e410773 WHIRLPOOL 931c933e322459733e56c012ee3cb2e95267bcb2e241002b9b21b6d4d531f207c0d119555a5022b23f1c4fc094a000007bd0f03d08ebf8748ec2d55ed96915b7
+MISC ChangeLog 11337 SHA256 a612f5c5ba0809c07616af29e6578536f24272fa681ee95940a06129737987fc SHA512 d84e884bc63a335b8ed6bb8890d4093cce70f1b1d4cf1a22553f7c4dd3a7e0a23bc631fd7f0b8200bb750540b917b811403ab16a9cea4f8861f0b7024577193a WHIRLPOOL ec0f278ada5151c03a6580249b2b7587cbb0bd7cc772f3c0b3e885c27a1fd2dcd5db93e084b37f54b28cd08fe507dbf7f2e0331597dde590b7cc504c0cb616ad
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHrst0ACgkQCaWpQKGI+9S3wACdEvgVob9Z/d/CkTMZWjn3nGFF
-gE8An2g544kK7XZdwMwoiZ6fvb3pm1I9
-=7TiY
+iQEcBAEBCAAGBQJSMMSFAAoJEOeBhlrCAAWGbfQH/3bAG2H6CotLTlKTfdyKUqjw
+GIVO0tgW4j7GheOooVzmXnTX7Ieo79RpIZPY2V33TKOlTMG1icXZTJ+kxiBOLxVx
+4yWiwZCLf/hkCdpBzWweIBl6h4dROCsglH8bI/fhWrJW+prWQRGGS0DdFigk8oez
+FuQnJkJcL9QbVKz9pA4pB4vL44y5qXJAjhm7JhRqyV6l6xQJchejjKBBtAxRbxmv
+QqJgD8p/xtzjSMszSzc83iFvMl35vhZ9Bjdy97OoKYAXm0saZQngg9IKrclVS0v8
+Y3LqC3kO2JVilYAV1KjXwej6ZPgjIux8tLMDw+wTOk0fwzNNY/1RBZZcMi3kZAI=
+=p/bu
 -----END PGP SIGNATURE-----
diff --git a/app-text/openjade/files/openjade-1.3.2-darwin.patch b/app-text/openjade/files/openjade-1.3.2-darwin.patch
new file mode 100644
index 000000000000..524454860d80
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-darwin.patch
@@ -0,0 +1,41 @@
+See also http://finkproject.org/doc/porting/libtool.php
+(Section 3.3) Fixing 1.4.x (Subsection 1) The flat_namespace bug
+--- configure~	2007-10-08 01:55:00 +0200
++++ configure	2007-10-08 01:55:27 +0200
+@@ -3063,9 +3063,6 @@
+ 
+ 
+ case "${host}" in
+-  *-*-darwin*)
+-    LINKFLAGS="-no-undefined"
+-    ;;
+   *)
+     if test "$GXX"
+     then
+@@ -7907,7 +7904,7 @@
+     ;;
+ 
+   darwin* | rhapsody*)
+-    allow_undefined_flag='-undefined suppress'
++    allow_undefined_flag='-undefined suppress -flat_namespace'
+     # FIXME: Relying on posixy $() will cause problems for
+     #        cross-compilation, but unfortunately the echo tests do not
+     #        yet detect zsh echo's removal of \ escapes.
+--- config/ltmain.sh~	2002-01-17 14:45:52 +0100
++++ config/ltmain.sh	2007-10-08 03:08:26 +0200
+@@ -3913,10 +3913,15 @@
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
++case "${host}" in
++  *-*-darwin*)
++    ;;
++  *)
+ 	  if test "$installed" = no && test $need_relink = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
++esac
+ 	done
+       fi
+ 
diff --git a/app-text/openjade/openjade-1.3.2-r6.ebuild b/app-text/openjade/openjade-1.3.2-r6.ebuild
new file mode 100644
index 000000000000..3b525beda710
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r6.ebuild
@@ -0,0 +1,116 @@
+# 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 $
+
+EAPI=5
+
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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
+	epatch "${FILESDIR}"/${P}-darwin.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="${EPREFIX}"/usr/share/sgml
+}
+
+src_configure() {
+	# We need Prefix env, bug #287358
+	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
+	econf \
+		--enable-http \
+		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+		--enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	# Bug 412725.
+	unset INCLUDE
+
+	emake -j1 SHELL="${BASH}"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)
+
+	make DESTDIR="${D}" \
+		SHELL="${BASH}" \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		install install-man
+
+	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"' > ${ED}/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"