From f3dcea2e7dc3315f254f2488fa50f8b1e9fa897d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Thu, 14 Feb 2008 11:09:23 +0000 Subject: [PATCH] Fix bug #210041, bug #210039, thanks to vapier Package-Manager: portage-2.1.3.19 --- dev-libs/nspr/ChangeLog | 6 +++++- dev-libs/nspr/Manifest | 8 ++++---- dev-libs/nspr/nspr-4.6.7.ebuild | 18 ++++++++++-------- dev-libs/nspr/nspr-4.6.8.ebuild | 16 +++++++++------- dev-libs/nspr/nspr-4.7.ebuild | 24 +++++++++++++++++------- 5 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 37df9566993c..f7f7cdb1ae7c 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.94 2008/02/11 12:13:56 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.95 2008/02/14 11:09:23 armin76 Exp $ + + 14 Feb 2008; Raúl Porcel nspr-4.6.7.ebuild, + nspr-4.6.8.ebuild, nspr-4.7.ebuild: + Fix bug #210041, bug #210039, thanks to vapier *nspr-4.7 (11 Feb 2008) *nspr-4.6.8 (11 Feb 2008) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index cf1860b26d6a..a07491e1eeb8 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -8,8 +8,8 @@ AUX nspr.pc.in 250 RMD160 4b09e190d343398d26568ed0dce821f951128782 SHA1 edcc81bc DIST nspr-4.6.7.tar.gz 1303759 RMD160 11a0d8b14ebdd441f6899c464b77144704ab638e SHA1 cf45319d02285ec5479445a1e9adfb9e94f55a6a SHA256 314e078f954677f469f2a60e8aca8efa3dd1807f7e1a109cc688a2469e2e3b70 DIST nspr-4.6.8.tar.gz 1313108 RMD160 da8b77c3b386adb82467613e0bcdbdf5f68369ea SHA1 ca0d7a940e1cf6cf6bd63680fedf090195d0b460 SHA256 47750e6a99e2570fa2119f21d5d201174282679352379a565e3e5a80453e48b1 DIST nspr-4.7.tar.gz 1304632 RMD160 9a2f24e9bde6006dea4af2f6d0ff7a3f419df5f4 SHA1 5d65e7960cde2059bfbc854c47c1eb295b9a2198 SHA256 6662a33cd04dee12d3b85c195277d05b81f46ec22369589fe371dad06e681aff -EBUILD nspr-4.6.7.ebuild 2588 RMD160 c010971196adf0fe5dc7548023363d539c665fe1 SHA1 ac4837e5f602fc8349b371db1261d1c3bf938dca SHA256 fe6c85e5b5ab779e7d7f7bb8659c5dc9ad6af34c7e98fc64a5a133d23c80aed5 -EBUILD nspr-4.6.8.ebuild 2596 RMD160 a3019c18000374938692e7edb787c5706b5ea841 SHA1 cf9147c5d3d89209a586c50a27c10d7b33fd27e7 SHA256 54aade443d95a6603d8440d020a56e3823a2ca7cb4f7cb61c4e31088934f0b72 -EBUILD nspr-4.7.ebuild 1875 RMD160 d6e08dd12ee963abb162b585db902876a32a9b1d SHA1 b7ce096ba44ca049110ae5a52e6418f80b99534d SHA256 c1b620b2f2c3d1ba5ccf7a3f9eb99512970700e23e69b8c03b218a73c449ae9c -MISC ChangeLog 12155 RMD160 72aa8a39fc1d8544206404297c5a43376e94b1ff SHA1 756d30688bf87f1ad1ac8e60e3637899f1303caa SHA256 71b13d657d7fb61808288a0fdcc67262fbc41017823a63ceac165ad727ff36ca +EBUILD nspr-4.6.7.ebuild 2684 RMD160 f5a1d2ddf1fadfb52204a98c50ac8b0760664ae3 SHA1 4a43a0f6c52b40562d03a677623a6cdee529a3da SHA256 af8da8d3b899426373068cd16ab51a299a66bd9513f0b2085e64b0b94be04294 +EBUILD nspr-4.6.8.ebuild 2693 RMD160 69644fff1881ae6af9cbe8312f6f7b1a5c7c6478 SHA1 d7248886a54e467549a7da4add3b231dfa0ac6bb SHA256 604e37c045603859a21307f043b8db11a0a20ae6253c5072a62f279785f4fd38 +EBUILD nspr-4.7.ebuild 2158 RMD160 a5a30ac7affbbbc286e1e93f874f25e5495d56cf SHA1 9c7da1709cf2c511e623926e86cf11bb0bff022e SHA256 4059a42a400ac9be53e789f5652562f33d108d6ef1e6efd7df8a53d599ecba7c +MISC ChangeLog 12311 RMD160 4f46b8508bd82d94f06034995283d2d992003436 SHA1 ec5e29ec435511e3a679b4587888e6aaa661c22e SHA256 61c0915a0854141f55af52fe60fff626c14a873e1b80fa9d23263567ae0ace1d MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b diff --git a/dev-libs/nspr/nspr-4.6.7.ebuild b/dev-libs/nspr/nspr-4.6.7.ebuild index 92a30fea2892..66b850601775 100644 --- a/dev-libs/nspr/nspr-4.6.7.ebuild +++ b/dev-libs/nspr/nspr-4.6.7.ebuild @@ -1,8 +1,8 @@ -# 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/dev-libs/nspr/nspr-4.6.7.ebuild,v 1.9 2007/12/17 23:34:06 redhatter Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.7.ebuild,v 1.10 2008/02/14 11:09:23 armin76 Exp $ -inherit eutils multilib +inherit eutils multilib toolchain-funcs DESCRIPTION="Netscape Portable Runtime" HOMEPAGE="http://www.mozilla.org/projects/nspr/" @@ -28,11 +28,13 @@ src_unpack() { src_compile() { cd build - if use amd64 || use ppc64 || use ia64 || use s390; then - myconf="${myconf} --enable-64bit" - else - myconf="" - fi + echo > "${T}"/test.c + $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + case $(file "${T}"/test.o) in + *64-bit*) myconf="${myconf} --enable-64bit";; + *32-bit*) ;; + *) die "FAIL";; + esac if use ipv6; then myconf="${myconf} --enable-ipv6" diff --git a/dev-libs/nspr/nspr-4.6.8.ebuild b/dev-libs/nspr/nspr-4.6.8.ebuild index 702886a2199c..11b32df4a97f 100644 --- a/dev-libs/nspr/nspr-4.6.8.ebuild +++ b/dev-libs/nspr/nspr-4.6.8.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.8.ebuild,v 1.1 2008/02/11 12:13:56 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.8.ebuild,v 1.2 2008/02/14 11:09:23 armin76 Exp $ -inherit eutils multilib +inherit eutils multilib toolchain-funcs DESCRIPTION="Netscape Portable Runtime" HOMEPAGE="http://www.mozilla.org/projects/nspr/" @@ -28,11 +28,13 @@ src_unpack() { src_compile() { cd build - if use amd64 || use ppc64 || use ia64 || use s390; then - myconf="${myconf} --enable-64bit" - else - myconf="" - fi + echo > "${T}"/test.c + $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + case $(file "${T}"/test.o) in + *64-bit*) myconf="${myconf} --enable-64bit";; + *32-bit*) ;; + *) die "FAIL";; + esac if use ipv6; then myconf="${myconf} --enable-ipv6" diff --git a/dev-libs/nspr/nspr-4.7.ebuild b/dev-libs/nspr/nspr-4.7.ebuild index d358412231b6..1ed82c5e849f 100644 --- a/dev-libs/nspr/nspr-4.7.ebuild +++ b/dev-libs/nspr/nspr-4.7.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.ebuild,v 1.1 2008/02/11 12:13:56 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.ebuild,v 1.2 2008/02/14 11:09:23 armin76 Exp $ -inherit eutils multilib +inherit eutils multilib toolchain-funcs DESCRIPTION="Netscape Portable Runtime" HOMEPAGE="http://www.mozilla.org/projects/nspr/" @@ -28,11 +28,13 @@ src_unpack() { src_compile() { cd "${S}"/build - if use amd64 || use ppc64 || use ia64 || use s390; then - myconf="${myconf} --enable-64bit" - else - myconf="" - fi + echo > "${T}"/test.c + $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + case $(file "${T}"/test.o) in + *64-bit*) myconf="${myconf} --enable-64bit";; + *32-bit*) ;; + *) die "FAIL";; + esac if use ipv6; then myconf="${myconf} --enable-ipv6" @@ -71,3 +73,11 @@ src_install () { # Remove stupid files in /usr/bin rm "${D}"/usr/bin/{prerr.properties,nspr.pc} } + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6 +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6 +} -- 2.26.2