Fix unreliable check for libosp.la, bug #235610

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc7-00236-g437f2f9 sparc64

4 files changed, 38 insertions, 8 deletions

diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index 5256dfad97f9..43a51fbedefa 100644
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/openjade
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.51 2007/06/11 14:38:30 hkbst Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.52 2008/12/09 21:23:47 bluebird Exp $
+
+  09 Dec 2008; Friedrich Oslage <bluebird@gentoo.org>
+  +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 <hkBst@gentoo.org> openjade-1.3.2-r1.ebuild:
   provide die's with error messages, remove die from econf
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 35bb960bb8d2..d1dd5e917094 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -1,8 +1,9 @@
 AUX openjade-1.3.2-la-fix.patch 1613 RMD160 57c5797e6978ec0b78f0ad7fb764669def4601ef SHA1 0871c2ee0205c5d517ef86e5bc37e78626c84b27 SHA256 a4836205a25fc5deb303cc93f87c9285e6f39667b712234ec93513a6bf17378d
 AUX openjade-1.3.2-ldflags.patch 1393 RMD160 e230cfbc1bb3242cd7a98f1507c539d4c988b7d1 SHA1 41bcae1dd6cb0931e8ae5e7b45b21505edcafb1f SHA256 3e68a96ef4e1c0f4a15a97fc44e032160a44af622edf943eddbaeaf262d465f4
+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 2804 RMD160 ac1583d56dad5b783cb87bef52a456cebb723d2f SHA1 4e648796064a89561b13cfd73e3b6e4c38f34109 SHA256 d832746cf45daaeb7fa275bb9a05d353477678a32ff7a848df972935a674f807
-MISC ChangeLog 7537 RMD160 66d5df766ca9b4734b80c2ab35d284abe9fa6880 SHA1 1d861190a1fe791f661d3e162503fb229e868006 SHA256 50af9ce4aae7869ddcd8fff61ddcf5cbb7ff072e3b0e74e00f75cc9474f86709
+EBUILD openjade-1.3.2-r1.ebuild 2854 RMD160 99ec0d6ef5bfdd32c87c81ded4ec7d2f1fa73711 SHA1 c565205ae8ba2edf4071dd0195ac461f74afa074 SHA256 a1b0b30703b2f177ca4f69cdc4496e7c3232df4e41f20711cd453063e5b3a097
+MISC ChangeLog 7712 RMD160 4a9b11efcaccabb79ef644fc093f97d6ce9a5022 SHA1 768f9bff425738e1f3b4c2070dcd135bea66ea58 SHA256 7cefb9aabe6750d9717c8502fb68981c7291729b0c287402afeb7a9c8b3171dd
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
diff --git a/app-text/openjade/files/openjade-1.3.2-lib64-fix.patch b/app-text/openjade/files/openjade-1.3.2-lib64-fix.patch
new file mode 100644
index 000000000000..773e9b8087f9
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-lib64-fix.patch
@@ -0,0 +1,24 @@
+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/openjade-1.3.2-r1.ebuild b/app-text/openjade/openjade-1.3.2-r1.ebuild
index 21674e7d3a3a..f7c5719c078d 100644
--- a/app-text/openjade/openjade-1.3.2-r1.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.36 2007/06/11 14:38:30 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.2-r1.ebuild,v 1.37 2008/12/09 21:23:47 bluebird Exp $
 
 inherit libtool sgml-catalog eutils flag-o-matic multilib
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-msggen.pl.patch
 	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-lib64-fix.patch
 }
 
 src_compile() {
@@ -55,7 +56,7 @@ src_install() {
 	dodir /usr
 	dodir /usr/$(get_libdir)
 
-	make DESTDIR=${D} \
+	make DESTDIR="${D}" \
 		libdir=/usr/$(get_libdir) \
 		install install-man || die "make install failed"
 
@@ -72,7 +73,7 @@ src_install() {
 	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
+	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}